opendev/gerrit
Code Issues Proposed changes

Apply "type inference for generic instance creation" Java 7 feature

Browse Source 
Change-Id: Ia14802c903ca67b9d94dc6038d70b0e9644bc621
This commit is contained in:
David Ostrovsky
2014-04-26 15:27:57 +02:00
parent 40a179b8ca
commit e73ae61339
224 changed files with 557 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
View File

@@ -156,7 +156,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
/** Listeners to receive changes as they happen (limited by visibility
* of holder's user). */
private final Map<ChangeListener, ChangeListenerHolder> listeners =
new ConcurrentHashMap<ChangeListener, ChangeListenerHolder>();
new ConcurrentHashMap<>();
/** Listeners to receive all changes as they happen. */
private final DynamicSet<ChangeListener> unrestrictedListeners;
@@ -320,7 +320,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
public HookResult doRefUpdateHook(final Project project, final String refname,
final Account uploader, final ObjectId oldId, final ObjectId newId) {
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--project", project.getName());
addArg(args, "--refname", refname);
addArg(args, "--uploader", getDisplayName(uploader));
@@ -355,7 +355,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.uploader = eventFactory.asAccountAttribute(uploader.getAccount());
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--is-draft", patchSet.isDraft() ? "true" : "false");
addArg(args, "--change-url", event.change.url);
@@ -379,7 +379,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.uploader = eventFactory.asAccountAttribute(uploader.getAccount());
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -413,7 +413,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--is-draft", patchSet.isDraft() ? "true" : "false");
addArg(args, "--change-url", event.change.url);
@@ -442,7 +442,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.patchSet = eventFactory.asPatchSetAttribute(patchSet);
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -465,7 +465,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.reason = reason;
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -489,7 +489,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.reason = reason;
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -513,7 +513,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.reason = reason;
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -539,7 +539,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.refUpdate = eventFactory.asRefUpdateAttribute(oldId, newId, refName);
fireEvent(refName, event);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--oldrev", event.refUpdate.oldRev);
addArg(args, "--newrev", event.refUpdate.newRev);
addArg(args, "--refname", event.refUpdate.refName);
@@ -560,7 +560,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.reviewer = eventFactory.asAccountAttribute(account);
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--change-url", event.change.url);
addArg(args, "--project", event.change.project);
@@ -580,7 +580,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
event.oldTopic = oldTopic;
fireEvent(change, event, db);
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--change", event.change.id);
addArg(args, "--project", event.change.project);
addArg(args, "--branch", event.change.branch);
@@ -593,7 +593,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
public void doClaSignupHook(Account account, ContributorAgreement cla) {
if (account != null) {
final List<String> args = new ArrayList<String>();
final List<String> args = new ArrayList<>();
addArg(args, "--submitter", getDisplayName(account));
addArg(args, "--user-id", account.getId().toString());
addArg(args, "--cla-name", cla.getName());
@@ -721,7 +721,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
}
SyncHookTask syncHook = new SyncHookTask(project, hook, args);
FutureTask<HookResult> task = new FutureTask<HookResult>(syncHook);
FutureTask<HookResult> task = new FutureTask<>(syncHook);
syncHookThreadPool.execute(task);
@@ -781,7 +781,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
HookResult result = null;
try {
final List<String> argv = new ArrayList<String>(1 + args.size());
final List<String> argv = new ArrayList<>(1 + args.size());
argv.add(hook.getAbsolutePath());
argv.addAll(args);