From 9895338de1c92d09fe82ec927e5ffd2da0973084 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 11 Nov 2015 14:51:02 -0800 Subject: RefDatabase: Remove fallback exactRef implementation This is simpler to implement than getRef. Make it abstract so implementers remember to override it. Change-Id: I5f319be1fb1206d7a0142ea939dc4e1039f850ab Signed-off-by: Jonathan Nieder --- .../tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java | 5 +++++ org.eclipse.jgit/.settings/.api_filters | 8 ++++++++ org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java | 8 +------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java index 1c21194248..3798858414 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java @@ -94,6 +94,11 @@ public class RefDatabaseConflictingNamesTest { return false; } + @Override + public Ref exactRef(String name) throws IOException { + return null; + } + @Override public Ref getRef(String name) throws IOException { return null; diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 79183a6cdd..1e18de6647 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -38,6 +38,14 @@ + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 5010a89ed5..73c7b1c613 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -290,13 +290,7 @@ public abstract class RefDatabase { * @since 4.1 */ @Nullable - public Ref exactRef(String name) throws IOException { - Ref ref = getRef(name); - if (ref == null || !name.equals(ref.getName())) { - return null; - } - return ref; - } + public abstract Ref exactRef(String name) throws IOException; /** * Read the specified references. -- cgit v1.2.3