From: Matthias Sohn Date: Wed, 23 Jun 2021 08:29:21 +0000 (+0200) Subject: Don't use deprecated Repository#getAllRefs in Repository X-Git-Tag: v6.0.0.202111291000-r~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0a3aaac33ef77ec4664b35b4f4e1d590e8208182;p=jgit.git Don't use deprecated Repository#getAllRefs in Repository Also expose the potentially IOException thrown by RefDatabase#getRefs. Hence the following methods now potentially throw IOException: - Repository#getAllRefsByPeeledObjectId Bug: 534731 Change-Id: Id6956ff112560e6314d4335238494708346f2338 --- diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 2d1aca8de1..e594e528be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1161,12 +1161,14 @@ public abstract class Repository implements AutoCloseable { * Get a map with all objects referenced by a peeled ref. * * @return a map with all objects referenced by a peeled ref. + * @throws IOException */ @NonNull - public Map> getAllRefsByPeeledObjectId() { - Map allRefs = getAllRefs(); + public Map> getAllRefsByPeeledObjectId() + throws IOException { + List allRefs = getRefDatabase().getRefs(); Map> ret = new HashMap<>(allRefs.size()); - for (Ref ref : allRefs.values()) { + for (Ref ref : allRefs) { ref = peel(ref); AnyObjectId target = ref.getPeeledObjectId(); if (target == null) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java index b4ccfe0ae4..0582338652 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java @@ -121,7 +121,7 @@ public class PlotWalk extends RevWalk { return pc; } - private Ref[] getRefs(AnyObjectId commitId) { + private Ref[] getRefs(AnyObjectId commitId) throws IOException { if (reverseRefMap == null) { reverseRefMap = repository.getAllRefsByPeeledObjectId(); for (Map.Entry> entry : additionalRefMap