From c4f1aec9c27663ef4d32e4c599a64fec031bc0ba Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 28 Jan 2017 21:36:26 +0900 Subject: [PATCH] Remove redundant 'final' and 'public' modifiers Change-Id: I7567e42f1d8203037a2d5596acce0fc09475714b --- .../com/google/gerrit/extensions/webui/PatchSetWebLink.java | 2 +- .../com/google/gerrit/client/admin/AccountGroupScreen.java | 2 +- .../main/java/com/google/gerrit/client/diff/ChunkManager.java | 2 +- .../main/java/com/google/gerrit/client/diff/DiffScreen.java | 2 +- .../java/com/google/gerrit/server/StarredChangesUtil.java | 2 +- .../gerrit/server/change/LimitedByteArrayOutputStream.java | 2 +- .../server/git/validators/OnSubmitValidationListener.java | 2 +- .../java/com/google/gerrit/server/mime/FileTypeRegistry.java | 4 ++-- .../main/java/com/google/gerrit/server/project/DeleteRef.java | 2 +- .../java/com/google/gerrit/server/project/ProjectNode.java | 2 +- .../com/google/gerrit/server/util/RequestScopePropagator.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java index b9004f2ea2..1ff4960464 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java @@ -34,5 +34,5 @@ public interface PatchSetWebLink extends WebLink { * @return WebLinkInfo that links to patch set in external service, * null if there should be no link. */ - WebLinkInfo getPatchSetWebLink(final String projectName, final String commit); + WebLinkInfo getPatchSetWebLink(String projectName, String commit); } 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 cbe8a06cfd..0f27f57448 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 @@ -70,7 +70,7 @@ public abstract class AccountGroupScreen extends MenuScreen { }); } - protected abstract void display(final GroupInfo group, final boolean canModify); + protected abstract void display(GroupInfo group, boolean canModify); protected AccountGroup.UUID getGroupUUID() { return group.getGroupUUID(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java index 5257ae0667..eed0f9b511 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java @@ -88,7 +88,7 @@ abstract class ChunkManager { } } - abstract Runnable diffChunkNav(final CodeMirror cm, final Direction dir); + abstract Runnable diffChunkNav(CodeMirror cm, Direction dir); void diffChunkNavHelper(List chunks, DiffScreen host, int res, Direction dir) { 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 a22d4bda0d..1cb5995831 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 @@ -778,7 +778,7 @@ abstract class DiffScreen extends Screen { this.prefsAction = prefsAction; } - abstract void operation(final Runnable apply); + abstract void operation(Runnable apply); private Runnable upToChange(final boolean openReplyBox) { return new Runnable() { 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 44513319eb..5d9fbd67f5 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 @@ -270,7 +270,7 @@ public class StarredChangesUtil { public Set byChange(final Change.Id changeId, final String label) throws OrmException { - try (final Repository repo = repoManager.openRepository(allUsers)) { + try (Repository repo = repoManager.openRepository(allUsers)) { return getRefNames(repo, RefNames.refsStarredChangesPrefix(changeId)) .stream() .map(Account.Id::parse) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java index 43b796a2ee..2962fc3015 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java @@ -33,7 +33,7 @@ class LimitedByteArrayOutputStream extends OutputStream { * @param max the maximum size in bytes which may be stored. * @param initial the initial size. It must be smaller than the max size. */ - public LimitedByteArrayOutputStream(int max, int initial) { + LimitedByteArrayOutputStream(int max, int initial) { checkArgument(initial <= max); maxSize = max; buffer = new ByteArrayOutputStream(initial); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java index f2f397c650..c736320fb4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java @@ -37,7 +37,7 @@ import java.util.Map; */ @ExtensionPoint public interface OnSubmitValidationListener { - public class Arguments { + class Arguments { private Project.NameKey project; private Repository repository; private ObjectReader objectReader; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java index 96486e9623..a231693313 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java @@ -31,7 +31,7 @@ public interface FileTypeRegistry { * or cannot be determined, {@link MimeUtil2#UNKNOWN_MIME_TYPE} which * is an alias for {@code application/octet-stream}. */ - MimeType getMimeType(final String path, final byte[] content); + MimeType getMimeType(String path, byte[] content); /** * Is this content type safe to transmit to a browser directly? @@ -42,6 +42,6 @@ public interface FileTypeRegistry { * content type and wants it to be protected (typically by wrapping * the data in a ZIP archive). */ - boolean isSafeInline(final MimeType type); + boolean isSafeInline(MimeType type); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java index 5623efc346..adff11bbcd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java @@ -63,7 +63,7 @@ public class DeleteRef { private String prefix; public interface Factory { - public DeleteRef create(ProjectResource r); + DeleteRef create(ProjectResource r); } @AssistedInject 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 e74511a4d9..9eafc4bc73 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 @@ -26,7 +26,7 @@ import java.util.TreeSet; /** Node of a Project in a tree formatted by {@link ListProjects}. */ public class ProjectNode implements TreeNode, Comparable { public interface Factory { - ProjectNode create(final Project project, final boolean isVisible); + ProjectNode create(Project project, boolean isVisible); } private final AllProjectsName allProjectsName; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java index ac69ecfaff..f3b44e0025 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java @@ -178,7 +178,7 @@ public abstract class RequestScopePropagator { /** * @see #wrap(Callable) */ - protected abstract Callable wrapImpl(final Callable callable); + protected abstract Callable wrapImpl(Callable callable); protected Callable context(final RequestContext context, final Callable callable) {