From ed5be35e2ef69b23260d4ec1ce3cabfc4aee0c95 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Sat, 19 Jun 2021 01:50:35 +0100 Subject: [PATCH] Remove use of deprecated getAllRefs() in ReceivePack Repository.getAllRefs() is deprecated and should not be used anymore. Leverage the ref-db and the retrieval of refs by prefix and adapt the result to the expected refname/ref map. Bug: 534731 Change-Id: I37a9092859f220ddc4e5063d01544f3e82208be8 Signed-off-by: Luca Milanesio --- .../eclipse/jgit/transport/ReceivePack.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 79f60c3202..58f8895e00 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -29,6 +29,7 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.UncheckedIOException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; @@ -37,6 +38,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.InvalidObjectIdException; @@ -441,7 +444,7 @@ public class ReceivePack { */ public void setAdvertisedRefs(Map allRefs, Set additionalHaves) { - refs = allRefs != null ? allRefs : db.getAllRefs(); + refs = allRefs != null ? allRefs : getAllRefs(); refs = refFilter.filter(refs); advertisedHaves.clear(); @@ -1295,6 +1298,21 @@ public class ReceivePack { return stats; } + /** + * Extract the full list of refs from the ref-db. + * + * @return Map of all refname/ref + */ + private Map getAllRefs() { + try { + return db.getRefDatabase().getRefs().stream() + .collect(Collectors.toMap(Ref::getName, + Function.identity())); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + /** * Receive a list of commands from the input. * -- 2.39.5