aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
diff options
context:
space:
mode:
authorLuca Milanesio <luca.milanesio@gmail.com>2021-06-19 01:50:35 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2021-06-26 16:41:01 +0200
commited5be35e2ef69b23260d4ec1ce3cabfc4aee0c95 (patch)
tree75d769dde98b716d5c072d44ceb2e481cfdbc98f /org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
parentd46af8c69d598b63301900758e49b6b260168c16 (diff)
downloadjgit-ed5be35e2ef69b23260d4ec1ce3cabfc4aee0c95.tar.gz
jgit-ed5be35e2ef69b23260d4ec1ce3cabfc4aee0c95.zip
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 <luca.milanesio@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java20
1 files changed, 19 insertions, 1 deletions
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<String, Ref> allRefs,
Set<ObjectId> additionalHaves) {
- refs = allRefs != null ? allRefs : db.getAllRefs();
+ refs = allRefs != null ? allRefs : getAllRefs();
refs = refFilter.filter(refs);
advertisedHaves.clear();
@@ -1296,6 +1299,21 @@ public class ReceivePack {
}
/**
+ * Extract the full list of refs from the ref-db.
+ *
+ * @return Map of all refname/ref
+ */
+ private Map<String, Ref> 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.
*
* @throws java.io.IOException