diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index 33c8e6e015..f8f515c96e 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -177,7 +177,7 @@ public abstract class AbstractDaemonTest { private final TestRule testRunner = new TestRule() { @Override - public Statement apply(final Statement base, final Description description) { + public Statement apply(Statement base, Description description) { return new Statement() { @Override public void evaluate() throws Throwable { diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java index b6547ef3d1..987cb973c9 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java @@ -191,7 +191,7 @@ public class AcceptanceTestRequestScope { static final Scope REQUEST = new Scope() { @Override - public Provider scope(final Key key, final Provider creator) { + public Provider scope(Key key, Provider creator) { return new Provider() { @Override public T get() { diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java index f25ca83220..72e7058a83 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java @@ -58,8 +58,7 @@ public class EventRecorder { } } - public EventRecorder( - DynamicSet eventListeners, final IdentifiedUser user) { + public EventRecorder(DynamicSet eventListeners, IdentifiedUser user) { recordedEvents = LinkedListMultimap.create(); eventListenerRegistration = diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java index 7e27e67c5d..c9a474fa9e 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/GitUtil.java @@ -56,7 +56,7 @@ public class GitUtil { private static final AtomicInteger testRepoCount = new AtomicInteger(); private static final int TEST_REPO_WINDOW_DAYS = 2; - public static void initSsh(final TestAccount a) { + public static void initSsh(TestAccount a) { final Properties config = new Properties(); config.put("StrictHostKeyChecking", "no"); JSch.setConfig(config); diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java index 0977e24b7d..819e918b9f 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java @@ -95,7 +95,7 @@ class InProcessProtocol extends TestProtocol { private static final Scope REQUEST = new Scope() { @Override - public Provider scope(final Key key, final Provider creator) { + public Provider scope(Key key, Provider creator) { return new Provider() { @Override public T get() { @@ -242,8 +242,7 @@ class InProcessProtocol extends TestProtocol { } @Override - public UploadPack create(Context req, final Repository repo) - throws ServiceNotAuthorizedException { + public UploadPack create(Context req, Repository repo) throws ServiceNotAuthorizedException { // Set the request context, but don't bother unsetting, since we don't // have an easy way to run code when this instance is done being used. // Each operation is run in its own thread, so we don't need to recover @@ -300,8 +299,7 @@ class InProcessProtocol extends TestProtocol { } @Override - public ReceivePack create(final Context req, Repository db) - throws ServiceNotAuthorizedException { + public ReceivePack create(Context req, Repository db) throws ServiceNotAuthorizedException { // Set the request context, but don't bother unsetting, since we don't // have an easy way to run code when this instance is done being used. // Each operation is run in its own thread, so we don't need to recover diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java index fe1d0b7819..7ab686832b 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java @@ -360,7 +360,7 @@ public class PushOneCommit { return new Result(ref, pushHead(testRepo, ref, tag != null, force, pushOptions), c, subject); } - public void setTag(final Tag tag) { + public void setTag(Tag tag) { this.tag = tag; } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index e957c88908..5f2ee6f8d8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -575,7 +575,7 @@ public class GetRelatedIT extends AbstractDaemonTest { return result; } - private void clearGroups(final PatchSet.Id psId) throws Exception { + private void clearGroups(PatchSet.Id psId) throws Exception { try (BatchUpdate bu = batchUpdateFactory.create(db, project, user(user), TimeUtil.nowTs())) { bu.addOp( psId.getParentKey(), diff --git a/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java b/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java index 80cffbb6d7..9495d19695 100644 --- a/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java +++ b/gerrit-antlr/src/main/java/com/google/gerrit/server/query/QueryParseException.java @@ -22,11 +22,11 @@ package com.google.gerrit.server.query; public class QueryParseException extends Exception { private static final long serialVersionUID = 1L; - public QueryParseException(final String message) { + public QueryParseException(String message) { super(message); } - public QueryParseException(final String msg, final Throwable why) { + public QueryParseException(String msg, Throwable why) { super(msg, why); } } diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java index 474fa366d8..128345281e 100644 --- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java +++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java @@ -115,7 +115,7 @@ class H2CacheFactory implements PersistentCacheFactory, LifecycleListener { @Override public void start() { if (executor != null) { - for (final H2CacheImpl cache : caches) { + for (H2CacheImpl cache : caches) { executor.execute(cache::start); @SuppressWarnings("unused") Future possiblyIgnoredError = diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java index 8bdc4105ff..eaa9af9d62 100644 --- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java +++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java @@ -150,7 +150,7 @@ public class H2CacheImpl extends AbstractLoadingCache implements Per } @Override - public void put(final K key, V val) { + public void put(K key, V val) { final ValueHolder h = new ValueHolder<>(val); h.created = TimeUtil.nowMs(); mem.put(key, h); @@ -159,7 +159,7 @@ public class H2CacheImpl extends AbstractLoadingCache implements Per @SuppressWarnings("unchecked") @Override - public void invalidate(final Object key) { + public void invalidate(Object key) { if (keyType.getRawType().isInstance(key) && store.mightContain((K) key)) { executor.execute(() -> store.invalidate((K) key)); } @@ -201,7 +201,7 @@ public class H2CacheImpl extends AbstractLoadingCache implements Per store.close(); } - void prune(final ScheduledExecutorService service) { + void prune(ScheduledExecutorService service) { store.prune(mem); Calendar cal = Calendar.getInstance(); @@ -239,7 +239,7 @@ public class H2CacheImpl extends AbstractLoadingCache implements Per } @Override - public ValueHolder load(final K key) throws Exception { + public ValueHolder load(K key) throws Exception { if (store.mightContain(key)) { ValueHolder h = store.getIfPresent(key); if (h != null) { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/Die.java b/gerrit-common/src/main/java/com/google/gerrit/common/Die.java index 6a1f30429c..5ad5ae8147 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/Die.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/Die.java @@ -17,11 +17,11 @@ package com.google.gerrit.common; public class Die extends RuntimeException { private static final long serialVersionUID = 1L; - public Die(final String why) { + public Die(String why) { super(why); } - public Die(final String why, final Throwable cause) { + public Die(String why, Throwable cause) { super(why, cause); } } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java index 4c5583fb8c..24e3808653 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/FileUtil.java @@ -39,18 +39,18 @@ public class FileUtil { return !Arrays.equals(curVers, newVers); } - public static void mkdir(final File path) { + public static void mkdir(File path) { if (!path.isDirectory() && !path.mkdir()) { throw new Die("Cannot make directory " + path); } } - public static void chmod(final int mode, final Path path) { + public static void chmod(int mode, Path path) { // TODO(dborowitz): Is there a portable way to do this with NIO? chmod(mode, path.toFile()); } - public static void chmod(final int mode, final File path) { + public static void chmod(int mode, File path) { path.setReadable(false, false /* all */); path.setWritable(false, false /* all */); path.setExecutable(false, false /* all */); diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java index 624bceac00..526e88b3fd 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/IoUtil.java @@ -32,7 +32,7 @@ import java.util.Set; @GwtIncompatible("Unemulated methods in Class and OutputStream") public final class IoUtil { - public static void copyWithThread(final InputStream src, final OutputStream dst) { + public static void copyWithThread(InputStream src, OutputStream dst) { new Thread("IoUtil-Copy") { @Override public void run() { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java index 692285f598..6e592840b5 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java @@ -55,7 +55,7 @@ public class PageLinks { return "/c/" + c + ",edit/"; } - public static String toChange(final Change.Id c) { + public static String toChange(Change.Id c) { return "/c/" + c + "/"; } @@ -72,15 +72,15 @@ public class PageLinks { return u; } - public static String toChange(final PatchSet.Id ps) { + public static String toChange(PatchSet.Id ps) { return "/c/" + ps.getParentKey() + "/" + ps.getId(); } - public static String toProject(final Project.NameKey p) { + public static String toProject(Project.NameKey p) { return ADMIN_PROJECTS + p.get(); } - public static String toProjectAcceess(final Project.NameKey p) { + public static String toProjectAcceess(Project.NameKey p) { return "/admin/projects/" + p.get() + ",access"; } @@ -100,7 +100,7 @@ public class PageLinks { return toChangeQuery(op("assignee", fullname)); } - public static String toCustomDashboard(final String params) { + public static String toCustomDashboard(String params) { return "/dashboard/?" + params; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java index 5be0878299..0369bfe5e4 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/ProjectAccessUtil.java @@ -26,7 +26,7 @@ import java.util.Set; public class ProjectAccessUtil { public static List mergeSections(List src) { Map map = new LinkedHashMap<>(); - for (final AccessSection section : src) { + for (AccessSection section : src) { if (section.getPermissions().isEmpty()) { continue; } @@ -44,21 +44,21 @@ public class ProjectAccessUtil { public static List removeEmptyPermissionsAndSections( final List src) { final Set sectionsToRemove = new HashSet<>(); - for (final AccessSection section : src) { + for (AccessSection section : src) { final Set permissionsToRemove = new HashSet<>(); - for (final Permission permission : section.getPermissions()) { + for (Permission permission : section.getPermissions()) { if (permission.getRules().isEmpty()) { permissionsToRemove.add(permission); } } - for (final Permission permissionToRemove : permissionsToRemove) { + for (Permission permissionToRemove : permissionsToRemove) { section.remove(permissionToRemove); } if (section.getPermissions().isEmpty()) { sectionsToRemove.add(section); } } - for (final AccessSection sectionToRemove : sectionsToRemove) { + for (AccessSection sectionToRemove : sectionsToRemove) { src.remove(sectionToRemove); } return src; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java b/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java index 961f43a63a..f59d4a95d5 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/RawInputUtil.java @@ -30,7 +30,7 @@ public class RawInputUtil { return create(content.getBytes(UTF_8)); } - public static RawInput create(final byte[] bytes, final String contentType) { + public static RawInput create(byte[] bytes, String contentType) { Preconditions.checkNotNull(bytes); Preconditions.checkArgument(bytes.length > 0); return new RawInput() { @@ -51,11 +51,11 @@ public class RawInputUtil { }; } - public static RawInput create(final byte[] bytes) { + public static RawInput create(byte[] bytes) { return create(bytes, "application/octet-stream"); } - public static RawInput create(final HttpServletRequest req) { + public static RawInput create(HttpServletRequest req) { return new RawInput() { @Override public String getContentType() { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java index 4e145144b6..cfecd78c9a 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java @@ -121,7 +121,7 @@ public class AccessSection extends RefConfigSection implements ComparableThis constructor should only be a last-ditch effort, when the usual account lookup has * failed and a stale account id has been discovered in the data store. */ - public AccountInfo(final Account.Id id) { + public AccountInfo(Account.Id id) { this.id = id; } @@ -40,7 +40,7 @@ public class AccountInfo { * * @param a the data store record holding the specific account details. */ - public AccountInfo(final Account a) { + public AccountInfo(Account a) { id = a.getId(); fullName = a.getFullName(); preferredEmail = a.getPreferredEmail(); @@ -66,7 +66,7 @@ public class AccountInfo { return preferredEmail; } - public void setPreferredEmail(final String email) { + public void setPreferredEmail(String email) { preferredEmail = email; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java index 9c34c97f8e..e0a6569897 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/FilenameComparator.java @@ -29,7 +29,7 @@ public class FilenameComparator implements Comparator { private FilenameComparator() {} @Override - public int compare(final String path1, final String path2) { + public int compare(String path1, String path2) { if (Patch.COMMIT_MSG.equals(path1) && Patch.COMMIT_MSG.equals(path2)) { return 0; } else if (Patch.COMMIT_MSG.equals(path1)) { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java index b8e498f06c..0c06868455 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java @@ -29,7 +29,7 @@ public class GroupDescriptions { return null; } - public static GroupDescription.Internal forAccountGroup(final AccountGroup group) { + public static GroupDescription.Internal forAccountGroup(AccountGroup group) { return new GroupDescription.Internal() { @Override public AccountGroup.UUID getGroupUUID() { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java index 1f746c4b3c..5de0aad515 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupInfo.java @@ -31,7 +31,7 @@ public class GroupInfo { *

This constructor should only be a last-ditch effort, when the usual group lookup has failed * and a stale group id has been discovered in the data store. */ - public GroupInfo(final AccountGroup.UUID uuid) { + public GroupInfo(AccountGroup.UUID uuid) { this.uuid = uuid; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java index 6d427e737c..c90e1fdc1d 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java @@ -274,7 +274,7 @@ public class LabelType { return byValue.get(value); } - public LabelValue getValue(final PatchSetApproval ca) { + public LabelValue getValue(PatchSetApproval ca) { initByValue(); return byValue.get(ca.getValue()); } @@ -282,7 +282,7 @@ public class LabelType { private void initByValue() { if (byValue == null) { byValue = new HashMap<>(); - for (final LabelValue v : values) { + for (LabelValue v : values) { byValue.put(v.getValue(), v); } } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java index e76db303e7..d5891d1575 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java @@ -29,7 +29,7 @@ public class LabelTypes { protected LabelTypes() {} - public LabelTypes(final List approvals) { + public LabelTypes(List approvals) { labelTypes = Collections.unmodifiableList(new ArrayList<>(approvals)); } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java index 93b7f9010e..28e47ee67a 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ParameterizedString.java @@ -24,7 +24,7 @@ import java.util.Map; /** Performs replacements on strings such as Hello ${user}. */ public class ParameterizedString { /** Obtain a string which has no parameters and always produces the value. */ - public static ParameterizedString asis(final String constant) { + public static ParameterizedString asis(String constant) { return new ParameterizedString(new Constant(constant)); } @@ -37,14 +37,14 @@ public class ParameterizedString { this(new Constant("")); } - private ParameterizedString(final Constant c) { + private ParameterizedString(Constant c) { pattern = c.text; rawPattern = c.text; patternOps = Collections.singletonList(c); parameters = Collections.emptyList(); } - public ParameterizedString(final String pattern) { + public ParameterizedString(String pattern) { final StringBuilder raw = new StringBuilder(); final List prs = new ArrayList<>(4); final List ops = new ArrayList<>(4); @@ -103,7 +103,7 @@ public class ParameterizedString { } /** Convert a map of parameters into a value array for binding. */ - public String[] bind(final Map params) { + public String[] bind(Map params) { final String[] r = new String[parameters.size()]; for (int i = 0; i < r.length; i++) { final StringBuilder b = new StringBuilder(); @@ -114,15 +114,15 @@ public class ParameterizedString { } /** Format this string by performing the variable replacements. */ - public String replace(final Map params) { + public String replace(Map params) { final StringBuilder r = new StringBuilder(); - for (final Format f : patternOps) { + for (Format f : patternOps) { f.format(r, params); } return r.toString(); } - public Builder replace(final String name, final String value) { + public Builder replace(String name, String value) { return new Builder().replace(name, value); } @@ -134,7 +134,7 @@ public class ParameterizedString { public final class Builder { private final Map params = new HashMap<>(); - public Builder replace(final String name, final String value) { + public Builder replace(String name, String value) { params.put(name, value); return this; } @@ -152,7 +152,7 @@ public class ParameterizedString { private static class Constant extends Format { private final String text; - Constant(final String text) { + Constant(String text) { this.text = text; } @@ -166,7 +166,7 @@ public class ParameterizedString { private final String name; private final List functions; - Parameter(final String parameter) { + Parameter(String parameter) { // "parameter[.functions...]" -> (parameter, functions...) final List names = Arrays.asList(parameter.split("\\.")); final List functs = new ArrayList<>(names.size()); diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java index 6222c1b705..81646fe65e 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/Permission.java @@ -262,7 +262,7 @@ public class Permission implements Comparable { } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (!(obj instanceof Permission)) { return false; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java index 92658303f1..27d43af7f4 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java @@ -278,7 +278,7 @@ public class PermissionRule implements Comparable { } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (!(obj instanceof PermissionRule)) { return false; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java index f8aa6a0fb7..663379ab53 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/RefConfigSection.java @@ -46,7 +46,7 @@ public abstract class RefConfigSection { } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (!(obj instanceof RefConfigSection)) { return false; } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java index bac92941b0..05f16111c7 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java @@ -22,7 +22,7 @@ public class SshHostKey { protected SshHostKey() {} - public SshHostKey(final String hi, final String hk, final String fp) { + public SshHostKey(String hi, String hk, String fp) { hostIdent = hi; hostKey = hk; fingerprint = fp; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java index 8b740c37ee..6e3db9e0c3 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchGroupException.java @@ -22,23 +22,23 @@ public class NoSuchGroupException extends Exception { public static final String MESSAGE = "Group Not Found: "; - public NoSuchGroupException(final AccountGroup.Id key) { + public NoSuchGroupException(AccountGroup.Id key) { this(key, null); } - public NoSuchGroupException(final AccountGroup.UUID key) { + public NoSuchGroupException(AccountGroup.UUID key) { this(key, null); } - public NoSuchGroupException(final AccountGroup.Id key, final Throwable why) { + public NoSuchGroupException(AccountGroup.Id key, Throwable why) { super(MESSAGE + key.toString(), why); } - public NoSuchGroupException(final AccountGroup.UUID key, final Throwable why) { + public NoSuchGroupException(AccountGroup.UUID key, Throwable why) { super(MESSAGE + key.toString(), why); } - public NoSuchGroupException(final AccountGroup.NameKey k, final Throwable why) { + public NoSuchGroupException(AccountGroup.NameKey k, Throwable why) { super(MESSAGE + k.toString(), why); } @@ -46,7 +46,7 @@ public class NoSuchGroupException extends Exception { this(who, null); } - public NoSuchGroupException(String who, final Throwable why) { + public NoSuchGroupException(String who, Throwable why) { super(MESSAGE + who, why); } } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java index ec8a811a8f..16d5240e80 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/UpdateParentFailedException.java @@ -20,7 +20,7 @@ public class UpdateParentFailedException extends Exception { public static final String MESSAGE = "Update Parent Project Failed: "; - public UpdateParentFailedException(final String message, final Throwable why) { + public UpdateParentFailedException(String message, Throwable why) { super(MESSAGE + ": " + message, why); } } diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java index 793a372067..1630ff8090 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java @@ -39,7 +39,7 @@ public abstract class FactoryModule extends AbstractModule { * * @param factory interface which specifies the bean factory method. */ - protected void factory(final Class factory) { + protected void factory(Class factory) { install(new FactoryModuleBuilder().build(factory)); } } diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java index 926818e856..5cdf2678ac 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java @@ -186,7 +186,7 @@ public class DynamicSet implements Iterable { * @param item item to check whether or not it is contained. * @return {@code true} if this set contains the given item. */ - public boolean contains(final T item) { + public boolean contains(T item) { Iterator iterator = iterator(); while (iterator.hasNext()) { T candidate = iterator.next(); @@ -203,7 +203,7 @@ public class DynamicSet implements Iterable { * @param item the item to add to the collection. Must not be null. * @return handle to remove the item at a later point in time. */ - public RegistrationHandle add(final T item) { + public RegistrationHandle add(T item) { return add(Providers.of(item)); } @@ -213,7 +213,7 @@ public class DynamicSet implements Iterable { * @param item the item to add to the collection. Must not be null. * @return handle to remove the item at a later point in time. */ - public RegistrationHandle add(final Provider item) { + public RegistrationHandle add(Provider item) { final AtomicReference> ref = new AtomicReference<>(item); items.add(ref); return new RegistrationHandle() { diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java index 5057529c97..50aed7d6cd 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java @@ -30,7 +30,7 @@ public class PrivateInternals_DynamicMapImpl extends DynamicMap { * @param item the item to add to the collection. Must not be null. * @return handle to remove the item at a later point in time. */ - public RegistrationHandle put(String pluginName, String exportName, final Provider item) { + public RegistrationHandle put(String pluginName, String exportName, Provider item) { final NamePair key = new NamePair(pluginName, exportName); items.put(key, item); return new RegistrationHandle() { diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java index 2d0f8332bb..7b70c6a47c 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java @@ -62,7 +62,7 @@ public class CopyableLabel extends Composite implements HasText { return flashEnabled; } - public static void setFlashEnabled(final boolean on) { + public static void setFlashEnabled(boolean on) { flashEnabled = on; } @@ -87,7 +87,7 @@ public class CopyableLabel extends Composite implements HasText { * * @param str initial content */ - public CopyableLabel(final String str) { + public CopyableLabel(String str) { this(str, true); } @@ -98,7 +98,7 @@ public class CopyableLabel extends Composite implements HasText { * @param showLabel if true, the content is shown, if false it is hidden from view and only the * copy icon is displayed. */ - public CopyableLabel(final String str, final boolean showLabel) { + public CopyableLabel(String str, boolean showLabel) { content = new FlowPanel(); initWidget(content); @@ -111,7 +111,7 @@ public class CopyableLabel extends Composite implements HasText { textLabel.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { showTextBox(); } }); @@ -160,7 +160,7 @@ public class CopyableLabel extends Composite implements HasText { * @param text the new preview text, should be shorter than the original text which would be * copied to the clipboard. */ - public void setPreviewText(final String text) { + public void setPreviewText(String text) { if (textLabel != null) { textLabel.setText(text); } @@ -206,7 +206,7 @@ public class CopyableLabel extends Composite implements HasText { } @Override - public void setText(final String newText) { + public void setText(String newText) { text = newText; visibleLen = newText.length(); @@ -229,7 +229,7 @@ public class CopyableLabel extends Composite implements HasText { textBox.addKeyPressHandler( new KeyPressHandler() { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { if (event.isControlKeyDown() || event.isMetaKeyDown()) { switch (event.getCharCode()) { case 'c': @@ -237,7 +237,7 @@ public class CopyableLabel extends Composite implements HasText { textBox.addKeyUpHandler( new KeyUpHandler() { @Override - public void onKeyUp(final KeyUpEvent event) { + public void onKeyUp(KeyUpEvent event) { Scheduler.get() .scheduleDeferred( new Command() { @@ -256,7 +256,7 @@ public class CopyableLabel extends Composite implements HasText { textBox.addBlurHandler( new BlurHandler() { @Override - public void onBlur(final BlurEvent event) { + public void onBlur(BlurEvent event) { hideTextBox(); } }); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java index 1066dd4e56..6ef5d7b56c 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/css/rebind/CssLinker.java @@ -38,19 +38,18 @@ public class CssLinker extends AbstractLinker { } @Override - public ArtifactSet link( - final TreeLogger logger, final LinkerContext context, final ArtifactSet artifacts) + public ArtifactSet link(final TreeLogger logger, LinkerContext context, ArtifactSet artifacts) throws UnableToCompleteException { final ArtifactSet returnTo = new ArtifactSet(); int index = 0; final HashMap css = new HashMap<>(); - for (final StandardStylesheetReference ssr : + for (StandardStylesheetReference ssr : artifacts.find(StandardStylesheetReference.class)) { css.put(ssr.getSrc(), null); } - for (final PublicResource pr : artifacts.find(PublicResource.class)) { + for (PublicResource pr : artifacts.find(PublicResource.class)) { if (css.containsKey(pr.getPartialPath())) { css.put(pr.getPartialPath(), new CssPubRsrc(name(logger, pr), pr)); } @@ -74,8 +73,7 @@ public class CssLinker extends AbstractLinker { return returnTo; } - private String name(final TreeLogger logger, final PublicResource r) - throws UnableToCompleteException { + private String name(TreeLogger logger, PublicResource r) throws UnableToCompleteException { byte[] out; try (ByteArrayOutputStream tmp = new ByteArrayOutputStream(); InputStream in = r.getContents(logger)) { @@ -105,13 +103,13 @@ public class CssLinker extends AbstractLinker { private static final long serialVersionUID = 1L; private final PublicResource src; - CssPubRsrc(final String partialPath, final PublicResource r) { + CssPubRsrc(String partialPath, PublicResource r) { super(StandardLinkerContext.class, partialPath); src = r; } @Override - public InputStream getContents(final TreeLogger logger) throws UnableToCompleteException { + public InputStream getContents(TreeLogger logger) throws UnableToCompleteException { return src.getContents(logger); } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java index 304d56ea39..5a4f6aad35 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/CompoundKeyCommand.java @@ -34,7 +34,7 @@ public final class CompoundKeyCommand extends KeyCommand { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { GlobalKey.temporaryWithTimeout(set); } } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java index 39613139e1..3eac7897a1 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/GlobalKey.java @@ -30,7 +30,7 @@ public class GlobalKey { public static final KeyPressHandler STOP_PROPAGATION = new KeyPressHandler() { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { event.stopPropagation(); } }; @@ -50,7 +50,7 @@ public class GlobalKey { .addKeyPressHandler( new KeyPressHandler() { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { final KeyCommandSet s = active.live; if (s != active.all) { active.live = active.all; @@ -78,19 +78,19 @@ public class GlobalKey { restoreGlobal = new CloseHandler() { @Override - public void onClose(final CloseEvent event) { + public void onClose(CloseEvent event) { active = global; } }; } } - static void temporaryWithTimeout(final KeyCommandSet s) { + static void temporaryWithTimeout(KeyCommandSet s) { active.live = s; restoreTimer.schedule(250); } - public static void dialog(final PopupPanel panel) { + public static void dialog(PopupPanel panel) { initEvents(); initDialog(); assert panel.isShowing(); @@ -110,7 +110,7 @@ public class GlobalKey { KeyDownEvent.getType()); } - public static HandlerRegistration addApplication(final Widget widget, final KeyCommand appKey) { + public static HandlerRegistration addApplication(Widget widget, KeyCommand appKey) { initEvents(); final State state = stateFor(widget); state.add(appKey); @@ -122,7 +122,7 @@ public class GlobalKey { }; } - public static HandlerRegistration add(final Widget widget, final KeyCommandSet cmdSet) { + public static HandlerRegistration add(Widget widget, KeyCommandSet cmdSet) { initEvents(); final State state = stateFor(widget); state.add(cmdSet); @@ -144,7 +144,7 @@ public class GlobalKey { return global; } - public static void filter(final KeyCommandFilter filter) { + public static void filter(KeyCommandFilter filter) { active.filter(filter); if (active != global) { global.filter(filter); @@ -159,7 +159,7 @@ public class GlobalKey { final KeyCommandSet all; KeyCommandSet live; - State(final Widget r) { + State(Widget r) { root = r; app = new KeyCommandSet(KeyConstants.I.applicationSection()); @@ -171,25 +171,25 @@ public class GlobalKey { live = all; } - void add(final KeyCommand k) { + void add(KeyCommand k) { app.add(k); all.add(k); } - void remove(final KeyCommand k) { + void remove(KeyCommand k) { app.remove(k); all.remove(k); } - void add(final KeyCommandSet s) { + void add(KeyCommandSet s) { all.add(s); } - void remove(final KeyCommandSet s) { + void remove(KeyCommandSet s) { all.remove(s); } - void filter(final KeyCommandFilter f) { + void filter(KeyCommandFilter f) { all.filter(f); } } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java index 0274b9d2f6..8222f8b250 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/HidePopupPanelCommand.java @@ -27,7 +27,7 @@ public class HidePopupPanelCommand extends KeyCommand { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { panel.hide(); } } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java index 2e9b652fd5..f1c92e02fc 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommand.java @@ -25,7 +25,7 @@ public abstract class KeyCommand implements KeyPressHandler { public static final int M_META = 4 << 16; public static final int M_SHIFT = 8 << 16; - public static boolean same(final KeyCommand a, final KeyCommand b) { + public static boolean same(KeyCommand a, KeyCommand b) { return a.getClass() == b.getClass() && a.helpText.equals(b.helpText) && a.sibling == b.sibling; } @@ -33,11 +33,11 @@ public abstract class KeyCommand implements KeyPressHandler { private final String helpText; KeyCommand sibling; - public KeyCommand(final int mask, final int key, final String help) { + public KeyCommand(int mask, int key, String help) { this(mask, (char) key, help); } - public KeyCommand(final int mask, final char key, final String help) { + public KeyCommand(int mask, char key, String help) { assert help != null; keyMask = mask | key; helpText = help; @@ -88,12 +88,12 @@ public abstract class KeyCommand implements KeyPressHandler { return b; } - private void modifier(final SafeHtmlBuilder b, final String name) { + private void modifier(SafeHtmlBuilder b, String name) { namedKey(b, name); b.append(" + "); } - private void namedKey(final SafeHtmlBuilder b, final String name) { + private void namedKey(SafeHtmlBuilder b, String name) { b.append('<'); b.openSpan(); b.setStyleName(KeyResources.I.css().helpKey()); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java index 734dd4eb77..90aa419b4c 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java @@ -33,7 +33,7 @@ public class KeyCommandSet implements KeyPressHandler { this(""); } - public KeyCommandSet(final String setName) { + public KeyCommandSet(String setName) { map = new HashMap<>(); name = setName; } @@ -42,7 +42,7 @@ public class KeyCommandSet implements KeyPressHandler { return name; } - public void setName(final String setName) { + public void setName(String setName) { assert setName != null; name = setName; } @@ -62,7 +62,7 @@ public class KeyCommandSet implements KeyPressHandler { b.sibling = a; } - public void add(final KeyCommand k) { + public void add(KeyCommand k) { assert !map.containsKey(k.keyMask) : "Key " + k.describeKeyStroke().asString() + " already registered"; if (!map.containsKey(k.keyMask)) { @@ -70,38 +70,38 @@ public class KeyCommandSet implements KeyPressHandler { } } - public void remove(final KeyCommand k) { + public void remove(KeyCommand k) { assert map.get(k.keyMask) == k; map.remove(k.keyMask); } - public void add(final KeyCommandSet set) { + public void add(KeyCommandSet set) { if (sets == null) { sets = new ArrayList<>(); } assert !sets.contains(set); sets.add(set); - for (final KeyCommand k : set.map.values()) { + for (KeyCommand k : set.map.values()) { add(k); } } - public void remove(final KeyCommandSet set) { + public void remove(KeyCommandSet set) { assert sets != null; assert sets.contains(set); sets.remove(set); - for (final KeyCommand k : set.map.values()) { + for (KeyCommand k : set.map.values()) { remove(k); } } - public void filter(final KeyCommandFilter filter) { + public void filter(KeyCommandFilter filter) { if (sets != null) { - for (final KeyCommandSet s : sets) { + for (KeyCommandSet s : sets) { s.filter(filter); } } - for (final Iterator i = map.values().iterator(); i.hasNext(); ) { + for (Iterator i = map.values().iterator(); i.hasNext(); ) { final KeyCommand kc = i.next(); if (!filter.include(kc)) { i.remove(); @@ -120,7 +120,7 @@ public class KeyCommandSet implements KeyPressHandler { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { final KeyCommand k = map.get(toMask(event)); if (k != null) { event.preventDefault(); @@ -129,7 +129,7 @@ public class KeyCommandSet implements KeyPressHandler { } } - static int toMask(final KeyPressEvent event) { + static int toMask(KeyPressEvent event) { int mask = event.getUnicodeCharCode(); if (mask == 0) { mask = event.getNativeEvent().getKeyCode(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java index 0ec9d10a17..13181250df 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyHelpPopup.java @@ -51,7 +51,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown closer.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { hide(); } }); @@ -84,7 +84,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown } @Override - public void setVisible(final boolean show) { + public void setVisible(boolean show) { super.setVisible(show); if (show) { focus.setFocus(true); @@ -92,7 +92,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { if (KeyCommandSet.toMask(event) == ShowHelpCommand.INSTANCE.keyMask) { // Block the '?' key from triggering us to show right after // we just hide ourselves. @@ -104,16 +104,16 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown } @Override - public void onKeyDown(final KeyDownEvent event) { + public void onKeyDown(KeyDownEvent event) { if (event.getNativeKeyCode() == KeyCodes.KEY_ESCAPE) { hide(); } } - private void populate(final Grid lists) { + private void populate(Grid lists) { int[] end = new int[5]; int column = 0; - for (final KeyCommandSet set : combinedSetsByName()) { + for (KeyCommandSet set : combinedSetsByName()) { int row = end[column]; row = formatGroup(lists, row, column, set); end[column] = row; @@ -131,7 +131,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown */ private static Collection combinedSetsByName() { LinkedHashMap byName = new LinkedHashMap<>(); - for (final KeyCommandSet set : GlobalKey.active.all.getSets()) { + for (KeyCommandSet set : GlobalKey.active.all.getSets()) { KeyCommandSet v = byName.get(set.getName()); if (v == null) { v = new KeyCommandSet(set.getName()); @@ -142,7 +142,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown return byName.values(); } - private int formatGroup(final Grid lists, int row, final int col, final KeyCommandSet set) { + private int formatGroup(Grid lists, int row, int col, KeyCommandSet set) { if (set.isEmpty()) { return row; } @@ -157,8 +157,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown return formatKeys(lists, row, col, set, null); } - private int formatKeys( - final Grid lists, int row, final int col, final KeyCommandSet set, final SafeHtml prefix) { + private int formatKeys(final Grid lists, int row, int col, KeyCommandSet set, SafeHtml prefix) { final CellFormatter fmt = lists.getCellFormatter(); final List keys = sort(set); if (lists.getRowCount() < row + keys.size()) { @@ -228,7 +227,7 @@ public class KeyHelpPopup extends PopupPanel implements KeyPressHandler, KeyDown return row; } - private List sort(final KeyCommandSet set) { + private List sort(KeyCommandSet set) { final List keys = new ArrayList<>(set.getKeys()); Collections.sort( keys, diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java index 86402e1771..1392675b43 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/NpTextBox.java @@ -22,7 +22,7 @@ public class NpTextBox extends TextBox { addKeyPressHandler(GlobalKey.STOP_PROPAGATION); } - public NpTextBox(final Element element) { + public NpTextBox(Element element) { super(element); addKeyPressHandler(GlobalKey.STOP_PROPAGATION); } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java index c2272c5935..08217f4880 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/ShowHelpCommand.java @@ -40,7 +40,7 @@ public class ShowHelpCommand extends KeyCommand { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { if (current != null) { // Already open? Close the dialog. // @@ -52,7 +52,7 @@ public class ShowHelpCommand extends KeyCommand { help.addCloseHandler( new CloseHandler() { @Override - public void onClose(final CloseEvent event) { + public void onClose(CloseEvent event) { current = null; BUS.fireEvent(new FocusEvent() {}); } @@ -61,7 +61,7 @@ public class ShowHelpCommand extends KeyCommand { help.setPopupPositionAndShow( new PositionCallback() { @Override - public void setPosition(final int pWidth, final int pHeight) { + public void setPosition(int pWidth, int pHeight) { final int left = (Window.getClientWidth() - pWidth) >> 1; final int wLeft = Window.getScrollLeft(); final int wTop = Window.getScrollTop(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java index bc183236ba..f133e4d7d1 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java @@ -41,7 +41,7 @@ public class ProgressBar extends Composite { } /** Create a bar displaying the specified message. */ - public ProgressBar(final String text) { + public ProgressBar(String text) { if (text == null || text.length() == 0) { callerText = ""; } else { @@ -68,7 +68,7 @@ public class ProgressBar extends Composite { } /** Update the bar's percent completion. */ - public void setValue(final int pComplete) { + public void setValue(int pComplete) { assert 0 <= pComplete && pComplete <= 100; value = pComplete; bar.setWidth(2 * pComplete + "px"); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java index eb141f1572..c93a78b75b 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java @@ -38,7 +38,7 @@ class AttMap { private Tag tag = ANY; private int live; - void reset(final String tagName) { + void reset(String tagName) { tag = TAGS.get(tagName.toLowerCase()); if (tag == null) { tag = ANY; @@ -46,7 +46,7 @@ class AttMap { live = 0; } - void onto(final Buffer raw, final SafeHtmlBuilder esc) { + void onto(Buffer raw, SafeHtmlBuilder esc) { for (int i = 0; i < live; i++) { final String v = values.get(i); if (v.length() > 0) { @@ -70,7 +70,7 @@ class AttMap { return ""; } - void set(String name, final String value) { + void set(String name, String value) { name = name.toLowerCase(); tag.assertSafe(name, value); @@ -91,7 +91,7 @@ class AttMap { } } - private static void assertNotJavascriptUrl(final String value) { + private static void assertNotJavascriptUrl(String value) { if (value.startsWith("#")) { // common in GWT, and safe, so bypass further checks diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java index 83abd5d6b3..c6e1d300d8 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java @@ -22,37 +22,37 @@ final class BufferDirect implements Buffer { } @Override - public void append(final boolean v) { + public void append(boolean v) { strbuf.append(v); } @Override - public void append(final char v) { + public void append(char v) { strbuf.append(v); } @Override - public void append(final int v) { + public void append(int v) { strbuf.append(v); } @Override - public void append(final long v) { + public void append(long v) { strbuf.append(v); } @Override - public void append(final float v) { + public void append(float v) { strbuf.append(v); } @Override - public void append(final double v) { + public void append(double v) { strbuf.append(v); } @Override - public void append(final String v) { + public void append(String v) { strbuf.append(v); } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java index e3aed550b9..bdd9801952 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java @@ -17,42 +17,42 @@ package com.google.gwtexpui.safehtml.client; final class BufferSealElement implements Buffer { private final SafeHtmlBuilder shb; - BufferSealElement(final SafeHtmlBuilder safeHtmlBuilder) { + BufferSealElement(SafeHtmlBuilder safeHtmlBuilder) { shb = safeHtmlBuilder; } @Override - public void append(final boolean v) { + public void append(boolean v) { shb.sealElement().append(v); } @Override - public void append(final char v) { + public void append(char v) { shb.sealElement().append(v); } @Override - public void append(final double v) { + public void append(double v) { shb.sealElement().append(v); } @Override - public void append(final float v) { + public void append(float v) { shb.sealElement().append(v); } @Override - public void append(final int v) { + public void append(int v) { shb.sealElement().append(v); } @Override - public void append(final long v) { + public void append(long v) { shb.sealElement().append(v); } @Override - public void append(final String v) { + public void append(String v) { shb.sealElement().append(v); } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java index 25cad1d3c6..ef80cdb01b 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java @@ -45,11 +45,11 @@ public abstract class HighlightSuggestOracle extends SuggestOracle { request, new Callback() { @Override - public void onSuggestionsReady(final Request request, final Response response) { + public void onSuggestionsReady(Request request, Response response) { final String qpat = getQueryPattern(request.getQuery()); final boolean html = isHTML(); final ArrayList r = new ArrayList<>(); - for (final Suggestion s : response.getSuggestions()) { + for (Suggestion s : response.getSuggestions()) { r.add(new BoldSuggestion(qpat, s, html)); } cb.onSuggestionsReady(request, new Response(r)); @@ -57,7 +57,7 @@ public abstract class HighlightSuggestOracle extends SuggestOracle { }); } - protected String getQueryPattern(final String query) { + protected String getQueryPattern(String query) { return query; } @@ -77,7 +77,7 @@ public abstract class HighlightSuggestOracle extends SuggestOracle { private final Suggestion suggestion; private final String displayString; - BoldSuggestion(final String qstr, final Suggestion s, final boolean html) { + BoldSuggestion(String qstr, Suggestion s, boolean html) { suggestion = s; String ds = s.getDisplayString(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java index 9161652a55..2a1ddc0ce1 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java @@ -79,17 +79,17 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm } /** @return the existing HTML property of a widget. */ - public static SafeHtml get(final HasHTML t) { + public static SafeHtml get(HasHTML t) { return new SafeHtmlString(t.getHTML()); } /** @return the existing HTML text, wrapped in a safe buffer. */ - public static SafeHtml asis(final String htmlText) { + public static SafeHtml asis(String htmlText) { return new SafeHtmlString(htmlText); } /** Set the HTML property of a widget. */ - public static T set(final T e, final SafeHtml str) { + public static T set(T e, SafeHtml str) { e.setHTML(str.asString()); return e; } @@ -106,13 +106,12 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm } /** @return the existing inner HTML of a table cell. */ - public static SafeHtml get(final HTMLTable t, final int row, final int col) { + public static SafeHtml get(HTMLTable t, int row, int col) { return new SafeHtmlString(t.getHTML(row, col)); } /** Set the inner HTML of a table cell. */ - public static T set( - final T t, final int row, final int col, final SafeHtml str) { + public static T set(final T t, int row, int col, SafeHtml str) { t.setHTML(row, col, str.asString()); return t; } @@ -140,13 +139,13 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm */ public SafeHtml wikify() { final SafeHtmlBuilder r = new SafeHtmlBuilder(); - for (final String p : linkify().asString().split("\n\n")) { + for (String p : linkify().asString().split("\n\n")) { if (isQuote(p)) { wikifyQuote(r, p); } else if (isPreFormat(p)) { r.openElement("p"); - for (final String line : p.split("\n")) { + for (String line : p.split("\n")) { r.openSpan(); r.setStyleName(RESOURCES.css().wikiPreFormat()); r.append(asis(line)); @@ -167,7 +166,7 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm return r.toSafeHtml(); } - private void wikifyList(final SafeHtmlBuilder r, final String p) { + private void wikifyList(SafeHtmlBuilder r, String p) { boolean in_ul = false; boolean in_p = false; for (String line : p.split("\n")) { @@ -232,11 +231,11 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm return p.startsWith("> ") || p.startsWith(" > "); } - private static boolean isPreFormat(final String p) { + private static boolean isPreFormat(String p) { return p.contains("\n ") || p.contains("\n\t") || p.startsWith(" ") || p.startsWith("\t"); } - private static boolean isList(final String p) { + private static boolean isList(String p) { return p.contains("\n- ") || p.contains("\n* ") || p.startsWith("- ") || p.startsWith("* "); } @@ -252,7 +251,7 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm * {@code $n}. * @return a new string, after the replacement has been made. */ - public SafeHtml replaceFirst(final String regex, final String repl) { + public SafeHtml replaceFirst(String regex, String repl) { return new SafeHtmlString(asString().replaceFirst(regex, repl)); } @@ -268,7 +267,7 @@ public abstract class SafeHtml implements com.google.gwt.safehtml.shared.SafeHtm * {@code $n}. * @return a new string, after the replacements have been made. */ - public SafeHtml replaceAll(final String regex, final String repl) { + public SafeHtml replaceAll(String regex, String repl) { return new SafeHtmlString(asString().replaceAll(regex, repl)); } diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java index f54149b3ec..a9269063ae 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java @@ -49,12 +49,12 @@ public class SafeHtmlBuilder extends SafeHtml { return !isEmpty(); } - public SafeHtmlBuilder append(final boolean in) { + public SafeHtmlBuilder append(boolean in) { cb.append(in); return this; } - public SafeHtmlBuilder append(final char in) { + public SafeHtmlBuilder append(char in) { switch (in) { case '&': cb.append("&"); @@ -83,22 +83,22 @@ public class SafeHtmlBuilder extends SafeHtml { return this; } - public SafeHtmlBuilder append(final int in) { + public SafeHtmlBuilder append(int in) { cb.append(in); return this; } - public SafeHtmlBuilder append(final long in) { + public SafeHtmlBuilder append(long in) { cb.append(in); return this; } - public SafeHtmlBuilder append(final float in) { + public SafeHtmlBuilder append(float in) { cb.append(in); return this; } - public SafeHtmlBuilder append(final double in) { + public SafeHtmlBuilder append(double in) { cb.append(in); return this; } @@ -112,7 +112,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append already safe HTML as-is, avoiding double escaping. */ - public SafeHtmlBuilder append(final SafeHtml in) { + public SafeHtmlBuilder append(SafeHtml in) { if (in != null) { cb.append(in.asString()); } @@ -120,7 +120,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append the string, escaping unsafe characters. */ - public SafeHtmlBuilder append(final String in) { + public SafeHtmlBuilder append(String in) { if (in != null) { impl.escapeStr(this, in); } @@ -128,7 +128,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append the string, escaping unsafe characters. */ - public SafeHtmlBuilder append(final StringBuilder in) { + public SafeHtmlBuilder append(StringBuilder in) { if (in != null) { append(in.toString()); } @@ -136,7 +136,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append the string, escaping unsafe characters. */ - public SafeHtmlBuilder append(final StringBuffer in) { + public SafeHtmlBuilder append(StringBuffer in) { if (in != null) { append(in.toString()); } @@ -144,7 +144,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append the result of toString(), escaping unsafe characters. */ - public SafeHtmlBuilder append(final Object in) { + public SafeHtmlBuilder append(Object in) { if (in != null) { append(in.toString()); } @@ -152,7 +152,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append the string, escaping unsafe characters. */ - public SafeHtmlBuilder append(final CharSequence in) { + public SafeHtmlBuilder append(CharSequence in) { if (in != null) { escapeCS(this, in); } @@ -167,7 +167,7 @@ public class SafeHtmlBuilder extends SafeHtml { * * @param tagName name of the HTML element to open. */ - public SafeHtmlBuilder openElement(final String tagName) { + public SafeHtmlBuilder openElement(String tagName) { assert isElementName(tagName); cb.append("<"); cb.append(tagName); @@ -187,7 +187,7 @@ public class SafeHtmlBuilder extends SafeHtml { * @return the attribute value, as a string. The empty string if the attribute has not been * assigned a value. The returned string is the raw (unescaped) value. */ - public String getAttribute(final String name) { + public String getAttribute(String name) { assert isAttributeName(name); assert cb == sBuf; return att.get(name); @@ -200,7 +200,7 @@ public class SafeHtmlBuilder extends SafeHtml { * @param value value to assign; any existing value is replaced. The value is escaped (if * necessary) during the assignment. */ - public SafeHtmlBuilder setAttribute(final String name, final String value) { + public SafeHtmlBuilder setAttribute(String name, String value) { assert isAttributeName(name); assert cb == sBuf; att.set(name, value != null ? value : ""); @@ -213,7 +213,7 @@ public class SafeHtmlBuilder extends SafeHtml { * @param name name of the attribute to set. * @param value value to assign, any existing value is replaced. */ - public SafeHtmlBuilder setAttribute(final String name, final int value) { + public SafeHtmlBuilder setAttribute(String name, int value) { return setAttribute(name, String.valueOf(value)); } @@ -227,7 +227,7 @@ public class SafeHtmlBuilder extends SafeHtml { * @param name name of the attribute to append onto. * @param value additional value to append. */ - public SafeHtmlBuilder appendAttribute(final String name, String value) { + public SafeHtmlBuilder appendAttribute(String name, String value) { if (value != null && value.length() > 0) { final String e = getAttribute(name); return setAttribute(name, e.length() > 0 ? e + " " + value : value); @@ -236,17 +236,17 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Set the height attribute of the current element. */ - public SafeHtmlBuilder setHeight(final int height) { + public SafeHtmlBuilder setHeight(int height) { return setAttribute("height", height); } /** Set the width attribute of the current element. */ - public SafeHtmlBuilder setWidth(final int width) { + public SafeHtmlBuilder setWidth(int width) { return setAttribute("width", width); } /** Set the CSS class name for this element. */ - public SafeHtmlBuilder setStyleName(final String style) { + public SafeHtmlBuilder setStyleName(String style) { assert isCssName(style); return setAttribute("class", style); } @@ -256,7 +256,7 @@ public class SafeHtmlBuilder extends SafeHtml { * *

If no CSS class name has been specified yet, this method initializes it to the single name. */ - public SafeHtmlBuilder addStyleName(final String style) { + public SafeHtmlBuilder addStyleName(String style) { assert isCssName(style); return appendAttribute("class", style); } @@ -281,7 +281,7 @@ public class SafeHtmlBuilder extends SafeHtml { } /** Append a closing tag for the named element. */ - public SafeHtmlBuilder closeElement(final String name) { + public SafeHtmlBuilder closeElement(String name) { assert isElementName(name); cb.append(" extends Composite { * * @param view the next view to display. */ - public void setView(final V view) { + public void setView(V view) { if (next != null) { main.remove(next); } @@ -67,10 +67,10 @@ public class ViewSite extends Composite { * * @param view the view being displayed. */ - protected void onShowView(final V view) {} + protected void onShowView(V view) {} @SuppressWarnings("unchecked") - final void swap(final View v) { + final void swap(View v) { if (next != null && next.getWidget() == v) { if (current != null) { main.remove(current); diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java index 17b0a4d7f3..9a2dbe3889 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java @@ -280,11 +280,11 @@ public class SafeHtmlBuilderTest { new SafeHtmlBuilder().openElement("form").setAttribute("action", href); } - private static String escape(final char c) { + private static String escape(char c) { return new SafeHtmlBuilder().append(c).asString(); } - private static String escape(final String c) { + private static String escape(String c) { return new SafeHtmlBuilder().append(c).asString(); } } diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java index 32f79d7f09..4df2f5fb49 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/DateFormatter.java @@ -90,7 +90,7 @@ public class DateFormatter { } /** Format a date using the locale's medium length format. */ - public String mediumFormat(final Date dt) { + public String mediumFormat(Date dt) { if (dt == null) { return ""; } diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java index 43ff60c0b2..4b170687c9 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeMap.java @@ -40,7 +40,7 @@ public class NativeMap extends JavaScriptObject { /** Loop through the result map and set asProperty on the children. */ public static > - AsyncCallback copyKeysIntoChildren(final String asProperty, AsyncCallback callback) { + AsyncCallback copyKeysIntoChildren(String asProperty, AsyncCallback callback) { return new TransformCallback(callback) { @Override protected M transform(M result) { diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java index a4b90c3859..e0bca0ebd9 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java @@ -38,7 +38,7 @@ public final class NativeString extends JavaScriptObject { public native String asString() /*-{ return this.s; }-*/; - public static AsyncCallback unwrap(final AsyncCallback cb) { + public static AsyncCallback unwrap(AsyncCallback cb) { return new AsyncCallback() { @Override public void onSuccess(NativeString result) { diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java index ebaa63b685..1421386a2e 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/Natives.java @@ -35,7 +35,7 @@ public class Natives { return Collections.emptySet(); } - public static List asList(final JsArrayString arr) { + public static List asList(JsArrayString arr) { if (arr == null) { return null; } @@ -59,7 +59,7 @@ public class Natives { }; } - public static List asList(final JsArray arr) { + public static List asList(JsArray arr) { if (arr == null) { return null; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java index 58865fa967..438df34888 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java @@ -29,7 +29,7 @@ public class ConfirmationDialog extends AutoCenterDialogBox { private Button okButton; public ConfirmationDialog( - final String dialogTitle, final SafeHtml message, final ConfirmationCallback callback) { + final String dialogTitle, SafeHtml message, ConfirmationCallback callback) { super(/* auto hide */ false, /* modal */ true); setGlassEnabled(true); setText(dialogTitle); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java index e4dc40d240..0081783a18 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java @@ -170,7 +170,7 @@ public class Dispatcher { return p.toString(); } - public static String toGroup(final AccountGroup.Id id) { + public static String toGroup(AccountGroup.Id id) { return ADMIN_GROUPS + id.toString(); } @@ -293,7 +293,7 @@ public class Dispatcher { return r; } - private static void dashboard(final String token) { + private static void dashboard(String token) { String rest = skip(token); if (rest.matches("[0-9]+")) { Gerrit.display(token, new AccountDashboardScreen(Account.Id.parse(rest))); @@ -319,7 +319,7 @@ public class Dispatcher { Gerrit.display(token, new NotFoundScreen()); } - private static void projects(final String token) { + private static void projects(String token) { String rest = skip(token); int c = rest.indexOf(DASHBOARDS); if (0 <= c) { @@ -366,7 +366,7 @@ public class Dispatcher { Gerrit.display(token, new NotFoundScreen()); } - private static void change(final String token) { + private static void change(String token) { String rest = skip(token); int c = rest.lastIndexOf(','); String panel = null; @@ -456,7 +456,7 @@ public class Dispatcher { return new PatchSet.Id(id, psIdStr.equals("edit") ? 0 : Integer.parseInt(psIdStr)); } - private static void extension(final String token) { + private static void extension(String token) { ExtensionScreen view = new ExtensionScreen(skip(token)); if (view.isFound()) { Gerrit.display(token, view); @@ -533,7 +533,7 @@ public class Dispatcher { }); } - private static void codemirrorForEdit(final String token, final Patch.Key id, final int line) { + private static void codemirrorForEdit(String token, Patch.Key id, int line) { GWT.runAsync( new AsyncSplit(token) { @Override @@ -839,7 +839,7 @@ public class Dispatcher { } } - private static void docSearch(final String token) { + private static void docSearch(String token) { GWT.runAsync( new AsyncSplit(token) { @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java index e8807126c4..d793082747 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java @@ -86,19 +86,19 @@ public class ErrorDialog extends PopupPanel { } /** Create a dialog box to show a single message string. */ - public ErrorDialog(final String message) { + public ErrorDialog(String message) { this(); body.add(new Label(message)); } /** Create a dialog box to show a single message string. */ - public ErrorDialog(final SafeHtml message) { + public ErrorDialog(SafeHtml message) { this(); body.add(message.toBlockWidget()); } /** Create a dialog box to nicely format an exception. */ - public ErrorDialog(final Throwable what) { + public ErrorDialog(Throwable what) { this(); String hdr; @@ -151,7 +151,7 @@ public class ErrorDialog extends PopupPanel { } } - public ErrorDialog setText(final String t) { + public ErrorDialog setText(String t) { text.setText(t); return this; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java index 751302ebee..e02c4e0b80 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java @@ -170,7 +170,7 @@ public class Gerrit implements EntryPoint { * * @param token location to parse, load, and render. */ - public static void display(final String token) { + public static void display(String token) { if (body.getView() == null || !body.getView().displayToken(token)) { dispatcher.display(token); updateUiLink(token); @@ -191,7 +191,7 @@ public class Gerrit implements EntryPoint { * @param token location that refers to {@code view}. * @param view the view to load. */ - public static void display(final String token, final Screen view) { + public static void display(String token, Screen view) { if (view.isRequiresSignIn() && !isSignedIn()) { doSignIn(token); } else { @@ -217,7 +217,7 @@ public class Gerrit implements EntryPoint { * * @param token new location that is already visible. */ - public static void updateImpl(final String token) { + public static void updateImpl(String token) { History.newItem(token, false); dispatchHistoryHooks(token); } @@ -226,7 +226,7 @@ public class Gerrit implements EntryPoint { searchPanel.setText(query); } - public static void setWindowTitle(final Screen screen, final String text) { + public static void setWindowTitle(Screen screen, String text) { if (screen == body.getView()) { if (text == null || text.length() == 0) { Window.setTitle(M.windowTitle1(myHost)); @@ -428,7 +428,7 @@ public class Gerrit implements EntryPoint { } @Override - public String decode(final String e) { + public String decode(String e) { return URL.decodeQueryString(e); } @@ -476,7 +476,7 @@ public class Gerrit implements EntryPoint { cbg.addFinal( new GerritCallback() { @Override - public void onSuccess(final HostPageData result) { + public void onSuccess(HostPageData result) { Document.get().getElementById("gerrit_hostpagedata").removeFromParent(); myTheme = result.theme; isNoteDbEnabled = result.isNoteDbEnabled; @@ -957,7 +957,7 @@ public class Gerrit implements EntryPoint { return docSearch; } - private static void getDocIndex(final AsyncCallback cb) { + private static void getDocIndex(AsyncCallback cb) { RequestBuilder req = new RequestBuilder(RequestBuilder.HEAD, GWT.getHostPageBaseURL() + INDEX); req.setCallback( new RequestCallback() { @@ -1031,22 +1031,21 @@ public class Gerrit implements EntryPoint { menuRight.add(fp); } - private static Anchor anchor(final String text, final String to) { + private static Anchor anchor(String text, String to) { final Anchor a = new Anchor(text, to); a.setStyleName(RESOURCES.css().menuItem()); Roles.getMenuitemRole().set(a.getElement()); return a; } - private static LinkMenuItem addLink( - final LinkMenuBar m, final String text, final String historyToken) { + private static LinkMenuItem addLink(final LinkMenuBar m, String text, String historyToken) { LinkMenuItem i = new LinkMenuItem(text, historyToken); m.addItem(i); return i; } private static void insertLink( - final LinkMenuBar m, final String text, final String historyToken, final int beforeIndex) { + final LinkMenuBar m, String text, String historyToken, int beforeIndex) { m.insertItem(new LinkMenuItem(text, historyToken), beforeIndex); } @@ -1090,7 +1089,7 @@ public class Gerrit implements EntryPoint { return i; } - private static void addDocLink(final LinkMenuBar m, final String text, final String href) { + private static void addDocLink(LinkMenuBar m, String text, String href) { final Anchor atag = anchor(text, docUrl + href); atag.setTarget("_blank"); m.add(atag); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java index b8195805b7..cc05e128b8 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java @@ -37,27 +37,27 @@ public class JumpKeys { } } - static void register(final Widget body) { + static void register(Widget body) { final KeyCommandSet jumps = new KeyCommandSet(); jumps.add( new KeyCommand(0, 'o', Gerrit.C.jumpAllOpen()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("status:open")); } }); jumps.add( new KeyCommand(0, 'm', Gerrit.C.jumpAllMerged()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("status:merged")); } }); jumps.add( new KeyCommand(0, 'a', Gerrit.C.jumpAllAbandoned()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("status:abandoned")); } }); @@ -66,35 +66,35 @@ public class JumpKeys { jumps.add( new KeyCommand(0, 'i', Gerrit.C.jumpMine()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.MINE); } }); jumps.add( new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("owner:self is:draft")); } }); jumps.add( new KeyCommand(0, 'c', Gerrit.C.jumpMineDraftComments()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("has:draft")); } }); jumps.add( new KeyCommand(0, 'w', Gerrit.C.jumpMineWatched()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("is:watched status:open")); } }); jumps.add( new KeyCommand(0, 's', Gerrit.C.jumpMineStarred()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChangeQuery("is:starred")); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java index cd715c656b..41534398f9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java @@ -28,7 +28,7 @@ public class RpcStatus implements RpcStartHandler, RpcCompleteHandler { private static int hideDepth; /** Execute code, hiding the RPCs they execute from being shown visually. */ - public static void hide(final Runnable run) { + public static void hide(Runnable run) { try { hideDepth++; run.run(); @@ -49,7 +49,7 @@ public class RpcStatus implements RpcStartHandler, RpcCompleteHandler { } @Override - public void onRpcStart(final RpcStartEvent event) { + public void onRpcStart(RpcStartEvent event) { onRpcStart(); } @@ -62,7 +62,7 @@ public class RpcStatus implements RpcStartHandler, RpcCompleteHandler { } @Override - public void onRpcComplete(final RpcCompleteEvent event) { + public void onRpcComplete(RpcCompleteEvent event) { onRpcComplete(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java index 37c6a0b94d..dc3c043cb9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java @@ -48,7 +48,7 @@ class SearchPanel extends Composite { searchBox.addKeyPressHandler( new KeyPressHandler() { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) { if (!suggestionDisplay.isSuggestionSelected) { doSearch(); @@ -92,7 +92,7 @@ class SearchPanel extends Composite { body.add(searchButton); } - void setText(final String query) { + void setText(String query) { searchBox.setText(query); } @@ -105,7 +105,7 @@ class SearchPanel extends Composite { this, new KeyCommand(0, '/', Gerrit.C.keySearch()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { event.preventDefault(); searchBox.setFocus(true); searchBox.selectAll(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java index cb947feb35..7a1a450295 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java @@ -44,13 +44,12 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { "cc:"), new AccountSuggestOracle() { @Override - public void onRequestSuggestions(final Request request, final Callback done) { + public void onRequestSuggestions(Request request, Callback done) { super.onRequestSuggestions( request, new Callback() { @Override - public void onSuggestionsReady( - final Request request, final Response response) { + public void onSuggestionsReady(final Request request, Response response) { if ("self".startsWith(request.getQuery())) { final ArrayList r = new ArrayList<>(response.getSuggestions().size() + 1); @@ -192,7 +191,7 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { return; } - for (final ParamSuggester ps : paramSuggester) { + for (ParamSuggester ps : paramSuggester) { if (ps.applicable(lastWord)) { ps.suggest(lastWord, request, done); return; @@ -211,7 +210,7 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { done.onSuggestionsReady(request, new Response(r)); } - private String getLastWord(final String query) { + private String getLastWord(String query) { final int lastSpace = query.lastIndexOf(' '); if (lastSpace == query.length() - 1) { return null; @@ -223,7 +222,7 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { } @Override - protected String getQueryPattern(final String query) { + protected String getQueryPattern(String query) { return super.getQueryPattern(getLastWord(query)); } @@ -258,18 +257,18 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { private final List operators; private final SuggestOracle parameterSuggestionOracle; - ParamSuggester(final List operators, final SuggestOracle parameterSuggestionOracle) { + ParamSuggester(List operators, SuggestOracle parameterSuggestionOracle) { this.operators = operators; this.parameterSuggestionOracle = parameterSuggestionOracle; } - boolean applicable(final String query) { + boolean applicable(String query) { final String operator = getApplicableOperator(query, operators); return operator != null && query.length() > operator.length(); } - private String getApplicableOperator(final String lastWord, final List operators) { - for (final String operator : operators) { + private String getApplicableOperator(String lastWord, List operators) { + for (String operator : operators) { if (lastWord.startsWith(operator)) { return operator; } @@ -277,17 +276,17 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { return null; } - void suggest(final String lastWord, final Request request, final Callback done) { + void suggest(String lastWord, Request request, Callback done) { final String operator = getApplicableOperator(lastWord, operators); parameterSuggestionOracle.requestSuggestions( new Request(lastWord.substring(operator.length()), request.getLimit()), new Callback() { @Override - public void onSuggestionsReady(final Request req, final Response response) { + public void onSuggestionsReady(Request req, Response response) { final String query = request.getQuery(); final List r = new ArrayList<>(response.getSuggestions().size()); - for (final SearchSuggestOracle.Suggestion s : response.getSuggestions()) { + for (SearchSuggestOracle.Suggestion s : response.getSuggestions()) { r.add( new SearchSuggestion( s.getDisplayString(), @@ -298,7 +297,7 @@ public class SearchSuggestOracle extends HighlightSuggestOracle { done.onSuggestionsReady(request, new Response(r)); } - private String quoteIfNeeded(final String s) { + private String quoteIfNeeded(String s) { if (!s.matches("^\\S*$")) { return "\"" + s + "\""; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java index 1a1f7bd32a..f771fee435 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java @@ -189,7 +189,7 @@ public class StringListPanel extends FlowPanel implements HasEnabled { return v; } - private void populate(final int row, List values) { + private void populate(int row, List values) { FlexCellFormatter fmt = table.getFlexCellFormatter(); fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().iconCell()); fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().leftMostCell()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java index 39a52e3ccd..a0060d5a36 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/access/AccessMap.java @@ -31,7 +31,7 @@ public class AccessMap extends NativeMap { api.get(NativeMap.copyKeysIntoChildren(callback)); } - public static void get(final Project.NameKey project, final AsyncCallback cb) { + public static void get(Project.NameKey project, AsyncCallback cb) { get( Collections.singleton(project), new AsyncCallback() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java index da0357f875..cbd763507f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java @@ -91,7 +91,7 @@ class ContactPanelShort extends Composite { registerNewEmail.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doRegisterNewEmail(); } }); @@ -148,7 +148,7 @@ class ContactPanelShort extends Composite { save.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doSave(); } }); @@ -156,7 +156,7 @@ class ContactPanelShort extends Composite { emailPick.addChangeHandler( new ChangeHandler() { @Override - public void onChange(final ChangeEvent event) { + public void onChange(ChangeEvent event) { final int idx = emailPick.getSelectedIndex(); final String v = 0 <= idx ? emailPick.getValue(idx) : null; if (Util.C.buttonOpenRegisterNewEmail().equals(v)) { @@ -249,7 +249,7 @@ class ContactPanelShort extends Composite { void display() {} - protected void row(final Grid info, final int row, final String name, final Widget field) { + protected void row(Grid info, int row, String name, Widget field) { info.setText(row, labelIdx, name); info.setWidget(row, fieldIdx, field); info.getCellFormatter().addStyleName(row, 0, Gerrit.RESOURCES.css().header()); @@ -279,7 +279,7 @@ class ContactPanelShort extends Composite { form.addSubmitHandler( new FormPanel.SubmitHandler() { @Override - public void onSubmit(final SubmitEvent event) { + public void onSubmit(SubmitEvent event) { event.cancel(); final String addr = inEmail.getText().trim(); if (!addr.contains("@")) { @@ -310,7 +310,7 @@ class ContactPanelShort extends Composite { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { inEmail.setEnabled(true); register.setEnabled(true); if (caught.getMessage().startsWith(EmailException.MESSAGE)) { @@ -331,7 +331,7 @@ class ContactPanelShort extends Composite { register.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { form.submit(); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java index dfbd5c7e41..5c6d40f389 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java @@ -49,7 +49,7 @@ public class MyIdentitiesScreen extends SettingsScreen { deleteIdentity.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { identites.deleteChecked(); } }); @@ -60,7 +60,7 @@ public class MyIdentitiesScreen extends SettingsScreen { linkIdentity.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { Location.assign(Gerrit.loginRedirect(History.getToken()) + "?link"); } }); @@ -167,7 +167,7 @@ public class MyIdentitiesScreen extends SettingsScreen { deleteIdentity.setEnabled(on); } - void display(final JsArray results) { + void display(JsArray results) { List idList = Natives.asList(results); Collections.sort(idList); @@ -175,13 +175,13 @@ public class MyIdentitiesScreen extends SettingsScreen { table.removeRow(table.getRowCount() - 1); } - for (final ExternalIdInfo k : idList) { + for (ExternalIdInfo k : idList) { addOneId(k); } updateDeleteButton(); } - void addOneId(final ExternalIdInfo k) { + void addOneId(ExternalIdInfo k) { if (k.isUsername()) { // Don't display the username as an identity here. return; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java index 5836763ee4..173dba6291 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyOAuthTokenScreen.java @@ -111,7 +111,7 @@ public class MyOAuthTokenScreen extends SettingsScreen { }); } - private void display(final GeneralPreferences prefs) { + private void display(GeneralPreferences prefs) { AccountApi.self() .view("oauthtoken") .get( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java index 03e72c7c05..3852387c91 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java @@ -104,7 +104,7 @@ public class MyPasswordScreen extends SettingsScreen { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { if (RestApi.isNotFound(caught)) { Gerrit.getUserAccount().username(null); display(); @@ -121,7 +121,7 @@ public class MyPasswordScreen extends SettingsScreen { enableUI(true); } - private void row(final Grid info, final int row, final String name, final Widget field) { + private void row(Grid info, int row, String name, Widget field) { final CellFormatter fmt = info.getCellFormatter(); if (LocaleInfo.getCurrentLocale().isRTL()) { info.setText(row, 1, name); @@ -146,7 +146,7 @@ public class MyPasswordScreen extends SettingsScreen { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { enableUI(true); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java index 9be15fff54..f3490658ac 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java @@ -74,7 +74,7 @@ public class MyPreferencesScreen extends SettingsScreen { showSiteHeader = new CheckBox(Util.C.showSiteHeader()); useFlashClipboard = new CheckBox(Util.C.useFlashClipboard()); maximumPageSize = new ListBox(); - for (final int v : PAGESIZE_CHOICES) { + for (int v : PAGESIZE_CHOICES) { maximumPageSize.addItem(Util.M.rowsPerPage(v), String.valueOf(v)); } @@ -241,7 +241,7 @@ public class MyPreferencesScreen extends SettingsScreen { save.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doSave(); } }); @@ -290,7 +290,7 @@ public class MyPreferencesScreen extends SettingsScreen { }); } - private void enable(final boolean on) { + private void enable(boolean on) { showSiteHeader.setEnabled(on); useFlashClipboard.setEnabled(on); maximumPageSize.setEnabled(on); @@ -351,19 +351,18 @@ public class MyPreferencesScreen extends SettingsScreen { myMenus.display(values); } - private void setListBox(final ListBox f, final int defaultValue, final int currentValue) { + private void setListBox(ListBox f, int defaultValue, int currentValue) { setListBox(f, String.valueOf(defaultValue), String.valueOf(currentValue)); } - private > void setListBox( - final ListBox f, final T defaultValue, final T currentValue) { + private > void setListBox(final ListBox f, T defaultValue, T currentValue) { setListBox( f, defaultValue != null ? defaultValue.name() : "", currentValue != null ? currentValue.name() : ""); } - private void setListBox(final ListBox f, final String defaultValue, final String currentValue) { + private void setListBox(ListBox f, String defaultValue, String currentValue) { final int n = f.getItemCount(); for (int i = 0; i < n; i++) { if (f.getValue(i).equals(currentValue)) { @@ -376,7 +375,7 @@ public class MyPreferencesScreen extends SettingsScreen { } } - private int getListBox(final ListBox f, final int defaultValue) { + private int getListBox(ListBox f, int defaultValue) { final int idx = f.getSelectedIndex(); if (0 <= idx) { return Short.parseShort(f.getValue(idx)); @@ -384,7 +383,7 @@ public class MyPreferencesScreen extends SettingsScreen { return defaultValue; } - private > T getListBox(final ListBox f, final T defaultValue, T[] all) { + private > T getListBox(ListBox f, T defaultValue, T[] all) { final int idx = f.getSelectedIndex(); if (0 <= idx) { String v = f.getValue(idx); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java index 9d676630d1..177fc09877 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java @@ -91,7 +91,7 @@ public class MyProfileScreen extends SettingsScreen { display(); } - private void infoRow(final int row, final String name) { + private void infoRow(int row, String name) { info.setText(row, labelIdx, name); info.getCellFormatter().addStyleName(row, 0, Gerrit.RESOURCES.css().header()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java index d3ac463718..c99cd1a7f8 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchedProjectsScreen.java @@ -129,7 +129,7 @@ public class MyWatchedProjectsScreen extends SettingsScreen { addNew.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doAddNew(); } }); @@ -138,7 +138,7 @@ public class MyWatchedProjectsScreen extends SettingsScreen { browse.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { int top = grid.getAbsoluteTop() - 50; // under page header // Try to place it to the right of everything else, but not // right justified @@ -158,7 +158,7 @@ public class MyWatchedProjectsScreen extends SettingsScreen { delSel.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { watchesTab.deleteChecked(); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java index 5e45b683fb..0a61b2d7d6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyWatchesTable.java @@ -97,7 +97,7 @@ public class MyWatchesTable extends FancyFlexTable { return infos; } - public void insertWatch(final ProjectWatchInfo k) { + public void insertWatch(ProjectWatchInfo k) { final String newName = k.project(); int row = 1; for (; row < table.getRowCount(); row++) { @@ -112,7 +112,7 @@ public class MyWatchesTable extends FancyFlexTable { populate(row, k); } - public void display(final JsArray result) { + public void display(JsArray result) { while (2 < table.getRowCount()) { table.removeRow(table.getRowCount() - 1); } @@ -125,7 +125,7 @@ public class MyWatchesTable extends FancyFlexTable { } } - protected void populate(final int row, final ProjectWatchInfo info) { + protected void populate(int row, ProjectWatchInfo info) { final FlowPanel fp = new FlowPanel(); fp.add(new ProjectLink(info.project(), new Project.NameKey(info.project()))); if (info.filter() != null) { @@ -156,13 +156,13 @@ public class MyWatchesTable extends FancyFlexTable { } protected void addNotifyButton( - final ProjectWatchInfo.Type type, final ProjectWatchInfo info, final int row, final int col) { + final ProjectWatchInfo.Type type, ProjectWatchInfo info, int row, int col) { final CheckBox cbox = new CheckBox(); cbox.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { final Boolean oldVal = info.notify(type); info.notify(type, cbox.getValue()); cbox.setEnabled(false); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java index afba2e232c..7c90884c6c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java @@ -66,7 +66,7 @@ public class NewAgreementScreen extends AccountScreen { this(null); } - public NewAgreementScreen(final String token) { + public NewAgreementScreen(String token) { nextToken = token != null ? token : PageLinks.SETTINGS_AGREEMENTS; } @@ -122,7 +122,7 @@ public class NewAgreementScreen extends AccountScreen { submit.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doSign(); } }); @@ -156,7 +156,7 @@ public class NewAgreementScreen extends AccountScreen { } radios.add(hdr); - for (final AgreementInfo cla : available) { + for (AgreementInfo cla : available) { final RadioButton r = new RadioButton("cla_id", cla.name()); r.addStyleName(Gerrit.RESOURCES.css().contributorAgreementButton()); radios.add(r); @@ -170,7 +170,7 @@ public class NewAgreementScreen extends AccountScreen { r.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { showCLA(cla); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java index d3d217c960..29de14a9e8 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java @@ -31,7 +31,7 @@ import com.google.gwt.user.client.ui.HTMLTable.CellFormatter; public class RegisterScreen extends AccountScreen { private final String nextToken; - public RegisterScreen(final String next) { + public RegisterScreen(String next) { nextToken = next; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java index 70e3911439..2dfc2eddbf 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java @@ -24,7 +24,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwtexpui.clippy.client.CopyableLabel; class SshHostKeyPanel extends Composite { - SshHostKeyPanel(final SshHostKey info) { + SshHostKeyPanel(SshHostKey info) { final FlowPanel body = new FlowPanel(); body.setStyleName(Gerrit.RESOURCES.css().sshHostKeyPanel()); body.add(new SmallHeading(Util.C.sshHostKeyTitle())); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java index 0cf30de555..6a8b44d7e0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java @@ -68,7 +68,7 @@ class SshPanel extends Composite { showAddKeyBlock.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { showAddKeyBlock(true); } }); @@ -82,7 +82,7 @@ class SshPanel extends Composite { deleteKey.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { keys.deleteChecked(); } }); @@ -114,7 +114,7 @@ class SshPanel extends Composite { clearNew.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { addTxt.setText(""); addTxt.setFocus(true); } @@ -125,7 +125,7 @@ class SshPanel extends Composite { addNew.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doAddNew(); } }); @@ -135,7 +135,7 @@ class SshPanel extends Composite { closeAddKeyBlock.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { showAddKeyBlock(false); } }); @@ -151,7 +151,7 @@ class SshPanel extends Composite { initWidget(body); } - void setKeyTableVisible(final boolean on) { + void setKeyTableVisible(boolean on) { keys.setVisible(on); deleteKey.setVisible(on); closeAddKeyBlock.setVisible(on); @@ -166,7 +166,7 @@ class SshPanel extends Composite { txt, new GerritCallback() { @Override - public void onSuccess(final SshKeyInfo k) { + public void onSuccess(SshKeyInfo k) { addNew.setEnabled(true); addTxt.setText(""); keys.addOneKey(k); @@ -178,7 +178,7 @@ class SshPanel extends Composite { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { addNew.setEnabled(true); if (isInvalidSshKey(caught)) { @@ -189,7 +189,7 @@ class SshPanel extends Composite { } } - private boolean isInvalidSshKey(final Throwable caught) { + private boolean isInvalidSshKey(Throwable caught) { if (caught instanceof InvalidSshKeyException) { return true; } @@ -207,9 +207,9 @@ class SshPanel extends Composite { Gerrit.SYSTEM_SVC.daemonHostKeys( new GerritCallback>() { @Override - public void onSuccess(final List result) { + public void onSuccess(List result) { serverKeys.clear(); - for (final SshHostKey keyInfo : result) { + for (SshHostKey keyInfo : result) { serverKeys.add(new SshHostKeyPanel(keyInfo)); } if (++loadCount == 2) { @@ -238,7 +238,7 @@ class SshPanel extends Composite { void display() {} - private void showAddKeyBlock(final boolean show) { + private void showAddKeyBlock(boolean show) { showAddKeyBlock.setVisible(!show); addKeyBlock.setVisible(show); } @@ -312,7 +312,7 @@ class SshPanel extends Composite { } } - void display(final List result) { + void display(List result) { if (result.isEmpty()) { setKeyTableVisible(false); showAddKeyBlock(true); @@ -320,7 +320,7 @@ class SshPanel extends Composite { while (1 < table.getRowCount()) { table.removeRow(table.getRowCount() - 1); } - for (final SshKeyInfo k : result) { + for (SshKeyInfo k : result) { addOneKey(k); } setKeyTableVisible(true); @@ -328,7 +328,7 @@ class SshPanel extends Composite { } } - void addOneKey(final SshKeyInfo k) { + void addOneKey(SshKeyInfo k) { final FlexCellFormatter fmt = table.getFlexCellFormatter(); final int row = table.getRowCount(); table.insertRow(row); @@ -378,7 +378,7 @@ class SshPanel extends Composite { } } - static String elide(final String s, final int len) { + static String elide(String s, int len) { if (s == null || s.length() < len || len <= 10) { return s; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java index 839a3e60cd..a893c5a977 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java @@ -75,7 +75,7 @@ class UsernameField extends Composite { setUserName.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { confirmSetUserName(); } }); @@ -143,14 +143,14 @@ class UsernameField extends Composite { }); } - private void enableUI(final boolean on) { + private void enableUI(boolean on) { userNameTxt.setEnabled(on); setUserName.setEnabled(on); } private static final class UserNameValidator implements KeyPressHandler { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { final char code = event.getCharCode(); final int nativeCode = event.getNativeEvent().getKeyCode(); switch (nativeCode) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java index 990798c997..b66f108e1f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java @@ -24,7 +24,7 @@ import com.google.gerrit.common.PageLinks; public class ValidateEmailScreen extends AccountScreen { private final String magicToken; - public ValidateEmailScreen(final String magicToken) { + public ValidateEmailScreen(String magicToken) { this.magicToken = magicToken; } @@ -41,7 +41,7 @@ public class ValidateEmailScreen extends AccountScreen { magicToken, new ScreenLoadCallback(this) { @Override - protected void preDisplay(final VoidResult result) {} + protected void preDisplay(VoidResult result) {} @Override protected void postDisplay() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java index 37813affb6..e518d26295 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java @@ -204,7 +204,7 @@ public class AccessSectionEditor extends Composite } } - void setEditing(final boolean editing) { + void setEditing(boolean editing) { this.editing = editing; } @@ -236,7 +236,7 @@ public class AccessSectionEditor extends Composite } } - private void addPermission(final String permissionName, final List permissionList) { + private void addPermission(String permissionName, List permissionList) { if (value.getPermission(permissionName) != null) { return; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java index 4d1ad22423..34a1ac95dd 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java @@ -48,7 +48,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { private CheckBox visibleToAllCheckBox; private Button saveGroupOptions; - public AccountGroupInfoScreen(final GroupInfo toShow, final String token) { + public AccountGroupInfoScreen(GroupInfo toShow, String token) { super(toShow, token); } @@ -62,7 +62,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { initGroupOptions(); } - private void enableForm(final boolean canModify) { + private void enableForm(boolean canModify) { groupNameTxt.setEnabled(canModify); ownerTxt.setEnabled(canModify); descTxt.setEnabled(canModify); @@ -91,14 +91,14 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { saveName.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { final String newName = groupNameTxt.getText().trim(); GroupApi.renameGroup( getGroupUUID(), newName, new GerritCallback() { @Override - public void onSuccess(final com.google.gerrit.client.VoidResult result) { + public void onSuccess(com.google.gerrit.client.VoidResult result) { saveName.setEnabled(false); setPageTitle(AdminMessages.I.group(newName)); groupNameTxt.setText(newName); @@ -129,7 +129,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { saveOwner.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { final String newOwner = ownerTxt.getText().trim(); if (newOwner.length() > 0) { AccountGroup.UUID ownerUuid = accountGroupOracle.getUUID(newOwner); @@ -139,7 +139,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { ownerId, new GerritCallback() { @Override - public void onSuccess(final GroupInfo result) { + public void onSuccess(GroupInfo result) { updateOwnerGroup(result); saveOwner.setEnabled(false); } @@ -166,14 +166,14 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { saveDesc.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { final String txt = descTxt.getText().trim(); GroupApi.setGroupDescription( getGroupUUID(), txt, new GerritCallback() { @Override - public void onSuccess(final VoidResult result) { + public void onSuccess(VoidResult result) { saveDesc.setEnabled(false); } }); @@ -199,13 +199,13 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { saveGroupOptions.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { GroupApi.setGroupOptions( getGroupUUID(), visibleToAllCheckBox.getValue(), new GerritCallback() { @Override - public void onSuccess(final VoidResult result) { + public void onSuccess(VoidResult result) { saveGroupOptions.setEnabled(false); } }); @@ -220,7 +220,7 @@ public class AccountGroupInfoScreen extends AccountGroupScreen { } @Override - protected void display(final GroupInfo group, final boolean canModify) { + protected void display(GroupInfo group, boolean canModify) { groupUUIDLabel.setText(group.getGroupUUID().get()); groupNameTxt.setText(group.name()); ownerTxt.setText( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java index 51b4979f4f..2614224ecd 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupMembersScreen.java @@ -59,7 +59,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { private FlowPanel noMembersInfo; private AccountGroupSuggestOracle accountGroupSuggestOracle; - public AccountGroupMembersScreen(final GroupInfo toShow, final String token) { + public AccountGroupMembersScreen(GroupInfo toShow, String token) { super(toShow, token); } @@ -71,7 +71,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { initNoMembersInfo(); } - private void enableForm(final boolean canModify) { + private void enableForm(boolean canModify) { addMemberBox.setEnabled(canModify); members.setEnabled(canModify); addIncludeBox.setEnabled(canModify); @@ -88,7 +88,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { addMemberBox.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doAddNewMember(); } }); @@ -100,7 +100,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { delMember.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { members.deleteChecked(); } }); @@ -124,7 +124,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { addIncludeBox.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doAddNewInclude(); } }); @@ -136,7 +136,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { delInclude.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { includes.deleteChecked(); } }); @@ -157,7 +157,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { } @Override - protected void display(final GroupInfo group, final boolean canModify) { + protected void display(GroupInfo group, boolean canModify) { if (AccountGroup.isInternalGroup(group.getGroupUUID())) { members.display(Natives.asList(group.members())); includes.display(Natives.asList(group.includes())); @@ -184,14 +184,14 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { nameEmail, new GerritCallback() { @Override - public void onSuccess(final AccountInfo memberInfo) { + public void onSuccess(AccountInfo memberInfo) { addMemberBox.setEnabled(true); addMemberBox.setText(""); members.insert(memberInfo); } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { addMemberBox.setEnabled(true); super.onFailure(caught); } @@ -215,14 +215,14 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { uuid.get(), new GerritCallback() { @Override - public void onSuccess(final GroupInfo result) { + public void onSuccess(GroupInfo result) { addIncludeBox.setEnabled(true); addIncludeBox.setText(""); includes.insert(result); } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { addIncludeBox.setEnabled(true); super.onFailure(caught); } @@ -242,7 +242,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { fmt.addStyleName(0, 3, Gerrit.RESOURCES.css().dataHeader()); } - void setEnabled(final boolean enabled) { + void setEnabled(boolean enabled) { this.enabled = enabled; for (int row = 1; row < table.getRowCount(); row++) { final AccountInfo i = getRowItem(row); @@ -266,7 +266,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { ids, new GerritCallback() { @Override - public void onSuccess(final VoidResult result) { + public void onSuccess(VoidResult result) { for (int row = 1; row < table.getRowCount(); ) { final AccountInfo i = getRowItem(row); if (i != null && ids.contains(i._accountId())) { @@ -280,12 +280,12 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { } } - void display(final List result) { + void display(List result) { while (1 < table.getRowCount()) { table.removeRow(table.getRowCount() - 1); } - for (final AccountInfo i : result) { + for (AccountInfo i : result) { final int row = table.getRowCount(); table.insertRow(row); applyDataRowStyle(row); @@ -323,7 +323,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { } } - void populate(final int row, final AccountInfo i) { + void populate(int row, AccountInfo i) { CheckBox checkBox = new CheckBox(); table.setWidget(row, 1, checkBox); checkBox.setEnabled(enabled); @@ -352,7 +352,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { fmt.addStyleName(0, 3, Gerrit.RESOURCES.css().dataHeader()); } - void setEnabled(final boolean enabled) { + void setEnabled(boolean enabled) { this.enabled = enabled; for (int row = 1; row < table.getRowCount(); row++) { final GroupInfo i = getRowItem(row); @@ -376,7 +376,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { ids, new GerritCallback() { @Override - public void onSuccess(final VoidResult result) { + public void onSuccess(VoidResult result) { for (int row = 1; row < table.getRowCount(); ) { final GroupInfo i = getRowItem(row); if (i != null && ids.contains(i.getGroupUUID())) { @@ -395,7 +395,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { table.removeRow(table.getRowCount() - 1); } - for (final GroupInfo i : list) { + for (GroupInfo i : list) { final int row = table.getRowCount(); table.insertRow(row); applyDataRowStyle(row); @@ -427,7 +427,7 @@ public class AccountGroupMembersScreen extends AccountGroupScreen { } } - void populate(final int row, final GroupInfo i) { + void populate(int row, GroupInfo i) { final FlexCellFormatter fmt = table.getFlexCellFormatter(); AccountGroup.UUID uuid = i.getGroupUUID(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java index 29b7677657..b67213ba96 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java @@ -32,7 +32,7 @@ public abstract class AccountGroupScreen extends MenuScreen { private final String membersTabToken; private final String auditLogTabToken; - public AccountGroupScreen(final GroupInfo toShow, final String token) { + public AccountGroupScreen(GroupInfo toShow, String token) { setRequiresSignIn(true); this.group = toShow; @@ -47,7 +47,7 @@ public abstract class AccountGroupScreen extends MenuScreen { AccountGroup.isInternalGroup(group.getGroupUUID())); } - private String getTabToken(final String token, final String tab) { + private String getTabToken(String token, String tab) { if (token.startsWith("/admin/groups/uuid-")) { return toGroup(group.getGroupUUID(), tab); } @@ -91,7 +91,7 @@ public abstract class AccountGroupScreen extends MenuScreen { return group.getOwnerUUID(); } - protected void setMembersTabVisible(final boolean visible) { + protected void setMembersTabVisible(boolean visible) { setLinkVisible(membersTabToken, visible); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java index 2e5bbb5ceb..eeacd97a70 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateChangeAction.java @@ -26,7 +26,7 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.PopupPanel; class CreateChangeAction { - static void call(final Button b, final String project) { + static void call(Button b, String project) { // TODO Replace CreateChangeDialog with a nicer looking display. b.setEnabled(false); new CreateChangeDialog(new Project.NameKey(project)) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java index 93a1b4b565..6914ee9b91 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateGroupScreen.java @@ -125,7 +125,7 @@ public class CreateGroupScreen extends Screen { addNew.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doCreateGroup(); } }); @@ -146,7 +146,7 @@ public class CreateGroupScreen extends Screen { newName, new GerritCallback() { @Override - public void onSuccess(final GroupInfo result) { + public void onSuccess(GroupInfo result) { History.newItem(Dispatcher.toGroup(result.getGroupId(), AccountGroupScreen.MEMBERS)); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java index b785d19b11..a73d78e194 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java @@ -181,7 +181,7 @@ public class CreateProjectScreen extends Screen { create.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doCreateProject(); } }); @@ -190,7 +190,7 @@ public class CreateProjectScreen extends Screen { browse.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { int top = grid.getAbsoluteTop() - 50; // under page header // Try to place it to the right of everything else, but not // right justified @@ -219,7 +219,7 @@ public class CreateProjectScreen extends Screen { } @Override - protected void populate(final int row, final ProjectInfo k) { + protected void populate(int row, ProjectInfo k) { populateState(row, k); final Anchor projectLink = new Anchor(k.name()); projectLink.addClickHandler( @@ -252,7 +252,7 @@ public class CreateProjectScreen extends Screen { }); } - private void addGrid(final VerticalPanel fp) { + private void addGrid(VerticalPanel fp) { grid = new Grid(2, 3); grid.setStyleName(Gerrit.RESOURCES.css().infoBlock()); grid.setText(0, 0, AdminConstants.I.columnProjectName() + ":"); @@ -295,7 +295,7 @@ public class CreateProjectScreen extends Screen { }); } - private void enableForm(final boolean enabled) { + private void enableForm(boolean enabled) { project.setEnabled(enabled); create.setEnabled(enabled); parent.setEnabled(enabled); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java index d28e9bbfd9..47842f5e75 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/EditConfigAction.java @@ -24,7 +24,7 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gwt.user.client.ui.Button; public class EditConfigAction { - static void call(final Button b, final String project) { + static void call(Button b, String project) { b.setEnabled(false); ChangeApi.createChange( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java index 0f5bf22724..259847ec65 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java @@ -43,7 +43,7 @@ public class GroupTable extends NavigationTable { this(null); } - public GroupTable(final String pointerId) { + public GroupTable(String pointerId) { super(AdminConstants.I.groupItemHelp()); setSavePointerId(pointerId); @@ -70,12 +70,12 @@ public class GroupTable extends NavigationTable { } @Override - protected Object getRowItemKey(final GroupInfo item) { + protected Object getRowItemKey(GroupInfo item) { return item.getGroupId(); } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { GroupInfo groupInfo = getRowItem(row); if (isInteralGroup(groupInfo)) { History.newItem(Dispatcher.toGroup(groupInfo.getGroupId())); @@ -121,7 +121,7 @@ public class GroupTable extends NavigationTable { } } - void populate(final int row, final GroupInfo k, final String toHighlight) { + void populate(int row, GroupInfo k, String toHighlight) { if (k.url() != null) { if (isInteralGroup(k)) { table.setWidget( @@ -152,7 +152,7 @@ public class GroupTable extends NavigationTable { setRowItem(row, k); } - private boolean isInteralGroup(final GroupInfo groupInfo) { + private boolean isInteralGroup(GroupInfo groupInfo) { return groupInfo != null && groupInfo.url().startsWith("#" + PageLinks.ADMIN_GROUPS); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java index d254c7d1b7..79a4cef3fd 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java @@ -205,7 +205,7 @@ public class PermissionEditor extends Composite addStage2.getStyle().setDisplay(Display.NONE); } - private void addGroup(final GroupReference ref) { + private void addGroup(GroupReference ref) { if (ref.getUUID() != null) { if (value.getRule(ref) == null) { PermissionRule newRule = value.getRule(ref, true); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java index 8a70f2e534..381c64476f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java @@ -45,7 +45,7 @@ public class PluginListScreen extends PluginScreen { PluginMap.all( new ScreenLoadCallback(this) { @Override - protected void preDisplay(final PluginMap result) { + protected void preDisplay(PluginMap result) { pluginTable.display(result); } }); @@ -75,12 +75,12 @@ public class PluginListScreen extends PluginScreen { fmt.addStyleName(0, 4, Gerrit.RESOURCES.css().dataHeader()); } - void display(final PluginMap plugins) { + void display(PluginMap plugins) { while (1 < table.getRowCount()) { table.removeRow(table.getRowCount() - 1); } - for (final PluginInfo p : Natives.asList(plugins.values())) { + for (PluginInfo p : Natives.asList(plugins.values())) { final int row = table.getRowCount(); table.insertRow(row); applyDataRowStyle(row); @@ -88,7 +88,7 @@ public class PluginListScreen extends PluginScreen { } } - void populate(final int row, final PluginInfo plugin) { + void populate(int row, PluginInfo plugin) { if (plugin.disabled() || plugin.indexUrl() == null) { table.setText(row, 1, plugin.name()); } else { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java index 05142c49f6..a52ea6071d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java @@ -134,7 +134,7 @@ public class ProjectAccessEditor extends Composite @Override public void setDelegate(EditorDelegate delegate) {} - void setEditing(final boolean editing) { + void setEditing(boolean editing) { this.editing = editing; addSection.setVisible(editing); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java index 0398e9d59e..8f83e2f710 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessScreen.java @@ -91,7 +91,7 @@ public class ProjectAccessScreen extends ProjectScreen { private NativeMap capabilityMap; - public ProjectAccessScreen(final Project.NameKey toShow) { + public ProjectAccessScreen(Project.NameKey toShow) { super(toShow); } @@ -211,7 +211,7 @@ public class ProjectAccessScreen extends ProjectScreen { displayReadOnly(newAccess); } else { error.add(new Label(Gerrit.C.projectAccessError())); - for (final String diff : diffs) { + for (String diff : diffs) { error.add(new Label(diff)); } if (access.canUpload()) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java index 887e4b868d..c6a391b59f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java @@ -82,7 +82,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { private NpTextBox filterTxt; private Query query; - public ProjectBranchesScreen(final Project.NameKey toShow) { + public ProjectBranchesScreen(Project.NameKey toShow) { super(toShow); } @@ -165,7 +165,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { addBranch.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { doAddNewBranch(); } }); @@ -179,7 +179,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { delBranch.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { branchTable.deleteChecked(); } }); @@ -283,7 +283,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { new ConfirmationCallback() { @Override public void onOk() { - //do nothing + // do nothing } }); confirmationDialog.center(); @@ -384,7 +384,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { confirmationDialog.center(); } - private void deleteBranches(final Set branches) { + private void deleteBranches(Set branches) { ProjectApi.deleteBranches( getProjectKey(), branches, @@ -473,7 +473,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { setRowItem(row, k); } - private void setHeadRevision(final int row, final int column, final String rev) { + private void setHeadRevision(int row, int column, String rev) { AccessMap.get( getProjectKey(), new GerritCallback() { @@ -488,7 +488,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen { }); } - private Widget getHeadRevisionWidget(final String headRevision) { + private Widget getHeadRevisionWidget(String headRevision) { FlowPanel p = new FlowPanel(); final InlineLabel l = new InlineLabel(headRevision); final Image edit = new Image(Gerrit.RESOURCES.edit()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java index 52fe33996f..7b5d04d08b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectDashboardsScreen.java @@ -25,7 +25,7 @@ public class ProjectDashboardsScreen extends ProjectScreen { private DashboardsTable dashes; Project.NameKey project; - public ProjectDashboardsScreen(final Project.NameKey project) { + public ProjectDashboardsScreen(Project.NameKey project) { super(project); this.project = project; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java index 2f5caf87bb..aea86a56ed 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java @@ -100,7 +100,7 @@ public class ProjectInfoScreen extends ProjectScreen { private OnEditEnabler saveEnabler; - public ProjectInfoScreen(final Project.NameKey toShow) { + public ProjectInfoScreen(Project.NameKey toShow) { super(toShow); } @@ -228,7 +228,7 @@ public class ProjectInfoScreen extends ProjectScreen { grid.add(AdminConstants.I.headingProjectState(), state); submitType = new ListBox(); - for (final SubmitType type : SubmitType.values()) { + for (SubmitType type : SubmitType.values()) { submitType.addItem(Util.toLongString(type), type.name()); } submitType.addChangeHandler( @@ -320,7 +320,7 @@ public class ProjectInfoScreen extends ProjectScreen { grid.addHtml(AdminConstants.I.useSignedOffBy(), signedOffBy); } - private void setSubmitType(final SubmitType newSubmitType) { + private void setSubmitType(SubmitType newSubmitType) { int index = -1; if (submitType != null) { for (int i = 0; i < submitType.getItemCount(); i++) { @@ -334,7 +334,7 @@ public class ProjectInfoScreen extends ProjectScreen { } } - private void setState(final ProjectState newState) { + private void setState(ProjectState newState) { if (state != null) { for (int i = 0; i < state.getItemCount(); i++) { if (newState.name().equals(state.getValue(i))) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java index 9166c56d6d..2a0313629c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java @@ -91,11 +91,11 @@ public class ProjectListScreen extends PaginatedProjectScreen { } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { History.newItem(link(getRowItem(row))); } - private String link(final ProjectInfo item) { + private String link(ProjectInfo item) { return Dispatcher.toProject(item.name_key()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java index 3328163e95..dc964b8432 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectScreen.java @@ -37,7 +37,7 @@ public abstract class ProjectScreen extends Screen { private final Project.NameKey name; - public ProjectScreen(final Project.NameKey toShow) { + public ProjectScreen(Project.NameKey toShow) { name = toShow; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java index b89139c21f..63433b9d4e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java @@ -276,7 +276,7 @@ public class ProjectTagsScreen extends PaginatedProjectScreen { new ConfirmationCallback() { @Override public void onOk() { - //do nothing + // do nothing } }); confirmationDialog.center(); @@ -376,7 +376,7 @@ public class ProjectTagsScreen extends PaginatedProjectScreen { confirmationDialog.center(); } - private void deleteTags(final Set tags) { + private void deleteTags(Set tags) { ProjectApi.deleteTags( getProjectKey(), tags, diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java index f08cdd860b..2e4926dcd0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java @@ -30,7 +30,7 @@ public class Util { AdminResources.I.css().ensureInjected(); } - public static String toLongString(final SubmitType type) { + public static String toLongString(SubmitType type) { if (type == null) { return ""; } @@ -52,7 +52,7 @@ public class Util { } } - public static String toLongString(final ProjectState type) { + public static String toLongString(ProjectState type) { if (type == null) { return ""; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java index 7e1db46e9d..cf8de5492d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ActionContext.java @@ -176,7 +176,7 @@ public class ActionContext extends JavaScriptObject { * The same as {@link #get(RestApi, JavaScriptObject)} but without converting a {@link * NativeString} result to String. */ - static final void getRaw(RestApi api, final JavaScriptObject cb) { + static final void getRaw(RestApi api, JavaScriptObject cb) { api.get(wrapRaw(cb)); } @@ -268,7 +268,7 @@ public class ActionContext extends JavaScriptObject { api.delete(wrapRaw(cb)); } - private static GerritCallback wrap(final JavaScriptObject cb) { + private static GerritCallback wrap(JavaScriptObject cb) { return new GerritCallback() { @Override public void onSuccess(JavaScriptObject result) { @@ -282,7 +282,7 @@ public class ActionContext extends JavaScriptObject { }; } - private static GerritCallback wrapRaw(final JavaScriptObject cb) { + private static GerritCallback wrapRaw(JavaScriptObject cb) { return new GerritCallback() { @Override public void onSuccess(JavaScriptObject result) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java index 234df60902..da14412d60 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/DefaultActions.java @@ -36,7 +36,7 @@ class DefaultActions { invoke(action, api, callback(PageLinks.toProject(project))); } - private static AsyncCallback callback(final String target) { + private static AsyncCallback callback(String target) { return new GerritCallback() { @Override public void onSuccess(JavaScriptObject in) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java index c7f6fae4a8..9050303a8b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java @@ -140,7 +140,7 @@ public class Assignee extends Composite { onCloseForm(); } - private void editAssignee(final String assignee) { + private void editAssignee(String assignee) { if (assignee.trim().isEmpty()) { ChangeApi.deleteAssignee( changeId.get(), diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java index b8fcab7a82..d6f67a6c89 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeActions.java @@ -45,8 +45,7 @@ public class ChangeActions { ChangeApi.unmarkPrivate(id.get(), cs(id, draftButtons)); } - public static GerritCallback cs( - final Change.Id id, final Button... draftButtons) { + public static GerritCallback cs(final Change.Id id, Button... draftButtons) { setEnabled(false, draftButtons); return new GerritCallback() { @Override @@ -67,7 +66,7 @@ public class ChangeActions { }; } - private static AsyncCallback mine(final Button... draftButtons) { + private static AsyncCallback mine(Button... draftButtons) { setEnabled(false, draftButtons); return new GerritCallback() { @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java index 6e088c4a4b..f3a07570c3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java @@ -308,7 +308,7 @@ public class ChangeScreen extends Screen { group.addFinal( new GerritCallback() { @Override - public void onSuccess(final ChangeInfo info) { + public void onSuccess(ChangeInfo info) { info.init(); initCurrentRevision(info); final RevisionInfo rev = info.revision(revision); @@ -586,7 +586,7 @@ public class ChangeScreen extends Screen { downloadAction = new DownloadAction(info, revision, style, headerLine, download); } - private void initProjectLinks(final ChangeInfo info) { + private void initProjectLinks(ChangeInfo info) { projectSettingsLink.setHref("#" + PageLinks.toProject(info.projectNameKey())); projectSettings.addDomHandler( new ClickHandler() { @@ -987,7 +987,7 @@ public class ChangeScreen extends Screen { } } - private void loadConfigInfo(final ChangeInfo info, DiffObject base) { + private void loadConfigInfo(ChangeInfo info, DiffObject base) { final RevisionInfo rev = info.revision(revision); if (base.isAutoMerge() && !initCurrentRevision(info).isMerge()) { Gerrit.display(getToken(), new NotFoundScreen()); @@ -1026,7 +1026,7 @@ public class ChangeScreen extends Screen { group.done(); } - private void loadConfigInfo(final ChangeInfo info, RevisionInfo rev) { + private void loadConfigInfo(ChangeInfo info, RevisionInfo rev) { if (loaded) { return; } @@ -1207,7 +1207,7 @@ public class ChangeScreen extends Screen { return r; } - private void loadCommit(final RevisionInfo rev, CallbackGroup group) { + private void loadCommit(RevisionInfo rev, CallbackGroup group) { if (rev.isEdit() || rev.commit() != null) { return; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java index 97abddbcdf..907691ee0b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditActions.java @@ -36,8 +36,7 @@ public class EditActions { ChangeApi.rebaseEdit(id.get(), cs(id, editButtons)); } - public static GerritCallback cs( - final Change.Id id, final Button... editButtons) { + public static GerritCallback cs(final Change.Id id, Button... editButtons) { setEnabled(false, editButtons); return new GerritCallback() { @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java index 192be34144..c0c8037c17 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java @@ -218,7 +218,7 @@ public class Hashtags extends Composite { } } - private void addHashtag(final String hashtags) { + private void addHashtag(String hashtags) { ChangeApi.hashtags(changeId.get()) .post( PostInput.create(hashtags, null), diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java index 689aa2a1a1..1d6ad3d229 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java @@ -125,7 +125,7 @@ public class LocalComments { public static void saveInlineComments() { final StorageBackend storage = new StorageBackend(); - for (final String cookie : storage.getKeys()) { + for (String cookie : storage.getKeys()) { if (isInlineComment(cookie)) { InlineComment input = getInlineComment(cookie); if (input.commentInfo.id() == null) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java index 3b96a12776..cfed9dba6f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PathSuggestOracle.java @@ -37,7 +37,7 @@ class PathSuggestOracle extends HighlightSuggestOracle { } @Override - protected void onRequestSuggestions(final Request req, final Callback cb) { + protected void onRequestSuggestions(Request req, Callback cb) { RestApi api = ChangeApi.revision(changeId.get(), revision.name()).view("files"); if (req.getQuery() != null) { api.addParameter("q", req.getQuery() == null ? "" : req.getQuery()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java index d5d5f36e53..32284b0890 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java @@ -198,7 +198,7 @@ public class RelatedChanges extends TabPanel { getTab(Tab.SUBMITTED_TOGETHER).setShowSubmittable(true); } - void set(final ChangeInfo info, final String revision) { + void set(ChangeInfo info, String revision) { if (info.status().isOpen()) { setForOpenChange(info, revision); } @@ -246,7 +246,7 @@ public class RelatedChanges extends TabPanel { } } - private void setForOpenChange(final ChangeInfo info, final String revision) { + private void setForOpenChange(ChangeInfo info, String revision) { if (info.mergeable()) { StringBuilder conflictsQuery = new StringBuilder(); conflictsQuery.append("status:open"); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java index 2a926b6bf9..00a543f285 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java @@ -229,7 +229,7 @@ public class ReplyBox extends Composite { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { if (RestApi.isNotSignedIn(caught)) { lc.setReplyComment(message.getText()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java index f216af82bd..1747352177 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RevertAction.java @@ -27,8 +27,7 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.PopupPanel; class RevertAction { - static void call( - final Button b, final Change.Id id, final String revision, final String commitSubject) { + static void call(final Button b, Change.Id id, String revision, String commitSubject) { // TODO Replace ActionDialog with a nicer looking display. b.setEnabled(false); new TextAreaActionDialog(Util.C.revertChangeTitle(), Util.C.headingRevertMessage()) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java index 8609774742..1ff751eec3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReviewerSuggestOracle.java @@ -34,7 +34,7 @@ public class ReviewerSuggestOracle extends HighlightSuggestOracle { private Change.Id changeId; @Override - protected void onRequestSuggestions(final Request req, final Callback cb) { + protected void onRequestSuggestions(Request req, Callback cb) { ChangeApi.suggestReviewers(changeId.get(), req.getQuery(), req.getLimit(), false) .get( new GerritCallback>() { @@ -56,7 +56,7 @@ public class ReviewerSuggestOracle extends HighlightSuggestOracle { } @Override - public void requestDefaultSuggestions(final Request req, final Callback cb) { + public void requestDefaultSuggestions(Request req, Callback cb) { requestSuggestions(req, cb); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java index cd880a3280..166029dec9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java @@ -151,7 +151,7 @@ public class Reviewers extends Composite { suggestBox.setServeSuggestionsOnOracle(false); } - private void addReviewer(final String reviewer, boolean confirmed) { + private void addReviewer(String reviewer, boolean confirmed) { if (reviewer.isEmpty()) { return; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java index f8bda642ae..1484809b7c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java @@ -50,7 +50,7 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen { private ChangeTable.Section incoming; private ChangeTable.Section closed; - public AccountDashboardScreen(final Account.Id id) { + public AccountDashboardScreen(Account.Id id) { ownerId = id; mine = Gerrit.isSignedIn() && ownerId.equals(Gerrit.getUserAccount().getId()); } @@ -64,7 +64,7 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen { keysNavigation.add( new KeyCommand(0, 'R', Util.C.keyReloadSearch()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(getToken()); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java index 055044cf4f..2d6ae15b23 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java @@ -114,7 +114,7 @@ public class ChangeTable extends NavigationTable { table.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { final Cell cell = table.getCellForEvent(event); if (cell == null) { return; @@ -133,18 +133,18 @@ public class ChangeTable extends NavigationTable { } @Override - protected Object getRowItemKey(final ChangeInfo item) { + protected Object getRowItemKey(ChangeInfo item) { return item.legacyId(); } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { final ChangeInfo c = getRowItem(row); final Change.Id id = c.legacyId(); Gerrit.display(PageLinks.toChange(id)); } - private void insertNoneRow(final int row) { + private void insertNoneRow(int row) { insertRow(row); table.setText(row, 0, Util.C.changeTableNone()); final FlexCellFormatter fmt = table.getFlexCellFormatter(); @@ -152,13 +152,13 @@ public class ChangeTable extends NavigationTable { fmt.setStyleName(row, 0, Gerrit.RESOURCES.css().emptySection()); } - private void insertChangeRow(final int row) { + private void insertChangeRow(int row) { insertRow(row); applyDataRowStyle(row); } @Override - protected void applyDataRowStyle(final int row) { + protected void applyDataRowStyle(int row) { super.applyDataRowStyle(row); final CellFormatter fmt = table.getCellFormatter(); fmt.addStyleName(row, C_STAR, Gerrit.RESOURCES.css().iconCell()); @@ -225,7 +225,7 @@ public class ChangeTable extends NavigationTable { } } - private void populateChangeRow(final int row, final ChangeInfo c, boolean highlightUnreviewed) { + private void populateChangeRow(int row, ChangeInfo c, boolean highlightUnreviewed) { CellFormatter fmt = table.getCellFormatter(); if (Gerrit.isSignedIn()) { table.setWidget(row, C_STAR, StarredChanges.createIcon(c.legacyId(), c.starred())); @@ -416,7 +416,7 @@ public class ChangeTable extends NavigationTable { return hex.length() == 1 ? "0" + hex : hex; } - public void addSection(final Section s) { + public void addSection(Section s) { assert s.parent == null; s.parent = this; @@ -434,8 +434,8 @@ public class ChangeTable extends NavigationTable { sections.add(s); } - private int insertRow(final int beforeRow) { - for (final Section s : sections) { + private int insertRow(int beforeRow) { + for (Section s : sections) { if (beforeRow <= s.titleRow) { s.titleRow++; } @@ -446,8 +446,8 @@ public class ChangeTable extends NavigationTable { return table.insertRow(beforeRow); } - private void removeRow(final int row) { - for (final Section s : sections) { + private void removeRow(int row) { + for (Section s : sections) { if (row < s.titleRow) { s.titleRow--; } @@ -464,7 +464,7 @@ public class ChangeTable extends NavigationTable { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { int row = getCurrentRow(); ChangeInfo c = getRowItem(row); if (c != null && Gerrit.isSignedIn()) { @@ -474,7 +474,7 @@ public class ChangeTable extends NavigationTable { } private final class TableChangeLink extends ChangeLink { - private TableChangeLink(final String text, final ChangeInfo c) { + private TableChangeLink(String text, ChangeInfo c) { super(text, c.legacyId()); } @@ -498,7 +498,7 @@ public class ChangeTable extends NavigationTable { this.highlightUnreviewed = value; } - public void setTitleText(final String text) { + public void setTitleText(String text) { titleText = text; titleWidget = null; if (titleRow >= 0) { @@ -506,7 +506,7 @@ public class ChangeTable extends NavigationTable { } } - public void setTitleWidget(final Widget title) { + public void setTitleWidget(Widget title) { titleWidget = title; titleText = null; if (titleRow >= 0) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java index 3cfe63d933..aba4ee0d3c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java @@ -34,7 +34,7 @@ public class DashboardTable extends ChangeTable { private List titles; private List queries; - public DashboardTable(final Screen screen, String params) { + public DashboardTable(Screen screen, String params) { titles = new ArrayList<>(); queries = new ArrayList<>(); String foreach = null; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java index 370d9425d2..1695eb9d45 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java @@ -64,7 +64,7 @@ public abstract class PagedSingleListScreen extends Screen { keysNavigation.add( new KeyCommand(0, 'R', Util.C.keyReloadSearch()) { @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(getToken()); } }); @@ -126,7 +126,7 @@ public abstract class PagedSingleListScreen extends Screen { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { if (link.isVisible()) { History.newItem(link.getTargetHistoryToken()); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java index 12638d7805..f511308114 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ProjectDashboardScreen.java @@ -25,7 +25,7 @@ public class ProjectDashboardScreen extends ProjectScreen implements ChangeListS private DashboardTable table; private String params; - public ProjectDashboardScreen(final Project.NameKey toShow, String params) { + public ProjectDashboardScreen(Project.NameKey toShow, String params) { super(toShow); this.params = params; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java index b4499acbf4..b102842009 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java @@ -73,7 +73,7 @@ public class StarredChanges { } /** Make a key command that toggles the star for a change. */ - public static KeyCommand newKeyCommand(final Icon icon) { + public static KeyCommand newKeyCommand(Icon icon) { return new KeyCommand(0, 's', Util.C.changeTableStar()) { @Override public void onKeyPress(KeyPressEvent event) { @@ -99,7 +99,7 @@ public class StarredChanges { * Set the starred status of a change. This method broadcasts to all interested UI widgets and * sends an RPC to the server to record the updated status. */ - public static void toggleStar(final Change.Id changeId, final boolean newValue) { + public static void toggleStar(Change.Id changeId, boolean newValue) { pending.put(changeId, newValue); fireChangeStarEvent(changeId, newValue); if (!busy) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java index b2efcdbb19..b62b547ce1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java @@ -25,7 +25,7 @@ public class Util { private static final String SUBJECT_CROP_APPENDIX = "..."; private static final int SUBJECT_CROP_RANGE = 10; - public static String toLongString(final Change.Status status) { + public static String toLongString(Change.Status status) { if (status == null) { return ""; } @@ -62,7 +62,7 @@ public class Util { * @return the subject, cropped if needed */ @SuppressWarnings("deprecation") - public static String cropSubject(final String subject) { + public static String cropSubject(String subject) { if (subject.length() > SUBJECT_MAX_LENGTH) { final int maxLength = SUBJECT_MAX_LENGTH - SUBJECT_CROP_APPENDIX.length(); for (int cropPosition = maxLength; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java index 62158545b3..0e4ef4e29c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardsTable.java @@ -34,7 +34,7 @@ import java.util.Map; public class DashboardsTable extends NavigationTable { Project.NameKey project; - public DashboardsTable(final Project.NameKey project) { + public DashboardsTable(Project.NameKey project) { super(Util.C.dashboardItem()); this.project = project; initColumnHeaders(); @@ -96,7 +96,7 @@ public class DashboardsTable extends NavigationTable { finishDisplay(); } - protected void insertTitleRow(final int row, String section) { + protected void insertTitleRow(int row, String section) { table.insertRow(row); table.setText(row, 0, section); @@ -106,7 +106,7 @@ public class DashboardsTable extends NavigationTable { fmt.addStyleName(row, 0, Gerrit.RESOURCES.css().sectionHeader()); } - protected void insert(final int row, final DashboardInfo k) { + protected void insert(int row, DashboardInfo k) { table.insertRow(row); applyDataRowStyle(row); @@ -121,7 +121,7 @@ public class DashboardsTable extends NavigationTable { populate(row, k); } - protected void populate(final int row, final DashboardInfo k) { + protected void populate(int row, DashboardInfo k) { if (k.isDefault()) { table.setWidget(row, 1, new Image(Gerrit.RESOURCES.greenCheck())); final FlexCellFormatter fmt = table.getFlexCellFormatter(); @@ -147,12 +147,12 @@ public class DashboardsTable extends NavigationTable { } @Override - protected Object getRowItemKey(final DashboardInfo item) { + protected Object getRowItemKey(DashboardInfo item) { return item.id(); } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { if (row > 0) { movePointerTo(row); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java index 702383aa8c..9ccf6eae50 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java @@ -412,7 +412,7 @@ abstract class DiffScreen extends Screen { } } - private BeforeSelectionChangeHandler onSelectionChange(final CodeMirror cm) { + private BeforeSelectionChangeHandler onSelectionChange(CodeMirror cm) { return new BeforeSelectionChangeHandler() { private InsertCommentBubble bubble; @@ -871,11 +871,11 @@ abstract class DiffScreen extends Screen { abstract Runnable updateActiveLine(CodeMirror cm); - private GutterClickHandler onGutterClick(final CodeMirror cm) { + private GutterClickHandler onGutterClick(CodeMirror cm) { return new GutterClickHandler() { @Override public void handle( - CodeMirror instance, final int line, final String gutterClass, NativeEvent clickEvent) { + CodeMirror instance, int line, String gutterClass, NativeEvent clickEvent) { if (Element.as(clickEvent.getEventTarget()).hasClassName(getLineNumberClassName()) && clickEvent.getButton() == NativeEvent.BUTTON_LEFT && !clickEvent.getMetaKey() diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java index b04973abc4..f8eab91df5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/InsertCommentBubble.java @@ -35,7 +35,7 @@ class InsertCommentBubble extends Composite { @UiField Image icon; - InsertCommentBubble(final CommentManager commentManager, final CodeMirror cm) { + InsertCommentBubble(CommentManager commentManager, CodeMirror cm) { initWidget(uiBinder.createAndBindUi(this)); addDomHandler( new ClickHandler() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java index 822bc74350..e62a28307d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java @@ -147,8 +147,7 @@ class PatchSetSelectBox extends Composite { } } - void setUpBlame( - final CodeMirror cm, final boolean isBase, final PatchSet.Id rev, final String path) { + void setUpBlame(final CodeMirror cm, boolean isBase, PatchSet.Id rev, String path) { if (!Patch.isMagic(path) && Gerrit.isSignedIn() && Gerrit.info().change().allowBlame()) { Anchor blameIcon = createBlameIcon(); blameIcon.addClickHandler( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java index f2b5fa6cd1..b7f5948954 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java @@ -138,7 +138,7 @@ public class SideBySide extends DiffScreen { } @Override - void registerCmEvents(final CodeMirror cm) { + void registerCmEvents(CodeMirror cm) { super.registerCmEvents(cm); KeyMap keyMap = diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java index cfd42267b3..28777940ad 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java @@ -219,7 +219,7 @@ class SideBySideChunkManager extends ChunkManager { * @param line line to put the padding below. * @param len number of lines to pad. Padding is inserted only if {@code len >= 1}. */ - private void addPadding(CodeMirror cm, int line, final int len) { + private void addPadding(CodeMirror cm, int line, int len) { if (0 < len) { Element pad = DOM.createDiv(); pad.setClassName(SideBySideTable.style.padding()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java index eafb10fadc..c138f3770b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipBar.java @@ -62,7 +62,7 @@ class SkipBar extends Composite { private TextMarker textMarker; private SkipBar otherBar; - SkipBar(SkipManager manager, final CodeMirror cm) { + SkipBar(SkipManager manager, CodeMirror cm) { this.manager = manager; this.cm = cm; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java index ea2f2cfda1..df9bcf9a9f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java @@ -30,7 +30,7 @@ class UpToChangeCommand extends KeyCommand { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { Gerrit.display(PageLinks.toChange(revision.getParentKey(), revision.getId())); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java index 3cf00c9c4b..d78e5927ab 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java @@ -661,7 +661,7 @@ public class EditScreen extends Screen { } @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { close.setEnabled(true); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java index 74cfaf18e5..01c4d265c9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupApi.java @@ -44,7 +44,7 @@ public class GroupApi { } /** Check if the current user is owner of a group */ - public static void isGroupOwner(String groupName, final AsyncCallback cb) { + public static void isGroupOwner(String groupName, AsyncCallback cb) { GroupMap.myOwned( groupName, new AsyncCallback() { @@ -105,7 +105,7 @@ public class GroupApi { /** Add members to a group. */ public static void addMembers( - AccountGroup.UUID group, Set members, final AsyncCallback> cb) { + AccountGroup.UUID group, Set members, AsyncCallback> cb) { if (members.size() == 1) { addMember( group, @@ -132,7 +132,7 @@ public class GroupApi { /** Remove members from a group. */ public static void removeMembers( - AccountGroup.UUID group, Set ids, final AsyncCallback cb) { + AccountGroup.UUID group, Set ids, AsyncCallback cb) { if (ids.size() == 1) { members(group).id(ids.iterator().next().toString()).delete(cb); } else { @@ -181,7 +181,7 @@ public class GroupApi { /** Remove included groups from a group. */ public static void removeIncludedGroups( - AccountGroup.UUID group, Set ids, final AsyncCallback cb) { + AccountGroup.UUID group, Set ids, AsyncCallback cb) { if (ids.size() == 1) { AccountGroup.UUID g = ids.iterator().next(); groups(group).id(g.get()).delete(cb); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java index 7182b785cb..7e2f2be7b6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfoCache.java @@ -93,7 +93,7 @@ public class ConfigInfoCache { }; } - private void getImpl(final String name, final AsyncCallback cb) { + private void getImpl(String name, AsyncCallback cb) { Entry e = cache.get(name); if (e != null) { cb.onSuccess(e); @@ -116,7 +116,7 @@ public class ConfigInfoCache { }); } - private void getImpl(final Integer id, final AsyncCallback cb) { + private void getImpl(Integer id, AsyncCallback cb) { String name = changeToProject.get(id); if (name != null) { getImpl(name, cb); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java index 71fa007e2f..a85c4c2078 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java @@ -176,7 +176,7 @@ public class ProjectApi { project(name).view("config").put(in, cb); } - public static void getParent(Project.NameKey name, final AsyncCallback cb) { + public static void getParent(Project.NameKey name, AsyncCallback cb) { project(name) .view("parent") .get( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java index 90a820fc10..af32d01f91 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/CallbackGroup.java @@ -65,7 +65,7 @@ public class CallbackGroup { return add(cb); } - public Callback add(final AsyncCallback cb) { + public Callback add(AsyncCallback cb) { checkFinalAdded(); return handleAdd(cb); } @@ -75,13 +75,13 @@ public class CallbackGroup { return handleAdd(cb); } - public Callback addFinal(final AsyncCallback cb) { + public Callback addFinal(AsyncCallback cb) { checkFinalAdded(); finalAdded = true; return handleAdd(cb); } - public HttpCallback addFinal(final HttpCallback cb) { + public HttpCallback addFinal(HttpCallback cb) { checkFinalAdded(); finalAdded = true; return handleAdd(cb); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java index 5688a3132e..2d6723a1e9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java @@ -32,7 +32,7 @@ public abstract class GerritCallback implements com.google.gwtjsonrpc.common.AsyncCallback, com.google.gwt.user.client.rpc.AsyncCallback { @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { showFailure(caught); } @@ -77,7 +77,7 @@ public abstract class GerritCallback return false; } - protected static boolean isInvalidXSRF(final Throwable caught) { + protected static boolean isInvalidXSRF(Throwable caught) { return caught instanceof InvocationException && caught.getMessage().equals(JsonConstants.ERROR_INVALID_XSRF); } @@ -94,17 +94,17 @@ public abstract class GerritCallback && caught.getMessage().equals(NoSuchEntityException.MESSAGE)); } - protected static boolean isNoSuchAccount(final Throwable caught) { + protected static boolean isNoSuchAccount(Throwable caught) { return caught instanceof RemoteJsonException && caught.getMessage().startsWith(NoSuchAccountException.MESSAGE); } - protected static boolean isNameAlreadyUsed(final Throwable caught) { + protected static boolean isNameAlreadyUsed(Throwable caught) { return caught instanceof RemoteJsonException && caught.getMessage().startsWith(NameAlreadyUsedException.MESSAGE); } - protected static boolean isNoSuchGroup(final Throwable caught) { + protected static boolean isNoSuchGroup(Throwable caught) { return caught instanceof RemoteJsonException && caught.getMessage().startsWith(NoSuchGroupException.MESSAGE); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java index 250bc6e8fa..8b0fefb9b7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RestApi.java @@ -116,7 +116,7 @@ public class RestApi { } @Override - public void onResponseReceived(Request req, final Response res) { + public void onResponseReceived(Request req, Response res) { int status = res.getStatusCode(); if (status == Response.SC_NO_CONTENT) { cb.onSuccess(new HttpResponse(res, null, null)); @@ -499,7 +499,7 @@ public class RestApi { } } - private static HttpCallback wrap(final AsyncCallback cb) { + private static HttpCallback wrap(AsyncCallback cb) { return new HttpCallback() { @Override public void onSuccess(HttpResponse r) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java index 74b45dfcff..3aae04ab27 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java @@ -24,12 +24,12 @@ import com.google.gerrit.common.errors.NoSuchEntityException; public abstract class ScreenLoadCallback extends GerritCallback { private final Screen screen; - public ScreenLoadCallback(final Screen s) { + public ScreenLoadCallback(Screen s) { screen = s; } @Override - public final void onSuccess(final T result) { + public final void onSuccess(T result) { if (screen.isAttached()) { preDisplay(result); screen.display(); @@ -42,7 +42,7 @@ public abstract class ScreenLoadCallback extends GerritCallback { protected void postDisplay() {} @Override - public void onFailure(final Throwable caught) { + public void onFailure(Throwable caught) { if (isSigninFailure(caught)) { new NotSignedInDialog().center(); } else if (isNoSuchEntity(caught)) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java index 80b8c66c69..bdebd684dc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java @@ -32,7 +32,7 @@ public class AccountGroupSuggestOracle extends SuggestAfterTypingNCharsOracle { private Project.NameKey projectName; @Override - public void _onRequestSuggestions(final Request req, final Callback callback) { + public void _onRequestSuggestions(Request req, Callback callback) { GroupMap.suggestAccountGroupForProject( projectName == null ? null : projectName.get(), req.getQuery(), @@ -58,7 +58,7 @@ public class AccountGroupSuggestOracle extends SuggestAfterTypingNCharsOracle { private static class AccountGroupSuggestion implements SuggestOracle.Suggestion { private final GroupInfo info; - AccountGroupSuggestion(final GroupInfo k) { + AccountGroupSuggestion(GroupInfo k) { info = k; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java index 78ae15629d..5038ad9e8b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java @@ -27,7 +27,7 @@ import java.util.List; /** Suggestion Oracle for Account entities. */ public class AccountSuggestOracle extends SuggestAfterTypingNCharsOracle { @Override - public void _onRequestSuggestions(final Request req, final Callback cb) { + public void _onRequestSuggestions(Request req, Callback cb) { AccountApi.suggest( req.getQuery(), req.getLimit(), diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java index 5d8d56cbcf..a1d22298df 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java @@ -29,8 +29,7 @@ public class AddMemberBox extends Composite { private final Button addMember; private final RemoteSuggestBox suggestBox; - public AddMemberBox( - final String buttonLabel, final String hint, final SuggestOracle suggestOracle) { + public AddMemberBox(final String buttonLabel, String hint, SuggestOracle suggestOracle) { addPanel = new FlowPanel(); addMember = new Button(buttonLabel); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java index 1ae4489f7a..68477bcb49 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java @@ -20,13 +20,13 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gwt.core.client.GWT; public class ChangeLink extends InlineHyperlink { - public static String permalink(final Change.Id c) { + public static String permalink(Change.Id c) { return GWT.getHostPageBaseURL() + c.get(); } protected Change.Id cid; - public ChangeLink(final String text, final Change.Id c) { + public ChangeLink(String text, Change.Id c) { super(text, PageLinks.toChange(c)); getElement().setPropertyString("href", permalink(c)); cid = c; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java index 85552c92c1..0a0c14a78e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java @@ -51,7 +51,7 @@ public abstract class CherryPickDialog extends TextAreaActionDialog { @Override protected void onRequestSuggestions(Request request, Callback done) { List suggestions = new ArrayList<>(); - for (final BranchInfo b : branches) { + for (BranchInfo b : branches) { if (b.ref().contains(request.getQuery())) { suggestions.add(new BranchSuggestion(b)); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java index 72bf06cc94..c5ee34f7c9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java @@ -24,7 +24,7 @@ import com.google.gwt.user.client.ui.Anchor; public class CommandMenuItem extends Anchor implements ClickHandler { private final Command command; - public CommandMenuItem(final String text, final Command cmd) { + public CommandMenuItem(String text, Command cmd) { super(text); setStyleName(Gerrit.RESOURCES.css().menuItem()); Roles.getMenuitemRole().set(getElement()); @@ -33,7 +33,7 @@ public class CommandMenuItem extends Anchor implements ClickHandler { } @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { setFocus(false); command.execute(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java index d497740588..b68f3296b7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java @@ -37,7 +37,7 @@ public abstract class CommentedActionDialog extends AutoCenterDialogBox protected boolean sent; - public CommentedActionDialog(final String title, final String heading) { + public CommentedActionDialog(String title, String heading) { super(/* auto hide */ false, /* modal */ true); setGlassEnabled(true); setText(title); @@ -48,7 +48,7 @@ public abstract class CommentedActionDialog extends AutoCenterDialogBox sendButton.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { enableButtons(false); onSend(); } @@ -59,7 +59,7 @@ public abstract class CommentedActionDialog extends AutoCenterDialogBox cancelButton.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { hide(); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java index f65fb1b837..c0b662a286 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java @@ -32,7 +32,7 @@ public class ComplexDisclosurePanel extends Composite private final DisclosurePanel main; private final Panel header; - public ComplexDisclosurePanel(final String text, final boolean isOpen) { + public ComplexDisclosurePanel(String text, boolean isOpen) { // Ick. GWT's DisclosurePanel won't let us subclass it, or do any // other modification of its header. We're stuck with injecting // into the DOM directly. @@ -81,7 +81,7 @@ public class ComplexDisclosurePanel extends Composite return header; } - public void setContent(final Widget w) { + public void setContent(Widget w) { main.setContent(w); } @@ -90,12 +90,12 @@ public class ComplexDisclosurePanel extends Composite } @Override - public HandlerRegistration addOpenHandler(final OpenHandler h) { + public HandlerRegistration addOpenHandler(OpenHandler h) { return main.addOpenHandler(h); } @Override - public HandlerRegistration addCloseHandler(final CloseHandler h) { + public HandlerRegistration addCloseHandler(CloseHandler h) { return main.addCloseHandler(h); } @@ -109,7 +109,7 @@ public class ComplexDisclosurePanel extends Composite * * @param isOpen {@code true} to open, {@code false} to close */ - public void setOpen(final boolean isOpen) { + public void setOpen(boolean isOpen) { main.setOpen(isOpen); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java index a9a1721069..045e0ae279 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java @@ -48,11 +48,11 @@ public abstract class FancyFlexTable extends Composite { return new MyFlexTable(); } - protected RowItem getRowItem(final int row) { + protected RowItem getRowItem(int row) { return FancyFlexTable.getRowItem(table.getCellFormatter().getElement(row, 0)); } - protected void setRowItem(final int row, final RowItem item) { + protected void setRowItem(int row, RowItem item) { setRowItem(table.getCellFormatter().getElement(row, 0), item); } @@ -117,15 +117,15 @@ public abstract class FancyFlexTable extends Composite { return left; } - protected void resetHtml(final SafeHtml body) { - for (final Iterator i = table.iterator(); i.hasNext(); ) { + protected void resetHtml(SafeHtml body) { + for (Iterator i = table.iterator(); i.hasNext(); ) { i.next(); i.remove(); } impl.resetHtml(table, body); } - protected void scrollIntoView(final int topRow, final int endRow) { + protected void scrollIntoView(int topRow, int endRow) { final CellFormatter fmt = table.getCellFormatter(); final Element top = fmt.getElement(topRow, C_ARROW).getParentElement(); final Element end = fmt.getElement(endRow, C_ARROW).getParentElement(); @@ -164,7 +164,7 @@ public abstract class FancyFlexTable extends Composite { Document.get().setScrollTop(nTop); } - protected void applyDataRowStyle(final int newRow) { + protected void applyDataRowStyle(int newRow) { table.getCellFormatter().addStyleName(newRow, C_ARROW, Gerrit.RESOURCES.css().iconCell()); table.getCellFormatter().addStyleName(newRow, C_ARROW, Gerrit.RESOURCES.css().leftMostCell()); } @@ -176,7 +176,7 @@ public abstract class FancyFlexTable extends Composite { * @return the td containing element {@code target}; null if {@code target} is not a member of * this table. */ - protected Element getParentCell(final Element target) { + protected Element getParentCell(Element target) { final Element body = FancyFlexTableImpl.getBodyElement(table); for (Element td = target; td != null && td != body; td = DOM.getParent(td)) { // If it's a TD, it might be the one we're looking for. @@ -192,7 +192,7 @@ public abstract class FancyFlexTable extends Composite { } /** @return the row of the child element; -1 if the child is not in the table. */ - protected int rowOf(final Element target) { + protected int rowOf(Element target) { final Element td = getParentCell(target); if (td == null) { return -1; @@ -203,7 +203,7 @@ public abstract class FancyFlexTable extends Composite { } /** @return the cell of the child element; -1 if the child is not in the table. */ - protected int columnOf(final Element target) { + protected int columnOf(Element target) { final Element td = getParentCell(target); if (td == null) { return -1; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java index ded0140e50..a3a2a7a4ad 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java @@ -20,7 +20,7 @@ import com.google.gwt.user.client.ui.HTMLTable; import com.google.gwtexpui.safehtml.client.SafeHtml; public class FancyFlexTableImpl { - public void resetHtml(final FlexTable myTable, final SafeHtml body) { + public void resetHtml(FlexTable myTable, SafeHtml body) { SafeHtml.setInnerHTML(getBodyElement(myTable), body); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java index a6484123fe..3eae0f8c1e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java @@ -23,7 +23,7 @@ import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder; public class FancyFlexTableImplIE8 extends FancyFlexTableImpl { @Override - public void resetHtml(final FlexTable myTable, final SafeHtml bodyHtml) { + public void resetHtml(FlexTable myTable, SafeHtml bodyHtml) { final Element oldBody = getBodyElement(myTable); final Element newBody = parseBody(bodyHtml); assert newBody != null; @@ -34,7 +34,7 @@ public class FancyFlexTableImplIE8 extends FancyFlexTableImpl { DOM.appendChild(tableElem, newBody); } - private static Element parseBody(final SafeHtml body) { + private static Element parseBody(SafeHtml body) { final SafeHtmlBuilder b = new SafeHtmlBuilder(); b.openElement("table"); b.append(body); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java index 6e1fb0987e..f8e382ace8 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingInlineHyperlink.java @@ -18,8 +18,7 @@ public class HighlightingInlineHyperlink extends InlineHyperlink { private String toHighlight; - public HighlightingInlineHyperlink( - final String text, final String token, final String toHighlight) { + public HighlightingInlineHyperlink(final String text, String token, String toHighlight) { super(text, token); this.toHighlight = toHighlight; highlight(text, toHighlight); @@ -31,7 +30,7 @@ public class HighlightingInlineHyperlink extends InlineHyperlink { highlight(text, toHighlight); } - private void highlight(final String text, final String toHighlight) { + private void highlight(String text, String toHighlight) { setHTML(Util.highlight(text, toHighlight)); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java index 643c766bac..1e3be3fb33 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java @@ -21,13 +21,13 @@ import com.google.gwt.user.client.ui.InlineHTML; public class HighlightingProjectsTable extends ProjectsTable { private String toHighlight; - public void display(final ProjectMap projects, final String toHighlight) { + public void display(ProjectMap projects, String toHighlight) { this.toHighlight = toHighlight; super.display(projects); } @Override - protected void populate(final int row, final ProjectInfo k) { + protected void populate(int row, ProjectInfo k) { populateState(row, k); table.setWidget( row, ProjectsTable.C_NAME, new InlineHTML(Util.highlight(k.name(), toHighlight))); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java index f8ad835459..4ccfe9df65 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java @@ -127,7 +127,7 @@ public class HintTextBox extends NpTextBox { addKeyDownHandler( new KeyDownHandler() { @Override - public void onKeyDown(final KeyDownEvent event) { + public void onKeyDown(KeyDownEvent event) { onKey(event.getNativeKeyCode()); } }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java index 6c28145022..c35d097319 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Hyperlink.java @@ -35,7 +35,7 @@ public class Hyperlink extends com.google.gwt.user.client.ui.Hyperlink { * @param token the history token to which it will link, which may not be null (use {@link Anchor} * instead if you don't need history processing) */ - public Hyperlink(final String text, final String token) { + public Hyperlink(String text, String token) { super(text, token); } @@ -52,7 +52,7 @@ public class Hyperlink extends com.google.gwt.user.client.ui.Hyperlink { } @Override - public void onBrowserEvent(final Event event) { + public void onBrowserEvent(Event event) { if (DOM.eventGetType(event) == Event.ONCLICK && impl.handleAsClick(event)) { event.preventDefault(); go(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java index 24f288782e..a4edb5b528 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/InlineHyperlink.java @@ -28,7 +28,7 @@ public class InlineHyperlink extends com.google.gwt.user.client.ui.InlineHyperli * @param text the hyperlink's text * @param token the history token to which it will link */ - public InlineHyperlink(final String text, final String token) { + public InlineHyperlink(String text, String token) { super(text, token); } @@ -36,7 +36,7 @@ public class InlineHyperlink extends com.google.gwt.user.client.ui.InlineHyperli public InlineHyperlink() {} @Override - public void onBrowserEvent(final Event event) { + public void onBrowserEvent(Event event) { if (DOM.eventGetType(event) == Event.ONCLICK && impl.handleAsClick(event)) { event.preventDefault(); go(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java index d08b6f9b85..d3db09897a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java @@ -32,20 +32,20 @@ public class LinkMenuBar extends Composite implements ScreenLoadHandler { Gerrit.EVENT_BUS.addHandler(ScreenLoadEvent.TYPE, this); } - public void addItem(final String text, final Command imp) { + public void addItem(String text, Command imp) { add(new CommandMenuItem(text, imp)); } - public void addItem(final CommandMenuItem i) { + public void addItem(CommandMenuItem i) { add(i); } - public void addItem(final LinkMenuItem i) { + public void addItem(LinkMenuItem i) { i.setMenuBar(this); add(i); } - public void insertItem(final LinkMenuItem i, int beforeIndex) { + public void insertItem(LinkMenuItem i, int beforeIndex) { i.setMenuBar(this); insert(i, beforeIndex); } @@ -66,7 +66,7 @@ public class LinkMenuBar extends Composite implements ScreenLoadHandler { return null; } - public void add(final Widget i) { + public void add(Widget i) { if (body.getWidgetCount() > 0) { final Widget p = body.getWidget(body.getWidgetCount() - 1); p.addStyleName(Gerrit.RESOURCES.css().linkMenuItemNotLast()); @@ -74,7 +74,7 @@ public class LinkMenuBar extends Composite implements ScreenLoadHandler { body.add(i); } - public void insert(final Widget i, int beforeIndex) { + public void insert(Widget i, int beforeIndex) { if (body.getWidgetCount() == 0 || body.getWidgetCount() <= beforeIndex) { add(i); return; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java index 9cc91a046f..8a8ab25637 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java @@ -21,7 +21,7 @@ import com.google.gwt.dom.client.AnchorElement; public class LinkMenuItem extends InlineHyperlink implements ScreenLoadHandler { private LinkMenuBar bar; - public LinkMenuItem(final String text, final String targetHistoryToken) { + public LinkMenuItem(String text, String targetHistoryToken) { super(text, targetHistoryToken); setStyleName(Gerrit.RESOURCES.css().menuItem()); Roles.getMenuitemRole().set(getElement()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java index 2c614b5836..0f28ddc742 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/MenuScreen.java @@ -54,22 +54,22 @@ public abstract class MenuScreen extends Screen { } @Override - protected void add(final Widget w) { + protected void add(Widget w) { body.add(w); } - protected void link(final String text, final String target) { + protected void link(String text, String target) { link(text, target, true); } - protected void link(final String text, final String target, final boolean visible) { + protected void link(String text, String target, boolean visible) { final LinkMenuItem item = new LinkMenuItem(text, target); item.setStyleName(Gerrit.RESOURCES.css().menuItem()); item.setVisible(visible); menu.add(item); } - protected void setLinkVisible(final String token, final boolean visible) { + protected void setLinkVisible(String token, boolean visible) { final LinkMenuItem item = menu.find(token); item.setVisible(visible); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java index 8975dda5a8..7e34730f6a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java @@ -42,7 +42,7 @@ public abstract class NavigationTable extends FancyFlexTable { } @Override - public void onBrowserEvent(final Event event) { + public void onBrowserEvent(Event event) { switch (DOM.eventGetType(event)) { case Event.ONCLICK: { @@ -198,11 +198,11 @@ public abstract class NavigationTable extends FancyFlexTable { } } - protected void movePointerTo(final int newRow) { + protected void movePointerTo(int newRow) { movePointerTo(newRow, true); } - protected void movePointerTo(final int newRow, final boolean scroll) { + protected void movePointerTo(int newRow, boolean scroll) { final CellFormatter fmt = table.getCellFormatter(); final boolean clear = 0 <= currentRow && currentRow < table.getRowCount(); if (clear) { @@ -223,7 +223,7 @@ public abstract class NavigationTable extends FancyFlexTable { currentRow = newRow; } - protected void scrollIntoView(final Element tr) { + protected void scrollIntoView(Element tr) { if (!computedScrollType) { parentScrollPanel = null; Widget w = getParent(); @@ -280,14 +280,14 @@ public abstract class NavigationTable extends FancyFlexTable { } } - protected void movePointerTo(final Object oldId) { + protected void movePointerTo(Object oldId) { final int row = findRow(oldId); if (0 <= row) { movePointerTo(row); } } - protected int findRow(final Object oldId) { + protected int findRow(Object oldId) { if (oldId != null) { final int max = table.getRowCount(); for (int row = 0; row < max; row++) { @@ -318,11 +318,11 @@ public abstract class NavigationTable extends FancyFlexTable { } } - public void setSavePointerId(final String id) { + public void setSavePointerId(String id) { saveId = id; } - public void setRegisterKeys(final boolean on) { + public void setRegisterKeys(boolean on) { if (on && isAttached()) { if (regNavigation == null) { regNavigation = GlobalKey.add(this, keysNavigation); @@ -375,7 +375,7 @@ public abstract class NavigationTable extends FancyFlexTable { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { ensurePointerVisible(); onUp(); } @@ -387,7 +387,7 @@ public abstract class NavigationTable extends FancyFlexTable { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { ensurePointerVisible(); onDown(); } @@ -399,7 +399,7 @@ public abstract class NavigationTable extends FancyFlexTable { } @Override - public void onKeyPress(final KeyPressEvent event) { + public void onKeyPress(KeyPressEvent event) { ensurePointerVisible(); onOpen(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java index 87de3b7687..2c7fcd4346 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java @@ -54,33 +54,33 @@ public class OnEditEnabler // The first parameter to the contructors must be the FocusWidget to enable, // subsequent parameters are widgets to listenTo. - public OnEditEnabler(final FocusWidget w, final TextBoxBase tb) { + public OnEditEnabler(FocusWidget w, TextBoxBase tb) { this(w); originalValue = tb.getValue().trim(); listenTo(tb); } - public OnEditEnabler(final FocusWidget w, final ListBox lb) { + public OnEditEnabler(FocusWidget w, ListBox lb) { this(w); listenTo(lb); } - public OnEditEnabler(final FocusWidget w, final CheckBox cb) { + public OnEditEnabler(FocusWidget w, CheckBox cb) { this(w); listenTo(cb); } - public OnEditEnabler(final FocusWidget w) { + public OnEditEnabler(FocusWidget w) { widget = w; } - public void updateOriginalValue(final TextBoxBase tb) { + public void updateOriginalValue(TextBoxBase tb) { originalValue = tb.getValue().trim(); } // Register input widgets to be listened to - public void listenTo(final TextBoxBase tb) { + public void listenTo(TextBoxBase tb) { strings.put(tb, tb.getText().trim()); tb.addKeyPressHandler(this); @@ -105,44 +105,44 @@ public class OnEditEnabler tb.addKeyDownHandler(this); } - public void listenTo(final ListBox lb) { + public void listenTo(ListBox lb) { lb.addChangeHandler(this); } @SuppressWarnings({"unchecked", "rawtypes"}) - public void listenTo(final CheckBox cb) { + public void listenTo(CheckBox cb) { cb.addValueChangeHandler((ValueChangeHandler) this); } // Handlers @Override - public void onKeyPress(final KeyPressEvent e) { + public void onKeyPress(KeyPressEvent e) { on(e); } @Override - public void onKeyDown(final KeyDownEvent e) { + public void onKeyDown(KeyDownEvent e) { on(e); } @Override - public void onMouseUp(final MouseUpEvent e) { + public void onMouseUp(MouseUpEvent e) { on(e); } @Override - public void onChange(final ChangeEvent e) { + public void onChange(ChangeEvent e) { on(e); } @SuppressWarnings("rawtypes") @Override - public void onValueChange(final ValueChangeEvent e) { + public void onValueChange(ValueChangeEvent e) { on(e); } - private void on(final GwtEvent e) { + private void on(GwtEvent e) { if (widget.isEnabled() || !(e.getSource() instanceof FocusWidget) || !((FocusWidget) e.getSource()).isEnabled()) { @@ -172,7 +172,7 @@ public class OnEditEnabler } } - private void onTextBoxBase(final TextBoxBase tb) { + private void onTextBoxBase(TextBoxBase tb) { // The text appears to not get updated until the handlers complete. Scheduler.get() .scheduleDeferred( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java index fab0cf71fd..7c45a20098 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ParentProjectBox.java @@ -38,11 +38,11 @@ public class ParentProjectBox extends Composite { suggestBox.setVisibleLength(len); } - public void setProject(final Project.NameKey project) { + public void setProject(Project.NameKey project) { suggestOracle.setProject(project); } - public void setParentProject(final Project.NameKey parent) { + public void setParentProject(Project.NameKey parent) { suggestBox.setText(parent != null ? parent.get() : ""); } @@ -77,7 +77,7 @@ public class ParentProjectBox extends Composite { } @Override - public void _onRequestSuggestions(Request req, final Callback callback) { + public void _onRequestSuggestions(Request req, Callback callback) { super._onRequestSuggestions( req, new Callback() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java index cace84b2dd..89bff711d4 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java @@ -52,7 +52,7 @@ public class ProjectListPopup { private boolean poppingUp; private boolean firstPopupLoad = true; - public void initPopup(final String popupText, final String currentPageLink) { + public void initPopup(String popupText, String currentPageLink) { createWidgets(popupText, currentPageLink); final FlowPanel pfp = new FlowPanel(); pfp.add(filterPanel); @@ -109,7 +109,7 @@ public class ProjectListPopup { return poppingUp; } - private void createWidgets(final String popupText, final String currentPageLink) { + private void createWidgets(String popupText, String currentPageLink) { filterPanel = new HorizontalPanel(); filterPanel.setStyleName(Gerrit.RESOURCES.css().projectFilterPanel()); final Label filterLabel = @@ -135,13 +135,13 @@ public class ProjectListPopup { projectsTab = new HighlightingProjectsTable() { @Override - protected void movePointerTo(final int row, final boolean scroll) { + protected void movePointerTo(int row, boolean scroll) { super.movePointerTo(row, scroll); onMovePointerTo(getRowItem(row).name()); } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { super.onOpenRow(row); openRow(getRowItem(row).name()); } @@ -161,7 +161,7 @@ public class ProjectListPopup { close.addClickHandler( new ClickHandler() { @Override - public void onClick(final ClickEvent event) { + public void onClick(ClickEvent event) { closePopup(); } }); @@ -188,7 +188,7 @@ public class ProjectListPopup { popup.hide(); } - public void setPreferredCoordinates(final int top, final int left) { + public void setPreferredCoordinates(int top, int left) { this.preferredTop = top; this.preferredLeft = left; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java index 2767a053ea..f2ebf817f9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java @@ -21,7 +21,7 @@ import com.google.gerrit.client.rpc.Natives; /** Suggestion Oracle for Project.NameKey entities. */ public class ProjectNameSuggestOracle extends SuggestAfterTypingNCharsOracle { @Override - public void _onRequestSuggestions(final Request req, final Callback callback) { + public void _onRequestSuggestions(Request req, Callback callback) { ProjectMap.suggest( req.getQuery(), req.getLimit(), diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java index 99d0e8ee90..ac8918084a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java @@ -48,12 +48,12 @@ public class ProjectsTable extends NavigationTable { } @Override - protected Object getRowItemKey(final ProjectInfo item) { + protected Object getRowItemKey(ProjectInfo item) { return item.name(); } @Override - protected void onOpenRow(final int row) { + protected void onOpenRow(int row) { if (row > 0) { movePointerTo(row); } @@ -84,7 +84,7 @@ public class ProjectsTable extends NavigationTable { finishDisplay(); } - protected void insert(final int row, final ProjectInfo k) { + protected void insert(int row, ProjectInfo k) { table.insertRow(row); applyDataRowStyle(row); @@ -98,7 +98,7 @@ public class ProjectsTable extends NavigationTable { populate(row, k); } - protected void populate(final int row, final ProjectInfo k) { + protected void populate(int row, ProjectInfo k) { populateState(row, k); table.setText(row, C_NAME, k.name()); table.setText(row, C_DESCRIPTION, k.description()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java index b0ee915338..03ed899e3d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java @@ -96,12 +96,12 @@ public abstract class Screen extends View { header.getCellFormatter().setWidth(0, Cols.FarEast.ordinal(), "100%"); } - protected void setWindowTitle(final String text) { + protected void setWindowTitle(String text) { windowTitle = text; Gerrit.setWindowTitle(this, text); } - protected void setPageTitle(final String text) { + protected void setPageTitle(String text) { final String old = headerText.getText(); if (text.isEmpty()) { header.setVisible(false); @@ -118,23 +118,23 @@ public abstract class Screen extends View { header.setVisible(value); } - public void setTitle(final Widget w) { + public void setTitle(Widget w) { titleWidget = w; } - protected void setTitleEast(final Widget w) { + protected void setTitleEast(Widget w) { header.setWidget(0, Cols.East.ordinal(), w); } - protected void setTitleFarEast(final Widget w) { + protected void setTitleFarEast(Widget w) { header.setWidget(0, Cols.FarEast.ordinal(), w); } - protected void setTitleWest(final Widget w) { + protected void setTitleWest(Widget w) { header.setWidget(0, Cols.West.ordinal(), w); } - protected void add(final Widget w) { + protected void add(Widget w) { body.add(w); } @@ -142,7 +142,7 @@ public abstract class Screen extends View { return body; } - protected void setTheme(final ThemeInfo t) { + protected void setTheme(ThemeInfo t) { theme = t; } @@ -152,7 +152,7 @@ public abstract class Screen extends View { } /** Set the history token for this screen. */ - public void setToken(final String t) { + public void setToken(String t) { assert t != null && !t.isEmpty(); token = t; @@ -172,7 +172,7 @@ public abstract class Screen extends View { } /** Set whether or not {@link Gerrit#isSignedIn()} must be true. */ - public final void setRequiresSignIn(final boolean b) { + public final void setRequiresSignIn(boolean b) { requiresSignIn = b; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java index b76c2fedc4..ea18d62042 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java @@ -22,7 +22,7 @@ public class SmallHeading extends Label { setStyleName(Gerrit.RESOURCES.css().smallHeading()); } - public SmallHeading(final String text) { + public SmallHeading(String text) { this(); setText(text); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java index 26026e1474..41e3573000 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Util.java @@ -21,7 +21,7 @@ public class Util { public static final UIConstants C = GWT.create(UIConstants.class); public static final UIMessages M = GWT.create(UIMessages.class); - public static String highlight(final String text, final String toHighlight) { + public static String highlight(String text, String toHighlight) { final SafeHtmlBuilder b = new SafeHtmlBuilder(); if (toHighlight == null || "".equals(toHighlight)) { b.append(text); diff --git a/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java b/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java index ce91a46326..cb1891e75f 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/addon/AddonInjector.java @@ -68,7 +68,7 @@ public class AddonInjector { } } - private void beginLoading(final String addon) { + private void beginLoading(String addon) { pending++; Loader.injectScript( getAddonScriptUri(addon), diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java index 582a3109a3..01bc7e2053 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Loader.java @@ -29,7 +29,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; public class Loader { private static native boolean isLibLoaded() /*-{ return $wnd.hasOwnProperty('CodeMirror'); }-*/; - static void initLibrary(final AsyncCallback cb) { + static void initLibrary(AsyncCallback cb) { if (isLibLoaded()) { cb.onSuccess(null); return; @@ -53,7 +53,7 @@ public class Loader { group.done(); } - private static void injectCss(ExternalTextResource css, final AsyncCallback cb) { + private static void injectCss(ExternalTextResource css, AsyncCallback cb) { try { css.getText( new ResourceCallback() { @@ -74,7 +74,7 @@ public class Loader { } } - public static void injectScript(SafeUri js, final AsyncCallback callback) { + public static void injectScript(SafeUri js, AsyncCallback callback) { final ScriptElement[] script = new ScriptElement[1]; script[0] = ScriptInjector.fromUrl(js.asString()) diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java index 74401024bf..5fda6082f7 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInjector.java @@ -70,7 +70,7 @@ public class ModeInjector { } } - private void beginLoading(final String mode) { + private void beginLoading(String mode) { pending++; Loader.injectScript( ModeInfo.getModeScriptUri(mode), diff --git a/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java b/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java index 1dce708d4f..23039d44cb 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/theme/ThemeLoader.java @@ -74,7 +74,7 @@ public class ThemeLoader { private static final EnumSet loaded = EnumSet.of(Theme.DEFAULT); - public static final void loadTheme(final Theme theme, final AsyncCallback cb) { + public static final void loadTheme(Theme theme, AsyncCallback cb) { if (loaded.contains(theme)) { cb.onSuccess(null); return; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java index 825505cd1d..be9df4c482 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java @@ -32,8 +32,7 @@ class DirectChangeByCommit extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { String query = CharMatcher.is('/').trimTrailingFrom(req.getPathInfo()); List results; try { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java index 87de00303a..7f78385d02 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/LoginUrlToken.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; public class LoginUrlToken { private static final String DEFAULT_TOKEN = '#' + PageLinks.MINE; - public static String getToken(final HttpServletRequest req) { + public static String getToken(HttpServletRequest req) { String token = req.getPathInfo(); if (Strings.isNullOrEmpty(token)) { return DEFAULT_TOKEN; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java index 57ec9c5182..8ceb50a45c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java @@ -174,7 +174,7 @@ class ProjectBasicAuthFilter implements Filter { } } - private boolean succeedAuthentication(final AccountState who) { + private boolean succeedAuthentication(AccountState who) { setUserIdentified(who.getAccount().getId()); return true; } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java index e270077def..6d9cd3c217 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java @@ -121,8 +121,7 @@ class UrlModule extends ServletModule { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { rsp.sendError(HttpServletResponse.SC_NOT_FOUND); } }); @@ -134,21 +133,19 @@ class UrlModule extends ServletModule { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { toGerrit(req.getRequestURI(), req, rsp); } }); } - private Key screen(final String target) { + private Key screen(String target) { return key( new HttpServlet() { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { toGerrit(target, req, rsp); } }); @@ -160,8 +157,7 @@ class UrlModule extends ServletModule { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { final String token = req.getPathInfo().substring(1); toGerrit(token, req, rsp); } @@ -174,8 +170,7 @@ class UrlModule extends ServletModule { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { try { String idString = req.getPathInfo(); if (idString.endsWith("/")) { @@ -224,20 +219,19 @@ class UrlModule extends ServletModule { }); } - private Key query(final String query) { + private Key query(String query) { return key( new HttpServlet() { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { toGerrit(PageLinks.toChangeQuery(query), req, rsp); } }); } - private Key key(final HttpServlet servlet) { + private Key key(HttpServlet servlet) { final Key srv = Key.get(HttpServlet.class, UniqueAnnotations.create()); bind(srv) .toProvider( @@ -257,15 +251,13 @@ class UrlModule extends ServletModule { private static final long serialVersionUID = 1L; @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { toGerrit("/register" + req.getPathInfo(), req, rsp); } }); } - static void toGerrit( - String target, HttpServletRequest req, HttpServletResponse rsp) + static void toGerrit(String target, HttpServletRequest req, HttpServletResponse rsp) throws IOException { final StringBuilder url = new StringBuilder(); url.append(req.getContextPath()); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index d0adc4b19e..ec7fb68f03 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -82,13 +82,13 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException, ServletException { doPost(req, rsp); } @Override - protected void doPost(final HttpServletRequest req, final HttpServletResponse rsp) + protected void doPost(HttpServletRequest req, HttpServletResponse rsp) throws IOException, ServletException { CacheHeaders.setNotCacheable(rsp); @@ -180,7 +180,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { return HtmlDomUtil.toUTF8(doc); } - private AuthResult auth(final Account account) { + private AuthResult auth(Account account) { if (account != null) { return new AuthResult(account.getId(), null, false); } @@ -194,7 +194,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { return null; } - private AuthResult byUserName(final String userName) { + private AuthResult byUserName(String userName) { try { List accountStates = accountQuery.byExternalId(SCHEME_USERNAME, userName); if (accountStates.isEmpty()) { @@ -212,7 +212,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { } } - private AuthResult byPreferredEmail(final String email) { + private AuthResult byPreferredEmail(String email) { try (ReviewDb db = schema.open()) { List matches = db.accounts().byPreferredEmail(email).toList(); return matches.size() == 1 ? auth(matches.get(0)) : null; @@ -222,7 +222,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { } } - private AuthResult byAccountId(final String idStr) { + private AuthResult byAccountId(String idStr) { final Account.Id id; try { id = Account.Id.parse(idStr); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java index 3a575a1e41..c7229bc1cd 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java @@ -66,8 +66,7 @@ class HttpAuthFilter implements Filter { private final boolean userNameToLowerCase; @Inject - HttpAuthFilter(final DynamicItem webSession, final AuthConfig authConfig) - throws IOException { + HttpAuthFilter(DynamicItem webSession, AuthConfig authConfig) throws IOException { this.sessionProvider = webSession; final String pageName = "LoginRedirect.html"; @@ -86,8 +85,7 @@ class HttpAuthFilter implements Filter { } @Override - public void doFilter( - final ServletRequest request, final ServletResponse response, final FilterChain chain) + public void doFilter(final ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if (isSessionValid((HttpServletRequest) request)) { chain.doFilter(request, response); @@ -165,7 +163,7 @@ class HttpAuthFilter implements Filter { } @Override - public void init(final FilterConfig filterConfig) {} + public void init(FilterConfig filterConfig) {} @Override public void destroy() {} diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java index 638d527720..f8c86eea2f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java @@ -21,7 +21,7 @@ import com.google.inject.servlet.ServletModule; public class HttpAuthModule extends ServletModule { private final AuthConfig authConfig; - public HttpAuthModule(final AuthConfig authConfig) { + public HttpAuthModule(AuthConfig authConfig) { this.authConfig = authConfig; } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java index 3696c21529..d86c85aa17 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java @@ -79,7 +79,7 @@ class HttpLoginServlet extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws ServletException, IOException { final String token = LoginUrlToken.getToken(req); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java index bb3dc6a12b..534e50ec12 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java @@ -46,7 +46,7 @@ class HttpsClientSslCertAuthFilter implements Filter { @Inject HttpsClientSslCertAuthFilter( - final DynamicItem webSession, final AccountManager accountManager) { + final DynamicItem webSession, AccountManager accountManager) { this.webSession = webSession; this.accountManager = accountManager; } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java index 8b14af7c0b..e93b0b647e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java @@ -47,8 +47,7 @@ public class HttpsClientSslCertLoginServlet extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { final StringBuilder rdr = new StringBuilder(); rdr.append(urlProvider.get()); rdr.append(LoginUrlToken.getToken(req)); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java index 67d36e4e3d..af853cc333 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java @@ -57,13 +57,12 @@ class GitLogoServlet extends HttpServlet { } @Override - protected long getLastModified(final HttpServletRequest req) { + protected long getLastModified(HttpServletRequest req) { return modified; } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { if (raw != null) { rsp.setContentType("image/png"); rsp.setContentLength(raw.length); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java index c5a1f183ca..5e22081f72 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebCssServlet.java @@ -54,7 +54,7 @@ abstract class GitwebCssServlet extends HttpServlet { private final byte[] raw_css; private final byte[] gz_css; - GitwebCssServlet(final Path src) throws IOException { + GitwebCssServlet(Path src) throws IOException { if (src != null) { final Path dir = src.getParent(); final String name = src.getFileName().toString(); @@ -76,13 +76,12 @@ abstract class GitwebCssServlet extends HttpServlet { } @Override - protected long getLastModified(final HttpServletRequest req) { + protected long getLastModified(HttpServletRequest req) { return modified; } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { if (raw_css != null) { rsp.setContentType("text/css"); rsp.setCharacterEncoding(UTF_8.name()); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java index 70f6e4c20f..651b582fca 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebJavaScriptServlet.java @@ -57,13 +57,12 @@ class GitwebJavaScriptServlet extends HttpServlet { } @Override - protected long getLastModified(final HttpServletRequest req) { + protected long getLastModified(HttpServletRequest req) { return modified; } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { if (raw != null) { rsp.setContentType("text/javascript"); rsp.setContentLength(raw.length); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java index abc7fdab89..ce8a500351 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java @@ -370,8 +370,7 @@ class GitwebServlet extends HttpServlet { } @Override - protected void service(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException { if (req.getQueryString() == null || req.getQueryString().isEmpty()) { // No query string? They want the project list, which we don't // currently support. Return to Gerrit's own web UI. @@ -458,7 +457,7 @@ class GitwebServlet extends HttpServlet { private static Map getParameters(HttpServletRequest req) { final Map params = new HashMap<>(); - for (final String pair : req.getQueryString().split("[&;]")) { + for (String pair : req.getQueryString().split("[&;]")) { final int eq = pair.indexOf('='); if (0 < eq) { String name = pair.substring(0, eq); @@ -622,8 +621,7 @@ class GitwebServlet extends HttpServlet { return env.getEnvArray(); } - private void copyContentToCGI(final HttpServletRequest req, final OutputStream dst) - throws IOException { + private void copyContentToCGI(HttpServletRequest req, OutputStream dst) throws IOException { final int contentLength = req.getContentLength(); final InputStream src = req.getInputStream(); new Thread( @@ -652,7 +650,7 @@ class GitwebServlet extends HttpServlet { .start(); } - private void copyStderrToLog(final InputStream in) { + private void copyStderrToLog(InputStream in) { new Thread( () -> { try (BufferedReader br = @@ -673,7 +671,7 @@ class GitwebServlet extends HttpServlet { return req.getHeaderNames(); } - private void readCgiHeaders(HttpServletResponse res, final InputStream in) throws IOException { + private void readCgiHeaders(HttpServletResponse res, InputStream in) throws IOException { String line; while (!(line = readLine(in)).isEmpty()) { if (line.startsWith("HTTP")) { @@ -704,7 +702,7 @@ class GitwebServlet extends HttpServlet { } } - private String readLine(final InputStream in) throws IOException { + private String readLine(InputStream in) throws IOException { final StringBuilder buf = new StringBuilder(); int b; while ((b = in.read()) != -1 && b != '\n') { @@ -721,12 +719,12 @@ class GitwebServlet extends HttpServlet { envMap = new HashMap<>(); } - EnvList(final EnvList l) { + EnvList(EnvList l) { envMap = new HashMap<>(l.envMap); } /** Set a name/value pair, null values will be treated as an empty String */ - public void set(final String name, String value) { + public void set(String name, String value) { if (value == null) { value = ""; } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java index 298301d4ec..a4eea96201 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -69,8 +69,7 @@ public class CatServlet extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { String keyStr = req.getPathInfo(); // We shouldn't have to do this extra decode pass, but somehow we diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java index 8ccf221c77..10735a5154 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java @@ -53,8 +53,7 @@ public class LegacyGerritServlet extends HttpServlet { } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { final byte[] tosend; if (RPCServletUtils.acceptsGzipEncoding(req)) { rsp.setHeader("Content-Encoding", "gzip"); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java index c79fa747da..914c830ed3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java @@ -289,7 +289,7 @@ public abstract class ResourceServlet extends HttpServlet { || name.contains("//"); // windows UNC path can be "//..." } - private Callable newLoader(final Path p) { + private Callable newLoader(Path p) { return () -> { try { return new Resource( diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java index b20f990c28..55bc2a6c1b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java @@ -52,13 +52,12 @@ public class SshInfoServlet extends HttpServlet { private final SshInfo sshd; @Inject - SshInfoServlet(final SshInfo daemon) { + SshInfoServlet(SshInfo daemon) { sshd = daemon; } @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { final List hostKeys = sshd.getHostKeys(); final String out; if (!hostKeys.isEmpty()) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index e893fccb91..18da84f323 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -738,7 +738,7 @@ public class RestApiServlet extends HttpServlet { return false; } - private Object parseRawInput(final HttpServletRequest req, Type type) + private Object parseRawInput(HttpServletRequest req, Type type) throws SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException, MethodNotAllowedException { @@ -913,7 +913,7 @@ public class RestApiServlet extends HttpServlet { } } - private static BinaryResult stackJsonString(HttpServletResponse res, final BinaryResult src) + private static BinaryResult stackJsonString(HttpServletResponse res, BinaryResult src) throws IOException { TemporaryBuffer.Heap buf = heap(HEAP_EST_SIZE, Integer.MAX_VALUE); buf.write(JSON_MAGIC); @@ -929,7 +929,7 @@ public class RestApiServlet extends HttpServlet { return asBinaryResult(buf).setContentType(JSON_TYPE).setCharacterEncoding(UTF_8); } - private static BinaryResult stackBase64(HttpServletResponse res, final BinaryResult src) + private static BinaryResult stackBase64(HttpServletResponse res, BinaryResult src) throws IOException { BinaryResult b64; long len = src.getContentLength(); @@ -960,7 +960,7 @@ public class RestApiServlet extends HttpServlet { return b64.setContentType("text/plain").setCharacterEncoding(ISO_8859_1); } - private static BinaryResult stackGzip(HttpServletResponse res, final BinaryResult src) + private static BinaryResult stackGzip(HttpServletResponse res, BinaryResult src) throws IOException { BinaryResult gz; long len = src.getContentLength(); @@ -1213,7 +1213,7 @@ public class RestApiServlet extends HttpServlet { } @SuppressWarnings("resource") - private static BinaryResult asBinaryResult(final TemporaryBuffer.Heap buf) { + private static BinaryResult asBinaryResult(TemporaryBuffer.Heap buf) { return new BinaryResult() { @Override public void writeTo(OutputStream os) throws IOException { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java index e561c9b001..9e0e8f6789 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java @@ -34,7 +34,7 @@ public class BaseServiceImplementation { private final Provider currentUser; protected BaseServiceImplementation( - final Provider schema, final Provider currentUser) { + final Provider schema, Provider currentUser) { this.schema = schema; this.currentUser = currentUser; } @@ -63,7 +63,7 @@ public class BaseServiceImplementation { * @param callback the callback that will receive the result. * @param action the action logic to perform. */ - protected void run(final AsyncCallback callback, final Action action) { + protected void run(AsyncCallback callback, Action action) { try { final T r = action.run(schema.get()); if (r != null) { @@ -100,7 +100,7 @@ public class BaseServiceImplementation { } } - private static void handleOrmException(final AsyncCallback callback, Exception e) { + private static void handleOrmException(AsyncCallback callback, Exception e) { if (e.getCause() instanceof Failure) { callback.onFailure(e.getCause().getCause()); } else if (e.getCause() instanceof NoSuchEntityException) { @@ -114,7 +114,7 @@ public class BaseServiceImplementation { public static class Failure extends Exception { private static final long serialVersionUID = 1L; - public Failure(final Throwable why) { + public Failure(Throwable why) { super(why); } } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java index cce87a8b48..178cda9358 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java @@ -52,16 +52,14 @@ final class GerritJsonServlet extends JsonServlet private final AuditService audit; @Inject - GerritJsonServlet( - final DynamicItem w, final RemoteJsonService s, final AuditService a) { + GerritJsonServlet(final DynamicItem w, RemoteJsonService s, AuditService a) { session = w; service = s; audit = a; } @Override - protected GerritCall createActiveCall( - final HttpServletRequest req, final HttpServletResponse rsp) { + protected GerritCall createActiveCall(final HttpServletRequest req, HttpServletResponse rsp) { final GerritCall call = new GerritCall(session.get(), req, new AuditedHttpServletResponse(rsp)); currentCall.set(call); return call; @@ -82,7 +80,7 @@ final class GerritJsonServlet extends JsonServlet } @Override - protected void preInvoke(final GerritCall call) { + protected void preInvoke(GerritCall call) { super.preInvoke(call); if (call.isComplete()) { @@ -106,8 +104,7 @@ final class GerritJsonServlet extends JsonServlet } @Override - protected void service(final HttpServletRequest req, final HttpServletResponse resp) - throws IOException { + protected void service(HttpServletRequest req, HttpServletResponse resp) throws IOException { try { super.service(req, resp); } finally { @@ -163,7 +160,7 @@ final class GerritJsonServlet extends JsonServlet return args; } - private String extractWhat(final Audit note, final GerritCall call) { + private String extractWhat(Audit note, GerritCall call) { Class methodClass = call.getMethodClass(); String methodClassName = methodClass != null ? methodClass.getName() : ""; methodClassName = methodClassName.substring(methodClassName.lastIndexOf(".") + 1); @@ -233,7 +230,7 @@ final class GerritJsonServlet extends JsonServlet return null; } - GerritCall(final WebSession session, final HttpServletRequest i, final HttpServletResponse o) { + GerritCall(WebSession session, HttpServletRequest i, HttpServletResponse o) { super(i, o); this.session = session; this.when = TimeUtil.nowMs(); @@ -248,7 +245,7 @@ final class GerritJsonServlet extends JsonServlet } @Override - public void onFailure(final Throwable error) { + public void onFailure(Throwable error) { if (error instanceof IllegalArgumentException || error instanceof IllegalStateException) { super.onFailure(error); } else if (error instanceof OrmException || error instanceof RuntimeException) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java index 9fd926970a..b167167d69 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java @@ -27,7 +27,7 @@ class GerritJsonServletProvider implements Provider { private final Class serviceClass; @Inject - GerritJsonServletProvider(final Class c) { + GerritJsonServletProvider(Class c) { serviceClass = c; } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java index a9d654c736..b932169b13 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java @@ -44,7 +44,7 @@ import java.util.concurrent.Callable; * successfully. */ public abstract class Handler implements Callable { - public static Handler wrap(final Callable r) { + public static Handler wrap(Callable r) { return new Handler() { @Override public T call() throws Exception { @@ -58,7 +58,7 @@ public abstract class Handler implements Callable { * * @param callback callback to receive the result of {@link #call()}. */ - public final void to(final AsyncCallback callback) { + public final void to(AsyncCallback callback) { try { final T r = call(); if (r != null) { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java index 53151820cb..b03609ebf8 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java @@ -26,7 +26,7 @@ public abstract class RpcServletModule extends ServletModule { private final String prefix; - protected RpcServletModule(final String pathPrefix) { + protected RpcServletModule(String pathPrefix) { prefix = pathPrefix; } @@ -38,7 +38,7 @@ public abstract class RpcServletModule extends ServletModule { rpc(name, clazz); } - protected void rpc(final String name, Class clazz) { + protected void rpc(String name, Class clazz) { final Key srv = Key.get(GerritJsonServlet.class, UniqueAnnotations.create()); final GerritJsonServletProvider provider = new GerritJsonServletProvider(clazz); bind(clazz); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java index ec67661603..7a7713dcf0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java @@ -44,9 +44,9 @@ class SystemInfoServiceImpl implements SystemInfoService { } @Override - public void daemonHostKeys(final AsyncCallback> callback) { + public void daemonHostKeys(AsyncCallback> callback) { final ArrayList r = new ArrayList<>(hostKeys.size()); - for (final HostKey hk : hostKeys) { + for (HostKey hk : hostKeys) { String host = hk.getHost(); if (host.startsWith("*:")) { final String port = host.substring(2); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java index bdb274d613..da471c3f4b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java @@ -41,11 +41,11 @@ class ProjectAdminServiceImpl implements ProjectAdminService { @Override public void projectAccess( - final Project.NameKey projectName, final AsyncCallback callback) { + final Project.NameKey projectName, AsyncCallback callback) { projectAccessFactory.create(projectName).to(callback); } - private static ObjectId getBase(final String baseRevision) { + private static ObjectId getBase(String baseRevision) { if (baseRevision != null && !baseRevision.isEmpty()) { return ObjectId.fromString(baseRevision); } diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java index 86989ddd44..086dcc26d2 100644 --- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java +++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java @@ -74,7 +74,7 @@ public class AllRequestFilterFilterProxyTest { *

This method adds the given filter to all {@link AllRequestFilter.FilterProxy} instances * created by {@link #getFilterProxy()}. */ - private ReloadableRegistrationHandle addFilter(final AllRequestFilter filter) { + private ReloadableRegistrationHandle addFilter(AllRequestFilter filter) { Key key = Key.get(AllRequestFilter.class); return filters.add(key, Providers.of(filter)); } diff --git a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java index b22ba49de6..4efbecc81d 100644 --- a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java +++ b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java @@ -59,11 +59,11 @@ public final class GerritLauncher { private static ClassLoader daemonClassLoader; - public static void main(final String[] argv) throws Exception { + public static void main(String[] argv) throws Exception { System.exit(mainImpl(argv)); } - public static int mainImpl(final String[] argv) throws Exception { + public static int mainImpl(String[] argv) throws Exception { if (argv.length == 0) { File me; try { @@ -108,7 +108,7 @@ public final class GerritLauncher { return invokeProgram(cl, argv); } - public static void daemonStart(final String[] argv) throws Exception { + public static void daemonStart(String[] argv) throws Exception { if (daemonClassLoader != null) { throw new IllegalStateException("daemonStart can be called only once per JVM instance"); } @@ -128,7 +128,7 @@ public final class GerritLauncher { } } - public static void daemonStop(final String[] argv) throws Exception { + public static void daemonStop(String[] argv) throws Exception { if (daemonClassLoader == null) { throw new IllegalStateException("daemonStop can be called only after call to daemonStop"); } @@ -148,7 +148,7 @@ public final class GerritLauncher { return "PrologShell".equals(cn) || "Rulec".equals(cn); } - private static String getVersion(final File me) { + private static String getVersion(File me) { if (me == null) { return ""; } @@ -163,8 +163,7 @@ public final class GerritLauncher { } } - private static int invokeProgram(final ClassLoader loader, final String[] origArgv) - throws Exception { + private static int invokeProgram(ClassLoader loader, String[] origArgv) throws Exception { String name = origArgv[0]; final String[] argv = new String[origArgv.length - 1]; System.arraycopy(origArgv, 1, argv, 0, argv.length); @@ -316,7 +315,7 @@ public final class GerritLauncher { } } - private static String safeName(final ZipEntry ze) { + private static String safeName(ZipEntry ze) { // Try to derive the name of the temporary file so it // doesn't completely suck. Best if we can make it // match the name it was in the archive. @@ -535,7 +534,7 @@ public final class GerritLauncher { if (tmpEntries != null) { final long now = System.currentTimeMillis(); final long expired = now - MILLISECONDS.convert(7, DAYS); - for (final File tmpEntry : tmpEntries) { + for (File tmpEntry : tmpEntries) { if (tmpEntry.isDirectory() && tmpEntry.lastModified() < expired) { final String[] all = tmpEntry.list(); if (all == null || all.length == 0) { diff --git a/gerrit-main/src/main/java/Main.java b/gerrit-main/src/main/java/Main.java index 8c9deb1033..0eca665f8f 100644 --- a/gerrit-main/src/main/java/Main.java +++ b/gerrit-main/src/main/java/Main.java @@ -19,7 +19,7 @@ public final class Main { // to jump into the real main code. // - public static void main(final String[] argv) throws Exception { + public static void main(String[] argv) throws Exception { if (onSupportedJavaVersion()) { com.google.gerrit.launcher.GerritLauncher.main(argv); diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java index 1406267ff4..a97e8aeb08 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java @@ -29,19 +29,17 @@ class OpenIdLoginServlet extends HttpServlet { private final OpenIdServiceImpl impl; @Inject - OpenIdLoginServlet(final OpenIdServiceImpl i) { + OpenIdLoginServlet(OpenIdServiceImpl i) { impl = i; } @Override - public void doGet(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + public void doGet(HttpServletRequest req, HttpServletResponse rsp) throws IOException { doPost(req, rsp); } @Override - public void doPost(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + public void doPost(HttpServletRequest req, HttpServletResponse rsp) throws IOException { try { CacheHeaders.setNotCacheable(rsp); impl.doAuth(req, rsp); diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java index a3bf361c2a..bd2efdf42f 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java @@ -183,7 +183,7 @@ class OpenIdServiceImpl { return new DiscoveryResult(aReq.getDestinationUrl(false), aReq.getParameterMap()); } - private boolean requestRegistration(final AuthRequest aReq) { + private boolean requestRegistration(AuthRequest aReq) { if (AuthRequest.SELECT_ID.equals(aReq.getIdentity())) { // We don't know anything about the identity, as the provider // will offer the user a way to indicate their identity. Skip @@ -204,7 +204,7 @@ class OpenIdServiceImpl { } /** Called by {@link OpenIdLoginServlet} doGet, doPost */ - void doAuth(final HttpServletRequest req, final HttpServletResponse rsp) throws Exception { + void doAuth(HttpServletRequest req, HttpServletResponse rsp) throws Exception { if (OMODE_CANCEL.equals(req.getParameter(OPENID_MODE))) { cancel(req, rsp); return; @@ -459,7 +459,7 @@ class OpenIdServiceImpl { } } - private boolean isSignIn(final SignInMode mode) { + private boolean isSignIn(SignInMode mode) { switch (mode) { case SIGN_IN: case REGISTER: @@ -470,7 +470,7 @@ class OpenIdServiceImpl { } } - private static SignInMode signInMode(final HttpServletRequest req) { + private static SignInMode signInMode(HttpServletRequest req) { try { return SignInMode.valueOf(req.getParameter(P_MODE)); } catch (RuntimeException e) { @@ -478,8 +478,7 @@ class OpenIdServiceImpl { } } - private void callback( - final boolean isNew, final HttpServletRequest req, final HttpServletResponse rsp) + private void callback(final boolean isNew, HttpServletRequest req, HttpServletResponse rsp) throws IOException { String token = req.getParameter(P_TOKEN); if (token == null || token.isEmpty() || token.startsWith("/SignInFailure,")) { @@ -495,8 +494,7 @@ class OpenIdServiceImpl { rsp.sendRedirect(rdr.toString()); } - private void cancel(final HttpServletRequest req, final HttpServletResponse rsp) - throws IOException { + private void cancel(HttpServletRequest req, HttpServletResponse rsp) throws IOException { if (isSignIn(signInMode(req))) { webSession.get().logout(); } @@ -504,7 +502,7 @@ class OpenIdServiceImpl { } private void cancelWithError( - final HttpServletRequest req, final HttpServletResponse rsp, final String errorDetail) + final HttpServletRequest req, HttpServletResponse rsp, String errorDetail) throws IOException { final SignInMode mode = signInMode(req); if (isSignIn(mode)) { @@ -554,8 +552,8 @@ class OpenIdServiceImpl { return new State(discovered, retTo, contextUrl); } - boolean isAllowedOpenID(final String id) { - for (final OpenIdProviderPattern pattern : allowedOpenIDs) { + boolean isAllowedOpenID(String id) { + for (OpenIdProviderPattern pattern : allowedOpenIDs) { if (pattern.matches(id)) { return true; } @@ -568,7 +566,7 @@ class OpenIdServiceImpl { final UrlEncoded retTo; final String contextUrl; - State(final DiscoveryInformation d, final UrlEncoded r, final String c) { + State(DiscoveryInformation d, UrlEncoded r, String c) { discovered = d; retTo = r; contextUrl = c; diff --git a/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java index 48890ddf76..33dd609080 100644 --- a/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java +++ b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java @@ -38,15 +38,15 @@ import org.apache.commons.codec.binary.Base64; public class AuthSMTPClient extends SMTPClient { private String authTypes; - public AuthSMTPClient(final String charset) { + public AuthSMTPClient(String charset) { super(charset); } - public void enableSSL(final boolean verify) { + public void enableSSL(boolean verify) { _socketFactory_ = sslFactory(verify); } - public boolean startTLS(final String hostname, final int port, final boolean verify) + public boolean startTLS(String hostname, int port, boolean verify) throws SocketException, IOException { if (sendCommand("STARTTLS") != 220) { return false; @@ -74,7 +74,7 @@ public class AuthSMTPClient extends SMTPClient { return true; } - private static SSLSocketFactory sslFactory(final boolean verify) { + private static SSLSocketFactory sslFactory(boolean verify) { if (verify) { return (SSLSocketFactory) SSLSocketFactory.getDefault(); } @@ -168,7 +168,7 @@ public class AuthSMTPClient extends SMTPClient { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - private String toHex(final byte[] b) { + private String toHex(byte[] b) { final StringBuilder sec = new StringBuilder(); for (byte c : b) { final int u = (c >> 4) & 0xf; @@ -186,7 +186,7 @@ public class AuthSMTPClient extends SMTPClient { return SMTPReply.isPositiveCompletion(sendCommand("AUTH", cmd)); } - private static String encodeBase64(final byte[] data) { + private static String encodeBase64(byte[] data) { return new String(Base64.encodeBase64(data), UTF_8); } } diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java index 8090f602c5..9435979bf5 100644 --- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java +++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java @@ -29,8 +29,7 @@ import java.util.List; public class EditDeserializer implements JsonDeserializer, JsonSerializer { @Override - public Edit deserialize( - final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) + public Edit deserialize(final JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { if (json.isJsonNull()) { return null; @@ -60,7 +59,7 @@ public class EditDeserializer implements JsonDeserializer, JsonSerializer< return new ReplaceEdit(get(o, 0), get(o, 1), get(o, 2), get(o, 3), l); } - private static int get(final JsonArray a, final int idx) throws JsonParseException { + private static int get(JsonArray a, int idx) throws JsonParseException { final JsonElement v = a.get(idx); if (!v.isJsonPrimitive()) { throw new JsonParseException("Expected array of 4 for Edit type"); @@ -73,8 +72,7 @@ public class EditDeserializer implements JsonDeserializer, JsonSerializer< } @Override - public JsonElement serialize( - final Edit src, final Type typeOfSrc, final JsonSerializationContext context) { + public JsonElement serialize(final Edit src, Type typeOfSrc, JsonSerializationContext context) { if (src == null) { return JsonNull.INSTANCE; } @@ -88,7 +86,7 @@ public class EditDeserializer implements JsonDeserializer, JsonSerializer< return a; } - private void add(final JsonArray a, final Edit src) { + private void add(JsonArray a, Edit src) { a.add(new JsonPrimitive(src.getBeginA())); a.add(new JsonPrimitive(src.getEndA())); a.add(new JsonPrimitive(src.getBeginB())); diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java index ce8a9f3933..184cb36a95 100644 --- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java +++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java @@ -46,7 +46,7 @@ public class Edit_JsonSerializer extends JsonSerializer { } @Override - public void printJson(final StringBuilder sb, final Edit o) { + public void printJson(StringBuilder sb, Edit o) { sb.append('['); append(sb, o); if (o instanceof ReplaceEdit) { @@ -58,7 +58,7 @@ public class Edit_JsonSerializer extends JsonSerializer { sb.append(']'); } - private void append(final StringBuilder sb, final Edit o) { + private void append(StringBuilder sb, Edit o) { sb.append(o.getBeginA()); sb.append(','); sb.append(o.getEndA()); diff --git a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java index 6617793368..c98da6485f 100644 --- a/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java +++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java @@ -20,8 +20,7 @@ import java.io.OutputStream; import org.eclipse.jgit.util.IO; public class ObjectIdSerialization { - public static void writeCanBeNull(final OutputStream out, final AnyObjectId id) - throws IOException { + public static void writeCanBeNull(OutputStream out, AnyObjectId id) throws IOException { if (id != null) { out.write((byte) 1); writeNotNull(out, id); @@ -30,11 +29,11 @@ public class ObjectIdSerialization { } } - public static void writeNotNull(final OutputStream out, final AnyObjectId id) throws IOException { + public static void writeNotNull(OutputStream out, AnyObjectId id) throws IOException { id.copyRawTo(out); } - public static ObjectId readCanBeNull(final InputStream in) throws IOException { + public static ObjectId readCanBeNull(InputStream in) throws IOException { switch (in.read()) { case 0: return null; @@ -45,7 +44,7 @@ public class ObjectIdSerialization { } } - public static ObjectId readNotNull(final InputStream in) throws IOException { + public static ObjectId readNotNull(InputStream in) throws IOException { final byte[] b = new byte[20]; IO.readFully(in, b, 0, 20); return ObjectId.fromRaw(b); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java index e740ec8a4d..e1a7bd4f85 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java @@ -165,7 +165,7 @@ public class JythonShell { execFile(GerritLauncher.getHomeDirectory(), STARTUP_FILE); } - protected void execResource(final String p) { + protected void execResource(String p) { try (InputStream in = JythonShell.class.getClassLoader().getResourceAsStream(p)) { if (in != null) { execStream(in, "resource " + p); @@ -177,7 +177,7 @@ public class JythonShell { } } - protected void execFile(final File parent, final String p) { + protected void execFile(File parent, String p) { try { File script = new File(parent, p); if (script.canExecute()) { @@ -200,7 +200,7 @@ public class JythonShell { } } - protected void execStream(final InputStream in, final String p) { + protected void execStream(InputStream in, String p) { try { runMethod0( console, @@ -213,7 +213,7 @@ public class JythonShell { } } - private static UnsupportedOperationException noShell(final String m, Throwable why) { + private static UnsupportedOperationException noShell(String m, Throwable why) { final String prefix = "Cannot create Jython shell: "; final String postfix = "\n (You might need to install jython.jar in the lib directory)"; return new UnsupportedOperationException(prefix + m + postfix, why); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java index 9f54634074..ff08d5994e 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java @@ -49,7 +49,7 @@ class HttpLog extends AbstractLifeCycle implements RequestLog { private final AsyncAppender async; @Inject - HttpLog(final SystemLog systemLog) { + HttpLog(SystemLog systemLog) { async = systemLog.createAsyncAppender(LOG_NAME, new HttpLogLayout()); } @@ -62,7 +62,7 @@ class HttpLog extends AbstractLifeCycle implements RequestLog { } @Override - public void log(final Request req, final Response rsp) { + public void log(Request req, Response rsp) { final LoggingEvent event = new LoggingEvent( // Logger.class.getName(), // fqnOfCategoryClass diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java index bfa4d641f9..2eea88d2fd 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLogLayout.java @@ -96,7 +96,7 @@ public final class HttpLogLayout extends Layout { } } - private void formatDate(final long now, final StringBuilder sbuf) { + private void formatDate(long now, StringBuilder sbuf) { final long rounded = now - (int) (now % 1000); if (rounded != lastTimeMillis) { synchronized (dateFormat) { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java index ebca46700a..1d3e170283 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyEnv.java @@ -19,7 +19,7 @@ import com.google.inject.Injector; public class JettyEnv { final Injector webInjector; - public JettyEnv(final Injector webInjector) { + public JettyEnv(Injector webInjector) { this.webInjector = webInjector; } } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java index d356d96576..c818276a5d 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyModule.java @@ -21,7 +21,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder; public class JettyModule extends LifecycleModule { private final JettyEnv env; - public JettyModule(final JettyEnv env) { + public JettyModule(JettyEnv env) { this.env = env; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java index c7606d6bfa..6b6ffe991f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java @@ -79,7 +79,7 @@ public class JettyServer { private final Config cfg; @Inject - Lifecycle(final JettyServer server, @GerritServerConfig final Config cfg) { + Lifecycle(JettyServer server, @GerritServerConfig final Config cfg) { this.server = server; this.cfg = cfg; } @@ -297,7 +297,7 @@ public class JettyServer { return config; } - static boolean isReverseProxied(final URI[] listenUrls) { + static boolean isReverseProxied(URI[] listenUrls) { for (URI u : listenUrls) { if ("http".equals(u.getScheme()) || "https".equals(u.getScheme())) { return false; @@ -306,7 +306,7 @@ public class JettyServer { return true; } - static URI[] listenURLs(final Config cfg) { + static URI[] listenURLs(Config cfg) { String[] urls = cfg.getStringList("httpd", null, "listenurl"); if (urls.length == 0) { urls = new String[] {"http://*:8080/"}; @@ -352,7 +352,7 @@ public class JettyServer { return pool; } - private Handler makeContext(final JettyEnv env, final Config cfg) { + private Handler makeContext(JettyEnv env, Config cfg) { final Set paths = new HashSet<>(); for (URI u : listenURLs(cfg)) { String p = u.getPath(); @@ -385,8 +385,7 @@ public class JettyServer { return r; } - private ContextHandler makeContext( - final String contextPath, final JettyEnv env, final Config cfg) { + private ContextHandler makeContext(final String contextPath, JettyEnv env, Config cfg) { final ServletContextHandler app = new ServletContextHandler(); // This enables the use of sessions in Jetty, feature available diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java index ccaee8ff9e..82238d63b3 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java @@ -155,8 +155,7 @@ public class ProjectQoSFilter implements Filter { private boolean done; private Thread worker; - TaskThunk( - final WorkQueue.Executor executor, final Continuation cont, final HttpServletRequest req) { + TaskThunk(final WorkQueue.Executor executor, Continuation cont, HttpServletRequest req) { this.executor = executor; this.cont = cont; this.name = generateName(req); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java index 56b644ab1b..49fd1f9d92 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java @@ -438,11 +438,11 @@ public class BaseInit extends SiteProgram { } } - private SiteRun createSiteRun(final SiteInit init) { + private SiteRun createSiteRun(SiteInit init) { return createSysInjector(init).getInstance(SiteRun.class); } - private Injector createSysInjector(final SiteInit init) { + private Injector createSysInjector(SiteInit init) { if (sysInjector == null) { final List modules = new ArrayList<>(); modules.add( diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java index 8868a31566..27620fa50a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java @@ -37,7 +37,7 @@ public class Browser { open(null /* root page */); } - public void open(final String link) throws Exception { + public void open(String link) throws Exception { String url = cfg.getString("gerrit", null, "canonicalWebUrl"); if (url == null) { url = cfg.getString("httpd", null, "listenUrl"); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java index b80bf35d88..44f883ad25 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigModule.java @@ -22,7 +22,7 @@ public class DatabaseConfigModule extends AbstractModule { private final SitePaths site; - public DatabaseConfigModule(final SitePaths site) { + public DatabaseConfigModule(SitePaths site) { this.site = site; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java index 5db4287957..3aad0f4aa9 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DerbyInitializer.java @@ -27,7 +27,7 @@ class DerbyInitializer implements DatabaseConfigInitializer { private final SitePaths site; @Inject - DerbyInitializer(final SitePaths site) { + DerbyInitializer(SitePaths site) { this.site = site; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java index 1f3fd0f2e1..63aa6ec9b7 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java @@ -27,7 +27,7 @@ class H2Initializer implements DatabaseConfigInitializer { private final SitePaths site; @Inject - H2Initializer(final SitePaths site) { + H2Initializer(SitePaths site) { this.site = site; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java index 395806942c..dea45a710a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java @@ -41,7 +41,7 @@ class InitContainer implements InitStep { private final Section container; @Inject - InitContainer(final ConsoleUI ui, final SitePaths site, final Section.Factory sections) { + InitContainer(ConsoleUI ui, SitePaths site, Section.Factory sections) { this.ui = ui; this.site = site; this.container = sections.get("container", null); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java index fc42f9d817..e57b6b9051 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java @@ -31,7 +31,7 @@ class InitGitManager implements InitStep { private final Section gerrit; @Inject - InitGitManager(final ConsoleUI ui, final Section.Factory sections) { + InitGitManager(ConsoleUI ui, Section.Factory sections) { this.ui = ui; this.gerrit = sections.get("gerrit", null); } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java index 4526a87184..9f02a5668a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java @@ -43,8 +43,7 @@ public class InitPluginStepsLoader { final ConsoleUI ui; @Inject - public InitPluginStepsLoader( - final ConsoleUI ui, final SitePaths sitePaths, final Injector initInjector) { + public InitPluginStepsLoader(final ConsoleUI ui, SitePaths sitePaths, Injector initInjector) { this.pluginsDir = sitePaths.plugins_dir; this.initInjector = initInjector; this.ui = ui; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java index 97359b3dca..666b549e19 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java @@ -34,7 +34,7 @@ class InitSendEmail implements InitStep { private final SitePaths site; @Inject - InitSendEmail(final ConsoleUI ui, final SitePaths site, final Section.Factory sections) { + InitSendEmail(ConsoleUI ui, SitePaths site, Section.Factory sections) { this.ui = ui; this.sendemail = sections.get("sendemail", null); this.site = site; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java index 3259f96799..c599e99eb8 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java @@ -122,7 +122,7 @@ class Libraries { return val; } - private static String read(final String p) throws IOException { + private static String read(String p) throws IOException { try (InputStream in = Libraries.class.getClassLoader().getResourceAsStream(p)) { if (in == null) { throw new FileNotFoundException("Cannot load resource " + p); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java index 0ba4083e49..fb4e0eb4cd 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java @@ -65,16 +65,16 @@ class LibraryDownloader { this.needs = new ArrayList<>(2); } - void setName(final String name) { + void setName(String name) { this.name = name; } - void setJarUrl(final String url) { + void setJarUrl(String url) { this.jarUrl = url; download = jarUrl.startsWith("http"); } - void setSHA1(final String sha1) { + void setSHA1(String sha1) { this.sha1 = sha1; } @@ -230,7 +230,7 @@ class LibraryDownloader { Files.copy(p, dst); } - private static Path url2file(final String urlString) throws IOException { + private static Path url2file(String urlString) throws IOException { final URL url = new URL(urlString); try { return Paths.get(url.toURI()); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java index 243ea09453..be61061b66 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java @@ -165,7 +165,7 @@ public class SitePathInitializer { chmod(0444, ex); } - private static List stepsOf(final Injector injector) { + private static List stepsOf(Injector injector) { final ArrayList r = new ArrayList<>(); for (Binding b : all(injector)) { r.add(b.getProvider().get()); @@ -173,7 +173,7 @@ public class SitePathInitializer { return r; } - private static List> all(final Injector injector) { + private static List> all(Injector injector) { return injector.findBindingsByType(new TypeLiteral() {}); } } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java index d5d7e786a4..f9944329c0 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java @@ -162,8 +162,7 @@ class UpgradeFrom2_0_x implements InitStep { savePublic(cfg); } - private boolean convertUrl(final Section database, String url) - throws UnsupportedEncodingException { + private boolean convertUrl(Section database, String url) throws UnsupportedEncodingException { String username = null; String password = null; @@ -243,14 +242,14 @@ class UpgradeFrom2_0_x implements InitStep { return false; } - private void sethost(final Section database, final InetSocketAddress addr) { + private void sethost(Section database, InetSocketAddress addr) { database.set("hostname", SocketUtil.hostname(addr)); if (0 < addr.getPort()) { database.set("port", String.valueOf(addr.getPort())); } } - private void setuser(final Section database, String username, String password) { + private void setuser(Section database, String username, String password) { if (username != null && !username.isEmpty()) { database.set("username", username); } @@ -278,7 +277,7 @@ class UpgradeFrom2_0_x implements InitStep { throw new IOException("Cannot read " + name, e); } final Properties dbprop = new Properties(); - for (final Map.Entry e : srvprop.entrySet()) { + for (Map.Entry e : srvprop.entrySet()) { final String key = (String) e.getKey(); if (key.startsWith("database.")) { dbprop.put(key.substring("database.".length()), e.getValue()); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java index 18ccb1aef3..2068540261 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java @@ -27,7 +27,7 @@ public abstract class ConsoleUI { } /** Get a UI instance, possibly forcing batch mode. */ - public static ConsoleUI getInstance(final boolean batchMode) { + public static ConsoleUI getInstance(boolean batchMode) { Console console = batchMode ? null : System.console(); return console != null ? new Interactive(console) : new Batch(); } @@ -87,7 +87,7 @@ public abstract class ConsoleUI { private static class Interactive extends ConsoleUI { private final Console console; - Interactive(final Console console) { + Interactive(Console console) { this.console = console; } @@ -164,7 +164,7 @@ public abstract class ConsoleUI { console.printf("error: '%s' is not a valid choice\n", r); } console.printf(" Supported options are:\n"); - for (final String v : allowedValues) { + for (String v : allowedValues) { console.printf(" %s\n", v.toLowerCase()); } } @@ -207,7 +207,7 @@ public abstract class ConsoleUI { if (r.isEmpty()) { return def; } - for (final T e : options) { + for (T e : options) { if (e.toString().equalsIgnoreCase(r)) { return e; } @@ -216,7 +216,7 @@ public abstract class ConsoleUI { console.printf("error: '%s' is not a valid choice\n", r); } console.printf(" Supported options are:\n"); - for (final T e : options) { + for (T e : options) { console.printf(" %s\n", e.toString().toLowerCase()); } } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java index b80cb22fa1..656f53aef6 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java @@ -46,7 +46,7 @@ public class InitUtil { return new Die(why, cause); } - public static void savePublic(final FileBasedConfig sec) throws IOException { + public static void savePublic(FileBasedConfig sec) throws IOException { if (modified(sec)) { sec.save(); } @@ -79,7 +79,7 @@ public class InitUtil { return SystemReader.getInstance().getHostname(); } - public static boolean isLocal(final String hostname) { + public static boolean isLocal(String hostname) { try { return InetAddress.getByName(hostname).isLoopbackAddress(); } catch (UnknownHostException e) { @@ -127,7 +127,7 @@ public class InitUtil { } } - private static InputStream open(final Class sibling, final String name) { + private static InputStream open(Class sibling, String name) { final InputStream in = sibling.getResourceAsStream(name); if (in == null) { String pkg = sibling.getName(); @@ -186,12 +186,12 @@ public class InitUtil { return new URI(url); } - public static boolean isAnyAddress(final URI u) { + public static boolean isAnyAddress(URI u) { return u.getHost() == null && (u.getAuthority().equals("*") || u.getAuthority().startsWith("*:")); } - public static int portOf(final URI uri) { + public static int portOf(URI uri) { int port = uri.getPort(); if (port < 0) { port = "https".equals(uri.getScheme()) ? 443 : 80; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java index d52005f9c5..c1c8745d2f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java @@ -58,7 +58,7 @@ public class Section { return flags.cfg.getString(section, subsection, name); } - public void set(final String name, final String value) { + public void set(String name, String value) { final ArrayList all = new ArrayList<>(); all.addAll(Arrays.asList(flags.cfg.getStringList(section, subsection, name))); @@ -78,7 +78,7 @@ public class Section { } } - public > void set(final String name, final T value) { + public > void set(String name, T value) { if (value != null) { set(name, value.name()); } else { @@ -90,12 +90,11 @@ public class Section { set(name, (String) null); } - public String string(final String title, final String name, final String dv) { + public String string(String title, String name, String dv) { return string(title, name, dv, false); } - public String string( - final String title, final String name, final String dv, final boolean nullIfDefault) { + public String string(final String title, String name, String dv, boolean nullIfDefault) { final String ov = get(name); String nv = ui.readString(ov != null ? ov : dv, "%s", title); if (nullIfDefault && nv.equals(dv)) { @@ -107,7 +106,7 @@ public class Section { return nv; } - public Path path(final String title, final String name, final String defValue) { + public Path path(String title, String name, String defValue) { return site.resolve(string(title, name, defValue)); } @@ -129,7 +128,7 @@ public class Section { } public , A extends EnumSet> T select( - String title, String name, T defValue, A allowedValues, final boolean nullIfDefault) { + String title, String name, T defValue, A allowedValues, boolean nullIfDefault) { final boolean set = get(name) != null; T oldValue = flags.cfg.getEnum(section, subsection, name, defValue); T newValue = ui.readEnum(oldValue, allowedValues, "%s", title); @@ -146,8 +145,7 @@ public class Section { return newValue; } - public String select( - final String title, final String name, final String dv, Set allowedValues) { + public String select(final String title, String name, String dv, Set allowedValues) { final String ov = get(name); String nv = ui.readString(ov != null ? ov : dv, allowedValues, "%s", title); if (!eq(ov, nv)) { @@ -156,7 +154,7 @@ public class Section { return nv; } - public String password(final String username, final String password) { + public String password(String username, String password) { final String ov = getSecure(password); String user = flags.sec.get(section, subsection, username); @@ -219,7 +217,7 @@ public class Section { return section; } - private static boolean eq(final String a, final String b) { + private static boolean eq(String a, String b) { if (a == null && b == null) { return true; } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java index 825bd70917..fca5551ecd 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java @@ -38,7 +38,7 @@ public abstract class AbstractProgram { return n.toLowerCase(); } - public final int main(final String[] argv) throws Exception { + public final int main(String[] argv) throws Exception { final CmdLineParser clp = new CmdLineParser(OptionHandlers.empty(), this); try { clp.parseArgument(argv); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java index e5076c945e..afb2fb406b 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java @@ -49,8 +49,7 @@ public class ErrorLogFile { root.addAppender(dst); } - public static LifecycleListener start(final Path sitePath, final Config config) - throws IOException { + public static LifecycleListener start(Path sitePath, Config config) throws IOException { Path logdir = FileUtil.mkdirsOrDie(new SitePaths(sitePath).logs_dir, "Cannot create log directory"); if (SystemLog.shouldConfigure()) { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java index 7eed2eff6d..c9df7e749a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java @@ -23,7 +23,7 @@ public class RuntimeShutdown { private static final ShutdownCallback cb = new ShutdownCallback(); /** Add a task to be performed when graceful shutdown is requested. */ - public static void add(final Runnable task) { + public static void add(Runnable task) { if (!cb.add(task)) { // If the shutdown has already begun we cannot enqueue a new // task. Instead trigger the task in the caller, without any @@ -55,7 +55,7 @@ public class RuntimeShutdown { setName("ShutdownCallback"); } - boolean add(final Runnable newTask) { + boolean add(Runnable newTask) { synchronized (this) { if (!shutdownStarted && !shutdownComplete) { if (tasks.isEmpty()) { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java index 279584a893..41feba280d 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java @@ -83,7 +83,7 @@ public abstract class SiteProgram extends AbstractProgram { this.sitePath = sitePath; } - protected SiteProgram(Path sitePath, final Provider dsProvider) { + protected SiteProgram(Path sitePath, Provider dsProvider) { this.sitePath = sitePath; this.dsProvider = dsProvider; } @@ -107,7 +107,7 @@ public abstract class SiteProgram extends AbstractProgram { /** @return provides database connectivity and site path. */ protected Injector createDbInjector( - final boolean enableMetrics, final DataSourceProvider.Context context) { + final boolean enableMetrics, DataSourceProvider.Context context) { final Path sitePath = getSitePath(); final List modules = new ArrayList<>(); diff --git a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java index 13e19ae2de..df5be2cc53 100644 --- a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java +++ b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/ui/GroupSuggestOracle.java @@ -40,7 +40,7 @@ public class GroupSuggestOracle extends SuggestOracle { } @Override - public void requestSuggestions(final Request req, final Callback done) { + public void requestSuggestions(Request req, Callback done) { if (req.getQuery().length() < chars) { responseEmptySuggestion(req, done); return; diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java index 1b06f0fc54..61c807c7fc 100644 --- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java +++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java @@ -24,8 +24,7 @@ public class EditList { private final int aSize; private final int bSize; - public EditList( - final List edits, final int contextLines, final int aSize, final int bSize) { + public EditList(final List edits, int contextLines, int aSize, int bSize) { this.edits = edits; this.context = contextLines; this.aSize = aSize; @@ -65,7 +64,7 @@ public class EditList { }; } - private int findCombinedEnd(final int i) { + private int findCombinedEnd(int i) { int end = i + 1; while (end < edits.size() && (combineA(end) || combineB(end))) { end++; @@ -73,14 +72,14 @@ public class EditList { return end - 1; } - private boolean combineA(final int i) { + private boolean combineA(int i) { final Edit s = edits.get(i); final Edit e = edits.get(i - 1); // + 1 to prevent '... skipping 1 common line ...' messages. return s.getBeginA() - e.getEndA() <= 2 * context + 1; } - private boolean combineB(final int i) { + private boolean combineB(int i) { final int s = edits.get(i).getBeginB(); final int e = edits.get(i - 1).getEndB(); // + 1 to prevent '... skipping 1 common line ...' messages. @@ -98,7 +97,7 @@ public class EditList { private final int aEnd; private final int bEnd; - private Hunk(final int ci, final int ei) { + private Hunk(int ci, int ei) { curIdx = ci; endIdx = ei; curEdit = edits.get(curIdx); @@ -172,7 +171,7 @@ public class EditList { return aCur < aEnd || bCur < bEnd; } - private boolean in(final Edit edit) { + private boolean in(Edit edit) { return aCur < edit.getEndA() || bCur < edit.getEndB(); } } diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java index 5ff0447b59..348f9b20b8 100644 --- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java +++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java @@ -31,11 +31,11 @@ public class SparseFileContent { return size; } - public void setSize(final int s) { + public void setSize(int s) { size = s; } - public String get(final int idx) { + public String get(int idx) { final String line = getLine(idx); if (line == null) { throw new ArrayIndexOutOfBoundsException(idx); @@ -43,7 +43,7 @@ public class SparseFileContent { return line; } - public boolean contains(final int idx) { + public boolean contains(int idx) { return getLine(idx) != null; } @@ -51,7 +51,7 @@ public class SparseFileContent { return ranges.isEmpty() ? size() : ranges.get(0).base; } - public int next(final int idx) { + public int next(int idx) { // Most requests are sequential in nature, fetching the next // line from the current range, or the immediate next range. // @@ -106,7 +106,7 @@ public class SparseFileContent { return size(); } - private String getLine(final int idx) { + private String getLine(int idx) { // Most requests are sequential in nature, fetching the next // line from the current range, or the next range. // @@ -148,7 +148,7 @@ public class SparseFileContent { return null; } - public void addLine(final int i, final String content) { + public void addLine(int i, String content) { final Range r; if (!ranges.isEmpty() && i == last().end()) { r = last(); @@ -180,14 +180,14 @@ public class SparseFileContent { protected int base; protected List lines; - private Range(final int b) { + private Range(int b) { base = b; lines = new ArrayList<>(); } protected Range() {} - private String get(final int i) { + private String get(int i) { return lines.get(i - base); } @@ -195,7 +195,7 @@ public class SparseFileContent { return base + lines.size(); } - private boolean contains(final int i) { + private boolean contains(int i) { return base <= i && i < end(); } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java index fe2122f8ab..74dadc5143 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroup.java @@ -42,7 +42,7 @@ public final class AccountGroup { protected NameKey() {} - public NameKey(final String n) { + public NameKey(String n) { name = n; } @@ -66,7 +66,7 @@ public final class AccountGroup { protected UUID() {} - public UUID(final String n) { + public UUID(String n) { uuid = n; } @@ -81,7 +81,7 @@ public final class AccountGroup { } /** Parse an AccountGroup.UUID out of a string representation. */ - public static UUID parse(final String str) { + public static UUID parse(String str) { final UUID r = new UUID(); r.fromString(str); return r; @@ -102,7 +102,7 @@ public final class AccountGroup { protected Id() {} - public Id(final int id) { + public Id(int id) { this.id = id; } @@ -117,7 +117,7 @@ public final class AccountGroup { } /** Parse an AccountGroup.Id out of a string representation. */ - public static Id parse(final String str) { + public static Id parse(String str) { final Id r = new Id(); r.fromString(str); return r; @@ -188,7 +188,7 @@ public final class AccountGroup { return name; } - public void setNameKey(final AccountGroup.NameKey nameKey) { + public void setNameKey(AccountGroup.NameKey nameKey) { name = nameKey; } @@ -196,7 +196,7 @@ public final class AccountGroup { return description; } - public void setDescription(final String d) { + public void setDescription(String d) { description = d; } @@ -204,11 +204,11 @@ public final class AccountGroup { return ownerGroupUUID; } - public void setOwnerGroupUUID(final AccountGroup.UUID uuid) { + public void setOwnerGroupUUID(AccountGroup.UUID uuid) { ownerGroupUUID = uuid; } - public void setVisibleToAll(final boolean visibleToAll) { + public void setVisibleToAll(boolean visibleToAll) { this.visibleToAll = visibleToAll; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java index b4bf7834f2..99ff35befa 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupById.java @@ -33,7 +33,7 @@ public final class AccountGroupById { includeUUID = new AccountGroup.UUID(); } - public Key(final AccountGroup.Id g, final AccountGroup.UUID u) { + public Key(AccountGroup.Id g, AccountGroup.UUID u) { groupId = g; includeUUID = u; } @@ -62,7 +62,7 @@ public final class AccountGroupById { protected AccountGroupById() {} - public AccountGroupById(final AccountGroupById.Key k) { + public AccountGroupById(AccountGroupById.Key k) { key = k; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java index d1e72afd82..a127a70710 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupByIdAud.java @@ -37,7 +37,7 @@ public final class AccountGroupByIdAud { includeUUID = new AccountGroup.UUID(); } - public Key(final AccountGroup.Id g, final AccountGroup.UUID u, final Timestamp t) { + public Key(AccountGroup.Id g, AccountGroup.UUID u, Timestamp t) { groupId = g; includeUUID = u; addedOn = t; @@ -76,8 +76,7 @@ public final class AccountGroupByIdAud { protected AccountGroupByIdAud() {} - public AccountGroupByIdAud( - final AccountGroupById m, final Account.Id adder, final Timestamp when) { + public AccountGroupByIdAud(final AccountGroupById m, Account.Id adder, Timestamp when) { final AccountGroup.Id group = m.getGroupId(); final AccountGroup.UUID include = m.getIncludeUUID(); key = new AccountGroupByIdAud.Key(group, include, when); @@ -92,7 +91,7 @@ public final class AccountGroupByIdAud { return removedOn == null; } - public void removed(final Account.Id deleter, final Timestamp when) { + public void removed(Account.Id deleter, Timestamp when) { removedBy = deleter; removedOn = when; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java index ce6999fd67..ce5b347483 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMember.java @@ -33,7 +33,7 @@ public final class AccountGroupMember { groupId = new AccountGroup.Id(); } - public Key(final Account.Id a, final AccountGroup.Id g) { + public Key(Account.Id a, AccountGroup.Id g) { accountId = a; groupId = g; } @@ -58,7 +58,7 @@ public final class AccountGroupMember { protected AccountGroupMember() {} - public AccountGroupMember(final AccountGroupMember.Key k) { + public AccountGroupMember(AccountGroupMember.Key k) { key = k; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java index 4f3992d1f2..da19351191 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountGroupMemberAudit.java @@ -37,7 +37,7 @@ public final class AccountGroupMemberAudit { groupId = new AccountGroup.Id(); } - public Key(final Account.Id a, final AccountGroup.Id g, final Timestamp t) { + public Key(Account.Id a, AccountGroup.Id g, Timestamp t) { accountId = a; groupId = g; addedOn = t; @@ -76,8 +76,7 @@ public final class AccountGroupMemberAudit { protected AccountGroupMemberAudit() {} - public AccountGroupMemberAudit( - final AccountGroupMember m, final Account.Id adder, Timestamp addedOn) { + public AccountGroupMemberAudit(final AccountGroupMember m, Account.Id adder, Timestamp addedOn) { final Account.Id who = m.getAccountId(); final AccountGroup.Id group = m.getAccountGroupId(); key = new AccountGroupMemberAudit.Key(who, group, addedOn); @@ -92,7 +91,7 @@ public final class AccountGroupMemberAudit { return removedOn == null; } - public void removed(final Account.Id deleter, final Timestamp when) { + public void removed(Account.Id deleter, Timestamp when) { removedBy = deleter; removedOn = when; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java index 3645dac5b6..372d644431 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java @@ -30,7 +30,7 @@ public final class AccountSshKey { accountId = new Account.Id(); } - public Id(final Account.Id a, final int s) { + public Id(Account.Id a, int s) { accountId = a; seq = s; } @@ -63,7 +63,7 @@ public final class AccountSshKey { protected AccountSshKey() {} - public AccountSshKey(final AccountSshKey.Id i, final String pub) { + public AccountSshKey(AccountSshKey.Id i, String pub) { id = i; sshPublicKey = pub.replace("\n", "").replace("\r", ""); valid = id.isValid(); diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java index d0df7c6601..fd8bbfd92e 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Branch.java @@ -33,12 +33,12 @@ public final class Branch { projectName = new Project.NameKey(); } - public NameKey(final Project.NameKey proj, final String branchName) { + public NameKey(Project.NameKey proj, String branchName) { projectName = proj; set(branchName); } - public NameKey(String proj, final String branchName) { + public NameKey(String proj, String branchName) { this(new Project.NameKey(proj), branchName); } @@ -68,7 +68,7 @@ public final class Branch { protected Branch() {} - public Branch(final Branch.NameKey newName) { + public Branch(Branch.NameKey newName) { name = newName; } @@ -88,7 +88,7 @@ public final class Branch { return revision; } - public void setRevision(final RevId id) { + public void setRevision(RevId id) { revision = id; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java index a101ca0f2b..a94dab3d84 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java @@ -102,7 +102,7 @@ public final class Change { protected Id() {} - public Id(final int id) { + public Id(int id) { this.id = id; } @@ -130,7 +130,7 @@ public final class Change { } /** Parse a Change.Id out of a string representation. */ - public static Id parse(final String str) { + public static Id parse(String str) { final Id r = new Id(); r.fromString(str); return r; @@ -262,7 +262,7 @@ public final class Change { protected Key() {} - public Key(final String id) { + public Key(String id) { this.id = id; } @@ -291,7 +291,7 @@ public final class Change { } /** Parse a Change.Key out of a string representation. */ - public static Key parse(final String str) { + public static Key parse(String str) { final Key r = new Key(); r.fromString(str); return r; @@ -416,8 +416,8 @@ public final class Change { return changeStatus; } - public static Status forCode(final char c) { - for (final Status s : Status.values()) { + public static Status forCode(char c) { + for (Status s : Status.values()) { if (s.code == c) { return s; } @@ -576,7 +576,7 @@ public final class Change { return changeKey; } - public void setKey(final Change.Key k) { + public void setKey(Change.Key k) { changeKey = k; } @@ -648,7 +648,7 @@ public final class Change { return null; } - public void setCurrentPatchSet(final PatchSetInfo ps) { + public void setCurrentPatchSet(PatchSetInfo ps) { if (originalSubject == null && subject != null) { // Change was created before schema upgrade. Use the last subject // associated with this change, as the most recent discussion will diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java index caf20c77b0..edc022fb3f 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/ChangeMessage.java @@ -34,7 +34,7 @@ public final class ChangeMessage { changeId = new Change.Id(); } - public Key(final Change.Id change, final String uuid) { + public Key(Change.Id change, String uuid) { this.changeId = change; this.uuid = uuid; } @@ -84,8 +84,7 @@ public final class ChangeMessage { protected ChangeMessage() {} - public ChangeMessage( - final ChangeMessage.Key k, final Account.Id a, final Timestamp wo, final PatchSet.Id psid) { + public ChangeMessage(final ChangeMessage.Key k, Account.Id a, Timestamp wo, PatchSet.Id psid) { key = k; author = a; writtenOn = wo; @@ -101,7 +100,7 @@ public final class ChangeMessage { return author; } - public void setAuthor(final Account.Id accountId) { + public void setAuthor(Account.Id accountId) { if (author != null) { throw new IllegalStateException("Cannot modify author once assigned"); } @@ -129,7 +128,7 @@ public final class ChangeMessage { return message; } - public void setMessage(final String s) { + public void setMessage(String s) { message = s; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java index 9d6118693f..6a3b69c50f 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/CurrentSchemaVersion.java @@ -35,7 +35,7 @@ public final class CurrentSchemaVersion { } @Override - protected void set(final String newValue) { + protected void set(String newValue) { assert get().equals(newValue); } } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java index c38078eb84..e69cab2af2 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java @@ -31,7 +31,7 @@ public class LabelId extends StringKey> { public LabelId() {} - public LabelId(final String n) { + public LabelId(String n) { id = n; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java index 269b6d47a3..0492c6ca39 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java @@ -49,7 +49,7 @@ public final class Patch { patchSetId = new PatchSet.Id(); } - public Key(final PatchSet.Id ps, final String name) { + public Key(PatchSet.Id ps, String name) { this.patchSetId = ps; this.fileName = name; } @@ -70,7 +70,7 @@ public final class Patch { } /** Parse a Patch.Id out of a string representation. */ - public static Key parse(final String str) { + public static Key parse(String str) { final Key r = new Key(); r.fromString(str); return r; @@ -103,7 +103,7 @@ public final class Patch { private final char code; - ChangeType(final char c) { + ChangeType(char c) { code = c; } @@ -116,8 +116,8 @@ public final class Patch { return s != null && s.length() == 1 && s.charAt(0) == code; } - public static ChangeType forCode(final char c) { - for (final ChangeType s : ChangeType.values()) { + public static ChangeType forCode(char c) { + for (ChangeType s : ChangeType.values()) { if (s.code == c) { return s; } @@ -156,7 +156,7 @@ public final class Patch { private final char code; - PatchType(final char c) { + PatchType(char c) { code = c; } @@ -165,8 +165,8 @@ public final class Patch { return code; } - public static PatchType forCode(final char c) { - for (final PatchType s : PatchType.values()) { + public static PatchType forCode(char c) { + for (PatchType s : PatchType.values()) { if (s.code == c) { return s; } @@ -203,7 +203,7 @@ public final class Patch { protected Patch() {} - public Patch(final Patch.Key newId) { + public Patch(Patch.Key newId) { key = newId; setChangeType(ChangeType.MODIFIED); setPatchType(PatchType.UNIFIED); @@ -217,7 +217,7 @@ public final class Patch { return nbrComments; } - public void setCommentCount(final int n) { + public void setCommentCount(int n) { nbrComments = n; } @@ -225,7 +225,7 @@ public final class Patch { return nbrDrafts; } - public void setDraftCount(final int n) { + public void setDraftCount(int n) { nbrDrafts = n; } @@ -249,7 +249,7 @@ public final class Patch { return ChangeType.forCode(changeType); } - public void setChangeType(final ChangeType type) { + public void setChangeType(ChangeType type) { changeType = type.getCode(); } @@ -257,7 +257,7 @@ public final class Patch { return PatchType.forCode(patchType); } - public void setPatchType(final PatchType type) { + public void setPatchType(PatchType type) { patchType = type.getCode(); } @@ -269,7 +269,7 @@ public final class Patch { return sourceFileName; } - public void setSourceFileName(final String n) { + public void setSourceFileName(String n) { sourceFileName = n; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java index 90552b8ccb..de953dcb2b 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java @@ -48,7 +48,7 @@ public final class PatchLineComment { patchKey = new Patch.Key(); } - public Key(final Patch.Key p, final String uuid) { + public Key(Patch.Key p, String uuid) { this.patchKey = p; this.uuid = uuid; } @@ -84,7 +84,7 @@ public final class PatchLineComment { private final char code; - Status(final char c) { + Status(char c) { code = c; } @@ -92,8 +92,8 @@ public final class PatchLineComment { return code; } - public static Status forCode(final char c) { - for (final Status s : Status.values()) { + public static Status forCode(char c) { + for (Status s : Status.values()) { if (s.code == c) { return s; } @@ -247,7 +247,7 @@ public final class PatchLineComment { return Status.forCode(status); } - public void setStatus(final Status s) { + public void setStatus(Status s) { status = s.getCode(); } @@ -255,7 +255,7 @@ public final class PatchLineComment { return side; } - public void setSide(final short s) { + public void setSide(short s) { side = s; } @@ -263,7 +263,7 @@ public final class PatchLineComment { return message; } - public void setMessage(final String s) { + public void setMessage(String s) { message = s; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java index 138da5aa5f..0cc76ed68a 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java @@ -86,7 +86,7 @@ public final class PatchSet { changeId = new Change.Id(); } - public Id(final Change.Id change, final int id) { + public Id(Change.Id change, int id) { this.changeId = change; this.patchSetId = id; } @@ -111,7 +111,7 @@ public final class PatchSet { } /** Parse a PatchSet.Id out of a string representation. */ - public static Id parse(final String str) { + public static Id parse(String str) { final Id r = new Id(); r.fromString(str); return r; @@ -183,7 +183,7 @@ public final class PatchSet { @Column(id = 6, notNull = false, length = Integer.MAX_VALUE) protected String groups; - //DELETED id = 7 (pushCertficate) + // DELETED id = 7 (pushCertficate) /** Certificate sent with a push that created this patch set. */ @Column(id = 8, notNull = false, length = Integer.MAX_VALUE) @@ -200,7 +200,7 @@ public final class PatchSet { protected PatchSet() {} - public PatchSet(final PatchSet.Id k) { + public PatchSet(PatchSet.Id k) { id = k; } @@ -227,7 +227,7 @@ public final class PatchSet { return revision; } - public void setRevision(final RevId i) { + public void setRevision(RevId i) { revision = i; } @@ -235,7 +235,7 @@ public final class PatchSet { return uploader; } - public void setUploader(final Account.Id who) { + public void setUploader(Account.Id who) { uploader = who; } @@ -243,7 +243,7 @@ public final class PatchSet { return createdOn; } - public void setCreatedOn(final Timestamp ts) { + public void setCreatedOn(Timestamp ts) { createdOn = ts; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java index ef2732bc58..0f3e4e13ce 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetApproval.java @@ -40,7 +40,7 @@ public final class PatchSetApproval { categoryId = new LabelId(); } - public Key(final PatchSet.Id ps, final Account.Id a, final LabelId c) { + public Key(PatchSet.Id ps, Account.Id a, LabelId c) { this.patchSetId = ps; this.accountId = a; this.categoryId = c; @@ -111,7 +111,7 @@ public final class PatchSetApproval { setGranted(ts); } - public PatchSetApproval(final PatchSet.Id psId, final PatchSetApproval src) { + public PatchSetApproval(PatchSet.Id psId, PatchSetApproval src) { key = new PatchSetApproval.Key(psId, src.getAccountId(), src.getLabelId()); value = src.getValue(); granted = src.granted; @@ -153,7 +153,7 @@ public final class PatchSetApproval { return value; } - public void setValue(final short v) { + public void setValue(short v) { value = v; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java index 4970db1477..f949013be6 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSetInfo.java @@ -22,7 +22,7 @@ public final class PatchSetInfo { public RevId id; public String shortMessage; - public ParentInfo(final RevId id, final String shortMessage) { + public ParentInfo(RevId id, String shortMessage) { this.id = id; this.shortMessage = shortMessage; } @@ -55,7 +55,7 @@ public final class PatchSetInfo { protected PatchSetInfo() {} - public PatchSetInfo(final PatchSet.Id k) { + public PatchSetInfo(PatchSet.Id k) { key = k; } @@ -67,7 +67,7 @@ public final class PatchSetInfo { return subject; } - public void setSubject(final String s) { + public void setSubject(String s) { if (s != null && s.length() > 255) { subject = s.substring(0, 255); } else { @@ -79,7 +79,7 @@ public final class PatchSetInfo { return message; } - public void setMessage(final String m) { + public void setMessage(String m) { message = m; } @@ -87,7 +87,7 @@ public final class PatchSetInfo { return author; } - public void setAuthor(final UserIdentity u) { + public void setAuthor(UserIdentity u) { author = u; } @@ -95,11 +95,11 @@ public final class PatchSetInfo { return committer; } - public void setCommitter(final UserIdentity u) { + public void setCommitter(UserIdentity u) { committer = u; } - public void setParents(final List p) { + public void setParents(List p) { parents = p; } @@ -107,7 +107,7 @@ public final class PatchSetInfo { return parents; } - public void setRevId(final String s) { + public void setRevId(String s) { revId = s; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java index 9918317fe5..8911b1be38 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Project.java @@ -31,7 +31,7 @@ public final class Project { protected NameKey() {} - public NameKey(final String n) { + public NameKey(String n) { name = n; } @@ -59,7 +59,7 @@ public final class Project { } /** Parse a Project.NameKey out of a string representation. */ - public static NameKey parse(final String str) { + public static NameKey parse(String str) { final NameKey r = new NameKey(); r.fromString(str); return r; @@ -129,7 +129,7 @@ public final class Project { return description; } - public void setDescription(final String d) { + public void setDescription(String d) { description = d; } @@ -161,23 +161,23 @@ public final class Project { return enableReviewerByEmail; } - public void setEnableReviewerByEmail(final InheritableBoolean enable) { + public void setEnableReviewerByEmail(InheritableBoolean enable) { enableReviewerByEmail = enable; } - public void setUseContributorAgreements(final InheritableBoolean u) { + public void setUseContributorAgreements(InheritableBoolean u) { useContributorAgreements = u; } - public void setUseSignedOffBy(final InheritableBoolean sbo) { + public void setUseSignedOffBy(InheritableBoolean sbo) { useSignedOffBy = sbo; } - public void setUseContentMerge(final InheritableBoolean cm) { + public void setUseContentMerge(InheritableBoolean cm) { useContentMerge = cm; } - public void setRequireChangeID(final InheritableBoolean cid) { + public void setRequireChangeID(InheritableBoolean cid) { requireChangeID = cid; } @@ -205,7 +205,7 @@ public final class Project { requireSignedPush = require; } - public void setMaxObjectSizeLimit(final String limit) { + public void setMaxObjectSizeLimit(String limit) { maxObjectSizeLimit = limit; } @@ -217,7 +217,7 @@ public final class Project { return submitType; } - public void setSubmitType(final SubmitType type) { + public void setSubmitType(SubmitType type) { submitType = type; } @@ -225,7 +225,7 @@ public final class Project { return state; } - public void setState(final ProjectState newState) { + public void setState(ProjectState newState) { state = newState; } @@ -233,7 +233,7 @@ public final class Project { return defaultDashboardId; } - public void setDefaultDashboard(final String defaultDashboardId) { + public void setDefaultDashboard(String defaultDashboardId) { this.defaultDashboardId = defaultDashboardId; } @@ -241,7 +241,7 @@ public final class Project { return localDefaultDashboardId; } - public void setLocalDefaultDashboard(final String localDefaultDashboardId) { + public void setLocalDefaultDashboard(String localDefaultDashboardId) { this.localDefaultDashboardId = localDefaultDashboardId; } @@ -249,11 +249,11 @@ public final class Project { return themeName; } - public void setThemeName(final String themeName) { + public void setThemeName(String themeName) { this.themeName = themeName; } - public void copySettingsFrom(final Project update) { + public void copySettingsFrom(Project update) { description = update.description; useContributorAgreements = update.useContributorAgreements; useSignedOffBy = update.useSignedOffBy; @@ -282,7 +282,7 @@ public final class Project { * @param allProjectsName name key of the wild project * @return name key of the parent project, {@code null} if this project is the wild project */ - public Project.NameKey getParent(final Project.NameKey allProjectsName) { + public Project.NameKey getParent(Project.NameKey allProjectsName) { if (parent != null) { return parent; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java index d04f8e616a..d2a3bd645e 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RevId.java @@ -25,7 +25,7 @@ public final class RevId { protected RevId() {} - public RevId(final String str) { + public RevId(String str) { id = str; } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java index 9abc7444c0..cd42dd1dcc 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/SystemConfig.java @@ -35,7 +35,7 @@ public final class SystemConfig { } @Override - protected void set(final String newValue) { + protected void set(String newValue) { assert get().equals(newValue); } } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java index 8cc97370e2..2f6008f178 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/TrackingId.java @@ -32,7 +32,7 @@ public final class TrackingId { protected Id() {} - public Id(final String id) { + public Id(String id) { this.id = id; } @@ -56,7 +56,7 @@ public final class TrackingId { protected System() {} - public System(final String s) { + public System(String s) { this.system = s; } @@ -89,7 +89,7 @@ public final class TrackingId { trackingSystem = new System(); } - protected Key(final Change.Id ch, final Id id, final System s) { + protected Key(Change.Id ch, Id id, System s) { changeId = ch; trackingKey = id; trackingSystem = s; @@ -119,11 +119,11 @@ public final class TrackingId { protected TrackingId() {} - public TrackingId(final Change.Id ch, final TrackingId.Id id, final TrackingId.System s) { + public TrackingId(Change.Id ch, TrackingId.Id id, TrackingId.System s) { key = new Key(ch, id, s); } - public TrackingId(final Change.Id ch, final String id, final String s) { + public TrackingId(Change.Id ch, String id, String s) { key = new Key(ch, new TrackingId.Id(id), new TrackingId.System(s)); } @@ -149,7 +149,7 @@ public final class TrackingId { } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (obj instanceof TrackingId) { final TrackingId tr = (TrackingId) obj; return key.equals(tr.key); diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java index ddc1297bc8..0b7aee3846 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/UserIdentity.java @@ -39,7 +39,7 @@ public final class UserIdentity { return name; } - public void setName(final String n) { + public void setName(String n) { name = n; } @@ -47,7 +47,7 @@ public final class UserIdentity { return email; } - public void setEmail(final String e) { + public void setEmail(String e) { email = e; } @@ -59,7 +59,7 @@ public final class UserIdentity { return when; } - public void setDate(final Timestamp d) { + public void setDate(Timestamp d) { when = d; } @@ -67,7 +67,7 @@ public final class UserIdentity { return tz; } - public void setTimeZone(final int offset) { + public void setTimeZone(int offset) { tz = offset; } @@ -75,7 +75,7 @@ public final class UserIdentity { return accountId; } - public void setAccount(final Account.Id id) { + public void setAccount(Account.Id id) { accountId = id; } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java index 6910d22b16..5e25651ff8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java +++ b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java @@ -68,7 +68,7 @@ class CallbackMetricImpl0 extends CallbackMetric0 implements CallbackMetri } @Override - public void register(final Runnable trigger) { + public void register(Runnable trigger) { registry.register( name, new com.codahale.metrics.Gauge() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java index c2643de57e..3478694ce1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java @@ -26,7 +26,7 @@ public class PredicateClassLoader extends ClassLoader { LinkedHashMultimap.create(); public PredicateClassLoader( - final DynamicSet predicateProviders, final ClassLoader parent) { + final DynamicSet predicateProviders, ClassLoader parent) { super(parent); for (PredicateProvider predicateProvider : predicateProviders) { @@ -37,10 +37,10 @@ public class PredicateClassLoader extends ClassLoader { } @Override - protected Class findClass(final String className) throws ClassNotFoundException { + protected Class findClass(String className) throws ClassNotFoundException { final Collection classLoaders = packageClassLoaderMap.get(getPackageName(className)); - for (final ClassLoader cl : classLoaders) { + for (ClassLoader cl : classLoaders) { try { return Class.forName(className, true, cl); } catch (ClassNotFoundException e) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java index 23c59f5359..36cb4cc150 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java @@ -137,7 +137,7 @@ public class PrologEnvironment extends BufferingPrologControl { /** Release resources stored in interpreter's hash manager. */ public void close() { - for (final Iterator i = cleanup.iterator(); i.hasNext(); ) { + for (Iterator i = cleanup.iterator(); i.hasNext(); ) { try { i.next().run(); } catch (Throwable err) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java index 1ef284c42d..d63f36ab8b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java @@ -97,7 +97,7 @@ public class ApprovalsUtil { } private static Iterable filterApprovals( - Iterable psas, final Account.Id accountId) { + Iterable psas, Account.Id accountId) { return Iterables.filter(psas, a -> Objects.equals(a.getAccountId(), accountId)); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java index 49ed8ef09a..37b6435cb1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java @@ -259,7 +259,7 @@ public class CommentsUtil { } private List byCommentStatus( - ResultSet comments, final PatchLineComment.Status status) { + ResultSet comments, PatchLineComment.Status status) { return toComments( serverId, Lists.newArrayList(Iterables.filter(comments, c -> c.getStatus() == status))); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java index 2c4c61ca0e..5121a6fda8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java @@ -349,7 +349,7 @@ public class IdentifiedUser extends CurrentUser { return newRefLogIdent(new Date(), TimeZone.getDefault()); } - public PersonIdent newRefLogIdent(final Date when, final TimeZone tz) { + public PersonIdent newRefLogIdent(Date when, TimeZone tz) { final Account ua = getAccount(); String name = ua.getFullName(); @@ -369,7 +369,7 @@ public class IdentifiedUser extends CurrentUser { return new PersonIdent(name, user + "@" + guessHost(), when, tz); } - public PersonIdent newCommitterIdent(final Date when, final TimeZone tz) { + public PersonIdent newCommitterIdent(Date when, TimeZone tz) { final Account ua = getAccount(); String name = ua.getFullName(); String email = ua.getPreferredEmail(); @@ -517,7 +517,7 @@ public class IdentifiedUser extends CurrentUser { return host; } - private String getHost(final InetAddress in) { + private String getHost(InetAddress in) { if (Boolean.FALSE.equals(disableReverseDnsLookup)) { return in.getCanonicalHostName(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java index f3ab21d1eb..7688f1d052 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java @@ -32,8 +32,7 @@ public class ProjectUtil { * @throws RepositoryNotFoundException the repository of the branch's project does not exist. * @throws IOException error while retrieving the branch from the repository. */ - public static boolean branchExists( - final GitRepositoryManager repoManager, final Branch.NameKey branch) + public static boolean branchExists(final GitRepositoryManager repoManager, Branch.NameKey branch) throws RepositoryNotFoundException, IOException { try (Repository repo = repoManager.openRepository(branch.getParentKey())) { boolean exists = repo.getRefDatabase().exactRef(branch.get()) != null; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java b/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java index 72b361c3ce..ea60682d2c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java @@ -30,7 +30,7 @@ public class RequestCleanup implements Runnable { private boolean ran; /** Register a task to be completed after the request ends. */ - public void add(final Runnable task) { + public void add(Runnable task) { synchronized (cleanup) { if (ran) { throw new IllegalStateException("Request has already been cleaned up"); @@ -43,7 +43,7 @@ public class RequestCleanup implements Runnable { public void run() { synchronized (cleanup) { ran = true; - for (final Iterator i = cleanup.iterator(); i.hasNext(); ) { + for (Iterator i = cleanup.iterator(); i.hasNext(); ) { try { i.next().run(); } catch (Throwable err) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java index cbaae1e646..a7c04f65ca 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java @@ -267,8 +267,7 @@ public class StarredChangesUtil { } } - public Set byChange(final Change.Id changeId, final String label) - throws OrmException { + public Set byChange(Change.Id changeId, String label) throws OrmException { try (Repository repo = repoManager.openRepository(allUsers)) { return getRefNames(repo, RefNames.refsStarredChangesPrefix(changeId)) .stream() @@ -283,8 +282,7 @@ public class StarredChangesUtil { @Deprecated // To be used only for IsStarredByLegacyPredicate. - public Set byAccount(final Account.Id accountId, final String label) - throws OrmException { + public Set byAccount(Account.Id accountId, String label) throws OrmException { try (Repository repo = repoManager.openRepository(allUsers)) { return getRefNames(repo, RefNames.REFS_STARRED_CHANGES) .stream() diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java index 83b6ec6de1..891dec2b97 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java @@ -33,7 +33,7 @@ public class StringUtil { * hex escape (\x00, \x01, ...) or as a C-style escape sequence (\a, \b, \t, \n, \v, \f, or \r). * Backslashes in the input string are doubled (\\). */ - public static String escapeString(final String str) { + public static String escapeString(String str) { // Allocate a buffer big enough to cover the case with a string needed // very excessive escaping without having to reallocate the buffer. final StringBuilder result = new StringBuilder(3 * str.length()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java b/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java index adad11cb67..2b7b6187b7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java @@ -25,7 +25,7 @@ public class UrlEncoded extends LinkedHashMap { public UrlEncoded() {} - public UrlEncoded(final String url) { + public UrlEncoded(String url) { this.url = url; } @@ -37,7 +37,7 @@ public class UrlEncoded extends LinkedHashMap { separator = '?'; buffer.append(url); } - for (final Map.Entry entry : entrySet()) { + for (Map.Entry entry : entrySet()) { final String key = entry.getKey(); final String val = entry.getValue(); if (separator != 0) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java index 533ed9d2e7..64a3874621 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java @@ -181,7 +181,7 @@ public class WebLinks { * @param project Project name. * @return Links for projects. */ - public List getProjectLinks(final String project) { + public List getProjectLinks(String project) { return filterLinks(projectLinks, webLink -> webLink.getProjectWeblink(project)); } @@ -190,7 +190,7 @@ public class WebLinks { * @param branch Branch name * @return Links for branches. */ - public List getBranchLinks(final String project, final String branch) { + public List getBranchLinks(String project, String branch) { return filterLinks(branchLinks, webLink -> webLink.getBranchWebLink(project, branch)); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java index 9eec82d88e..255078a494 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java @@ -58,7 +58,7 @@ public class AccountByEmailCacheImpl implements AccountByEmailCache { } @Override - public Set get(final String email) { + public Set get(String email) { try { return cache.get(email); } catch (ExecutionException e) { @@ -68,7 +68,7 @@ public class AccountByEmailCacheImpl implements AccountByEmailCache { } @Override - public void evict(final String email) { + public void evict(String email) { if (email != null) { cache.invalidate(email); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java index 1600982a73..e4df457f5c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java @@ -194,7 +194,7 @@ public class AccountCacheImpl implements AccountCache { } } - private Optional load(final ReviewDb db, final Account.Id who) + private Optional load(ReviewDb db, Account.Id who) throws OrmException, IOException, ConfigInvalidException { Account account = accounts.get(db, who); if (account == null) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java index 88a241158c..c6abb5b53f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java @@ -99,7 +99,7 @@ public class AccountControl { * because {@link GroupMembership#getKnownGroups()} may only return a subset of the effective * groups. */ - public boolean canSee(final Account.Id otherUser) { + public boolean canSee(Account.Id otherUser) { return canSee( new OtherUser() { @Override @@ -121,7 +121,7 @@ public class AccountControl { * because {@link GroupMembership#getKnownGroups()} may only return a subset of the effective * groups. */ - public boolean canSee(final AccountState otherUser) { + public boolean canSee(AccountState otherUser) { return canSee( new OtherUser() { @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java index a536c1a630..b8b4a9e0d7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java @@ -18,11 +18,11 @@ package com.google.gerrit.server.account; public class AccountException extends Exception { private static final long serialVersionUID = 1L; - public AccountException(final String message) { + public AccountException(String message) { super(message); } - public AccountException(final String message, final Throwable why) { + public AccountException(String message, Throwable why) { super(message, why); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java index 19fd34dcc0..f1a2555bad 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java @@ -21,7 +21,7 @@ package com.google.gerrit.server.account; public class AccountUserNameException extends AccountException { private static final long serialVersionUID = 1L; - public AccountUserNameException(final String message, final Throwable why) { + public AccountUserNameException(String message, Throwable why) { super(message, why); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java index 4dd99268f6..e654b8d737 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java @@ -89,7 +89,7 @@ public class AuthRequest { return password; } - public void setPassword(final String pass) { + public void setPassword(String pass) { password = pass; } @@ -97,7 +97,7 @@ public class AuthRequest { return displayName; } - public void setDisplayName(final String name) { + public void setDisplayName(String name) { displayName = name != null && name.length() > 0 ? name : null; } @@ -105,7 +105,7 @@ public class AuthRequest { return emailAddress; } - public void setEmailAddress(final String email) { + public void setEmailAddress(String email) { emailAddress = email != null && email.length() > 0 ? email : null; } @@ -113,7 +113,7 @@ public class AuthRequest { return userName; } - public void setUserName(final String user) { + public void setUserName(String user) { userName = user; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java index 795f1c5704..d8e46f46f1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java @@ -37,7 +37,7 @@ public class DefaultRealm extends AbstractRealm { } @Override - public boolean allowsEdit(final AccountFieldName field) { + public boolean allowsEdit(AccountFieldName field) { if (authConfig.getAuthType() == AuthType.HTTP) { switch (field) { case USER_NAME: @@ -62,7 +62,7 @@ public class DefaultRealm extends AbstractRealm { } @Override - public AuthRequest authenticate(final AuthRequest who) { + public AuthRequest authenticate(AuthRequest who) { if (who.getEmailAddress() == null && who.getLocalUser() != null && emailExpander.canExpand(who.getLocalUser())) { @@ -72,10 +72,10 @@ public class DefaultRealm extends AbstractRealm { } @Override - public void onCreateAccount(final AuthRequest who, final Account account) {} + public void onCreateAccount(AuthRequest who, Account account) {} @Override - public Account.Id lookup(final String accountName) { + public Account.Id lookup(String accountName) { if (emailExpander.canExpand(accountName)) { final Set c = byEmail.get(emailExpander.expand(accountName)); if (1 == c.size()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java index 3c501e9a80..af2ab199bd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java @@ -23,7 +23,7 @@ public interface EmailExpander { class None implements EmailExpander { public static final None INSTANCE = new None(); - public static boolean canHandle(final String fmt) { + public static boolean canHandle(String fmt) { return fmt == null || fmt.isEmpty(); } @@ -43,26 +43,26 @@ public interface EmailExpander { class Simple implements EmailExpander { private static final String PLACEHOLDER = "{0}"; - public static boolean canHandle(final String fmt) { + public static boolean canHandle(String fmt) { return fmt != null && fmt.contains(PLACEHOLDER); } private final String lhs; private final String rhs; - public Simple(final String fmt) { + public Simple(String fmt) { final int p = fmt.indexOf(PLACEHOLDER); lhs = fmt.substring(0, p); rhs = fmt.substring(p + PLACEHOLDER.length()); } @Override - public boolean canExpand(final String user) { + public boolean canExpand(String user) { return !user.contains(" "); } @Override - public String expand(final String user) { + public String expand(String user) { return lhs + user + rhs; } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java index b14491fb90..170688023c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java @@ -88,7 +88,7 @@ public class GroupCacheImpl implements GroupCache { } @Override - public AccountGroup get(final AccountGroup.Id groupId) { + public AccountGroup get(AccountGroup.Id groupId) { try { Optional g = byId.get(groupId); return g.isPresent() ? g.get() : missing(groupId); @@ -99,7 +99,7 @@ public class GroupCacheImpl implements GroupCache { } @Override - public void evict(final AccountGroup group) throws IOException { + public void evict(AccountGroup group) throws IOException { if (group.getId() != null) { byId.invalidate(group.getId()); } @@ -113,8 +113,8 @@ public class GroupCacheImpl implements GroupCache { } @Override - public void evictAfterRename( - final AccountGroup.NameKey oldName, final AccountGroup.NameKey newName) throws IOException { + public void evictAfterRename(final AccountGroup.NameKey oldName, AccountGroup.NameKey newName) + throws IOException { if (oldName != null) { byName.invalidate(oldName.get()); } @@ -175,12 +175,12 @@ public class GroupCacheImpl implements GroupCache { private final SchemaFactory schema; @Inject - ByIdLoader(final SchemaFactory sf) { + ByIdLoader(SchemaFactory sf) { schema = sf; } @Override - public Optional load(final AccountGroup.Id key) throws Exception { + public Optional load(AccountGroup.Id key) throws Exception { try (ReviewDb db = schema.open()) { return Optional.ofNullable(db.accountGroups().get(key)); } @@ -191,7 +191,7 @@ public class GroupCacheImpl implements GroupCache { private final SchemaFactory schema; @Inject - ByNameLoader(final SchemaFactory sf) { + ByNameLoader(SchemaFactory sf) { schema = sf; } @@ -212,7 +212,7 @@ public class GroupCacheImpl implements GroupCache { private final SchemaFactory schema; @Inject - ByUUIDLoader(final SchemaFactory sf) { + ByUUIDLoader(SchemaFactory sf) { schema = sf; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java index 4bab3a7559..6ba2e5e365 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupComparator.java @@ -20,7 +20,7 @@ import java.util.Comparator; public class GroupComparator implements Comparator { @Override - public int compare(final AccountGroup group1, final AccountGroup group2) { + public int compare(AccountGroup group1, AccountGroup group2) { return group1.getName().compareTo(group2.getName()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java index e88e97e761..4b4c2663be 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java @@ -32,11 +32,11 @@ public class GroupControl { private final GroupBackend groupBackend; @Inject - GenericFactory(final GroupBackend gb) { + GenericFactory(GroupBackend gb) { groupBackend = gb; } - public GroupControl controlFor(final CurrentUser who, final AccountGroup.UUID groupId) + public GroupControl controlFor(CurrentUser who, AccountGroup.UUID groupId) throws NoSuchGroupException { final GroupDescription.Basic group = groupBackend.get(groupId); if (group == null) { @@ -52,13 +52,13 @@ public class GroupControl { private final GroupBackend groupBackend; @Inject - Factory(final GroupCache gc, final Provider cu, final GroupBackend gb) { + Factory(GroupCache gc, Provider cu, GroupBackend gb) { groupCache = gc; user = cu; groupBackend = gb; } - public GroupControl controlFor(final AccountGroup.Id groupId) throws NoSuchGroupException { + public GroupControl controlFor(AccountGroup.Id groupId) throws NoSuchGroupException { final AccountGroup group = groupCache.get(groupId); if (group == null) { throw new NoSuchGroupException(groupId); @@ -66,7 +66,7 @@ public class GroupControl { return controlFor(GroupDescriptions.forAccountGroup(group)); } - public GroupControl controlFor(final AccountGroup.UUID groupId) throws NoSuchGroupException { + public GroupControl controlFor(AccountGroup.UUID groupId) throws NoSuchGroupException { final GroupDescription.Basic group = groupBackend.get(groupId); if (group == null) { throw new NoSuchGroupException(groupId); @@ -82,7 +82,7 @@ public class GroupControl { return new GroupControl(user.get(), group, groupBackend); } - public GroupControl validateFor(final AccountGroup.Id groupId) throws NoSuchGroupException { + public GroupControl validateFor(AccountGroup.Id groupId) throws NoSuchGroupException { final GroupControl c = controlFor(groupId); if (!c.isVisible()) { throw new NoSuchGroupException(groupId); @@ -90,7 +90,7 @@ public class GroupControl { return c; } - public GroupControl validateFor(final AccountGroup.UUID groupUUID) throws NoSuchGroupException { + public GroupControl validateFor(AccountGroup.UUID groupUUID) throws NoSuchGroupException { final GroupControl c = controlFor(groupUUID); if (!c.isVisible()) { throw new NoSuchGroupException(groupUUID); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java index 1c9baf846a..e1fc1011d6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java @@ -139,7 +139,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { private final SchemaFactory schema; @Inject - SubgroupsLoader(final SchemaFactory sf) { + SubgroupsLoader(SchemaFactory sf) { schema = sf; } @@ -165,7 +165,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { private final SchemaFactory schema; @Inject - ParentGroupsLoader(final SchemaFactory sf) { + ParentGroupsLoader(SchemaFactory sf) { schema = sf; } @@ -190,7 +190,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { private final SchemaFactory schema; @Inject - AllExternalLoader(final SchemaFactory sf) { + AllExternalLoader(SchemaFactory sf) { schema = sf; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java index ea99b9bae1..d84d051c19 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java @@ -58,7 +58,7 @@ public class GroupMembers { this.currentUser = currentUser; } - public Set listAccounts(final AccountGroup.UUID groupUUID, final Project.NameKey project) + public Set listAccounts(AccountGroup.UUID groupUUID, Project.NameKey project) throws NoSuchGroupException, NoSuchProjectException, OrmException, IOException { return listAccounts(groupUUID, project, new HashSet()); } @@ -78,8 +78,7 @@ public class GroupMembers { return Collections.emptySet(); } - private Set getProjectOwners( - final Project.NameKey project, final Set seen) + private Set getProjectOwners(final Project.NameKey project, Set seen) throws NoSuchProjectException, NoSuchGroupException, OrmException, IOException { seen.add(SystemGroupBackend.PROJECT_OWNERS); if (project == null) { @@ -90,7 +89,7 @@ public class GroupMembers { projectControl.controlFor(project, currentUser).getProjectState().getAllOwners(); final HashSet projectOwners = new HashSet<>(); - for (final AccountGroup.UUID ownerGroup : ownerGroups) { + for (AccountGroup.UUID ownerGroup : ownerGroups) { if (!seen.contains(ownerGroup)) { projectOwners.addAll(listAccounts(ownerGroup, project, seen)); } @@ -99,19 +98,19 @@ public class GroupMembers { } private Set getGroupMembers( - final AccountGroup group, final Project.NameKey project, final Set seen) + final AccountGroup group, Project.NameKey project, Set seen) throws NoSuchGroupException, OrmException, NoSuchProjectException, IOException { seen.add(group.getGroupUUID()); final GroupDetail groupDetail = groupDetailFactory.create(group.getId()).call(); final Set members = new HashSet<>(); if (groupDetail.members != null) { - for (final AccountGroupMember member : groupDetail.members) { + for (AccountGroupMember member : groupDetail.members) { members.add(accountCache.get(member.getAccountId()).getAccount()); } } if (groupDetail.includes != null) { - for (final AccountGroupById groupInclude : groupDetail.includes) { + for (AccountGroupById groupInclude : groupDetail.includes) { final AccountGroup includedGroup = groupCache.get(groupInclude.getIncludeUUID()); if (includedGroup != null && !seen.contains(includedGroup.getGroupUUID())) { members.addAll(listAccounts(includedGroup.getGroupUUID(), project, seen)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java index b0ada0df44..a42362c261 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java @@ -64,7 +64,7 @@ public class InternalGroupBackend implements GroupBackend { } @Override - public Collection suggest(final String name, final ProjectControl project) { + public Collection suggest(String name, ProjectControl project) { return groupCache .all() .stream() diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java index cbd2072782..cc39883885 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java @@ -109,7 +109,7 @@ class ChangesImpl implements Changes { return query().withQuery(query); } - private List get(final QueryRequest q) throws RestApiException { + private List get(QueryRequest q) throws RestApiException { QueryChanges qc = queryProvider.get(); if (q.getQuery() != null) { qc.addQuery(q.getQuery()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java index 4d135b846f..d41f02cd1b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java @@ -39,7 +39,7 @@ public class AccountGroupIdHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String n = params.getParameter(0); final AccountGroup group = groupCache.get(new AccountGroup.NameKey(n)); if (group == null) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java index 79ab8c8726..d547b8c16f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java @@ -41,7 +41,7 @@ public class AccountGroupUUIDHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String n = params.getParameter(0); GroupReference group = GroupBackends.findExactSuggestion(groupBackend, n); if (group == null) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java index bdf0c9134e..0e841ec644 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java @@ -45,7 +45,7 @@ public class ChangeIdHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String token = params.getParameter(0); final String[] tokens = token.split(","); if (tokens.length != 3) { @@ -57,7 +57,7 @@ public class ChangeIdHandler extends OptionHandler { final Change.Key key = Change.Key.parse(tokens[2]); final Project.NameKey project = new Project.NameKey(tokens[0]); final Branch.NameKey branch = new Branch.NameKey(project, tokens[1]); - for (final ChangeData cd : queryProvider.get().byBranchKey(branch, key)) { + for (ChangeData cd : queryProvider.get().byBranchKey(branch, key)) { setter.addValue(cd.getId()); return 1; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java index e8283bee1f..cb70abfe4c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java @@ -35,7 +35,7 @@ public class PatchSetIdHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String token = params.getParameter(0); final PatchSet.Id id; try { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java index bd0cdcda28..18235271d7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java @@ -58,7 +58,7 @@ public class ProjectControlHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { String projectName = params.getParameter(0); while (projectName.endsWith("/")) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java index e0193c51ae..4325c002cc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java @@ -36,7 +36,7 @@ public class SocketAddressHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String token = params.getParameter(0); try { setter.addValue(SocketUtil.parse(token, 0)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java index b7af2e7194..0be75a7e81 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java @@ -34,7 +34,7 @@ public class SubcommandHandler extends OptionHandler { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { setter.addValue(params.getParameter(0)); owner.stopOptionParsing(); return 1; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java index b0b6142bb3..1b1faa4aa4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java @@ -20,7 +20,7 @@ import com.google.gerrit.server.account.AccountException; public class AuthenticationUnavailableException extends AccountException { private static final long serialVersionUID = 1L; - public AuthenticationUnavailableException(final String message, final Throwable why) { + public AuthenticationUnavailableException(String message, Throwable why) { super(message, why); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java index 3ad97b0cbb..af9c51b6a5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java @@ -33,7 +33,7 @@ public final class UniversalAuthBackend implements AuthBackend { } @Override - public AuthUser authenticate(final AuthRequest request) throws AuthException { + public AuthUser authenticate(AuthRequest request) throws AuthException { List authUsers = new ArrayList<>(); List authExs = new ArrayList<>(); for (AuthBackend backend : authBackends) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java index 1acd647d33..d0a1285a06 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java @@ -135,7 +135,7 @@ class Helper { return new InitialDirContext(env); } - private DirContext kerberosOpen(final Properties env) throws LoginException, NamingException { + private DirContext kerberosOpen(Properties env) throws LoginException, NamingException { LoginContext ctx = new LoginContext("KerberosLogin"); ctx.login(); Subject subject = ctx.getSubject(); @@ -207,8 +207,7 @@ class Helper { } Set queryForGroups( - final DirContext ctx, final String username, LdapQuery.Result account) - throws NamingException { + final DirContext ctx, String username, LdapQuery.Result account) throws NamingException { final LdapSchema schema = getSchema(ctx); final Set groupDNs = new HashSet<>(); @@ -330,7 +329,7 @@ class Helper { final ParameterizedString groupName; final List groupMemberQueryList; - LdapSchema(final DirContext ctx) { + LdapSchema(DirContext ctx) { type = discoverLdapType(ctx); groupMemberQueryList = new ArrayList<>(); accountQueryList = new ArrayList<>(); @@ -360,7 +359,7 @@ class Helper { throw new IllegalArgumentException("No variables in ldap.groupMemberPattern"); } - for (final String name : groupMemberQuery.getParameters()) { + for (String name : groupMemberQuery.getParameters()) { accountAtts.add(name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java index 1a8d916bb4..3683b35f73 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java @@ -113,7 +113,7 @@ public class LdapGroupBackend implements GroupBackend { } @Override - public GroupDescription.Basic get(final AccountGroup.UUID uuid) { + public GroupDescription.Basic get(AccountGroup.UUID uuid) { if (!handles(uuid)) { return null; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java index 28eb05da44..3d25e864b5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java @@ -61,8 +61,7 @@ class LdapQuery { return pattern.getParameterNames(); } - List query(final DirContext ctx, final Map params) - throws NamingException { + List query(DirContext ctx, Map params) throws NamingException { final SearchControls sc = new SearchControls(); final NamingEnumeration res; @@ -87,9 +86,9 @@ class LdapQuery { class Result { private final Map atts = new HashMap<>(); - Result(final SearchResult sr) { + Result(SearchResult sr) { if (returnAttributes != null) { - for (final String attName : returnAttributes) { + for (String attName : returnAttributes) { final Attribute a = sr.getAttributes().get(attName); if (a != null && a.size() > 0) { atts.put(attName, a); @@ -111,12 +110,12 @@ class LdapQuery { return get("dn"); } - String get(final String attName) throws NamingException { + String get(String attName) throws NamingException { final Attribute att = getAll(attName); return att != null && 0 < att.size() ? String.valueOf(att.get(0)) : null; } - Attribute getAll(final String attName) { + Attribute getAll(String attName) { return atts.get(attName); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java index 4685dc0699..50df3e8ecc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java @@ -110,11 +110,11 @@ class LdapRealm extends AbstractRealm { mandatoryGroup = optional(config, "mandatoryGroup"); } - static SearchScope scope(final Config c, final String setting) { + static SearchScope scope(Config c, String setting) { return c.getEnum("ldap", null, setting, SearchScope.SUBTREE); } - static String optional(final Config config, final String name) { + static String optional(Config config, String name) { return config.getString("ldap", null, name); } @@ -134,7 +134,7 @@ class LdapRealm extends AbstractRealm { return config.getBoolean("ldap", name, defaultValue); } - static String required(final Config config, final String name) { + static String required(Config config, String name) { final String v = optional(config, name); if (v == null || "".equals(v)) { throw new IllegalArgumentException("No ldap." + name + " configured"); @@ -142,12 +142,12 @@ class LdapRealm extends AbstractRealm { return v; } - static List optionalList(final Config config, final String name) { + static List optionalList(Config config, String name) { String[] s = config.getStringList("ldap", null, name); return Arrays.asList(s); } - static List requiredList(final Config config, final String name) { + static List requiredList(Config config, String name) { List vlist = optionalList(config, name); if (vlist.isEmpty()) { @@ -157,7 +157,7 @@ class LdapRealm extends AbstractRealm { return vlist; } - static String optdef(final Config c, final String n, final String d) { + static String optdef(Config c, String n, String d) { final String[] v = c.getStringList("ldap", null, n); if (v == null || v.length == 0) { return d; @@ -171,7 +171,7 @@ class LdapRealm extends AbstractRealm { } } - static String reqdef(final Config c, final String n, final String d) { + static String reqdef(Config c, String n, String d) { final String v = optdef(c, n, d); if (v == null) { throw new IllegalArgumentException("No ldap." + n + " configured"); @@ -200,7 +200,7 @@ class LdapRealm extends AbstractRealm { } @Override - public boolean allowsEdit(final AccountFieldName field) { + public boolean allowsEdit(AccountFieldName field) { return !readOnlyAccountFields.contains(field); } @@ -210,7 +210,7 @@ class LdapRealm extends AbstractRealm { } final Map values = new HashMap<>(); - for (final String name : m.attributes()) { + for (String name : m.attributes()) { values.put(name, m.get(name)); } @@ -219,7 +219,7 @@ class LdapRealm extends AbstractRealm { } @Override - public AuthRequest authenticate(final AuthRequest who) throws AccountException { + public AuthRequest authenticate(AuthRequest who) throws AccountException { if (config.getBoolean("ldap", "localUsernameToLowerCase", false)) { who.setLocalUser(who.getLocalUser().toLowerCase(Locale.US)); } @@ -298,7 +298,7 @@ class LdapRealm extends AbstractRealm { } @Override - public void onCreateAccount(final AuthRequest who, final Account account) { + public void onCreateAccount(AuthRequest who, Account account) { usernameCache.put(who.getLocalUser(), Optional.of(account.getId())); } @@ -335,7 +335,7 @@ class LdapRealm extends AbstractRealm { private final Helper helper; @Inject - MemberLoader(final Helper helper) { + MemberLoader(Helper helper) { this.helper = helper; } @@ -358,12 +358,12 @@ class LdapRealm extends AbstractRealm { private final Helper helper; @Inject - ExistenceLoader(final Helper helper) { + ExistenceLoader(Helper helper) { this.helper = helper; } @Override - public Boolean load(final String groupDn) throws Exception { + public Boolean load(String groupDn) throws Exception { final DirContext ctx = helper.open(); try { Name compositeGroupName = new CompositeName().add(groupDn); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java index 5df13f9a75..fe1f1ffd1f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java @@ -22,7 +22,7 @@ import javax.naming.directory.DirContext; abstract class LdapType { static final LdapType RFC_2307 = new Rfc2307(); - static LdapType guessType(final DirContext ctx) throws NamingException { + static LdapType guessType(DirContext ctx) throws NamingException { final Attributes rootAtts = ctx.getAttributes(""); Attribute supported = rootAtts.get("supportedCapabilities"); if (supported != null diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java index 369914dc60..00386089c6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java @@ -36,7 +36,7 @@ public enum SearchScope { private final int scope; - SearchScope(final int scope) { + SearchScope(int scope) { this.scope = scope; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java index 6a692d7e94..70e1619529 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java @@ -457,7 +457,7 @@ public class ChangeInserter implements InsertChangeOp { } private Set filterOnChangeVisibility( - final ReviewDb db, final ChangeNotes notes, Set accounts) { + final ReviewDb db, ChangeNotes notes, Set accounts) { return accounts .stream() .filter( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java index ca70b0e34e..d0e489bb6d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -475,7 +475,7 @@ public class ConsistencyChecker { } private void insertMergedPatchSet( - final RevCommit commit, final @Nullable PatchSet.Id psIdToDelete, boolean reuseOldPsId) { + final RevCommit commit, @Nullable PatchSet.Id psIdToDelete, boolean reuseOldPsId) { ProblemInfo notFound = problem("No patch set found for merged commit " + commit.name()); if (!user.get().isIdentifiedUser()) { notFound.status = Status.FIX_FAILED; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java index 01401b8766..0c2ec68d6c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java @@ -136,7 +136,7 @@ public class FileContentUtil { } } - private static BinaryResult asBinaryResult(byte[] raw, final ObjectLoader obj) { + private static BinaryResult asBinaryResult(byte[] raw, ObjectLoader obj) { if (raw != null) { return BinaryResult.create(raw); } @@ -206,7 +206,7 @@ public class FileContentUtil { @SuppressWarnings("resource") private BinaryResult zipBlob( - final String path, final ObjectLoader obj, RevCommit commit, @Nullable final String suffix) { + final String path, ObjectLoader obj, RevCommit commit, @Nullable final String suffix) { final String commitName = commit.getName(); final long when = commit.getCommitTime() * 1000L; return new BinaryResult() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java index 6449f9bce2..1ac5a88f24 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java @@ -441,7 +441,7 @@ public class GetDiff implements RestReadView { } @Override - public final int parseArguments(final Parameters params) throws CmdLineException { + public final int parseArguments(Parameters params) throws CmdLineException { final String value = params.getParameter(0); short context; if ("all".equalsIgnoreCase(value)) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java index 843ef3ceac..6111dfb86e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java @@ -42,8 +42,7 @@ public class IncludedInResolver { private static final Logger log = LoggerFactory.getLogger(IncludedInResolver.class); - public static Result resolve(final Repository repo, final RevWalk rw, final RevCommit commit) - throws IOException { + public static Result resolve(Repository repo, RevWalk rw, RevCommit commit) throws IOException { RevFlag flag = newFlag(rw); try { return new IncludedInResolver(repo, rw, commit, flag).resolve(); @@ -53,7 +52,7 @@ public class IncludedInResolver { } public static boolean includedInOne( - final Repository repo, final RevWalk rw, final RevCommit commit, final Collection refs) + final Repository repo, RevWalk rw, RevCommit commit, Collection refs) throws IOException { RevFlag flag = newFlag(rw); try { @@ -100,7 +99,7 @@ public class IncludedInResolver { return detail; } - private boolean includedInOne(final Collection refs) throws IOException { + private boolean includedInOne(Collection refs) throws IOException { parseCommits(refs); List before = new ArrayList<>(); List after = new ArrayList<>(); @@ -112,7 +111,7 @@ public class IncludedInResolver { } /** Resolves which tip refs include the target commit. */ - private Set includedIn(final Collection tips, int limit) + private Set includedIn(Collection tips, int limit) throws IOException, MissingObjectException, IncorrectObjectTypeException { Set result = new HashSet<>(); for (RevCommit tip : tips) { @@ -149,7 +148,7 @@ public class IncludedInResolver { * @param before * @param after */ - private void partition(final List before, final List after) { + private void partition(List before, List after) { int insertionPoint = Collections.binarySearch( tipsByCommitTime, @@ -187,7 +186,7 @@ public class IncludedInResolver { } /** Parse commit of ref and store the relation between ref and commit. */ - private void parseCommits(final Collection refs) throws IOException { + private void parseCommits(Collection refs) throws IOException { if (commitToRef != null) { return; } @@ -219,7 +218,7 @@ public class IncludedInResolver { sortOlderFirst(tipsByCommitTime); } - private void sortOlderFirst(final List tips) { + private void sortOlderFirst(List tips) { Collections.sort( tips, new Comparator() { @@ -236,7 +235,7 @@ public class IncludedInResolver { public Result() {} - public void setBranches(final List b) { + public void setBranches(List b) { Collections.sort(b); branches = b; } @@ -245,7 +244,7 @@ public class IncludedInResolver { return branches; } - public void setTags(final List t) { + public void setTags(List t) { Collections.sort(t); tags = t; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java index 7b932778bc..6540e5b94c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java @@ -126,7 +126,7 @@ public class AuthConfig { return Collections.unmodifiableList(r); } - private static AuthType toType(final Config cfg) { + private static AuthType toType(Config cfg) { return cfg.getEnum("auth", null, "type", AuthType.OPENID); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java index 7b407865de..16c7508561 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java @@ -31,7 +31,7 @@ public class CacheResource extends ConfigResource { this.cacheProvider = cacheProvider; } - public CacheResource(String pluginName, String cacheName, final Cache cache) { + public CacheResource(String pluginName, String cacheName, Cache cache) { this( pluginName, cacheName, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java index 0da1d3b9aa..c6527fdc53 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java @@ -31,7 +31,7 @@ import org.eclipse.jgit.lib.Config; public class ConfigUtil { @SuppressWarnings("unchecked") - private static T[] allValuesOf(final T defaultValue) { + private static T[] allValuesOf(T defaultValue) { try { return (T[]) defaultValue.getClass().getMethod("values").invoke(null); } catch (IllegalArgumentException @@ -63,7 +63,7 @@ public class ConfigUtil { final T[] all) { String n = valueString.replace(' ', '_').replace('-', '_'); - for (final T e : all) { + for (T e : all) { if (e.name().equalsIgnoreCase(n)) { return e; } @@ -81,7 +81,7 @@ public class ConfigUtil { r.append("."); r.append(setting); r.append("; supported values are: "); - for (final T e : all) { + for (T e : all) { r.append(e.name()); r.append(" "); } @@ -194,7 +194,7 @@ public class ConfigUtil { * assume if the value does not contain an indication of the units. * @return the setting, or {@code defaultValue} if not set, expressed in {@code units}. */ - public static long getTimeUnit(final String valueString, long defaultValue, TimeUnit wantUnit) { + public static long getTimeUnit(String valueString, long defaultValue, TimeUnit wantUnit) { Matcher m = Pattern.compile("^(0|[1-9][0-9]*)\\s*(.*)$").matcher(valueString); if (!m.matches()) { return defaultValue; @@ -410,8 +410,8 @@ public class ConfigUtil { return Integer.class == t || int.class == t; } - private static boolean match(final String a, final String... cases) { - for (final String b : cases) { + private static boolean match(String a, String... cases) { + for (String b : cases) { if (b != null && b.equalsIgnoreCase(a)) { return true; } @@ -434,7 +434,7 @@ public class ConfigUtil { + valueString); } - private static IllegalArgumentException notTimeUnit(final String val) { + private static IllegalArgumentException notTimeUnit(String val) { return new IllegalArgumentException("Invalid time unit value: " + val); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java index 100a7cde9a..a93d1f2a8c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java @@ -32,7 +32,7 @@ import org.eclipse.jgit.util.FS; /** Creates {@link GerritServerConfig}. */ public class GerritServerConfigModule extends AbstractModule { - public static String getSecureStoreClassName(final Path sitePath) { + public static String getSecureStoreClassName(Path sitePath) { if (sitePath != null) { return getSecureStoreFromGerritConfig(sitePath); } @@ -41,7 +41,7 @@ public class GerritServerConfigModule extends AbstractModule { return nullToDefault(secureStoreProperty); } - private static String getSecureStoreFromGerritConfig(final Path sitePath) { + private static String getSecureStoreFromGerritConfig(Path sitePath) { AbstractModule m = new AbstractModule() { @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java index 4358186e33..fdb400bda2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java @@ -32,7 +32,7 @@ public class RequestScopedReviewDbProvider implements Provider { @Inject public RequestScopedReviewDbProvider( - final SchemaFactory schema, final Provider cleanup) { + final SchemaFactory schema, Provider cleanup) { this.schema = schema; this.cleanup = cleanup; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java index ac2f0c6fd1..ddd28777c7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java @@ -25,7 +25,7 @@ public class TrackingFooter { private final Pattern match; private final String system; - public TrackingFooter(String f, final String m, final String s) throws PatternSyntaxException { + public TrackingFooter(String f, String m, String s) throws PatternSyntaxException { f = f.trim(); if (f.endsWith(":")) { f = f.substring(0, f.length() - 1); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java index a897bdc6ea..85528d9aeb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java @@ -23,7 +23,7 @@ import org.eclipse.jgit.revwalk.FooterLine; public class TrackingFooters { protected List trackingFooters; - public TrackingFooters(final List trFooters) { + public TrackingFooters(List trFooters) { trackingFooters = trFooters; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 15c1ae99c3..f1d7d9686b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -149,7 +149,7 @@ public class StreamEventsApiListener return psUtil.get(db.get(), notes, PatchSet.Id.fromRef(info.ref)); } - private Supplier changeAttributeSupplier(final Change change) { + private Supplier changeAttributeSupplier(Change change) { return Suppliers.memoize( new Supplier() { @Override @@ -159,7 +159,7 @@ public class StreamEventsApiListener }); } - private Supplier accountAttributeSupplier(final AccountInfo account) { + private Supplier accountAttributeSupplier(AccountInfo account) { return Suppliers.memoize( new Supplier() { @Override @@ -172,7 +172,7 @@ public class StreamEventsApiListener } private Supplier patchSetAttributeSupplier( - final Change change, final PatchSet patchSet) { + final Change change, PatchSet patchSet) { return Suppliers.memoize( new Supplier() { @Override @@ -298,7 +298,7 @@ public class StreamEventsApiListener } @Override - public void onReviewerDeleted(final ReviewerDeletedListener.Event ev) { + public void onReviewerDeleted(ReviewerDeletedListener.Event ev) { try { ChangeNotes notes = getNotes(ev.getChange()); Change change = notes.getChange(); @@ -362,7 +362,7 @@ public class StreamEventsApiListener } @Override - public void onGitReferenceUpdated(final GitReferenceUpdatedListener.Event ev) { + public void onGitReferenceUpdated(GitReferenceUpdatedListener.Event ev) { RefUpdatedEvent event = new RefUpdatedEvent(); if (ev.getUpdater() != null) { event.submitter = accountAttributeSupplier(ev.getUpdater()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java index b48c5b060e..d547d7fdb2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java @@ -42,7 +42,7 @@ public class MergeSorter { this.incoming = incoming; } - Collection sort(final Collection toMerge) throws IOException { + Collection sort(Collection toMerge) throws IOException { final Set heads = new HashSet<>(); final Set sort = new HashSet<>(toMerge); while (!sort.isEmpty()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java index 4d2329ae2d..6e17cdf426 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java @@ -194,7 +194,7 @@ public class MergeUtil { public CodeReviewCommit getFirstFastForward( CodeReviewCommit mergeTip, RevWalk rw, List toMerge) throws IntegrationException { - for (final Iterator i = toMerge.iterator(); i.hasNext(); ) { + for (Iterator i = toMerge.iterator(); i.hasNext(); ) { try { final CodeReviewCommit n = i.next(); if (mergeTip == null || rw.isMergedInto(mergeTip, n)) { @@ -354,7 +354,7 @@ public class MergeUtil { PatchSetApproval submitAudit = null; - for (final PatchSetApproval a : safeGetApprovals(ctl, psId)) { + for (PatchSetApproval a : safeGetApprovals(ctl, psId)) { if (a.getValue() <= 0) { // Negative votes aren't counted. continue; @@ -475,10 +475,7 @@ public class MergeUtil { } public boolean canMerge( - MergeSorter mergeSorter, - Repository repo, - CodeReviewCommit mergeTip, - CodeReviewCommit toMerge) + MergeSorter mergeSorter, Repository repo, CodeReviewCommit mergeTip, CodeReviewCommit toMerge) throws IntegrationException { if (hasMissingDependencies(mergeSorter, toMerge)) { return false; @@ -562,8 +559,8 @@ public class MergeUtil { || canMerge(mergeSorter, repo, mergeTip, toMerge); } - public boolean hasMissingDependencies( - MergeSorter mergeSorter, CodeReviewCommit toMerge) throws IntegrationException { + public boolean hasMissingDependencies(MergeSorter mergeSorter, CodeReviewCommit toMerge) + throws IntegrationException { try { return !mergeSorter.sort(Collections.singleton(toMerge)).contains(toMerge); } catch (IOException e) { @@ -758,10 +755,7 @@ public class MergeUtil { } public void markCleanMerges( - RevWalk rw, - RevFlag canMergeFlag, - CodeReviewCommit mergeTip, - Set alreadyAccepted) + RevWalk rw, RevFlag canMergeFlag, CodeReviewCommit mergeTip, Set alreadyAccepted) throws IntegrationException { if (mergeTip == null) { // If mergeTip is null here, branchTip was null, indicating a new branch diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java index c2b5947155..ff16ab6f7c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -263,8 +263,7 @@ public class CommitValidators { || NEW_PATCHSET.matcher(event.command.getRefName()).matches(); } - private CommitValidationMessage getMissingChangeIdErrorMsg( - final String errMsg, final RevCommit c) { + private CommitValidationMessage getMissingChangeIdErrorMsg(String errMsg, RevCommit c) { StringBuilder sb = new StringBuilder(); sb.append("ERROR: ").append(errMsg); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java index f88460bfc0..ce287d0c0d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java @@ -123,7 +123,7 @@ class DbGroupMemberAuditListener implements GroupMemberAuditListener { public void onDeleteGroupsFromGroup(Account.Id me, Collection removed) { final List auditUpdates = new ArrayList<>(); try (ReviewDb db = schema.open()) { - for (final AccountGroupById g : removed) { + for (AccountGroupById g : removed) { AccountGroupByIdAud audit = null; for (AccountGroupByIdAud a : db.accountGroupByIdAud().byGroupInclude(g.getGroupId(), g.getIncludeUUID())) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java index 9f612bfbdc..1e1008c7aa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java @@ -75,7 +75,7 @@ public class DeleteIncludedGroups implements RestModifyView toRemove = new ArrayList<>(); - for (final String includedGroup : input.groups) { + for (String includedGroup : input.groups) { GroupDescription.Basic d = groupsCollection.parse(includedGroup); if (!control.canRemoveGroup()) { throw new AuthException(String.format("Cannot delete group: %s", d.getName())); @@ -90,7 +90,7 @@ public class DeleteIncludedGroups implements RestModifyView getIncludedGroups(final AccountGroup.Id groupId) + private Map getIncludedGroups(AccountGroup.Id groupId) throws OrmException { final Map groups = new HashMap<>(); for (AccountGroupById g : db.get().accountGroupById().byGroup(groupId)) { @@ -108,7 +108,7 @@ public class DeleteIncludedGroups implements RestModifyView toRemoved) { + private void writeAudits(List toRemoved) { final Account.Id me = self.get().getAccountId(); auditService.dispatchDeleteGroupsFromGroup(me, toRemoved); } @@ -121,7 +121,7 @@ public class DeleteIncludedGroups implements RestModifyView delete; @Inject - DeleteIncludedGroup(final Provider delete) { + DeleteIncludedGroup(Provider delete) { this.delete = delete; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java index e365ce3443..d9b1c3d277 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java @@ -75,7 +75,7 @@ public class DeleteMembers implements RestModifyView { final Map members = getMembers(internalGroup.getId()); final List toRemove = new ArrayList<>(); - for (final String nameOrEmail : input.members) { + for (String nameOrEmail : input.members) { Account a = accounts.parse(nameOrEmail).getAccount(); if (!control.canRemoveMember()) { @@ -90,22 +90,22 @@ public class DeleteMembers implements RestModifyView { writeAudits(toRemove); db.get().accountGroupMembers().delete(toRemove); - for (final AccountGroupMember m : toRemove) { + for (AccountGroupMember m : toRemove) { accountCache.evict(m.getAccountId()); } return Response.none(); } - private void writeAudits(final List toRemove) { + private void writeAudits(List toRemove) { final Account.Id me = self.get().getAccountId(); auditService.dispatchDeleteAccountsFromGroup(me, toRemove); } - private Map getMembers(final AccountGroup.Id groupId) + private Map getMembers(AccountGroup.Id groupId) throws OrmException { final Map members = new HashMap<>(); - for (final AccountGroupMember m : db.get().accountGroupMembers().byGroup(groupId)) { + for (AccountGroupMember m : db.get().accountGroupMembers().byGroup(groupId)) { members.put(m.getAccountId(), m); } return members; @@ -118,7 +118,7 @@ public class DeleteMembers implements RestModifyView { private final Provider delete; @Inject - DeleteMember(final Provider delete) { + DeleteMember(Provider delete) { this.delete = delete; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java index 5e3110cd5f..d32afa295c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java @@ -253,9 +253,9 @@ public class ListGroups implements RestReadView { List groupList; if (!projects.isEmpty()) { Map groups = new HashMap<>(); - for (final ProjectControl projectControl : projects) { + for (ProjectControl projectControl : projects) { final Set groupsRefs = projectControl.getAllGroups(); - for (final GroupReference groupRef : groupsRefs) { + for (GroupReference groupRef : groupsRefs) { final AccountGroup group = groupCache.get(groupRef.getUUID()); if (group != null) { groups.put(group.getGroupUUID(), group); @@ -294,7 +294,7 @@ public class ListGroups implements RestReadView { limit <= 0 ? 10 : Math.min(limit, 10))); List groupInfos = Lists.newArrayListWithCapacity(groupRefs.size()); - for (final GroupReference ref : groupRefs) { + for (GroupReference ref : groupRefs) { GroupDescription.Basic desc = groupBackend.get(ref.getUUID()); if (desc != null) { groupInfos.add(json.addOptions(options).format(desc)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java index 8e2c925cf5..b24d094ad0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java @@ -61,7 +61,7 @@ public class ListMembers implements RestReadView { } @Override - public List apply(final GroupResource resource) + public List apply(GroupResource resource) throws MethodNotAllowedException, OrmException { if (resource.toAccountGroup() == null) { throw new MethodNotAllowedException(); @@ -83,7 +83,7 @@ public class ListMembers implements RestReadView { } private Map getMembers( - final AccountGroup.UUID groupUUID, final HashSet seenGroups) + final AccountGroup.UUID groupUUID, HashSet seenGroups) throws OrmException { seenGroups.add(groupUUID); @@ -103,7 +103,7 @@ public class ListMembers implements RestReadView { } if (groupDetail.members != null) { - for (final AccountGroupMember m : groupDetail.members) { + for (AccountGroupMember m : groupDetail.members) { if (!members.containsKey(m.getAccountId())) { members.put(m.getAccountId(), accountLoader.get(m.getAccountId())); } @@ -112,7 +112,7 @@ public class ListMembers implements RestReadView { if (recursive) { if (groupDetail.includes != null) { - for (final AccountGroupById includedGroup : groupDetail.includes) { + for (AccountGroupById includedGroup : groupDetail.includes) { if (!seenGroups.contains(includedGroup.getIncludeUUID())) { members.putAll(getMembers(includedGroup.getIncludeUUID(), seenGroups)); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java index 5e06242b66..0fae9c9229 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/Schema.java @@ -176,7 +176,7 @@ public class Schema { * @param fillArgs arguments for filling fields. * @return all non-null field values from the object. */ - public final Iterable> buildFields(final T obj, final FillArgs fillArgs) { + public final Iterable> buildFields(T obj, FillArgs fillArgs) { return FluentIterable.from(fields.values()) .transform( new Function, Values>() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java index 47a8cadad7..a8cc8aaf5a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java @@ -59,7 +59,7 @@ public class AllAccountsIndexer extends SiteIndexer> futures = new ArrayList<>(); final AtomicBoolean ok = new AtomicBoolean(true); - for (final ProjectHolder project : projects) { + for (ProjectHolder project : projects) { ListenableFuture future = executor.submit( reindexProject( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java index 5f778779fa..c7f2ecd54e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java @@ -41,7 +41,7 @@ import org.eclipse.jgit.util.IO; public class BasicSerialization { private static final byte[] NO_BYTES = {}; - private static int safeRead(final InputStream input) throws IOException { + private static int safeRead(InputStream input) throws IOException { final int b = input.read(); if (b == -1) { throw new EOFException(); @@ -50,20 +50,20 @@ public class BasicSerialization { } /** Read a fixed-width 64 bit integer in network byte order (big-endian). */ - public static long readFixInt64(final InputStream input) throws IOException { + public static long readFixInt64(InputStream input) throws IOException { final long h = readFixInt32(input); final long l = readFixInt32(input) & 0xFFFFFFFFL; return (h << 32) | l; } /** Write a fixed-width 64 bit integer in network byte order (big-endian). */ - public static void writeFixInt64(final OutputStream output, final long val) throws IOException { + public static void writeFixInt64(OutputStream output, long val) throws IOException { writeFixInt32(output, (int) (val >>> 32)); writeFixInt32(output, (int) (val & 0xFFFFFFFFL)); } /** Read a fixed-width 32 bit integer in network byte order (big-endian). */ - public static int readFixInt32(final InputStream input) throws IOException { + public static int readFixInt32(InputStream input) throws IOException { final int b1 = safeRead(input); final int b2 = safeRead(input); final int b3 = safeRead(input); @@ -72,7 +72,7 @@ public class BasicSerialization { } /** Write a fixed-width 32 bit integer in network byte order (big-endian). */ - public static void writeFixInt32(final OutputStream output, final int val) throws IOException { + public static void writeFixInt32(OutputStream output, int val) throws IOException { output.write((val >>> 24) & 0xFF); output.write((val >>> 16) & 0xFF); output.write((val >>> 8) & 0xFF); @@ -80,7 +80,7 @@ public class BasicSerialization { } /** Read a varint from the input, one byte at a time. */ - public static int readVarInt32(final InputStream input) throws IOException { + public static int readVarInt32(InputStream input) throws IOException { int result = 0; int offset = 0; for (; offset < 32; offset += 7) { @@ -94,7 +94,7 @@ public class BasicSerialization { } /** Write a varint; value is treated as an unsigned value. */ - public static void writeVarInt32(final OutputStream output, int value) throws IOException { + public static void writeVarInt32(OutputStream output, int value) throws IOException { while (true) { if ((value & ~0x7F) == 0) { output.write(value); @@ -106,7 +106,7 @@ public class BasicSerialization { } /** Read a fixed length byte array whose length is specified as a varint. */ - public static byte[] readBytes(final InputStream input) throws IOException { + public static byte[] readBytes(InputStream input) throws IOException { final int len = readVarInt32(input); if (len == 0) { return NO_BYTES; @@ -117,20 +117,19 @@ public class BasicSerialization { } /** Write a byte array prefixed by its length in a varint. */ - public static void writeBytes(final OutputStream output, final byte[] data) throws IOException { + public static void writeBytes(OutputStream output, byte[] data) throws IOException { writeBytes(output, data, 0, data.length); } /** Write a byte array prefixed by its length in a varint. */ - public static void writeBytes( - final OutputStream output, final byte[] data, final int offset, final int len) + public static void writeBytes(final OutputStream output, byte[] data, int offset, int len) throws IOException { writeVarInt32(output, len); output.write(data, offset, len); } /** Read a UTF-8 string, prefixed by its byte length in a varint. */ - public static String readString(final InputStream input) throws IOException { + public static String readString(InputStream input) throws IOException { final byte[] bin = readBytes(input); if (bin.length == 0) { return null; @@ -139,7 +138,7 @@ public class BasicSerialization { } /** Write a UTF-8 string, prefixed by its byte length in a varint. */ - public static void writeString(final OutputStream output, final String s) throws IOException { + public static void writeString(OutputStream output, String s) throws IOException { if (s == null) { writeVarInt32(output, 0); } else { @@ -148,8 +147,7 @@ public class BasicSerialization { } /** Read an enum whose code is stored as a varint. */ - public static T readEnum(final InputStream input, final T[] all) - throws IOException { + public static T readEnum(InputStream input, T[] all) throws IOException { final int val = readVarInt32(input); for (T t : all) { if (t.getCode() == val) { @@ -160,8 +158,7 @@ public class BasicSerialization { } /** Write an enum whose code is stored as a varint. */ - public static void writeEnum(final OutputStream output, final T e) - throws IOException { + public static void writeEnum(OutputStream output, T e) throws IOException { writeVarInt32(output, e.getCode()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java index c96e8083aa..10ad33b697 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java @@ -33,7 +33,7 @@ public class ColumnFormatter { * output. As only non-printable characters in the column text are ever escaped, the column * separator must be a non-printable character if the output needs to be unambiguously parsed. */ - public ColumnFormatter(final PrintWriter out, final char columnSeparator) { + public ColumnFormatter(PrintWriter out, char columnSeparator) { this.out = out; this.columnSeparator = columnSeparator; this.firstColumn = true; @@ -45,7 +45,7 @@ public class ColumnFormatter { * * @param content the string to add. */ - public void addColumn(final String content) { + public void addColumn(String content) { if (!firstColumn) { out.print(columnSeparator); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java index 7f3ac01de1..e91f3f3e99 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.mail; import com.google.gerrit.server.mail.send.EmailHeader; public class Address { - public static Address parse(final String in) { + public static Address parse(String in) { final int lt = in.indexOf('<'); final int gt = in.indexOf('>'); final int at = in.indexOf("@"); @@ -110,7 +110,7 @@ public class Address { return true; } - private static String quotedPhrase(final String name) { + private static String quotedPhrase(String name) { if (EmailHeader.needsQuotedPrintable(name)) { return EmailHeader.quotedPrintable(name); } @@ -123,7 +123,7 @@ public class Address { return name; } - private static String wrapInQuotes(final String name) { + private static String wrapInQuotes(String name) { final StringBuilder r = new StringBuilder(2 + name.length()); r.append('"'); for (int i = 0; i < name.length(); i++) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java index b6d7fa8558..5dae659964 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java @@ -78,7 +78,7 @@ public class MailUtil { return a.getId(); } - private static boolean isReviewer(final FooterLine candidateFooterLine) { + private static boolean isReviewer(FooterLine candidateFooterLine) { return candidateFooterLine.matches(FooterKey.SIGNED_OFF_BY) || candidateFooterLine.matches(FooterKey.ACKED_BY) || candidateFooterLine.matches(FooterConstants.REVIEWED_BY) @@ -94,17 +94,17 @@ public class MailUtil { this.cc = new HashSet<>(); } - public MailRecipients(final Set reviewers, final Set cc) { + public MailRecipients(Set reviewers, Set cc) { this.reviewers = new HashSet<>(reviewers); this.cc = new HashSet<>(cc); } - public void add(final MailRecipients recipients) { + public void add(MailRecipients recipients) { reviewers.addAll(recipients.reviewers); cc.addAll(recipients.cc); } - public void remove(final Account.Id toRemove) { + public void remove(Account.Id toRemove) { reviewers.remove(toRemove); cc.remove(toRemove); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java index b9ade64cfe..f0ff6c3cf2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -90,7 +90,7 @@ public abstract class ChangeEmail extends NotificationEmail { } @Override - public void setFrom(final Account.Id id) { + public void setFrom(Account.Id id) { super.setFrom(id); /** Is the from user in an email squelching group? */ @@ -98,17 +98,17 @@ public abstract class ChangeEmail extends NotificationEmail { emailOnlyAuthors = !user.getCapabilities().canEmailReviewers(); } - public void setPatchSet(final PatchSet ps) { + public void setPatchSet(PatchSet ps) { patchSet = ps; } - public void setPatchSet(final PatchSet ps, final PatchSetInfo psi) { + public void setPatchSet(PatchSet ps, PatchSetInfo psi) { patchSet = ps; patchSetInfo = psi; } @Deprecated - public void setChangeMessage(final ChangeMessage cm) { + public void setChangeMessage(ChangeMessage cm) { setChangeMessage(cm.getMessage(), cm.getWrittenOn()); } @@ -319,8 +319,8 @@ public abstract class ChangeEmail extends NotificationEmail { } /** TO or CC all vested parties (change owner, patch set uploader, author). */ - protected void rcptToAuthors(final RecipientType rt) { - for (final Account.Id id : authors) { + protected void rcptToAuthors(RecipientType rt) { + for (Account.Id id : authors) { add(rt, id); } } @@ -391,14 +391,14 @@ public abstract class ChangeEmail extends NotificationEmail { } @Override - protected void add(final RecipientType rt, final Account.Id to) { + protected void add(RecipientType rt, Account.Id to) { if (!emailOnlyAuthors || authors.contains(to)) { super.add(rt, to); } } @Override - protected boolean isVisibleTo(final Account.Id to) throws OrmException { + protected boolean isVisibleTo(Account.Id to) throws OrmException { return projectState == null || projectState .controlFor(args.identifiedUserFactory.create(to)) @@ -426,7 +426,7 @@ public abstract class ChangeEmail extends NotificationEmail { authors.add(patchSetInfo.getCommitter().getAccount()); } } - //$FALL-THROUGH$ + // $FALL-THROUGH$ case OWNER_REVIEWERS: case OWNER: authors.add(change.getOwner()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java index e2b589403d..0bfe4288af 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java @@ -83,7 +83,7 @@ public abstract class EmailHeader { return false; } - static boolean needsQuotedPrintableWithinPhrase(final int cp) { + static boolean needsQuotedPrintableWithinPhrase(int cp) { switch (cp) { case '!': case '*': @@ -202,7 +202,7 @@ public abstract class EmailHeader { int len = 8; boolean firstAddress = true; boolean needComma = false; - for (final Address addr : list) { + for (Address addr : list) { java.lang.String s = addr.toHeaderString(); if (firstAddress) { firstAddress = false; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java index db526263c7..53fcc7fe6f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java @@ -73,7 +73,7 @@ public class FromAddressGeneratorProvider implements Provider cc) { + public void addReviewers(Collection cc) { reviewers.addAll(cc); } - public void addReviewersByEmail(final Collection

cc) { + public void addReviewersByEmail(Collection
cc) { reviewersByEmail.addAll(cc); } - public void addExtraCC(final Collection cc) { + public void addExtraCC(Collection cc) { extraCC.addAll(cc); } - public void addExtraCCByEmail(final Collection
cc) { + public void addExtraCCByEmail(Collection
cc) { extraCCByEmail.addAll(cc); } @@ -67,7 +67,7 @@ public abstract class NewChangeSender extends ChangeEmail { default: add(RecipientType.CC, extraCC); extraCCByEmail.stream().forEach(cc -> add(RecipientType.CC, cc)); - //$FALL-THROUGH$ + // $FALL-THROUGH$ case OWNER_REVIEWERS: add(RecipientType.TO, reviewers); addByEmail(RecipientType.TO, reviewersByEmail); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java index c2ae0bc928..7931ab54f4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java @@ -91,7 +91,7 @@ public abstract class OutgoingEmail { headers = new LinkedHashMap<>(); } - public void setFrom(final Account.Id id) { + public void setFrom(Account.Id id) { fromId = id; } @@ -309,26 +309,26 @@ public abstract class OutgoingEmail { } /** Set a header in the outgoing message using a template. */ - protected void setVHeader(final String name, final String value) throws EmailException { + protected void setVHeader(String name, String value) throws EmailException { setHeader(name, velocify(value)); } /** Set a header in the outgoing message. */ - protected void setHeader(final String name, final String value) { + protected void setHeader(String name, String value) { headers.put(name, new EmailHeader.String(value)); } /** Remove a header from the outgoing message. */ - protected void removeHeader(final String name) { + protected void removeHeader(String name) { headers.remove(name); } - protected void setHeader(final String name, final Date date) { + protected void setHeader(String name, Date date) { headers.put(name, new EmailHeader.Date(date)); } /** Append text to the outgoing email body. */ - protected void appendText(final String text) { + protected void appendText(String text) { if (text != null) { textBody.append(text); } @@ -342,7 +342,7 @@ public abstract class OutgoingEmail { } /** Lookup a human readable name for an account, usually the "full name". */ - protected String getNameFor(final Account.Id accountId) { + protected String getNameFor(Account.Id accountId) { if (accountId == null) { return args.gerritPersonIdent.getName(); } @@ -435,27 +435,27 @@ public abstract class OutgoingEmail { } /** Schedule this message for delivery to the listed accounts. */ - protected void add(final RecipientType rt, final Collection list) { - for (final Account.Id id : list) { + protected void add(RecipientType rt, Collection list) { + for (Account.Id id : list) { add(rt, id); } } /** Schedule this message for delivery to the listed address. */ - protected void addByEmail(final RecipientType rt, final Collection
list) { - for (final Address id : list) { + protected void addByEmail(RecipientType rt, Collection
list) { + for (Address id : list) { add(rt, id); } } - protected void add(final RecipientType rt, final UserIdentity who) { + protected void add(RecipientType rt, UserIdentity who) { if (who != null && who.getAccount() != null) { add(rt, who.getAccount()); } } /** Schedule delivery of this message to the given account. */ - protected void add(final RecipientType rt, final Account.Id to) { + protected void add(RecipientType rt, Account.Id to) { try { if (!rcptTo.contains(to) && isVisibleTo(to)) { rcptTo.add(to); @@ -471,12 +471,12 @@ public abstract class OutgoingEmail { * @throws OrmException * @return whether this email is visible to the given account. */ - protected boolean isVisibleTo(final Account.Id to) throws OrmException { + protected boolean isVisibleTo(Account.Id to) throws OrmException { return true; } /** Schedule delivery of this message to the given account. */ - protected void add(final RecipientType rt, final Address addr) { + protected void add(RecipientType rt, Address addr) { if (addr != null && addr.getEmail() != null && addr.getEmail().length() > 0) { if (!args.validator.isValid(addr.getEmail())) { log.warn("Not emailing " + addr.getEmail() + " (invalid email address)"); @@ -497,7 +497,7 @@ public abstract class OutgoingEmail { } } - private Address toAddress(final Account.Id id) { + private Address toAddress(Account.Id id) { final Account a = args.accountCache.get(id).getAccount(); final String e = a.getPreferredEmail(); if (!a.isActive() || e == null) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java index 1483e21ce1..f0b61db8ec 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java @@ -45,11 +45,11 @@ public class ReplacePatchSetSender extends ReplyToChangeSender { super(ea, "newpatchset", newChangeData(ea, project, id)); } - public void addReviewers(final Collection cc) { + public void addReviewers(Collection cc) { reviewers.addAll(cc); } - public void addExtraCC(final Collection cc) { + public void addExtraCC(Collection cc) { extraCC.addAll(cc); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java index 80e6bb8dc5..538d75b963 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java @@ -320,8 +320,7 @@ public class SmtpEmailSender implements EmailSender { + "--\r\n"; } - private void setMissingHeader( - final Map hdrs, final String name, final String value) { + private void setMissingHeader(final Map hdrs, String name, String value) { if (!hdrs.containsKey(name) || hdrs.get(name).isEmpty()) { hdrs.put(name, new EmailHeader.String(value)); } @@ -365,7 +364,7 @@ public class SmtpEmailSender implements EmailSender { try { client.disconnect(); } catch (IOException e2) { - //Ignored + // Ignored } } if (e instanceof EmailException) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java index 77ba79d198..7cb34e2a9e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java @@ -79,7 +79,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry { @Override @SuppressWarnings("unchecked") - public MimeType getMimeType(final String path, final byte[] content) { + public MimeType getMimeType(String path, byte[] content) { Set mimeTypes = new HashSet<>(); if (content != null && content.length > 0) { try { @@ -93,7 +93,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry { @Override @SuppressWarnings("unchecked") - public MimeType getMimeType(final String path, final InputStream is) { + public MimeType getMimeType(String path, InputStream is) { Set mimeTypes = new HashSet<>(); try { mimeTypes.addAll(mimeUtil.getMimeTypes(is)); @@ -104,7 +104,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry { } @SuppressWarnings("unchecked") - private MimeType getMimeType(Set mimeTypes, final String path) { + private MimeType getMimeType(Set mimeTypes, String path) { try { mimeTypes.addAll(mimeUtil.getMimeTypes(path)); } catch (MimeException e) { @@ -128,7 +128,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry { } @Override - public boolean isSafeInline(final MimeType type) { + public boolean isSafeInline(MimeType type) { if (MimeUtil2.UNKNOWN_MIME_TYPE.equals(type)) { // Most browsers perform content type sniffing when they get told // a generic content type. This is bad, so assume we cannot send diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java index 673cb64b99..16ede58c1d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java @@ -153,7 +153,7 @@ public class PatchList implements Serializable { */ public List toPatchList(PatchSet.Id setId) { final ArrayList r = new ArrayList<>(patches.length); - for (final PatchListEntry e : patches) { + for (PatchListEntry e : patches) { r.add(e.toPatch(setId)); } return r; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java index 46d41bcfa3..c99d0d7f46 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java @@ -48,7 +48,7 @@ import org.eclipse.jgit.util.RawParseUtils; public class PatchListEntry { private static final byte[] EMPTY_HEADER = {}; - static PatchListEntry empty(final String fileName) { + static PatchListEntry empty(String fileName) { return new PatchListEntry( ChangeType.MODIFIED, PatchType.UNIFIED, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java index ad8ad6f54c..8b86be2630 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java @@ -112,8 +112,7 @@ class PatchScriptBuilder { bId = b; } - PatchScript toPatchScript( - PatchListEntry content, CommentDetail comments, List history) + PatchScript toPatchScript(PatchListEntry content, CommentDetail comments, List history) throws IOException { reader = db.newObjectReader(); try { @@ -123,8 +122,7 @@ class PatchScriptBuilder { } } - private PatchScript build( - PatchListEntry content, CommentDetail comments, List history) + private PatchScript build(PatchListEntry content, CommentDetail comments, List history) throws IOException { boolean intralineDifferenceIsPossible = true; boolean intralineFailure = false; @@ -327,7 +325,7 @@ class PatchScriptBuilder { private void safeAdd(List empty, Edit toAdd) { final int a = toAdd.getBeginA(); final int b = toAdd.getBeginB(); - for (final Edit e : edits) { + for (Edit e : edits) { if (e.getBeginA() <= a && a <= e.getEndA()) { return; } @@ -392,7 +390,7 @@ class PatchScriptBuilder { private void packContent(boolean ignoredWhitespace) { EditList list = new EditList(edits, context, a.size(), b.size()); - for (final EditList.Hunk hunk : list.getHunks()) { + for (EditList.Hunk hunk : list.getHunks()) { while (hunk.next()) { if (hunk.isContextLine()) { final String lineA = a.src.getString(hunk.getCurA()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java index e0afc08ec9..3ed8b37ed5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java @@ -139,7 +139,7 @@ public class PluginLoader implements LifecycleListener { } } - public static List listPlugins(Path pluginsDir, final String suffix) throws IOException { + public static List listPlugins(Path pluginsDir, String suffix) throws IOException { if (pluginsDir == null || !Files.exists(pluginsDir)) { return ImmutableList.of(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java index 36b0631edf..ff48a7d188 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java @@ -247,7 +247,7 @@ public class ServerPlugin extends Plugin { serverManager.start(); } - private Injector newRootInjector(final PluginGuiceEnvironment env) { + private Injector newRootInjector(PluginGuiceEnvironment env) { List modules = Lists.newArrayListWithCapacity(2); if (getApiType() == ApiType.PLUGIN) { modules.add(env.getSysModule()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java index 91441d8a24..50b8752150 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java @@ -78,7 +78,7 @@ class UniversalServerPluginProvider implements ServerPluginProvider { } } - private List providersForHandlingPlugin(final Path srcPath) { + private List providersForHandlingPlugin(Path srcPath) { List providers = new ArrayList<>(); for (ServerPluginProvider serverPluginProvider : serverPluginProviders) { boolean handles = serverPluginProvider.handles(srcPath); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java index 65ba1ab056..f4ca925b2c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java @@ -172,7 +172,7 @@ public class ChangeControl { this.patchSetUtil = patchSetUtil; } - public ChangeControl forUser(final CurrentUser who) { + public ChangeControl forUser(CurrentUser who) { if (getUser().equals(who)) { return this; } @@ -254,7 +254,7 @@ public class ChangeControl { } /** Can this user publish this draft change or any draft patch set of this change? */ - public boolean canPublish(final ReviewDb db) throws OrmException { + public boolean canPublish(ReviewDb db) throws OrmException { return (isOwner() || getRefControl().canPublishDrafts()) && isVisible(db); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java index 654ce698f7..f81a0f3043 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java @@ -76,7 +76,7 @@ public class GarbageCollect return applySync(project, input); } - private Response.Accepted applyAsync(final Project.NameKey project, final Input input) { + private Response.Accepted applyAsync(Project.NameKey project, Input input) { Runnable job = new Runnable() { @Override @@ -103,7 +103,7 @@ public class GarbageCollect } @SuppressWarnings("resource") - private BinaryResult applySync(final Project.NameKey project, final Input input) { + private BinaryResult applySync(Project.NameKey project, Input input) { return new BinaryResult() { @Override public void writeTo(OutputStream out) throws IOException { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java index 701809797d..986b4ad30a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java @@ -346,7 +346,7 @@ public class ListProjects implements RestReadView { PermissionBackend.WithUser perm = permissionBackend.user(currentUser); final TreeMap treeMap = new TreeMap<>(); try { - for (final Project.NameKey projectName : filter(perm)) { + for (Project.NameKey projectName : filter(perm)) { final ProjectState e = projectCache.get(projectName); if (e == null || (!all && e.getProject().getState() == HIDDEN)) { // If we can't get it from the cache, pretend its not present. @@ -567,12 +567,12 @@ public class ListProjects implements RestReadView { } private void printProjectTree( - final PrintWriter stdout, final TreeMap treeMap) { + final PrintWriter stdout, TreeMap treeMap) { final SortedSet sortedNodes = new TreeSet<>(); // Builds the inheritance tree using a list. // - for (final ProjectNode key : treeMap.values()) { + for (ProjectNode key : treeMap.values()) { if (key.isAllProjects()) { sortedNodes.add(key); continue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java index 61b5c0510c..23d8d80b95 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java @@ -23,11 +23,11 @@ public class NoSuchProjectException extends Exception { private static final String MESSAGE = "Project not found: "; private final Project.NameKey project; - public NoSuchProjectException(final Project.NameKey key) { + public NoSuchProjectException(Project.NameKey key) { this(key, null); } - public NoSuchProjectException(final Project.NameKey key, final Throwable why) { + public NoSuchProjectException(Project.NameKey key, Throwable why) { super(MESSAGE + key.toString(), why); project = key; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java index 2c90ce86d6..59debde9f4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java @@ -18,11 +18,11 @@ package com.google.gerrit.server.project; public class NoSuchRefException extends Exception { private static final long serialVersionUID = 1L; - public NoSuchRefException(final String ref) { + public NoSuchRefException(String ref) { this(ref, null); } - public NoSuchRefException(final String ref, final Throwable why) { + public NoSuchRefException(String ref, Throwable why) { super(ref, why); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java index 3ca7bd83eb..6ee143c862 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -120,7 +120,7 @@ public class ProjectCacheImpl implements ProjectCache { } @Override - public ProjectState get(final Project.NameKey projectName) { + public ProjectState get(Project.NameKey projectName) { try { return checkedGet(projectName); } catch (IOException e) { @@ -151,7 +151,7 @@ public class ProjectCacheImpl implements ProjectCache { } @Override - public void evict(final Project p) { + public void evict(Project p) { if (p != null) { byName.invalidate(p.getNameKey().get()); } @@ -159,14 +159,14 @@ public class ProjectCacheImpl implements ProjectCache { /** Invalidate the cached information about the given project. */ @Override - public void evict(final Project.NameKey p) { + public void evict(Project.NameKey p) { if (p != null) { byName.invalidate(p.get()); } } @Override - public void remove(final Project p) { + public void remove(Project p) { listLock.lock(); try { SortedSet n = Sets.newTreeSet(list.get(ListKey.ALL)); @@ -218,7 +218,7 @@ public class ProjectCacheImpl implements ProjectCache { } @Override - public Iterable byName(final String pfx) { + public Iterable byName(String pfx) { final Iterable src; try { src = list.get(ListKey.ALL).tailSet(new Project.NameKey(pfx)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java index 16a3b6b29f..66bbcca55d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java @@ -55,7 +55,7 @@ public class ProjectCacheWarmer implements LifecycleListener { log.info("Loading project cache"); scheduler.execute( () -> { - for (final Project.NameKey name : cache.all()) { + for (Project.NameKey name : cache.all()) { pool.execute( () -> { cache.get(name); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 44a3405c2a..252118c832 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -86,7 +86,7 @@ public class ProjectControl { private final ProjectCache projectCache; @Inject - GenericFactory(final ProjectCache pc) { + GenericFactory(ProjectCache pc) { projectCache = pc; } @@ -108,7 +108,7 @@ public class ProjectControl { userCache = uc; } - public ProjectControl controlFor(final Project.NameKey nameKey) throws NoSuchProjectException { + public ProjectControl controlFor(Project.NameKey nameKey) throws NoSuchProjectException { return userCache.get().get(nameKey); } } @@ -309,12 +309,12 @@ public class ProjectControl { return getGroups(localAccess()); } - private static Set getGroups(final List sectionMatcherList) { + private static Set getGroups(List sectionMatcherList) { final Set all = new HashSet<>(); - for (final SectionMatcher matcher : sectionMatcherList) { + for (SectionMatcher matcher : sectionMatcherList) { final AccessSection section = matcher.section; - for (final Permission permission : section.getPermissions()) { - for (final PermissionRule rule : permission.getRules()) { + for (Permission permission : section.getPermissions()) { + for (PermissionRule rule : permission.getRules()) { all.add(rule.getGroup()); } } @@ -397,7 +397,7 @@ public class ProjectControl { // matches every possible reference. Check all // patterns also have the permission. // - for (final String pattern : patterns) { + for (String pattern : patterns) { if (controlForRef(pattern).canPerform(permission)) { canPerform = true; } else if (ignore.contains(pattern)) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java index 403efd2ab2..e1ba692cb0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java @@ -76,12 +76,12 @@ public class ProjectNode implements TreeNode, Comparable { return children; } - public void addChild(final ProjectNode child) { + public void addChild(ProjectNode child) { children.add(child); } @Override - public int compareTo(final ProjectNode o) { + public int compareTo(ProjectNode o) { return project.getNameKey().compareTo(o.project.getNameKey()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java index 32dc41f4eb..15984d8bae 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java @@ -319,7 +319,7 @@ public class ProjectState { return result; } - public ProjectControl controlFor(final CurrentUser user) { + public ProjectControl controlFor(CurrentUser user) { return projectControlFactory.create(user, this); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java index 6c45bc350f..90d083b0d0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java @@ -65,7 +65,7 @@ public class SetHead implements RestModifyView { } @Override - public String apply(final ProjectResource rsrc, Input input) + public String apply(ProjectResource rsrc, Input input) throws AuthException, ResourceNotFoundException, BadRequestException, UnprocessableEntityException, IOException { if (!rsrc.getControl().isOwner()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java index 7ec87068c2..56e3273bb3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java @@ -105,7 +105,7 @@ public class SetParent implements RestModifyView { } } - public void validateParentUpdate(final ProjectControl ctl, String newParent, boolean checkIfAdmin) + public void validateParentUpdate(ProjectControl ctl, String newParent, boolean checkIfAdmin) throws AuthException, ResourceConflictException, UnprocessableEntityException, PermissionBackendException { IdentifiedUser user = ctl.getUser().asIdentifiedUser(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java index bf32beac25..c1fecba199 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java @@ -92,7 +92,7 @@ public abstract class QueryBuilder { // Class c = clazz; while (c != QueryBuilder.class) { - for (final Method method : c.getDeclaredMethods()) { + for (Method method : c.getDeclaredMethods()) { if (method.getAnnotation(Operator.class) != null && Predicate.class.isAssignableFrom(method.getReturnType()) && method.getParameterTypes().length == 1 @@ -204,8 +204,7 @@ public abstract class QueryBuilder { return predicates; } - private Predicate toPredicate(Tree r) - throws QueryParseException, IllegalArgumentException { + private Predicate toPredicate(Tree r) throws QueryParseException, IllegalArgumentException { switch (r.getType()) { case AND: return and(children(r)); @@ -295,8 +294,7 @@ public abstract class QueryBuilder { throw error("Unsupported query:" + value); } - private List> children(Tree r) - throws QueryParseException, IllegalArgumentException { + private List> children(Tree r) throws QueryParseException, IllegalArgumentException { List> p = new ArrayList<>(r.getChildCount()); for (int i = 0; i < r.getChildCount(); i++) { p.add(toPredicate(r.getChild(i))); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java index 4d8c6a1a88..9e8f77b5f2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java @@ -64,7 +64,7 @@ public class ConflictsPredicate extends OrPredicate { List> changePredicates = Lists.newArrayListWithCapacity(changes.size()); final Provider db = args.db; - for (final Change c : changes) { + for (Change c : changes) { final ChangeDataCache changeDataCache = new ChangeDataCache(c, db, args.changeDataFactory, args.projectCache); List files = listFiles(c, args, changeDataCache); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java index f828970308..fec7f26583 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java @@ -34,7 +34,7 @@ public class OwnerinPredicate extends ChangeOperatorPredicate { } @Override - public boolean match(final ChangeData object) throws OrmException { + public boolean match(ChangeData object) throws OrmException { final Change change = object.change(); if (change == null) { return false; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java index c5bd1402ff..67f6894193 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java @@ -92,7 +92,7 @@ public class DataSourceProvider implements Provider, LifecycleListen MULTI_USER } - private DataSource open(final Config cfg, final Context context, final DataSourceType dst) { + private DataSource open(Config cfg, Context context, DataSourceType dst) { ConfigSection dbs = new ConfigSection(cfg, "database"); String driver = dbs.optional("driver"); if (Strings.isNullOrEmpty(driver)) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java index 3cffdb1402..7ae63fdfd9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java @@ -26,7 +26,7 @@ class H2 extends BaseDataSourceType { private final SitePaths site; @Inject - H2(final SitePaths site, @GerritServerConfig final Config cfg) { + H2(SitePaths site, @GerritServerConfig final Config cfg) { super("org.h2.Driver"); this.cfg = cfg; this.site = site; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java index 26ff0d4a09..48ff646b11 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java @@ -76,7 +76,7 @@ public class SchemaCreator { indexCollection = ic; } - public void create(final ReviewDb db) throws OrmException, IOException, ConfigInvalidException { + public void create(ReviewDb db) throws OrmException, IOException, ConfigInvalidException { final JdbcSchema jdbc = (JdbcSchema) db; try (JdbcExecutor e = new JdbcExecutor(jdbc)) { jdbc.updateSchema(e); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java index 084d63bc2d..266fbaa894 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java @@ -62,7 +62,7 @@ public class SchemaUpdater { this.updater = buildInjector(parent).getProvider(SchemaVersion.class); } - private static Injector buildInjector(final Injector parent) { + private static Injector buildInjector(Injector parent) { // Use DEVELOPMENT mode to allow lazy initialization of the // graph. This avoids touching ancient schema versions that // are behind this installation's current version. @@ -101,7 +101,7 @@ public class SchemaUpdater { }); } - public void update(final UpdateUI ui) throws OrmException { + public void update(UpdateUI ui) throws OrmException { try (ReviewDb db = ReviewDbUtil.unwrapDb(schema.open())) { final SchemaVersion u = updater.get(); @@ -130,7 +130,7 @@ public class SchemaUpdater { return updater.get(); } - private CurrentSchemaVersion getSchemaVersion(final ReviewDb db) { + private CurrentSchemaVersion getSchemaVersion(ReviewDb db) { try { return db.schemaVersion().get(new CurrentSchemaVersion.Key()); } catch (OrmException e) { @@ -138,7 +138,7 @@ public class SchemaUpdater { } } - private void updateSystemConfig(final ReviewDb db) throws OrmException { + private void updateSystemConfig(ReviewDb db) throws OrmException { final SystemConfig sc = db.systemConfig().get(new SystemConfig.Key()); if (sc == null) { throw new OrmException("No record in system_config table"); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java index 7fe89cd765..93aaf686b2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java @@ -44,7 +44,7 @@ public abstract class SchemaVersion { private final Provider prior; private final int versionNbr; - protected SchemaVersion(final Provider prior) { + protected SchemaVersion(Provider prior) { this.prior = prior; this.versionNbr = guessVersion(getClass()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java index 2f3d09f12b..bdc15f4cb0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java @@ -85,7 +85,7 @@ public class SchemaVersionCheck implements LifecycleListener { @Override public void stop() {} - private CurrentSchemaVersion getSchemaVersion(final ReviewDb db) { + private CurrentSchemaVersion getSchemaVersion(ReviewDb db) { try { return db.schemaVersion().get(new CurrentSchemaVersion.Key()); } catch (OrmException e) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java index adee5fc9cc..f4cba98afa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java @@ -39,10 +39,10 @@ class ScriptRunner { static final ScriptRunner NOOP = new ScriptRunner(null, null) { @Override - void run(final ReviewDb db) {} + void run(ReviewDb db) {} }; - ScriptRunner(final String scriptName, final InputStream script) { + ScriptRunner(String scriptName, InputStream script) { this.name = scriptName; try { this.commands = script != null ? parse(script) : null; @@ -51,7 +51,7 @@ class ScriptRunner { } } - void run(final ReviewDb db) throws OrmException { + void run(ReviewDb db) throws OrmException { try { final JdbcSchema schema = (JdbcSchema) db; final Connection c = schema.getConnection(); @@ -73,7 +73,7 @@ class ScriptRunner { } } - private List parse(final InputStream in) throws IOException { + private List parse(InputStream in) throws IOException { try (BufferedReader br = new BufferedReader(new InputStreamReader(in, UTF_8))) { String delimiter = ";"; List commands = new ArrayList<>(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java index b729b09ac3..02ff159b56 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java @@ -130,7 +130,7 @@ public class DefaultSecureStore extends SecureStore { } } - private static void saveSecure(final FileBasedConfig sec) throws IOException { + private static void saveSecure(FileBasedConfig sec) throws IOException { if (FileUtil.modified(sec)) { final byte[] out = Constants.encode(sec.toText()); final File path = sec.getFile(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java index 70a6fce99d..0e5b2f805b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java @@ -53,7 +53,7 @@ public class SshAddressesModule extends AbstractModule { return listen; } - for (final String desc : want) { + for (String desc : want) { try { listen.add(SocketUtil.resolve(desc, DEFAULT_PORT)); } catch (IllegalArgumentException e) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java index e4d2890089..a9a22d989b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java @@ -52,7 +52,7 @@ public class IdGenerator { } /** A very simple bit permutation to mask a simple incrementer. */ - public static int mix(final int salt, final int in) { + public static int mix(int salt, int in) { short v0 = hi16(in); short v1 = lo16(in); v0 += ((v1 << 2) + 0 ^ v1) + (salt ^ (v1 >>> 3)) + 1; @@ -61,7 +61,7 @@ public class IdGenerator { } /* For testing only. */ - static int unmix(final int in) { + static int unmix(int in) { short v0 = hi16(in); short v1 = lo16(in); v1 -= ((v0 << 2) + 2 ^ v0) + (salt ^ (v0 >>> 3)) + 3; @@ -69,7 +69,7 @@ public class IdGenerator { return result(v0, v1); } - private static short hi16(final int in) { + private static short hi16(int in) { return (short) ( // ((in >>> 24 & 0xff)) @@ -78,7 +78,7 @@ public class IdGenerator { ); } - private static short lo16(final int in) { + private static short lo16(int in) { return (short) ( // ((in >>> 8 & 0xff)) @@ -87,7 +87,7 @@ public class IdGenerator { ); } - private static int result(final short v0, final short v1) { + private static int result(short v0, short v1) { return ((v0 & 0xff) << 24) | // (((v0 >>> 8) & 0xff) << 16) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java index 4019851b64..f243726672 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java @@ -52,7 +52,7 @@ public final class MostSpecificComparator implements Comparator Callable wrap(final Callable callable) { + public final Callable wrap(Callable callable) { final RequestContext callerContext = checkNotNull(local.getContext()); final Callable wrapped = wrapImpl(context(callerContext, cleanup(callable))); return new Callable() { @@ -114,7 +114,7 @@ public abstract class RequestScopePropagator { * @param runnable the Runnable to wrap. * @return a new Runnable which will execute in the current request scope. */ - public final Runnable wrap(final Runnable runnable) { + public final Runnable wrap(Runnable runnable) { final Callable wrapped = wrap(Executors.callable(runnable)); if (runnable instanceof ProjectRunnable) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java index 5b22f7398a..afa2aee683 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java @@ -22,12 +22,12 @@ import java.net.UnknownHostException; public final class SocketUtil { /** True if this InetAddress is a raw IPv6 in dotted quad notation. */ - public static boolean isIPv6(final InetAddress ip) { + public static boolean isIPv6(InetAddress ip) { return ip instanceof Inet6Address && ip.getHostName().equals(ip.getHostAddress()); } /** Get the name or IP address, or {@code *} if this address is a wildcard IP. */ - public static String hostname(final InetSocketAddress addr) { + public static String hostname(InetSocketAddress addr) { if (addr.getAddress() != null) { if (addr.getAddress().isAnyLocalAddress()) { return "*"; @@ -38,7 +38,7 @@ public final class SocketUtil { } /** Format an address string into {@code host:port} or {@code *:port} syntax. */ - public static String format(final SocketAddress s, final int defaultPort) { + public static String format(SocketAddress s, int defaultPort) { if (s instanceof InetSocketAddress) { final InetSocketAddress addr = (InetSocketAddress) s; if (addr.getPort() == defaultPort) { @@ -62,7 +62,7 @@ public final class SocketUtil { } /** Parse an address string such as {@code host:port} or {@code *:port}. */ - public static InetSocketAddress parse(final String desc, final int defaultPort) { + public static InetSocketAddress parse(String desc, int defaultPort) { String hostStr; String portStr; @@ -109,7 +109,7 @@ public final class SocketUtil { } /** Parse and resolve an address string, looking up the IP address. */ - public static InetSocketAddress resolve(final String desc, final int defaultPort) { + public static InetSocketAddress resolve(String desc, int defaultPort) { final InetSocketAddress addr = parse(desc, defaultPort); if (addr.getAddress() != null && addr.getAddress().isAnyLocalAddress()) { return addr; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java index 61c863b4d4..6de2fef49f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java @@ -56,7 +56,7 @@ public class SubmoduleSectionParser { public Set parseAllSections() { Set parsedSubscriptions = new HashSet<>(); - for (final String id : bbc.getSubsections("submodule")) { + for (String id : bbc.getSubsections("submodule")) { final SubmoduleSubscription subscription = parse(id); if (subscription != null) { parsedSubscriptions.add(subscription); @@ -65,7 +65,7 @@ public class SubmoduleSectionParser { return parsedSubscriptions; } - private SubmoduleSubscription parse(final String id) { + private SubmoduleSubscription parse(String id) { final String url = bbc.getString("submodule", id, "url"); final String path = bbc.getString("submodule", id, "path"); String branch = bbc.getString("submodule", id, "branch"); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java index 65fbfd6ad9..81a2df2625 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java @@ -46,7 +46,7 @@ public class SystemLog { private final Config config; @Inject - public SystemLog(final SitePaths site, @GerritServerConfig Config config) { + public SystemLog(SitePaths site, @GerritServerConfig Config config) { this.site = site; this.config = config; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java index 8d511f302e..49d4a55d89 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java @@ -36,11 +36,11 @@ public class TreeFormatter { private final PrintWriter stdout; private String currentTabSeparator = " "; - public TreeFormatter(final PrintWriter stdout) { + public TreeFormatter(PrintWriter stdout) { this.stdout = stdout; } - public void printTree(final SortedSet rootNodes) { + public void printTree(SortedSet rootNodes) { if (rootNodes.isEmpty()) { return; } @@ -50,7 +50,7 @@ public class TreeFormatter { currentTabSeparator = DEFAULT_TAB_SEPARATOR; int i = 0; final int size = rootNodes.size(); - for (final TreeNode rootNode : rootNodes) { + for (TreeNode rootNode : rootNodes) { final boolean isLastRoot = ++i == size; if (isLastRoot) { currentTabSeparator = " "; @@ -60,28 +60,28 @@ public class TreeFormatter { } } - public void printTree(final TreeNode rootNode) { + public void printTree(TreeNode rootNode) { printTree(rootNode, 0, true); } - private void printTree(final TreeNode node, final int level, final boolean isLast) { + private void printTree(TreeNode node, int level, boolean isLast) { printNode(node, level, isLast); final SortedSet childNodes = node.getChildren(); int i = 0; final int size = childNodes.size(); - for (final TreeNode childNode : childNodes) { + for (TreeNode childNode : childNodes) { final boolean isLastChild = ++i == size; printTree(childNode, level + 1, isLastChild); } } - private void printIndention(final int level) { + private void printIndention(int level) { if (level > 0) { stdout.print(String.format("%-" + 4 * level + "s", currentTabSeparator)); } } - private void printNode(final TreeNode node, final int level, final boolean isLast) { + private void printNode(TreeNode node, int level, boolean isLast) { printIndention(level); stdout.print(isLast ? LAST_NODE_PREFIX : NODE_PREFIX); if (node.isVisible()) { diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java index 95be5cb4dc..95c4aaef00 100644 --- a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java +++ b/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java @@ -141,7 +141,7 @@ public class PRED_commit_edits_2 extends Predicate.P2 { return Pattern.compile(term.name(), Pattern.MULTILINE); } - private Text load(final ObjectId tree, final String path, final ObjectReader reader) + private Text load(ObjectId tree, String path, ObjectReader reader) throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException, IOException { if (path == null) { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java index 355f775197..997fda9191 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java @@ -57,7 +57,7 @@ public class EventDeserializerTest { assertThat(e.submitter.get().email).isEqualTo(accountAttribute.email); } - private Supplier createSupplier(final T value) { + private Supplier createSupplier(T value) { return Suppliers.memoize( new Supplier() { @Override diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java index 800413b442..fae8559c31 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java @@ -129,14 +129,14 @@ public class BasicSerializationTest { assertOutput(b(7, 'c', 'o', 'f', 'f', 'e', 'e', '4'), out); } - private static void assertOutput(final byte[] expect, final ByteArrayOutputStream out) { + private static void assertOutput(byte[] expect, ByteArrayOutputStream out) { final byte[] buf = out.toByteArray(); for (int i = 0; i < expect.length; i++) { assertEquals(expect[i], buf[i]); } } - private static InputStream r(final byte[] buf) { + private static InputStream r(byte[] buf) { return new ByteArrayInputStream(buf); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java index 2909df7fa3..42e8a8e399 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java @@ -96,7 +96,7 @@ public class AddressTest extends GerritBaseTests { assertInvalid("a <@a>"); } - private void assertInvalid(final String in) { + private void assertInvalid(String in) { try { Address.parse(in); fail("Expected IllegalArgumentException for " + in); @@ -151,7 +151,7 @@ public class AddressTest extends GerritBaseTests { assertThat(format(null, "a,b@a")).isEqualTo(""); } - private static String format(final String name, final String email) { + private static String format(String name, String email) { return new Address(name, email).toHeaderString(); } } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java index a7b37a8b4f..aaf723abc6 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java @@ -51,7 +51,7 @@ public class FromAddressGeneratorProviderTest { return new FromAddressGeneratorProvider(config, "Anonymous Coward", ident, accountCache).get(); } - private void setFrom(final String newFrom) { + private void setFrom(String newFrom) { config.setString("sendemail", null, "from", newFrom); } @@ -366,18 +366,18 @@ public class FromAddressGeneratorProviderTest { verify(accountCache); } - private Account.Id user(final String name, final String email) { + private Account.Id user(String name, String email) { final AccountState s = makeUser(name, email); expect(accountCache.get(eq(s.getAccount().getId()))).andReturn(s); return s.getAccount().getId(); } - private Account.Id userNoLookup(final String name, final String email) { + private Account.Id userNoLookup(String name, String email) { final AccountState s = makeUser(name, email); return s.getAccount().getId(); } - private AccountState makeUser(final String name, final String email) { + private AccountState makeUser(String name, String email) { final Account.Id userId = new Account.Id(42); final Account account = new Account(userId, TimeUtil.nowTs()); account.setFullName(name); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java index 4c0bcc08b4..3a38a50084 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java @@ -31,7 +31,7 @@ public class QueryParserTest { assertSingleWord("project", "tools/*", r); } - private static void assertSingleWord(final String name, final String value, final Tree r) { + private static void assertSingleWord(String name, String value, Tree r) { assertEquals(QueryParser.FIELD_NAME, r.getType()); assertEquals(name, r.getText()); assertEquals(1, r.getChildCount()); @@ -41,7 +41,7 @@ public class QueryParserTest { assertEquals(0, c.getChildCount()); } - private static Tree parse(final String str) throws QueryParseException { + private static Tree parse(String str) throws QueryParseException { return QueryParser.parse(str); } } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java index f53a59b8c6..98160a92a6 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java @@ -621,11 +621,11 @@ public class CommitMsgHookTest extends HookTestCase { "RealTag: abc\n")); } - private void hookDoesNotModify(final String in) throws Exception { + private void hookDoesNotModify(String in) throws Exception { assertEquals(in, call(in)); } - private String call(final String body) throws Exception { + private String call(String body) throws Exception { final File tmp = write(body); try { final File hook = getHook("commit-msg"); @@ -636,7 +636,7 @@ public class CommitMsgHookTest extends HookTestCase { } } - private DirCacheEntry file(final String name) throws IOException { + private DirCacheEntry file(String name) throws IOException { try (ObjectInserter oi = repository.newObjectInserter()) { final DirCacheEntry e = new DirCacheEntry(name); e.setFileMode(FileMode.REGULAR_FILE); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java index 3d4a1a0917..ec2057e2d6 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java @@ -94,7 +94,7 @@ public abstract class HookTestCase extends LocalDiskRepositoryTestCase { cleanup.clear(); } - protected File getHook(final String name) throws IOException { + protected File getHook(String name) throws IOException { File hook = hooks.get(name); if (hook != null) { return hook; diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java index dd42b67d6a..8f37c20a98 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java @@ -33,7 +33,7 @@ public class GerritServerTests extends GerritBaseTests { public TestRule testRunner = new TestRule() { @Override - public Statement apply(final Statement base, final Description description) { + public Statement apply(Statement base, Description description) { return new Statement() { @Override public void evaluate() throws Throwable { diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java index bff27cad89..21b21ef2e4 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java @@ -65,7 +65,7 @@ public class InMemoryDatabase implements SchemaFactory { } /** Drop the database from memory; does nothing if the instance was null. */ - public static void drop(final InMemoryDatabase db) { + public static void drop(InMemoryDatabase db) { if (db != null) { db.drop(); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java index 459bccd023..eadbaae3b9 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestChanges.java @@ -81,7 +81,7 @@ public class TestChanges { return ps; } - public static ChangeUpdate newUpdate(Injector injector, Change c, final CurrentUser user) + public static ChangeUpdate newUpdate(Injector injector, Change c, CurrentUser user) throws Exception { injector = injector.createChildInjector( diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java index dc96e1814d..318e67f8cb 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java @@ -48,7 +48,7 @@ public abstract class AbstractGitCommand extends BaseCommand { protected Project project; @Override - public void start(final Environment env) { + public void start(Environment env) { Context ctx = context.subContext(newSession(), context.getCommandLine()); final Context old = sshScope.set(ctx); try { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java index dbf5b1037a..7fa79fc99f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java @@ -115,22 +115,22 @@ public abstract class BaseCommand implements Command { } @Override - public void setInputStream(final InputStream in) { + public void setInputStream(InputStream in) { this.in = in; } @Override - public void setOutputStream(final OutputStream out) { + public void setOutputStream(OutputStream out) { this.out = out; } @Override - public void setErrorStream(final OutputStream err) { + public void setErrorStream(OutputStream err) { this.err = err; } @Override - public void setExitCallback(final ExitCallback callback) { + public void setExitCallback(ExitCallback callback) { this.exit = callback; } @@ -143,7 +143,7 @@ public abstract class BaseCommand implements Command { return commandName; } - void setName(final String prefix) { + void setName(String prefix) { this.commandName = prefix; } @@ -151,7 +151,7 @@ public abstract class BaseCommand implements Command { return argv; } - public void setArguments(final String[] argv) { + public void setArguments(String[] argv) { this.argv = argv; } @@ -172,7 +172,7 @@ public abstract class BaseCommand implements Command { * * @param cmd the command that will receive the current state. */ - protected void provideStateTo(final Command cmd) { + protected void provideStateTo(Command cmd) { cmd.setInputStream(in); cmd.setOutputStream(out); cmd.setErrorStream(err); @@ -253,7 +253,7 @@ public abstract class BaseCommand implements Command { * * @param thunk the runnable to execute on the thread, performing the command's logic. */ - protected void startThread(final CommandRunnable thunk) { + protected void startThread(CommandRunnable thunk) { final TaskThunk tt = new TaskThunk(thunk); if (isAdminHighPriorityCommand()) { @@ -288,7 +288,7 @@ public abstract class BaseCommand implements Command { * * @param rc exit code for the remote client. */ - protected void onExit(final int rc) { + protected void onExit(int rc) { exit.onExit(rc); if (cleanup != null) { cleanup.run(); @@ -296,11 +296,11 @@ public abstract class BaseCommand implements Command { } /** Wrap the supplied output stream in a UTF-8 encoded PrintWriter. */ - protected static PrintWriter toPrintWriter(final OutputStream o) { + protected static PrintWriter toPrintWriter(OutputStream o) { return new PrintWriter(new BufferedWriter(new OutputStreamWriter(o, ENC))); } - private int handleError(final Throwable e) { + private int handleError(Throwable e) { if ((e.getClass() == IOException.class && "Pipe closed".equals(e.getMessage())) || // (e.getClass() == SshException.class && "Already closed".equals(e.getMessage())) @@ -374,7 +374,7 @@ public abstract class BaseCommand implements Command { private final String taskName; private Project.NameKey projectName; - private TaskThunk(final CommandRunnable thunk) { + private TaskThunk(CommandRunnable thunk) { this.thunk = thunk; StringBuilder m = new StringBuilder(); @@ -496,7 +496,7 @@ public abstract class BaseCommand implements Command { * command. Should be between 1 and 255, inclusive. * @param msg message to also send to the client's stderr. */ - public Failure(final int exitCode, final String msg) { + public Failure(int exitCode, String msg) { this(exitCode, msg, null); } @@ -509,7 +509,7 @@ public abstract class BaseCommand implements Command { * @param why stack trace to include in the server's log, but is not sent to the client's * stderr. */ - public Failure(final int exitCode, final String msg, final Throwable why) { + public Failure(int exitCode, String msg, Throwable why) { super(msg, why); this.exitCode = exitCode; } @@ -524,7 +524,7 @@ public abstract class BaseCommand implements Command { * * @param msg message to also send to the client's stderr. */ - public UnloggedFailure(final String msg) { + public UnloggedFailure(String msg) { this(1, msg); } @@ -535,7 +535,7 @@ public abstract class BaseCommand implements Command { * command. Should be between 1 and 255, inclusive. * @param msg message to also send to the client's stderr. */ - public UnloggedFailure(final int exitCode, final String msg) { + public UnloggedFailure(int exitCode, String msg) { this(exitCode, msg, null); } @@ -548,7 +548,7 @@ public abstract class BaseCommand implements Command { * @param why stack trace to include in the server's log, but is not sent to the client's * stderr. */ - public UnloggedFailure(final int exitCode, final String msg, final Throwable why) { + public UnloggedFailure(int exitCode, String msg, Throwable why) { super(exitCode, msg, why); } } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java index 075dca3b00..fece76849f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java @@ -56,7 +56,7 @@ public class CommandExecutorQueueProvider implements QueueProvider { executor.setThreadFactory( new ThreadFactory() { @Override - public Thread newThread(final Runnable task) { + public Thread newThread(Runnable task) { final Thread t = parent.newThread(task); t.setPriority(Thread.MIN_PRIORITY); return t; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java index 66b8fe688f..05354a0b40 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java @@ -93,7 +93,7 @@ class CommandFactoryProvider implements Provider, LifecycleListe public CommandFactory get() { return new CommandFactory() { @Override - public Command createCommand(final String requestCommand) { + public Command createCommand(String requestCommand) { return new Trampoline(requestCommand); } }; @@ -112,7 +112,7 @@ class CommandFactoryProvider implements Provider, LifecycleListe private final AtomicBoolean logged; private final AtomicReference> task; - Trampoline(final String cmdLine) { + Trampoline(String cmdLine) { commandLine = cmdLine; argv = split(cmdLine); logged = new AtomicBoolean(); @@ -120,33 +120,33 @@ class CommandFactoryProvider implements Provider, LifecycleListe } @Override - public void setInputStream(final InputStream in) { + public void setInputStream(InputStream in) { this.in = in; } @Override - public void setOutputStream(final OutputStream out) { + public void setOutputStream(OutputStream out) { this.out = out; } @Override - public void setErrorStream(final OutputStream err) { + public void setErrorStream(OutputStream err) { this.err = err; } @Override - public void setExitCallback(final ExitCallback callback) { + public void setExitCallback(ExitCallback callback) { this.exit = callback; } @Override - public void setSession(final ServerSession session) { + public void setSession(ServerSession session) { final SshSession s = session.getAttribute(SshSession.KEY); this.ctx = sshScope.newContext(schemaFactory, s, commandLine); } @Override - public void start(final Environment env) throws IOException { + public void start(Environment env) throws IOException { this.env = env; final Context ctx = this.ctx; task.set( @@ -203,7 +203,7 @@ class CommandFactoryProvider implements Provider, LifecycleListe } } - private int translateExit(final int rc) { + private int translateExit(int rc) { switch (rc) { case BaseCommand.STATUS_NOT_ADMIN: return 1; @@ -219,7 +219,7 @@ class CommandFactoryProvider implements Provider, LifecycleListe } } - private void log(final int rc) { + private void log(int rc) { if (logged.compareAndSet(false, true)) { log.onExecute(cmd, rc, ctx.getSession()); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java index 54ffba6451..93aab0bb45 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java @@ -28,7 +28,7 @@ public abstract class CommandModule extends LifecycleModule { * @param name the name of the command the client will provide in order to call the command. * @return a binding that must be bound to a non-singleton provider for a {@link Command} object. */ - protected LinkedBindingBuilder command(final String name) { + protected LinkedBindingBuilder command(String name) { return bind(Commands.key(name)); } @@ -38,7 +38,7 @@ public abstract class CommandModule extends LifecycleModule { * @param name the name of the command the client will provide in order to call the command. * @return a binding that must be bound to a non-singleton provider for a {@link Command} object. */ - protected LinkedBindingBuilder command(final CommandName name) { + protected LinkedBindingBuilder command(CommandName name) { return bind(Commands.key(name)); } @@ -49,7 +49,7 @@ public abstract class CommandModule extends LifecycleModule { * @param name the name of the command the client will provide in order to call the command. * @return a binding that must be bound to a non-singleton provider for a {@link Command} object. */ - protected LinkedBindingBuilder command(final CommandName parent, final String name) { + protected LinkedBindingBuilder command(CommandName parent, String name) { return bind(Commands.key(parent, name)); } @@ -60,7 +60,7 @@ public abstract class CommandModule extends LifecycleModule { * @param clazz class of the command with {@link CommandMetaData} annotation to retrieve the name * and the description from */ - protected void command(final CommandName parent, final Class clazz) { + protected void command(CommandName parent, Class clazz) { CommandMetaData meta = clazz.getAnnotation(CommandMetaData.class); if (meta == null) { throw new IllegalStateException("no CommandMetaData annotation found"); @@ -78,8 +78,7 @@ public abstract class CommandModule extends LifecycleModule { * @param clazz class of the command with {@link CommandMetaData} annotation to retrieve the * description from */ - protected void alias( - final CommandName parent, final String name, final Class clazz) { + protected void alias(final CommandName parent, String name, Class clazz) { CommandMetaData meta = clazz.getAnnotation(CommandMetaData.class); if (meta == null) { throw new IllegalStateException("no CommandMetaData annotation found"); @@ -95,7 +94,7 @@ public abstract class CommandModule extends LifecycleModule { * @param to name of an already registered command that will perform the action when {@code from} * is invoked by a client. */ - protected void alias(final String from, final String to) { + protected void alias(String from, String to) { bind(Commands.key(from)).to(Commands.key(to)); } } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java index 200d3a0f27..61c36cbe53 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java @@ -22,7 +22,7 @@ final class CommandProvider { private final Provider provider; private final String description; - CommandProvider(final Provider p, final String d) { + CommandProvider(Provider p, String d) { this.provider = p; this.description = d; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java index 620ffbe84d..43d2c5033a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java @@ -27,40 +27,40 @@ public class Commands { /** Magic value signaling the top level. */ public static final CommandName CMD_ROOT = named(ROOT); - public static Key key(final String name) { + public static Key key(String name) { return key(named(name)); } - public static Key key(final CommandName name) { + public static Key key(CommandName name) { return Key.get(Command.class, name); } - public static Key key(final CommandName parent, final String name) { + public static Key key(CommandName parent, String name) { return Key.get(Command.class, named(parent, name)); } - public static Key key(final CommandName parent, final String name, final String descr) { + public static Key key(CommandName parent, String name, String descr) { return Key.get(Command.class, named(parent, name, descr)); } /** Create a CommandName annotation for the supplied name. */ @AutoAnnotation - public static CommandName named(final String value) { + public static CommandName named(String value) { return new AutoAnnotation_Commands_named(value); } /** Create a CommandName annotation for the supplied name. */ - public static CommandName named(final CommandName parent, final String name) { + public static CommandName named(CommandName parent, String name) { return new NestedCommandNameImpl(parent, name); } /** Create a CommandName annotation for the supplied name and description. */ - public static CommandName named(final CommandName parent, final String name, final String descr) { + public static CommandName named(CommandName parent, String name, String descr) { return new NestedCommandNameImpl(parent, name, descr); } /** Return the name of this command, possibly including any parents. */ - public static String nameOf(final CommandName name) { + public static String nameOf(CommandName name) { if (name instanceof NestedCommandNameImpl) { return nameOf(((NestedCommandNameImpl) name).parent) + " " + name.value(); } @@ -68,7 +68,7 @@ public class Commands { } /** Is the second command a direct child of the first command? */ - public static boolean isChild(final CommandName parent, final CommandName name) { + public static boolean isChild(CommandName parent, CommandName name) { if (name instanceof NestedCommandNameImpl) { return parent.equals(((NestedCommandNameImpl) name).parent); } @@ -90,13 +90,13 @@ public class Commands { private final String name; private final String descr; - NestedCommandNameImpl(final CommandName parent, final String name) { + NestedCommandNameImpl(CommandName parent, String name) { this.parent = parent; this.name = name; this.descr = ""; } - NestedCommandNameImpl(final CommandName parent, final String name, final String descr) { + NestedCommandNameImpl(CommandName parent, String name, String descr) { this.parent = parent; this.name = name; this.descr = descr; @@ -122,7 +122,7 @@ public class Commands { } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { return obj instanceof NestedCommandNameImpl && parent.equals(((NestedCommandNameImpl) obj).parent) && value().equals(((NestedCommandNameImpl) obj).value()); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java index d655500285..9ea7b65d14 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java @@ -92,7 +92,7 @@ class DatabasePubKeyAuth implements PublickeyAuthenticator { } private static void addPublicKey( - final Collection out, final KeyPairProvider p, final String type) { + final Collection out, KeyPairProvider p, String type) { final KeyPair pair = p.loadKey(type); if (pair != null && pair.getPublic() != null) { out.add(pair.getPublic()); @@ -162,9 +162,8 @@ class DatabasePubKeyAuth implements PublickeyAuthenticator { return p.keys; } - private SshKeyCacheEntry find( - final Iterable keyList, final PublicKey suppliedKey) { - for (final SshKeyCacheEntry k : keyList) { + private SshKeyCacheEntry find(final Iterable keyList, PublicKey suppliedKey) { + for (SshKeyCacheEntry k : keyList) { if (k.match(suppliedKey)) { return k; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java index 87e90f4cbd..3f2e258537 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java @@ -69,7 +69,7 @@ final class DispatchCommand extends BaseCommand { } @Override - public void start(final Environment env) throws IOException { + public void start(Environment env) throws IOException { try { parseCommandLine(); if (Strings.isNullOrEmpty(commandName)) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java index 2a88f63b2c..c782d2fa4f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java @@ -35,7 +35,7 @@ public class DispatchCommandProvider implements Provider { private final CommandName parent; private volatile ConcurrentMap map; - public DispatchCommandProvider(final CommandName cn) { + public DispatchCommandProvider(CommandName cn) { this.parent = cn; } @@ -44,7 +44,7 @@ public class DispatchCommandProvider implements Provider { return factory.create(getMap()); } - public RegistrationHandle register(final CommandName name, final Provider cmd) { + public RegistrationHandle register(CommandName name, Provider cmd) { final ConcurrentMap m = getMap(); final CommandProvider commandProvider = new CommandProvider(cmd, null); if (m.putIfAbsent(name.value(), commandProvider) != null) { @@ -58,7 +58,7 @@ public class DispatchCommandProvider implements Provider { }; } - public RegistrationHandle replace(final CommandName name, final Provider cmd) { + public RegistrationHandle replace(CommandName name, Provider cmd) { final ConcurrentMap m = getMap(); final CommandProvider commandProvider = new CommandProvider(cmd, null); m.put(name.value(), commandProvider); @@ -84,7 +84,7 @@ public class DispatchCommandProvider implements Provider { @SuppressWarnings("unchecked") private ConcurrentMap createMap() { ConcurrentMap m = Maps.newConcurrentMap(); - for (final Binding b : allCommands()) { + for (Binding b : allCommands()) { final Annotation annotation = b.getKey().getAnnotation(); if (annotation instanceof CommandName) { final CommandName n = (CommandName) annotation; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java index 0b1f3aea9c..8e4be7891e 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java @@ -51,7 +51,7 @@ class GerritGSSAuthenticator extends GSSAuthenticator { } @Override - public boolean validateIdentity(final ServerSession session, final String identity) { + public boolean validateIdentity(ServerSession session, String identity) { final SshSession sd = session.getAttribute(SshSession.KEY); int at = identity.indexOf('@'); String username; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java index 20694b2315..c0b6d5a8fd 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java @@ -31,7 +31,7 @@ class HostKeyProvider implements Provider { private final SitePaths site; @Inject - HostKeyProvider(final SitePaths site) { + HostKeyProvider(SitePaths site) { this.site = site; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java index eafdcd6d28..aec85d4943 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java @@ -76,33 +76,33 @@ class NoShell implements Factory { } @Override - public void setInputStream(final InputStream in) { + public void setInputStream(InputStream in) { this.in = in; } @Override - public void setOutputStream(final OutputStream out) { + public void setOutputStream(OutputStream out) { this.out = out; } @Override - public void setErrorStream(final OutputStream err) { + public void setErrorStream(OutputStream err) { this.err = err; } @Override - public void setExitCallback(final ExitCallback callback) { + public void setExitCallback(ExitCallback callback) { this.exit = callback; } @Override - public void setSession(final ServerSession session) { + public void setSession(ServerSession session) { SshSession s = session.getAttribute(SshSession.KEY); this.context = sshScope.newContext(schemaFactory, s, ""); } @Override - public void start(final Environment env) throws IOException { + public void start(Environment env) throws IOException { Context old = sshScope.set(context); String message; try { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java index fe8197d43a..b0116e4013 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java @@ -46,7 +46,7 @@ public abstract class PluginCommandModule extends CommandModule { command(command, clazz); } - protected void alias(final String name, Class clazz) { + protected void alias(String name, Class clazz) { alias(command, name, clazz); } } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java index 3c108b0f14..22791674b7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java @@ -257,7 +257,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { setSessionFactory( new SessionFactory(this) { @Override - protected ServerSessionImpl createSession(final IoSession io) throws Exception { + protected ServerSessionImpl createSession(IoSession io) throws Exception { connected.incrementAndGet(); sessionsCreated.increment(); if (io instanceof MinaSession) { @@ -392,12 +392,12 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { final List keys = myHostKeys(); final List r = new ArrayList<>(); - for (final PublicKey pub : keys) { + for (PublicKey pub : keys) { final Buffer buf = new ByteArrayBuffer(); buf.putRawPublicKey(pub); final byte[] keyBin = buf.getCompactData(); - for (final String addr : advertised) { + for (String addr : advertised) { try { r.add(new HostKey(addr, keyBin)); } catch (JSchException e) { @@ -423,7 +423,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { } private static void addPublicKey( - final Collection out, final KeyPairProvider p, final String type) { + final Collection out, KeyPairProvider p, String type) { final KeyPair pair = p.loadKey(type); if (pair != null && pair.getPublic() != null) { out.add(pair.getPublic()); @@ -523,7 +523,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { } @SuppressWarnings("unchecked") - private void initCiphers(final Config cfg) { + private void initCiphers(Config cfg) { final List> a = BaseBuilder.setUpDefaultCiphers(true); for (Iterator> i = a.iterator(); i.hasNext(); ) { @@ -561,9 +561,9 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { @SafeVarargs private static List> filter( - final Config cfg, final String key, final NamedFactory... avail) { + final Config cfg, String key, NamedFactory... avail) { final ArrayList> def = new ArrayList<>(); - for (final NamedFactory n : avail) { + for (NamedFactory n : avail) { if (n == null) { break; } @@ -576,7 +576,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { } boolean didClear = false; - for (final String setting : want) { + for (String setting : want) { String name = setting.trim(); boolean add = true; if (name.startsWith("-")) { @@ -617,8 +617,8 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { } @SafeVarargs - private static NamedFactory find(final String name, final NamedFactory... avail) { - for (final NamedFactory n : avail) { + private static NamedFactory find(String name, NamedFactory... avail) { + for (NamedFactory n : avail) { if (n != null && name.equals(n.getName())) { return n; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java index 2cab00b5fc..1a5e1379a5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java @@ -22,7 +22,7 @@ class SshKeyCacheEntry { private final AccountSshKey.Id id; private final PublicKey publicKey; - SshKeyCacheEntry(final AccountSshKey.Id i, final PublicKey k) { + SshKeyCacheEntry(AccountSshKey.Id i, PublicKey k) { id = i; publicKey = k; } @@ -31,7 +31,7 @@ class SshKeyCacheEntry { return id.getParentKey(); } - boolean match(final PublicKey inkey) { + boolean match(PublicKey inkey) { return publicKey.equals(inkey); } } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java index dfd56f1f88..12064c83fa 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java @@ -89,7 +89,7 @@ class SshLog implements LifecycleListener { audit(context.get(), "0", "LOGIN"); } - void onAuthFail(final SshSession sd) { + void onAuthFail(SshSession sd) { final LoggingEvent event = new LoggingEvent( // Logger.class.getName(), // fqnOfCategoryClass @@ -210,7 +210,7 @@ class SshLog implements LifecycleListener { audit(context.get(), "0", "LOGOUT"); } - private LoggingEvent log(final String msg) { + private LoggingEvent log(String msg) { final SshSession sd = session.get(); final CurrentUser user = sd.getUser(); @@ -248,7 +248,7 @@ class SshLog implements LifecycleListener { return event; } - private static String id(final int id) { + private static String id(int id) { return IdGenerator.format(id); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java index 627bf71a31..442ec52cb2 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java @@ -69,7 +69,7 @@ public final class SshLogLayout extends Layout { return buf.toString(); } - private void formatDate(final long now, final StringBuffer sbuf) { + private void formatDate(long now, StringBuffer sbuf) { final int millis = (int) (now % 1000); final long rounded = now - millis; if (rounded != lastTimeMillis) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java index 44554ca13c..5e2626ef67 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java @@ -24,7 +24,7 @@ public class SshRemotePeerProvider implements Provider { private final Provider session; @Inject - SshRemotePeerProvider(final Provider s) { + SshRemotePeerProvider(Provider s) { session = s; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java index 202a80eed8..963a71a4bb 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java @@ -51,7 +51,7 @@ public class SshScope { volatile long started; volatile long finished; - private Context(SchemaFactory sf, final SshSession s, final String c, final long at) { + private Context(SchemaFactory sf, SshSession s, String c, long at) { schemaFactory = sf; session = s; commandLine = c; @@ -179,7 +179,7 @@ public class SshScope { public static final Scope REQUEST = new Scope() { @Override - public Provider scope(final Key key, final Provider creator) { + public Provider scope(Key key, Provider creator) { return new Provider() { @Override public T get() { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java index f08fb432a5..1a60a20f90 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java @@ -35,7 +35,7 @@ public class SshSession { private volatile String authError; private volatile String peerAgent; - SshSession(final int sessionId, SocketAddress peer) { + SshSession(int sessionId, SocketAddress peer) { this.sessionId = sessionId; this.remoteAddress = peer; this.remoteAsString = format(remoteAddress); @@ -109,7 +109,7 @@ public class SshSession { return authError != null; } - private static String format(final SocketAddress remote) { + private static String format(SocketAddress remote) { if (remote instanceof InetSocketAddress) { final InetSocketAddress sa = (InetSocketAddress) remote; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java index 33d253ab54..ab0ffcfd15 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java @@ -48,7 +48,7 @@ public class SshUtil { * @throws NoSuchAlgorithmException the JVM is missing the key algorithm. * @throws NoSuchProviderException the JVM is missing the provider. */ - public static PublicKey parse(final AccountSshKey key) + public static PublicKey parse(AccountSshKey key) throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException { try { final String s = key.getEncodedKey(); @@ -69,7 +69,7 @@ public class SshUtil { * @return {@code keyStr} if conversion failed; otherwise the converted key, in OpenSSH key * format. */ - public static String toOpenSshPublicKey(final String keyStr) { + public static String toOpenSshPublicKey(String keyStr) { try { final StringBuilder strBuf = new StringBuilder(); final BufferedReader br = new BufferedReader(new StringReader(keyStr)); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java index 58fd027e53..76612100e7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java @@ -26,7 +26,7 @@ class StreamCommandExecutorProvider implements Provider { private final WorkQueue queues; @Inject - StreamCommandExecutorProvider(@GerritServerConfig final Config config, final WorkQueue wq) { + StreamCommandExecutorProvider(@GerritServerConfig final Config config, WorkQueue wq) { final int cores = Runtime.getRuntime().availableProcessors(); poolSize = config.getInt("sshd", "streamThreads", cores + 1); queues = wq; @@ -42,7 +42,7 @@ class StreamCommandExecutorProvider implements Provider { executor.setThreadFactory( new ThreadFactory() { @Override - public Thread newThread(final Runnable task) { + public Thread newThread(Runnable task) { final Thread t = parent.newThread(task); t.setPriority(Thread.MIN_PRIORITY); return t; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java index 4434694cde..35788fd0c9 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java @@ -126,7 +126,7 @@ final class AdminSetParent extends SshCommand { } final List childProjects = new ArrayList<>(); - for (final ProjectControl pc : children) { + for (ProjectControl pc : children) { childProjects.add(pc.getProject().getNameKey()); } if (oldParent != null) { @@ -137,7 +137,7 @@ final class AdminSetParent extends SshCommand { } } - for (final Project.NameKey nameKey : childProjects) { + for (Project.NameKey nameKey : childProjects) { final String name = nameKey.get(); if (allProjectsName.equals(nameKey)) { @@ -190,18 +190,18 @@ final class AdminSetParent extends SshCommand { * list of child projects does not contain projects that were specified to be excluded from * reparenting. */ - private List getChildrenForReparenting(final ProjectControl parent) + private List getChildrenForReparenting(ProjectControl parent) throws PermissionBackendException { final List childProjects = new ArrayList<>(); final List excluded = new ArrayList<>(excludedChildren.size()); - for (final ProjectControl excludedChild : excludedChildren) { + for (ProjectControl excludedChild : excludedChildren) { excluded.add(excludedChild.getProject().getNameKey()); } final List automaticallyExcluded = new ArrayList<>(excludedChildren.size()); if (newParentKey != null) { automaticallyExcluded.addAll(getAllParents(newParentKey)); } - for (final ProjectInfo child : listChildProjects.apply(new ProjectResource(parent))) { + for (ProjectInfo child : listChildProjects.apply(new ProjectResource(parent))) { final Project.NameKey childName = new Project.NameKey(child.name); if (!excluded.contains(childName)) { if (!automaticallyExcluded.contains(childName)) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java index 92098cc893..633eaa0420 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java @@ -34,7 +34,7 @@ final class ApproveOption implements Option, Setter { private Short value; - ApproveOption(final String name, final String usage, final LabelType type) { + ApproveOption(String name, String usage, LabelType type) { this.name = name; this.usage = usage; this.type = type; @@ -100,7 +100,7 @@ final class ApproveOption implements Option, Setter { } @Override - public void addValue(final Short val) { + public void addValue(Short val) { this.value = val; } @@ -122,13 +122,13 @@ final class ApproveOption implements Option, Setter { private final ApproveOption cmdOption; // CS IGNORE RedundantModifier FOR NEXT 1 LINES. REASON: needed by org.kohsuke.args4j.Option - public Handler(final CmdLineParser parser, final OptionDef option, final Setter setter) { + public Handler(CmdLineParser parser, OptionDef option, Setter setter) { super(parser, option, setter); this.cmdOption = (ApproveOption) setter; } @Override - protected Short parse(final String token) throws NumberFormatException, CmdLineException { + protected Short parse(String token) throws NumberFormatException, CmdLineException { String argument = token; if (argument.startsWith("+")) { argument = argument.substring(1); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java index 22bca56a6b..4bb176c0a5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java @@ -75,7 +75,7 @@ final class CreateGroupCommand extends SshCommand { metaVar = "USERNAME", usage = "initial set of users to become members of the group" ) - void addMember(final Account.Id id) { + void addMember(Account.Id id) { initialMembers.add(id); } @@ -90,7 +90,7 @@ final class CreateGroupCommand extends SshCommand { metaVar = "GROUP", usage = "initial set of groups to be included in the group" ) - void addGroup(final AccountGroup.UUID id) { + void addGroup(AccountGroup.UUID id) { initialGroups.add(id); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java index 8357a919e5..c510680e63 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java @@ -91,9 +91,9 @@ public class ListGroupsCommand extends SshCommand { groupBackend); } - void display(final PrintWriter out) throws OrmException, BadRequestException { + void display(PrintWriter out) throws OrmException, BadRequestException { final ColumnFormatter formatter = new ColumnFormatter(out, '\t'); - for (final GroupInfo info : get()) { + for (GroupInfo info : get()) { formatter.addColumn(MoreObjects.firstNonNull(info.name, "n/a")); if (verboseOutput) { AccountGroup o = diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java index 5b7f23b75d..0c9cafe45e 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java @@ -109,7 +109,7 @@ public class LsUserRefs extends SshCommand { tagCache, changeNotesFactory, changeCache, repo, userProjectControl, db, true) .filter(repo.getRefDatabase().getRefs(ALL), false); - for (final String ref : refsMap.keySet()) { + for (String ref : refsMap.keySet()) { if (!onlyRefsHeads || ref.startsWith(RefNames.REFS_HEADS)) { stdout.println(ref); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java index 4201c2cc99..3f592bee45 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java @@ -272,7 +272,7 @@ public class QueryShell { Identity.create(rs, "COLUMN_NAME"), new Function("TYPE") { @Override - String apply(final ResultSet rs) throws SQLException { + String apply(ResultSet rs) throws SQLException { String type = rs.getString("TYPE_NAME"); switch (rs.getInt("DATA_TYPE")) { case java.sql.Types.CHAR: @@ -344,7 +344,7 @@ public class QueryShell { println(""); } - private void executeStatement(final String sql) { + private void executeStatement(String sql) { final long start = TimeUtil.nowMs(); final boolean hasResultSet; try { @@ -397,7 +397,7 @@ public class QueryShell { * @param show Functions to map columns * @throws SQLException */ - private void showResultSet(final ResultSet rs, boolean alreadyOnRow, long start, Function... show) + private void showResultSet(ResultSet rs, boolean alreadyOnRow, long start, Function... show) throws SQLException { switch (outputFormat) { case JSON_SINGLE: @@ -620,7 +620,7 @@ public class QueryShell { } } - private void warning(final String msg) { + private void warning(String msg) { switch (outputFormat) { case JSON_SINGLE: case JSON: @@ -639,7 +639,7 @@ public class QueryShell { } } - private void error(final SQLException err) { + private void error(SQLException err) { switch (outputFormat) { case JSON_SINGLE: case JSON: @@ -718,7 +718,7 @@ public class QueryShell { private abstract static class Function { final String name; - Function(final String name) { + Function(String name) { this.name = name; } @@ -726,19 +726,19 @@ public class QueryShell { } private static class Identity extends Function { - static Identity create(final ResultSet rs, final String name) throws SQLException { + static Identity create(ResultSet rs, String name) throws SQLException { return new Identity(rs.findColumn(name), name); } final int colId; - Identity(final int colId, final String name) { + Identity(int colId, String name) { super(name); this.colId = colId; } @Override - String apply(final ResultSet rs) throws SQLException { + String apply(ResultSet rs) throws SQLException { return rs.getString(colId); } } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java index 7789c65e74..1fbcc171b7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java @@ -61,7 +61,7 @@ final class Receive extends AbstractGitCommand { metaVar = "EMAIL", usage = "request reviewer for change(s)" ) - void addReviewer(final Account.Id id) { + void addReviewer(Account.Id id) { reviewerId.add(id); } @@ -71,7 +71,7 @@ final class Receive extends AbstractGitCommand { metaVar = "EMAIL", usage = "CC user on change(s)" ) - void addCC(final Account.Id id) { + void addCC(Account.Id id) { ccId.add(id); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java index ca69b5477d..491455d6df 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -78,7 +78,7 @@ public class ReviewCommand extends SshCommand { metaVar = "{COMMIT | CHANGE,PATCHSET}", usage = "list of commits or patch sets to review" ) - void addPatchSetId(final String token) { + void addPatchSetId(String token) { try { PatchSet ps = psParser.parsePatchSet(token, projectControl, branch); patchSets.add(ps); @@ -159,7 +159,7 @@ public class ReviewCommand extends SshCommand { usage = "custom label(s) to assign", metaVar = "LABEL=VALUE" ) - void addLabel(final String token) { + void addLabel(String token) { LabelVote v = LabelVote.parseWithEquals(token); LabelType.checkName(v.label()); // Disallow SUBM. customLabels.put(v.label(), v.value()); @@ -256,7 +256,7 @@ public class ReviewCommand extends SshCommand { input = reviewFromJson(); } - for (final PatchSet patchSet : patchSets) { + for (PatchSet patchSet : patchSets) { try { if (input != null) { applyReview(patchSet, input); @@ -281,7 +281,7 @@ public class ReviewCommand extends SshCommand { } } - private void applyReview(PatchSet patchSet, final ReviewInput review) throws RestApiException { + private void applyReview(PatchSet patchSet, ReviewInput review) throws RestApiException { gApi.changes() .id(patchSet.getId().getParentKey().get()) .revision(patchSet.getRevision().get()) @@ -297,7 +297,7 @@ public class ReviewCommand extends SshCommand { } } - private void reviewPatchSet(final PatchSet patchSet) throws Exception { + private void reviewPatchSet(PatchSet patchSet) throws Exception { if (notify == null) { notify = NotifyHandling.ALL; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java index 0c8c74a31a..1306c52eab 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -50,7 +50,7 @@ final class ScpCommand extends BaseCommand { private IOException error; @Override - public void setArguments(final String[] args) { + public void setArguments(String[] args) { root = ""; for (int i = 0; i < args.length; i++) { if (args[i].charAt(0) == '-') { @@ -81,7 +81,7 @@ final class ScpCommand extends BaseCommand { } @Override - public void start(final Environment env) { + public void start(Environment env) { startThread(this::runImp); } @@ -155,7 +155,7 @@ final class ScpCommand extends BaseCommand { } } - private void readFile(final Entry ent) throws IOException { + private void readFile(Entry ent) throws IOException { byte[] data = ent.getBytes(); if (data == null) { throw new FileNotFoundException(ent.getPath()); @@ -169,7 +169,7 @@ final class ScpCommand extends BaseCommand { readAck(); } - private void readDir(final Entry dir) throws IOException { + private void readDir(Entry dir) throws IOException { header(dir, 0); readAck(); @@ -186,8 +186,7 @@ final class ScpCommand extends BaseCommand { readAck(); } - private void header(final Entry dir, final int len) - throws IOException, UnsupportedEncodingException { + private void header(Entry dir, int len) throws IOException, UnsupportedEncodingException { final StringBuilder buf = new StringBuilder(); switch (dir.getType()) { case DIR: diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java index 8c6db83d52..19231698ba 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java @@ -231,7 +231,7 @@ final class SetAccountCommand extends SshCommand { private void addSshKeys(List sshKeys) throws RestApiException, OrmException, IOException, ConfigInvalidException, PermissionBackendException { - for (final String sshKey : sshKeys) { + for (String sshKey : sshKeys) { AddSshKey.Input in = new AddSshKey.Input(); in.raw = RawInputUtil.create(sshKey.getBytes(UTF_8), "plain/text"); addSshKey.apply(rsrc, in); @@ -302,7 +302,7 @@ final class SetAccountCommand extends SshCommand { stderr.println("preferred email not found: " + email); } - private List readSshKey(final List sshKeys) + private List readSshKey(List sshKeys) throws UnsupportedEncodingException, IOException { if (!sshKeys.isEmpty()) { int idx = sshKeys.indexOf("-"); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java index 5dee10563d..a8452c8a52 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java @@ -75,7 +75,7 @@ final class ShowConnections extends SshCommand { private int columns = 80; @Override - public void start(final Environment env) throws IOException { + public void start(Environment env) throws IOException { String s = env.getEnv().get(Environment.ENV_COLUMNS); if (s != null && !s.isEmpty()) { try { @@ -122,7 +122,7 @@ final class ShowConnections extends SshCommand { String.format( "%-8s %8s %8s %-15s %s\n", "Session", "Start", "Idle", "User", "Remote Host")); stdout.print("--------------------------------------------------------------\n"); - for (final IoSession io : list) { + for (IoSession io : list) { checkState(io instanceof MinaSession, "expected MinaSession"); MinaSession minaSession = (MinaSession) io; long start = minaSession.getSession().getCreationTime(); @@ -142,7 +142,7 @@ final class ShowConnections extends SshCommand { } else { stdout.print(String.format("%-8s %-15s %s\n", "Session", "User", "Remote Host")); stdout.print("--------------------------------------------------------------\n"); - for (final IoSession io : list) { + for (IoSession io : list) { AbstractSession s = AbstractSession.getSession(io, true); SshSession sd = s != null ? s.getAttribute(SshSession.KEY) : null; @@ -169,11 +169,11 @@ final class ShowConnections extends SshCommand { } } - private static String id(final SshSession sd) { + private static String id(SshSession sd) { return sd != null ? IdGenerator.format(sd.getSessionId()) : ""; } - private static String time(final long now, final long time) { + private static String time(long now, long time) { if (time - now < 24 * 60 * 60 * 1000L) { return new SimpleDateFormat("HH:mm:ss").format(new Date(time)); } @@ -193,7 +193,7 @@ final class ShowConnections extends SshCommand { return String.format("%02d:%02d:%02d", hr, min, sec); } - private String username(final SshSession sd) { + private String username(SshSession sd) { if (sd == null) { return ""; } @@ -214,7 +214,7 @@ final class ShowConnections extends SshCommand { return ""; } - private String hostname(final SocketAddress remoteAddress) { + private String hostname(SocketAddress remoteAddress) { if (remoteAddress == null) { return "?"; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java index dfb9c9c920..ff44b7625c 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java @@ -180,7 +180,7 @@ final class ShowQueue extends SshCommand { return format(when, delay); } - private static String startTime(final Date when) { + private static String startTime(Date when) { return format(when, TimeUtil.nowMs() - when.getTime()); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java index 1c0a4247ac..5688bfc670 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java @@ -131,7 +131,7 @@ final class StreamEvents extends BaseCommand { private PrintWriter stdout; @Override - public void start(final Environment env) throws IOException { + public void start(Environment env) throws IOException { try { parseCommandLine(); } catch (UnloggedFailure e) { @@ -150,7 +150,7 @@ final class StreamEvents extends BaseCommand { eventListeners.add( new UserScopedEventListener() { @Override - public void onEvent(final Event event) { + public void onEvent(Event event) { if (subscribedToEvents.isEmpty() || subscribedToEvents.contains(event.getType())) { offer(event); } @@ -170,7 +170,7 @@ final class StreamEvents extends BaseCommand { } @Override - protected void onExit(final int rc) { + protected void onExit(int rc) { eventListenerRegistration.remove(); synchronized (taskLock) { @@ -199,7 +199,7 @@ final class StreamEvents extends BaseCommand { } } - private void offer(final Event event) { + private void offer(Event event) { synchronized (taskLock) { if (!queue.offer(event)) { dropped = true; @@ -263,7 +263,7 @@ final class StreamEvents extends BaseCommand { } } - private void write(final Object message) { + private void write(Object message) { String msg = null; try { msg = gson.toJson(message) + "\n"; diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index 8aa5b9e2ea..bb293ccedf 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -195,7 +195,7 @@ public class CmdLineParser { return parser.help.value; } - public void parseArgument(final String... args) throws CmdLineException { + public void parseArgument(String... args) throws CmdLineException { List tmp = Lists.newArrayListWithCapacity(args.length); for (int argi = 0; argi < args.length; argi++) { final String str = args[argi]; @@ -232,7 +232,7 @@ public class CmdLineParser { public void parseOptionMap(ListMultimap params) throws CmdLineException { List tmp = Lists.newArrayListWithCapacity(2 * params.size()); - for (final String key : params.keySet()) { + for (String key : params.keySet()) { String name = makeOption(key); if (isBoolean(name)) { @@ -391,7 +391,7 @@ public class CmdLineParser { private HelpOption help; - MyParser(final Object bean) { + MyParser(Object bean) { super(bean); ensureOptionsInitialized(); } @@ -417,7 +417,7 @@ public class CmdLineParser { @SuppressWarnings({"unchecked", "rawtypes"}) @Override - protected OptionHandler createOptionHandler(final OptionDef option, final Setter setter) { + protected OptionHandler createOptionHandler(OptionDef option, Setter setter) { if (isHandlerSpecified(option) || isEnum(setter) || isPrimitive(setter)) { return add(super.createOptionHandler(option, setter)); } @@ -444,7 +444,7 @@ public class CmdLineParser { } } - private boolean isHandlerSpecified(final OptionDef option) { + private boolean isHandlerSpecified(OptionDef option) { return option.handler() != OptionHandler.class; } diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java index 582bee2143..95d11a5d0d 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java @@ -25,7 +25,7 @@ import org.kohsuke.args4j.spi.OptionHandler; public class OptionHandlerUtil { /** Generate a key for an {@link OptionHandlerFactory} in Guice. */ @SuppressWarnings("unchecked") - public static Key> keyFor(final Class valueType) { + public static Key> keyFor(Class valueType) { final Type factoryType = Types.newParameterizedType(OptionHandlerFactory.class, valueType); return (Key>) Key.get(factoryType); } @@ -36,7 +36,7 @@ public class OptionHandlerUtil { return (Key>) Key.get(handlerType); } - public static Module moduleFor(final Class type, Class> impl) { + public static Module moduleFor(Class type, Class> impl) { return new FactoryModuleBuilder().implement(handlerOf(type), impl).build(keyFor(type)); } diff --git a/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java index 171e059ca3..6dc10065c0 100644 --- a/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java +++ b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java @@ -63,7 +63,7 @@ public class BlindSSLSocketFactory extends SSLSocketFactory { private final SSLSocketFactory sslFactory; - private BlindSSLSocketFactory(final SSLSocketFactory sslFactory) { + private BlindSSLSocketFactory(SSLSocketFactory sslFactory) { this.sslFactory = sslFactory; } diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java index 269334032b..616030e1db 100644 --- a/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java +++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java @@ -54,7 +54,7 @@ final class ReviewDbDataSourceProvider implements Provider, Lifecycl } } - private void closeDataSource(final DataSource ds) { + private void closeDataSource(DataSource ds) { try { Class type = Class.forName("org.apache.commons.dbcp.BasicDataSource"); if (type.isInstance(ds)) {