Merge changes I711e72e8,Ie23c829e,I04c40d11
* changes:
Fix JdkObsolete issues with SortedMap
Fix JdkObsolete issues with SortedSet
Fix/ignore JdkObsolete issues with StringBuffer
diff --git a/java/com/google/gerrit/httpd/CanonicalWebUrl.java b/java/com/google/gerrit/httpd/CanonicalWebUrl.java
index 437ddf3..3b04884 100644
--- a/java/com/google/gerrit/httpd/CanonicalWebUrl.java
+++ b/java/com/google/gerrit/httpd/CanonicalWebUrl.java
@@ -37,6 +37,7 @@
return url != null ? url : computeFromRequest(req);
}
+ @SuppressWarnings("JdkObsolete")
static String computeFromRequest(HttpServletRequest req) {
StringBuffer url = req.getRequestURL();
try {
diff --git a/java/com/google/gerrit/httpd/RequireSslFilter.java b/java/com/google/gerrit/httpd/RequireSslFilter.java
index a4a87e2..ca3c3d8 100644
--- a/java/com/google/gerrit/httpd/RequireSslFilter.java
+++ b/java/com/google/gerrit/httpd/RequireSslFilter.java
@@ -78,10 +78,7 @@
//
final String url;
if (isLocalHost(req)) {
- final StringBuffer b = req.getRequestURL();
- b.replace(0, b.indexOf(":"), "https");
- url = b.toString();
-
+ url = getLocalHostUrl(req);
} else {
url = urlProvider.get() + req.getServletPath();
}
@@ -90,6 +87,13 @@
}
}
+ @SuppressWarnings("JdkObsolete")
+ private static String getLocalHostUrl(HttpServletRequest req) {
+ StringBuffer b = req.getRequestURL();
+ b.replace(0, b.indexOf(":"), "https");
+ return b.toString();
+ }
+
private static boolean isSecure(HttpServletRequest req) {
return "https".equals(req.getScheme()) || req.isSecure();
}
diff --git a/java/com/google/gerrit/httpd/auth/oauth/OAuthWebFilter.java b/java/com/google/gerrit/httpd/auth/oauth/OAuthWebFilter.java
index 2642a543..935762f 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/OAuthWebFilter.java
+++ b/java/com/google/gerrit/httpd/auth/oauth/OAuthWebFilter.java
@@ -31,9 +31,9 @@
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -175,12 +175,12 @@
}
private void pickSSOServiceProvider() throws ServletException {
- SortedSet<String> plugins = oauthServiceProviders.plugins();
+ NavigableSet<String> plugins = oauthServiceProviders.plugins();
if (plugins.isEmpty()) {
throw new ServletException("OAuth service provider wasn't installed");
}
if (plugins.size() == 1) {
- SortedMap<String, Provider<OAuthServiceProvider>> services =
+ NavigableMap<String, Provider<OAuthServiceProvider>> services =
oauthServiceProviders.byPlugin(Iterables.getOnlyElement(plugins));
if (services.size() == 1) {
ssoProvider = Iterables.getOnlyElement(services.values()).get();
diff --git a/java/com/google/gerrit/httpd/auth/openid/OAuthWebFilterOverOpenID.java b/java/com/google/gerrit/httpd/auth/openid/OAuthWebFilterOverOpenID.java
index 2e8585d..3d9c819 100644
--- a/java/com/google/gerrit/httpd/auth/openid/OAuthWebFilterOverOpenID.java
+++ b/java/com/google/gerrit/httpd/auth/openid/OAuthWebFilterOverOpenID.java
@@ -21,8 +21,8 @@
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
-import java.util.SortedMap;
-import java.util.SortedSet;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -79,9 +79,9 @@
}
private void pickSSOServiceProvider() {
- SortedSet<String> plugins = oauthServiceProviders.plugins();
+ NavigableSet<String> plugins = oauthServiceProviders.plugins();
if (plugins.size() == 1) {
- SortedMap<String, Provider<OAuthServiceProvider>> services =
+ NavigableMap<String, Provider<OAuthServiceProvider>> services =
oauthServiceProviders.byPlugin(Iterables.getOnlyElement(plugins));
if (services.size() == 1) {
ssoProvider = Iterables.getOnlyElement(services.values()).get();
diff --git a/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java b/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
index ef37fc5..d8516fd 100644
--- a/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
+++ b/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
@@ -520,7 +520,7 @@
macros.put("URL", url);
Matcher m = Pattern.compile("(\\\\)?@([A-Z_]+)@").matcher(md);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (m.find()) {
String key = m.group(2);
String val = macros.get(key);
diff --git a/java/com/google/gerrit/httpd/raw/IndexServlet.java b/java/com/google/gerrit/httpd/raw/IndexServlet.java
index 3f2c202..c7f239d 100644
--- a/java/com/google/gerrit/httpd/raw/IndexServlet.java
+++ b/java/com/google/gerrit/httpd/raw/IndexServlet.java
@@ -74,7 +74,6 @@
SoySauce.Renderer renderer;
try {
Map<String, String[]> parameterMap = req.getParameterMap();
- String requestUrl = req.getRequestURL() == null ? null : req.getRequestURL().toString();
// TODO(hiesel): Remove URL ordainer as parameter once Soy is consistent
ImmutableMap<String, Object> templateData =
IndexHtmlUtil.templateData(
@@ -85,7 +84,7 @@
faviconPath,
parameterMap,
urlOrdainer,
- requestUrl);
+ getRequestUrl(req));
renderer = soySauce.renderTemplate("com.google.gerrit.httpd.raw.Index").setData(templateData);
} catch (URISyntaxException | RestApiException e) {
throw new IOException(e);
@@ -98,4 +97,13 @@
w.write(renderer.renderHtml().get().toString().getBytes(UTF_8));
}
}
+
+ @SuppressWarnings("JdkObsolete")
+ @Nullable
+ private static String getRequestUrl(HttpServletRequest req) {
+ if (req.getRequestURL() == null) {
+ return null;
+ }
+ return req.getRequestURL().toString();
+ }
}
diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index ed694e6..9677814 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -825,13 +825,18 @@
if (isRead(request)) {
logger.atWarning().log(
"request %s performed a ref update %s although the request is a READ request",
- request.getRequestURL().toString(), refUpdateFormat);
+ getRequestUrl(request), refUpdateFormat);
}
response.addHeader(X_GERRIT_UPDATED_REF, refUpdateFormat);
}
globals.webSession.get().resetRefUpdatedEvents();
}
+ @SuppressWarnings("JdkObsolete")
+ private static String getRequestUrl(HttpServletRequest req) {
+ return req.getRequestURL().toString();
+ }
+
private String getEtagWithRetry(
HttpServletRequest req,
TraceContext traceContext,
diff --git a/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java b/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java
index 7e472c9..6b17456 100644
--- a/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java
+++ b/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.SortedMap;
+import java.util.NavigableMap;
import java.util.TreeMap;
import org.kohsuke.args4j.Option;
@@ -55,7 +55,7 @@
throws AuthException, PermissionBackendException {
permissionBackend.currentUser().check(GlobalPermission.VIEW_CACHES);
- SortedMap<String, MetricJson> out = new TreeMap<>();
+ NavigableMap<String, MetricJson> out = new TreeMap<>();
List<String> prefixes = new ArrayList<>(query.size());
for (String q : query) {
if (q.endsWith("/")) {
diff --git a/java/com/google/gerrit/pgm/init/api/GitRepositoryManagerOnInit.java b/java/com/google/gerrit/pgm/init/api/GitRepositoryManagerOnInit.java
index 8e69eb9..fabad49 100644
--- a/java/com/google/gerrit/pgm/init/api/GitRepositoryManagerOnInit.java
+++ b/java/com/google/gerrit/pgm/init/api/GitRepositoryManagerOnInit.java
@@ -23,7 +23,7 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.Repository;
@@ -65,7 +65,7 @@
}
@Override
- public SortedSet<Project.NameKey> list() {
+ public NavigableSet<Project.NameKey> list() {
throw new UnsupportedOperationException("not implemented");
}
diff --git a/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java
index 7c61c92..33f2ad1 100644
--- a/java/com/google/gerrit/server/StarredChangesUtil.java
+++ b/java/com/google/gerrit/server/StarredChangesUtil.java
@@ -54,10 +54,10 @@
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
import java.util.List;
+import java.util.NavigableSet;
import java.util.Set;
-import java.util.SortedSet;
import java.util.TreeSet;
import org.eclipse.jgit.lib.BatchRefUpdate;
import org.eclipse.jgit.lib.Constants;
@@ -113,7 +113,7 @@
@AutoValue
public abstract static class StarRef {
private static final StarRef MISSING =
- new AutoValue_StarredChangesUtil_StarRef(null, ImmutableSortedSet.of());
+ new AutoValue_StarredChangesUtil_StarRef(null, Collections.emptyNavigableSet());
private static StarRef create(Ref ref, Iterable<String> labels) {
return new AutoValue_StarredChangesUtil_StarRef(
@@ -123,7 +123,7 @@
@Nullable
public abstract Ref ref();
- public abstract ImmutableSortedSet<String> labels();
+ public abstract NavigableSet<String> labels();
public ObjectId objectId() {
return ref() != null ? ref().getObjectId() : ObjectId.zeroId();
@@ -185,7 +185,7 @@
this.queryProvider = queryProvider;
}
- public ImmutableSortedSet<String> getLabels(Account.Id accountId, Change.Id changeId) {
+ public NavigableSet<String> getLabels(Account.Id accountId, Change.Id changeId) {
try (Repository repo = repoManager.openRepository(allUsers)) {
return readLabels(repo, RefNames.refsStarredChanges(changeId, accountId)).labels();
} catch (IOException e) {
@@ -197,7 +197,7 @@
}
}
- public ImmutableSortedSet<String> star(
+ public NavigableSet<String> star(
Account.Id accountId,
Project.NameKey project,
Change.Id changeId,
@@ -208,7 +208,7 @@
String refName = RefNames.refsStarredChanges(changeId, accountId);
StarRef old = readLabels(repo, refName);
- Set<String> labels = new HashSet<>(old.labels());
+ NavigableSet<String> labels = new TreeSet<>(old.labels());
if (labelsToAdd != null) {
labels.addAll(labelsToAdd);
}
@@ -224,7 +224,7 @@
}
indexer.index(project, changeId);
- return ImmutableSortedSet.copyOf(labels);
+ return Collections.unmodifiableNavigableSet(labels);
} catch (IOException e) {
throw new StorageException(
String.format("Star change %d for account %d failed", changeId.get(), accountId.get()),
@@ -420,7 +420,7 @@
return;
}
- SortedSet<String> invalidLabels = new TreeSet<>();
+ NavigableSet<String> invalidLabels = new TreeSet<>();
for (String label : labels) {
if (CharMatcher.whitespace().matchesAnyOf(label)) {
invalidLabels.add(label);
diff --git a/java/com/google/gerrit/server/git/GitRepositoryManager.java b/java/com/google/gerrit/server/git/GitRepositoryManager.java
index 8dba3e1..d045baa 100644
--- a/java/com/google/gerrit/server/git/GitRepositoryManager.java
+++ b/java/com/google/gerrit/server/git/GitRepositoryManager.java
@@ -18,7 +18,7 @@
import com.google.inject.ImplementedBy;
import com.google.inject.Singleton;
import java.io.IOException;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Repository;
@@ -74,7 +74,7 @@
throws RepositoryNotFoundException, RepositoryExistsException, IOException;
/** Returns set of all known projects, sorted by natural NameKey order. */
- SortedSet<Project.NameKey> list();
+ NavigableSet<Project.NameKey> list();
/**
* Check if garbage collection can be performed by the repository manager.
diff --git a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
index dd34148..daa2e09 100644
--- a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
+++ b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
@@ -34,7 +34,7 @@
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import java.util.TreeSet;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Config;
@@ -254,10 +254,10 @@
}
@Override
- public SortedSet<Project.NameKey> list() {
+ public NavigableSet<Project.NameKey> list() {
ProjectVisitor visitor = new ProjectVisitor(basePath);
scanProjects(visitor);
- return Collections.unmodifiableSortedSet(visitor.found);
+ return Collections.unmodifiableNavigableSet(visitor.found);
}
protected void scanProjects(ProjectVisitor visitor) {
@@ -286,7 +286,7 @@
}
protected class ProjectVisitor extends SimpleFileVisitor<Path> {
- private final SortedSet<Project.NameKey> found = new TreeSet<>();
+ private final NavigableSet<Project.NameKey> found = new TreeSet<>();
private Path startFolder;
public ProjectVisitor(Path startFolder) {
diff --git a/java/com/google/gerrit/server/group/SystemGroupBackend.java b/java/com/google/gerrit/server/group/SystemGroupBackend.java
index a63feeb..5a9b9e5 100644
--- a/java/com/google/gerrit/server/group/SystemGroupBackend.java
+++ b/java/com/google/gerrit/server/group/SystemGroupBackend.java
@@ -45,9 +45,9 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.NavigableMap;
import java.util.Optional;
import java.util.Set;
-import java.util.SortedMap;
import java.util.TreeMap;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
@@ -89,7 +89,7 @@
}
private final ImmutableSet<String> reservedNames;
- private final SortedMap<String, GroupReference> namesToGroups;
+ private final NavigableMap<String, GroupReference> namesToGroups;
private final ImmutableSet<String> names;
private final ImmutableMap<AccountGroup.UUID, GroupReference> uuids;
private final ImmutableSet<AccountGroup.UUID> externalUserMemberships;
@@ -97,7 +97,7 @@
@Inject
@VisibleForTesting
public SystemGroupBackend(@GerritServerConfig Config cfg) {
- SortedMap<String, GroupReference> n = new TreeMap<>();
+ NavigableMap<String, GroupReference> n = new TreeMap<>();
ImmutableMap.Builder<AccountGroup.UUID, GroupReference> u = ImmutableMap.builder();
ImmutableSet.Builder<String> reservedNamesBuilder = ImmutableSet.builder();
@@ -112,7 +112,7 @@
u.put(ref.getUUID(), ref);
}
reservedNames = reservedNamesBuilder.build();
- namesToGroups = Collections.unmodifiableSortedMap(n);
+ namesToGroups = Collections.unmodifiableNavigableMap(n);
names =
ImmutableSet.copyOf(
namesToGroups.values().stream().map(GroupReference::getName).collect(toSet()));
@@ -172,7 +172,8 @@
@Override
public Collection<GroupReference> suggest(String name, ProjectState project) {
String nameLC = name.toLowerCase(Locale.US);
- SortedMap<String, GroupReference> matches = namesToGroups.tailMap(nameLC);
+ NavigableMap<String, GroupReference> matches =
+ namesToGroups.tailMap(nameLC, /* inclusive= */ true);
if (matches.isEmpty()) {
return new ArrayList<>();
}
diff --git a/java/com/google/gerrit/server/plugincontext/PluginMapContext.java b/java/com/google/gerrit/server/plugincontext/PluginMapContext.java
index fb50cd5..cd61429 100644
--- a/java/com/google/gerrit/server/plugincontext/PluginMapContext.java
+++ b/java/com/google/gerrit/server/plugincontext/PluginMapContext.java
@@ -22,7 +22,7 @@
import com.google.gerrit.server.plugincontext.PluginContext.PluginMetrics;
import com.google.inject.Inject;
import java.util.Iterator;
-import java.util.SortedSet;
+import java.util.NavigableSet;
/**
* Context to invoke extensions from a {@link DynamicMap}.
@@ -135,7 +135,7 @@
* @return sorted list of the plugins that have registered implementations for this extension
* point
*/
- public SortedSet<String> plugins() {
+ public NavigableSet<String> plugins() {
return dynamicMap.plugins();
}
diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java
index 854f091..b94e44d 100644
--- a/java/com/google/gerrit/server/restapi/group/ListGroups.java
+++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java
@@ -57,8 +57,8 @@
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
+import java.util.NavigableMap;
import java.util.Set;
-import java.util.SortedMap;
import java.util.TreeMap;
import java.util.function.Predicate;
import java.util.regex.Pattern;
@@ -235,8 +235,9 @@
}
@Override
- public Response<SortedMap<String, GroupInfo>> apply(TopLevelResource resource) throws Exception {
- SortedMap<String, GroupInfo> output = new TreeMap<>();
+ public Response<NavigableMap<String, GroupInfo>> apply(TopLevelResource resource)
+ throws Exception {
+ NavigableMap<String, GroupInfo> output = new TreeMap<>();
for (GroupInfo info : get()) {
output.put(MoreObjects.firstNonNull(info.name, "Group " + Url.decode(info.id)), info);
info.name = null;
diff --git a/java/com/google/gerrit/server/restapi/project/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java
index 4d8005b..5706016 100644
--- a/java/com/google/gerrit/server/restapi/project/ListProjects.java
+++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java
@@ -76,9 +76,9 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.NavigableSet;
import java.util.Optional;
import java.util.SortedMap;
-import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Stream;
@@ -680,7 +680,7 @@
private void printProjectTree(
final PrintWriter stdout, TreeMap<Project.NameKey, ProjectNode> treeMap) {
- final SortedSet<ProjectNode> sortedNodes = new TreeSet<>();
+ final NavigableSet<ProjectNode> sortedNodes = new TreeSet<>();
// Builds the inheritance tree using a list.
//
diff --git a/java/com/google/gerrit/server/restapi/project/ProjectNode.java b/java/com/google/gerrit/server/restapi/project/ProjectNode.java
index 1e6200c..816c69d 100644
--- a/java/com/google/gerrit/server/restapi/project/ProjectNode.java
+++ b/java/com/google/gerrit/server/restapi/project/ProjectNode.java
@@ -19,7 +19,7 @@
import com.google.gerrit.server.util.TreeFormatter.TreeNode;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import java.util.TreeSet;
/** Node of a Project in a tree formatted by {@link ListProjects}. */
@@ -32,7 +32,7 @@
private final Project project;
private final boolean isVisible;
- private final SortedSet<ProjectNode> children = new TreeSet<>();
+ private final NavigableSet<ProjectNode> children = new TreeSet<>();
@Inject
protected ProjectNode(
@@ -72,7 +72,7 @@
}
@Override
- public SortedSet<? extends ProjectNode> getChildren() {
+ public NavigableSet<? extends ProjectNode> getChildren() {
return children;
}
diff --git a/java/com/google/gerrit/server/tools/ToolsCatalog.java b/java/com/google/gerrit/server/tools/ToolsCatalog.java
index 9c1483f..015b8f1 100644
--- a/java/com/google/gerrit/server/tools/ToolsCatalog.java
+++ b/java/com/google/gerrit/server/tools/ToolsCatalog.java
@@ -31,7 +31,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.SortedMap;
+import java.util.NavigableMap;
import java.util.TreeMap;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.RawParseUtils;
@@ -46,7 +46,7 @@
public class ToolsCatalog {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- private final SortedMap<String, Entry> toc;
+ private final NavigableMap<String, Entry> toc;
@Inject
ToolsCatalog() throws IOException {
@@ -73,8 +73,8 @@
return toc.get(name);
}
- private static SortedMap<String, Entry> readToc() throws IOException {
- SortedMap<String, Entry> toc = new TreeMap<>();
+ private static NavigableMap<String, Entry> readToc() throws IOException {
+ NavigableMap<String, Entry> toc = new TreeMap<>();
final BufferedReader br =
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(read("TOC")), UTF_8));
String line;
@@ -108,7 +108,7 @@
}
toc.put(top.getPath(), top);
- return Collections.unmodifiableSortedMap(toc);
+ return Collections.unmodifiableNavigableMap(toc);
}
@Nullable
diff --git a/java/com/google/gerrit/server/util/TreeFormatter.java b/java/com/google/gerrit/server/util/TreeFormatter.java
index 49d4a55..5a898d5 100644
--- a/java/com/google/gerrit/server/util/TreeFormatter.java
+++ b/java/com/google/gerrit/server/util/TreeFormatter.java
@@ -15,7 +15,7 @@
package com.google.gerrit.server.util;
import java.io.PrintWriter;
-import java.util.SortedSet;
+import java.util.NavigableSet;
public class TreeFormatter {
@@ -24,7 +24,7 @@
boolean isVisible();
- SortedSet<? extends TreeNode> getChildren();
+ NavigableSet<? extends TreeNode> getChildren();
}
public static final String NOT_VISIBLE_NODE = "(x)";
@@ -40,7 +40,7 @@
this.stdout = stdout;
}
- public void printTree(SortedSet<? extends TreeNode> rootNodes) {
+ public void printTree(NavigableSet<? extends TreeNode> rootNodes) {
if (rootNodes.isEmpty()) {
return;
}
@@ -66,7 +66,7 @@
private void printTree(TreeNode node, int level, boolean isLast) {
printNode(node, level, isLast);
- final SortedSet<? extends TreeNode> childNodes = node.getChildren();
+ final NavigableSet<? extends TreeNode> childNodes = node.getChildren();
int i = 0;
final int size = childNodes.size();
for (TreeNode childNode : childNodes) {
diff --git a/java/com/google/gerrit/testing/InMemoryRepositoryManager.java b/java/com/google/gerrit/testing/InMemoryRepositoryManager.java
index 362e23c..2051ae3 100644
--- a/java/com/google/gerrit/testing/InMemoryRepositoryManager.java
+++ b/java/com/google/gerrit/testing/InMemoryRepositoryManager.java
@@ -14,16 +14,16 @@
package com.google.gerrit.testing;
-import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Sets;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.Project.NameKey;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.RepositoryCaseMismatchException;
import com.google.inject.Inject;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.internal.storage.dfs.DfsRepository;
import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
@@ -111,12 +111,12 @@
}
@Override
- public synchronized SortedSet<Project.NameKey> list() {
- SortedSet<Project.NameKey> names = Sets.newTreeSet();
+ public synchronized NavigableSet<Project.NameKey> list() {
+ NavigableSet<Project.NameKey> names = Sets.newTreeSet();
for (DfsRepository repo : repos.values()) {
names.add(Project.nameKey(repo.getDescription().getRepositoryName()));
}
- return ImmutableSortedSet.copyOf(names);
+ return Collections.unmodifiableNavigableSet(names);
}
public synchronized void deleteRepository(Project.NameKey name) {
diff --git a/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java
index 6b8177e..82cc049 100644
--- a/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java
+++ b/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java
@@ -16,7 +16,7 @@
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.entities.Project.NameKey;
-import java.util.SortedSet;
+import java.util.NavigableSet;
import org.eclipse.jgit.lib.Repository;
import org.junit.Before;
import org.junit.Test;
@@ -53,7 +53,7 @@
}
@Override
- public SortedSet<NameKey> list() {
+ public NavigableSet<NameKey> list() {
throw new UnsupportedOperationException("Not implemented");
}
}
