Clean up various CheckStyle warnings
- Remove unnecessary public and static modifiers
- Change order of modifiers to follow JLS recommendation
- Add missing { } on if-blocks
Change-Id: Ibc43caad316369feaf30a8ee4f5f70665bc66f3c
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/addon/Addons.java b/gerrit-gwtui/src/main/java/net/codemirror/addon/Addons.java
index 5365cc5..7c8b362 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/addon/Addons.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/addon/Addons.java
@@ -20,7 +20,7 @@
import com.google.gwt.resources.client.DataResource.DoNotEmbed;
public interface Addons extends ClientBundle {
- public static final Addons I = GWT.create(Addons.class);
+ Addons I = GWT.create(Addons.class);
@Source("merge_bundled.js") @DoNotEmbed DataResource merge_bundled();
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/VersionedAuthorizedKeysOnInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/VersionedAuthorizedKeysOnInit.java
index 9ef6956..1c72600 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/VersionedAuthorizedKeysOnInit.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/VersionedAuthorizedKeysOnInit.java
@@ -49,7 +49,7 @@
import java.util.List;
public class VersionedAuthorizedKeysOnInit extends VersionedMetaData {
- public static interface Factory {
+ public interface Factory {
VersionedAuthorizedKeysOnInit create(Account.Id accountId);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
index 674cba6..b91378e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
@@ -64,9 +64,10 @@
if (input != null) {
List<AccountProjectWatch.Key> keysToDelete = new LinkedList<>();
for (String projectKeyToDelete : input) {
- if (!watchedProjectsMap.containsKey(projectKeyToDelete))
+ if (!watchedProjectsMap.containsKey(projectKeyToDelete)) {
throw new UnprocessableEntityException(projectKeyToDelete
+ " is not currently watched by this user.");
+ }
keysToDelete.add(watchedProjectsMap.get(projectKeyToDelete).getKey());
}
dbProvider.get().accountProjectWatches().deleteKeys(keysToDelete);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
index 4662f87..dc96d49 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
@@ -165,7 +165,7 @@
}
}
- public static interface Factory {
+ public interface Factory {
VersionedAuthorizedKeys create(Account.Id accountId);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteReviewerSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteReviewerSender.java
index 89daa1d..75f9f82 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteReviewerSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteReviewerSender.java
@@ -34,7 +34,7 @@
public class DeleteReviewerSender extends ReplyToChangeSender {
private final Set<Account.Id> reviewers = new HashSet<>();
- public static interface Factory extends
+ public interface Factory extends
ReplyToChangeSender.Factory<DeleteReviewerSender> {
@Override
DeleteReviewerSender create(Project.NameKey project, Change.Id change);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
index 4d2a719..0dfd8c9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
@@ -515,7 +515,7 @@
* messages below.
*/
@AutoValue
- static abstract class ChangeMessageCandidate {
+ abstract static class ChangeMessageCandidate {
static ChangeMessageCandidate create(ChangeMessage cm) {
return new AutoValue_ChangeBundle_ChangeMessageCandidate(
cm.getAuthor(),
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
index 5eed391..ed7b134 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
@@ -844,7 +844,7 @@
* @throws OrmException an error occurred reading the database.
*/
public Collection<PatchSet> visiblePatchSets() throws OrmException {
- return FluentIterable.from(patchSets()).filter(new Predicate<PatchSet>() {
+ Predicate<PatchSet> predicate = new Predicate<PatchSet>() {
@Override
public boolean apply(PatchSet input) {
try {
@@ -852,7 +852,9 @@
} catch (OrmException e) {
return false;
}
- }}).toList();
+ }
+ };
+ return FluentIterable.from(patchSets()).filter(predicate).toList();
}
public void setPatchSets(Collection<PatchSet> patchSets) {
