From 46b7128a2e604c85d9c8ce0ce5501a994105a49c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 15 May 2018 09:56:32 +0900 Subject: [PATCH] BatchRefUpdate: Don't use deprecated RefDatabase#getRefs(String) Change-Id: I672c9cfe221ddc4acbde7a8040bd6ba83b16626e Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/lib/BatchRefUpdate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java index 5e1755370..925b6bead 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java @@ -46,6 +46,7 @@ import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; +import static java.util.stream.Collectors.toCollection; import java.io.IOException; import java.text.MessageFormat; @@ -528,8 +529,9 @@ public void execute(RevWalk walk, ProgressMonitor monitor, } if (!commands2.isEmpty()) { // What part of the name space is already taken - Collection takenNames = new HashSet<>(refdb.getRefs( - RefDatabase.ALL).keySet()); + Collection takenNames = refdb.getRefs().stream() + .map(Ref::getName) + .collect(toCollection(HashSet::new)); Collection takenPrefixes = getTakenPrefixes(takenNames); // Now to the update that may require more room in the name space