Merge "Use <> operator where possible"
diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 5155e6c..82ff535 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -417,7 +417,7 @@
server.getTestInjector().injectMembers(this);
Transport.register(inProcessProtocol);
- toClose = Collections.synchronizedList(new ArrayList<Repository>());
+ toClose = Collections.synchronizedList(new ArrayList<>());
// All groups which were added during the server start (e.g. in SchemaCreatorImpl) aren't
// contained in the instance of the group index which is available here and in tests. There are
diff --git a/java/com/google/gerrit/gpg/PublicKeyChecker.java b/java/com/google/gerrit/gpg/PublicKeyChecker.java
index 07b42f1..27530e7 100644
--- a/java/com/google/gerrit/gpg/PublicKeyChecker.java
+++ b/java/com/google/gerrit/gpg/PublicKeyChecker.java
@@ -130,7 +130,7 @@
if (store == null) {
throw new IllegalStateException("PublicKeyStore is required");
}
- return check(key, 0, true, trusted != null ? new HashSet<Fingerprint>() : null);
+ return check(key, 0, true, trusted != null ? new HashSet<>() : null);
}
/**
diff --git a/java/com/google/gerrit/index/query/QueryBuilder.java b/java/com/google/gerrit/index/query/QueryBuilder.java
index c6c39c3..12d1dd6 100644
--- a/java/com/google/gerrit/index/query/QueryBuilder.java
+++ b/java/com/google/gerrit/index/query/QueryBuilder.java
@@ -101,7 +101,7 @@
&& (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC) {
final String name = method.getName().toLowerCase();
if (!opFactories.containsKey(name)) {
- opFactories.put(name, new ReflectionFactory<T, Q>(name, method));
+ opFactories.put(name, new ReflectionFactory<>(name, method));
}
}
}
diff --git a/java/com/google/gerrit/lucene/LuceneVersionManager.java b/java/com/google/gerrit/lucene/LuceneVersionManager.java
index d3a1a24..f3ba73d 100644
--- a/java/com/google/gerrit/lucene/LuceneVersionManager.java
+++ b/java/com/google/gerrit/lucene/LuceneVersionManager.java
@@ -81,7 +81,7 @@
continue;
}
if (!versions.containsKey(v)) {
- versions.put(v, new Version<V>(null, v, true, cfg.getReady(def.getName(), v)));
+ versions.put(v, new Version<>(null, v, true, cfg.getReady(def.getName(), v)));
}
}
} catch (IOException e) {
diff --git a/java/com/google/gerrit/pgm/Passwd.java b/java/com/google/gerrit/pgm/Passwd.java
index f63d2f4..10ed07d 100644
--- a/java/com/google/gerrit/pgm/Passwd.java
+++ b/java/com/google/gerrit/pgm/Passwd.java
@@ -78,7 +78,7 @@
bind(Boolean.class).annotatedWith(InstallAllPlugins.class).toInstance(Boolean.FALSE);
bind(new TypeLiteral<List<String>>() {})
.annotatedWith(InstallPlugins.class)
- .toInstance(new ArrayList<String>());
+ .toInstance(new ArrayList<>());
bind(String.class)
.annotatedWith(SecureStoreClassName.class)
.toProvider(Providers.of(getConfiguredSecureStoreClass()));
diff --git a/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index 25aa062..7745ad4 100644
--- a/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -345,7 +345,7 @@
maxThreads,
minThreads,
idleTimeout,
- new BlockingArrayQueue<Runnable>(
+ new BlockingArrayQueue<>(
minThreads, // capacity,
minThreads, // growBy,
maxCapacity // maxCapacity
diff --git a/java/com/google/gerrit/pgm/init/BaseInit.java b/java/com/google/gerrit/pgm/init/BaseInit.java
index 3de7947..c1fd1df 100644
--- a/java/com/google/gerrit/pgm/init/BaseInit.java
+++ b/java/com/google/gerrit/pgm/init/BaseInit.java
@@ -239,8 +239,7 @@
protected void configure() {
bind(ConsoleUI.class).toInstance(ui);
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath);
- List<String> plugins =
- MoreObjects.firstNonNull(getInstallPlugins(), new ArrayList<String>());
+ List<String> plugins = MoreObjects.firstNonNull(getInstallPlugins(), new ArrayList<>());
bind(new TypeLiteral<List<String>>() {})
.annotatedWith(InstallPlugins.class)
.toInstance(plugins);
diff --git a/java/com/google/gerrit/server/DynamicOptions.java b/java/com/google/gerrit/server/DynamicOptions.java
index dc5a262..dcc96d5 100644
--- a/java/com/google/gerrit/server/DynamicOptions.java
+++ b/java/com/google/gerrit/server/DynamicOptions.java
@@ -171,8 +171,7 @@
* classloaders.
*/
protected static Map<ClassLoader, Map<ClassLoader, WeakReference<ClassLoader>>> mergedClByCls =
- Collections.synchronizedMap(
- new WeakHashMap<ClassLoader, Map<ClassLoader, WeakReference<ClassLoader>>>());
+ Collections.synchronizedMap(new WeakHashMap<>());
protected Object bean;
protected Map<String, DynamicBean> beansByPlugin;
diff --git a/java/com/google/gerrit/server/account/GroupMembers.java b/java/com/google/gerrit/server/account/GroupMembers.java
index faa1621..375b3a1 100644
--- a/java/com/google/gerrit/server/account/GroupMembers.java
+++ b/java/com/google/gerrit/server/account/GroupMembers.java
@@ -67,7 +67,7 @@
throw new IllegalStateException("listAccounts called with PROJECT_OWNERS argument");
}
try {
- return listAccounts(groupUUID, null, new HashSet<AccountGroup.UUID>());
+ return listAccounts(groupUUID, null, new HashSet<>());
} catch (NoSuchProjectException e) {
throw new IllegalStateException(e);
}
@@ -81,7 +81,7 @@
*/
public Set<Account> listAccounts(AccountGroup.UUID groupUUID, Project.NameKey project)
throws NoSuchProjectException, IOException {
- return listAccounts(groupUUID, project, new HashSet<AccountGroup.UUID>());
+ return listAccounts(groupUUID, project, new HashSet<>());
}
private Set<Account> listAccounts(
diff --git a/java/com/google/gerrit/server/config/SysExecutorModule.java b/java/com/google/gerrit/server/config/SysExecutorModule.java
index f552434..6c729d9 100644
--- a/java/com/google/gerrit/server/config/SysExecutorModule.java
+++ b/java/com/google/gerrit/server/config/SysExecutorModule.java
@@ -90,7 +90,7 @@
poolSize,
10,
TimeUnit.MINUTES,
- new ArrayBlockingQueue<Runnable>(poolSize),
+ new ArrayBlockingQueue<>(poolSize),
new ThreadFactoryBuilder()
.setNameFormat("ChangeUpdate-%d")
.setDaemon(true)
diff --git a/java/com/google/gerrit/server/documentation/MarkdownFormatterHeader.java b/java/com/google/gerrit/server/documentation/MarkdownFormatterHeader.java
index bb8d225..00f7ec1 100644
--- a/java/com/google/gerrit/server/documentation/MarkdownFormatterHeader.java
+++ b/java/com/google/gerrit/server/documentation/MarkdownFormatterHeader.java
@@ -56,7 +56,7 @@
@Override
public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {
- return new HashSet<NodeRenderingHandler<? extends Node>>(
+ return new HashSet<>(
Arrays.asList(
new NodeRenderingHandler<>(
AnchorLink.class,
diff --git a/java/com/google/gerrit/server/plugins/PluginMetricMaker.java b/java/com/google/gerrit/server/plugins/PluginMetricMaker.java
index 961ac10..b49a190 100644
--- a/java/com/google/gerrit/server/plugins/PluginMetricMaker.java
+++ b/java/com/google/gerrit/server/plugins/PluginMetricMaker.java
@@ -47,7 +47,7 @@
public PluginMetricMaker(MetricMaker root, String prefix) {
this.root = root;
this.prefix = prefix.endsWith("/") ? prefix : prefix + "/";
- cleanup = Collections.synchronizedSet(new HashSet<RegistrationHandle>());
+ cleanup = Collections.synchronizedSet(new HashSet<>());
}
@Override
diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java
index 36cffb3..f051d10 100644
--- a/java/com/google/gerrit/server/project/ProjectConfig.java
+++ b/java/com/google/gerrit/server/project/ProjectConfig.java
@@ -360,7 +360,7 @@
String name = section.getName();
if (sectionsWithUnknownPermissions.contains(name)) {
AccessSection a = accessSections.get(name);
- a.setPermissions(new ArrayList<Permission>());
+ a.setPermissions(new ArrayList<>());
} else {
accessSections.remove(name);
}
diff --git a/java/com/google/gerrit/testing/FakeEmailSender.java b/java/com/google/gerrit/testing/FakeEmailSender.java
index e81d0f4..bbfd9b1 100644
--- a/java/com/google/gerrit/testing/FakeEmailSender.java
+++ b/java/com/google/gerrit/testing/FakeEmailSender.java
@@ -87,7 +87,7 @@
@Inject
FakeEmailSender(WorkQueue workQueue) {
this.workQueue = workQueue;
- messages = Collections.synchronizedList(new ArrayList<Message>());
+ messages = Collections.synchronizedList(new ArrayList<>());
messagesRead = 0;
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
index a3b891e..b4455f7 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitResolvingMergeCommitIT.java
@@ -351,7 +351,7 @@
private PushOneCommit.Result createChange(TestRepository<?> repo, String subject)
throws Exception {
- return createChange(repo, subject, "x", "x", new ArrayList<RevCommit>(), "refs/for/master");
+ return createChange(repo, subject, "x", "x", new ArrayList<>(), "refs/for/master");
}
private PushOneCommit.Result createChange(
