Adjust to changes made on Gerrit 'master' The following changes were applied: * obsolete JDK SortedSet was change to NavigableSet on GitRepositoryManager * Repository was adjusted to JGit changes Bug: Issue 15070 Change-Id: Ida77fececedf5a9d1f0bc25b10444943e36894ca
diff --git a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java index e527725..e3fde24 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java +++ b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java
@@ -21,7 +21,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; -import java.util.SortedSet; +import java.util.NavigableSet; import org.eclipse.jgit.lib.Repository; @Singleton @@ -47,7 +47,7 @@ } @Override - public SortedSet<Project.NameKey> list() { + public NavigableSet<Project.NameKey> list() { return repoManager.list(); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java index 91e9bb6..ebe4146 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java
@@ -172,7 +172,7 @@ } @Override - public Set<ObjectId> getAdditionalHaves() { + public Set<ObjectId> getAdditionalHaves() throws IOException { return delegate.getAdditionalHaves(); } @@ -195,7 +195,7 @@ } @Override - public Map<AnyObjectId, Set<Ref>> getAllRefsByPeeledObjectId() { + public Map<AnyObjectId, Set<Ref>> getAllRefsByPeeledObjectId() throws IOException { return delegate.getAllRefsByPeeledObjectId(); }