Merge changes from topic 'checkstyle-cleanup'

* changes:
  Remove redundant 'private' modifier on constructors
  Remove redundant 'static' modifiers
  InitIndex: Add comment in empty if-block
  Declare variables on separate lines
  Change class modifier order to follow Java Language Spec
  Add missing whitespace around keywords, operators and braces

gerrit-common/src/main/java/com/google/gerrit/common/data/GarbageCollectionResult.java

@@ -39,7 +39,7 @@ public class GarbageCollectionResult {
   }
 
   public static class Error {
-    public static enum Type {
+    public enum Type {
       /** Git garbage collection was already scheduled for this project */
       GC_ALREADY_SCHEDULED,
 

gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScript.java

@@ -27,11 +27,11 @@ import org.eclipse.jgit.diff.Edit;
 import java.util.List;
 
 public class PatchScript {
-  public static enum DisplayMethod {
+  public enum DisplayMethod {
     NONE, DIFF, IMG
   }
 
-  public static enum FileMode {
+  public enum FileMode {
     FILE, SYMLINK, GITLINK
   }
 

gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java

@@ -17,7 +17,7 @@ package com.google.gerrit.common.data;
 public class PermissionRule implements Comparable<PermissionRule> {
   public static final String FORCE_PUSH = "Force Push";
   public static final String FORCE_EDIT = "Force Edit";
-  public static enum Action {
+  public enum Action {
     ALLOW, DENY, BLOCK,
 
     INTERACTIVE, BATCH

gerrit-common/src/main/java/com/google/gerrit/common/data/SubmitRecord.java

@@ -23,7 +23,7 @@ import java.util.Objects;
  * Describes the state required to submit a change.
  */
 public class SubmitRecord {
-  public static enum Status {
+  public enum Status {
     /** The change is ready for submission. */
     OK,
 
@@ -49,7 +49,7 @@ public class SubmitRecord {
   public String errorMessage;
 
   public static class Label {
-    public static enum Status {
+    public enum Status {
       /**
        * This label provides what is necessary for submission.
        * <p>

gerrit-common/src/main/java/com/google/gerrit/common/data/SubmitTypeRecord.java

@@ -20,7 +20,7 @@ import com.google.gerrit.extensions.client.SubmitType;
  * Describes the submit type for a change.
  */
 public class SubmitTypeRecord {
-  public static enum Status {
+  public enum Status {
     /** The type was computed successfully */
     OK,
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewInput.java

@@ -66,7 +66,7 @@ public class ReviewInput {
    */
   public String onBehalfOf;
 
-  public static enum DraftHandling {
+  public enum DraftHandling {
     /** Delete pending drafts on this revision only. */
     DELETE,
 
@@ -80,7 +80,7 @@ public class ReviewInput {
     PUBLISH_ALL_REVISIONS
   }
 
-  public static enum NotifyHandling {
+  public enum NotifyHandling {
     NONE, OWNER, OWNER_REVIEWERS, ALL
   }
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java

@@ -61,7 +61,7 @@ public interface Projects {
   ListRequest list();
 
   public abstract class ListRequest {
-    public static enum FilterType {
+    public enum FilterType {
       CODE, PARENT_CANDIDATES, PERMISSIONS, ALL
     }
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java

@@ -32,7 +32,7 @@ public class DiffPreferencesInfo {
   public static final short[] CONTEXT_CHOICES =
       {3, 10, 25, 50, 75, 100, WHOLE_FILE_CONTEXT};
 
-  public static enum Whitespace {
+  public enum Whitespace {
     IGNORE_NONE,
     IGNORE_TRAILING,
     IGNORE_LEADING_AND_TRAILING,

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java

@@ -27,11 +27,11 @@ public class GeneralPreferencesInfo {
   public static final int[] PAGESIZE_CHOICES = {10, 25, 50, 100};
 
   /** Preferred method to download a change. */
-  public static enum DownloadCommand {
+  public enum DownloadCommand {
     REPO_DOWNLOAD, PULL, CHECKOUT, CHERRY_PICK, FORMAT_PATCH
   }
 
-  public static enum DateFormat {
+  public enum DateFormat {
     /** US style dates: Apr 27, Feb 14, 2010 */
     STD("MMM d", "MMM d, yyyy"),
 
@@ -64,7 +64,7 @@ public class GeneralPreferencesInfo {
     }
   }
 
-  public static enum ReviewCategoryStrategy {
+  public enum ReviewCategoryStrategy {
     NONE,
     NAME,
     EMAIL,
@@ -72,18 +72,18 @@ public class GeneralPreferencesInfo {
     ABBREV
   }
 
-  public static enum DiffView {
+  public enum DiffView {
     SIDE_BY_SIDE,
     UNIFIED_DIFF
   }
 
-  public static enum EmailStrategy {
+  public enum EmailStrategy {
     ENABLED,
     CC_ON_OWN_COMMENTS,
     DISABLED
   }
 
-  public static enum TimeFormat {
+  public enum TimeFormat {
     /** 12-hour clock: 1:15 am, 2:13 pm */
     HHMM_12("h:mm a"),
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GerritTopMenu.java

@@ -19,7 +19,7 @@ public enum GerritTopMenu {
 
   public final String menuName;
 
-  private GerritTopMenu() {
+  GerritTopMenu() {
     menuName = name().substring(0, 1) + name().substring(1).toLowerCase();
   }
 }

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListChangesOption.java

@@ -70,7 +70,7 @@ public enum ListChangesOption {
 
   private final int value;
 
-  private ListChangesOption(int v) {
+  ListChangesOption(int v) {
     this.value = v;
   }
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListGroupsOption.java

@@ -26,7 +26,7 @@ public enum ListGroupsOption {
 
   private final int value;
 
-  private ListGroupsOption(int v) {
+  ListGroupsOption(int v) {
     this.value = v;
   }
 

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DiffInfo.java

@@ -35,7 +35,7 @@ public class DiffInfo {
   // Binary file
   public Boolean binary;
 
-  public static enum IntraLineStatus {
+  public enum IntraLineStatus {
     OK,
     TIMEOUT,
     FAILURE

gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProblemInfo.java

@@ -15,7 +15,7 @@
 package com.google.gerrit.extensions.common;
 
 public class ProblemInfo {
-  public static enum Status {
+  public enum Status {
     FIXED, FIX_FAILED
   }
 

gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabelText.java

@@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.Constants;
 
 interface CopyableLabelText extends Constants {
-  static final CopyableLabelText I = GWT.create(CopyableLabelText.class);
+  final CopyableLabelText I = GWT.create(CopyableLabelText.class);
 
   String tooltip();
   String copied();

gerrit-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java

@@ -102,7 +102,7 @@ class AttMap {
     }
   }
 
-  private static interface Tag {
+  private interface Tag {
     void assertSafe(String name, String value);
   }
 

gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/Tooltip.java

@@ -23,7 +23,7 @@ import com.google.gwt.user.client.ui.UIObject;
 /** Displays custom tooltip message below an element. */
 public class Tooltip {
   interface Resources extends ClientBundle {
-    static final Resources I = GWT.create(Resources.class);
+    final Resources I = GWT.create(Resources.class);
 
     @Source("tooltip.css")
     Css css();

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupInfoScreen.java

@@ -211,7 +211,9 @@ public class AccountGroupInfoScreen extends AccountGroupScreen {
   protected void display(final GroupInfo group, final boolean canModify) {
     groupUUIDLabel.setText(group.getGroupUUID().get());
     groupNameTxt.setText(group.name());
-    ownerTxt.setText(group.owner() != null?group.owner():Util.M.deletedReference(group.getOwnerUUID().get()));
+    ownerTxt.setText(group.owner() != null
+        ? group.owner()
+        : Util.M.deletedReference(group.getOwnerUUID().get()));
     descTxt.setText(group.description());
     visibleToAllCheckBox.setValue(group.options().isVisibleToAll());
     setMembersTabVisible(AccountGroup.isInternalGroup(group.getGroupUUID()));

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ActionMessageBox.java

@@ -35,7 +35,7 @@ abstract class ActionMessageBox extends Composite {
   interface Binder extends UiBinder<HTMLPanel, ActionMessageBox> {}
   private static final Binder uiBinder = GWT.create(Binder.class);
 
-  static interface Style extends CssResource {
+  interface Style extends CssResource {
     String popup();
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java

@@ -95,7 +95,7 @@ public class FileTable extends FlowPanel {
     String restoreDelete();
   }
 
-  public static enum Mode {
+  public enum Mode {
     REVIEW,
     EDIT
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.java

@@ -50,7 +50,7 @@ class Message extends Composite {
   interface Binder extends UiBinder<HTMLPanel, Message> {}
   private static final Binder uiBinder = GWT.create(Binder.class);
 
-  static interface Style extends CssResource {
+  interface Style extends CssResource {
     String closed();
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java

@@ -137,7 +137,7 @@ public class RelatedChanges extends TabPanel {
     abstract String getTitle(int count);
     abstract String getTitle(String count);
 
-    private Tab(String defaultTitle, String tooltip) {
+    Tab(String defaultTitle, String tooltip) {
       this.defaultTitle = defaultTitle;
       this.tooltip = tooltip;
     }

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java

@@ -20,8 +20,8 @@ import com.google.gwt.resources.client.CssResource;
 
 public interface Resources extends ClientBundle {
   public static final Resources I = GWT.create(Resources.class);
-  static final ChangeConstants C = GWT.create(ChangeConstants.class);
+  final ChangeConstants C = GWT.create(ChangeConstants.class);
-  static final ChangeMessages M = GWT.create(ChangeMessages.class);
+  final ChangeMessages M = GWT.create(ChangeMessages.class);
 
   @Source("common.css") Style style();
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java

@@ -19,11 +19,11 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
 
 public class ReviewInput extends JavaScriptObject {
-  public static enum NotifyHandling {
+  public enum NotifyHandling {
     NONE, OWNER, OWNER_REVIEWERS, ALL
   }
 
-  public static enum DraftHandling {
+  public enum DraftHandling {
     DELETE, PUBLISH, KEEP, PUBLISH_ALL_REVISIONS
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java

@@ -37,7 +37,7 @@ public class StarredChanges {
   private static final Event.Type<ChangeStarHandler> TYPE = new Event.Type<>();
 
   /** Handler that can receive notifications of a change's starred status. */
-  public static interface ChangeStarHandler {
+  public interface ChangeStarHandler {
     void onChangeStar(ChangeStarEvent event);
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java

@@ -68,7 +68,7 @@ public class Header extends Composite {
     Resources.I.style().ensureInjected();
   }
 
-  private static enum ReviewedState {
+  private enum ReviewedState {
     AUTO_REVIEW, LOADED
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java

@@ -46,7 +46,7 @@ class PublishedBox extends CommentBox {
   interface Binder extends UiBinder<HTMLPanel, PublishedBox> {}
   private static final Binder uiBinder = GWT.create(Binder.class);
 
-  static interface Style extends CssResource {
+  interface Style extends CssResource {
     String closed();
   }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java

@@ -20,7 +20,7 @@ import com.google.gwt.resources.client.ImageResource;
 
 /** Resources used by diff. */
 interface Resources extends ClientBundle {
-  static final Resources I = GWT.create(Resources.class);
+  final Resources I = GWT.create(Resources.class);
 
   @Source("CommentBox.css") CommentBox.Style style();
   @Source("Scrollbar.css") Scrollbar.Style scrollbarStyle();

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideCommentManager.java

@@ -357,7 +357,8 @@ class SideBySideCommentManager extends CommentManager {
       return w;
     }
 
-    int lineA, lineB;
+    int lineA;
+    int lineB;
     if (line == 0) {
       lineA = lineB = 0;
     } else if (side == DisplaySide.A) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditConstants.java

@@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.Constants;
 
 interface EditConstants extends Constants {
-  static final EditConstants I = GWT.create(EditConstants.class);
+  final EditConstants I = GWT.create(EditConstants.class);
 
   String closeUnsavedChanges();
   String cancelUnsavedChanges();

gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java

@@ -70,7 +70,7 @@ public abstract class Screen extends View {
   public void registerKeys() {
   }
 
-  private static enum Cols {
+  private enum Cols {
     West, Title, East, FarEast
   }
 

gerrit-gwtui/src/main/java/net/codemirror/lib/Lib.java

@@ -21,7 +21,7 @@ import com.google.gwt.resources.client.DataResource.DoNotEmbed;
 import com.google.gwt.resources.client.ExternalTextResource;
 
 interface Lib extends ClientBundle {
-  static final Lib I = GWT.create(Lib.class);
+  final Lib I = GWT.create(Lib.class);
 
   @Source("cm.css")
   ExternalTextResource css();

gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/PluginServletContext.java

@@ -208,7 +208,7 @@ class PluginServletContext {
     }
   }
 
-  static interface API {
+  interface API {
     String getContextPath();
     String getInitParameter(String name);
     @SuppressWarnings("rawtypes")

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java

@@ -121,7 +121,7 @@ public class BaseServiceImplementation {
   }
 
   /** Arbitrary action to run with a database connection. */
-  public static interface Action<T> {
+  public interface Action<T> {
     /**
      * Perform this action, returning the onSuccess value.
      *

gerrit-lucene/src/main/java/com/google/gerrit/lucene/WrappableSearcherManager.java

@@ -143,7 +143,8 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
   @Override
   protected IndexSearcher refreshIfNeeded(IndexSearcher referenceToRefresh) throws IOException {
     final IndexReader r = referenceToRefresh.getIndexReader();
-    assert r instanceof DirectoryReader: "searcher's IndexReader should be a DirectoryReader, but got " + r;
+    assert r instanceof DirectoryReader :
+      "searcher's IndexReader should be a DirectoryReader, but got " + r;
     final IndexReader newReader = DirectoryReader.openIfChanged((DirectoryReader) r);
     if (newReader == null) {
       return null;
@@ -171,7 +172,8 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
     final IndexSearcher searcher = acquire();
     try {
       final IndexReader r = searcher.getIndexReader();
-      assert r instanceof DirectoryReader: "searcher's IndexReader should be a DirectoryReader, but got " + r;
+      assert r instanceof DirectoryReader :
+        "searcher's IndexReader should be a DirectoryReader, but got " + r;
       return ((DirectoryReader) r).isCurrent();
     } finally {
       release(searcher);

gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/DiscoveryResult.java

@@ -17,7 +17,7 @@ package com.google.gerrit.httpd.auth.openid;
 import java.util.Map;
 
 final class DiscoveryResult {
-  static enum Status {
+  enum Status {
     /** Provider was discovered and {@code providerUrl} is valid. */
     VALID,
 

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java

@@ -64,6 +64,7 @@ class InitIndex implements InitStep {
           site, def.getLatest().getVersion(), true);
     }
     if ((site.isNew || isEmptySite()) && type == IndexType.LUCENE) {
+      // Do nothing
     } else {
       final String message = String.format(
         "\nThe index must be %sbuilt before starting Gerrit:\n"

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java

@@ -71,7 +71,8 @@ public class InitPlugins implements InitStep {
         @Override
         public int compare(PluginData a, PluginData b) {
           return a.name.compareTo(b.name);
-      }});
+        }
+      });
   }
 
   private final ConsoleUI ui;

gerrit-pgm/src/main/java/com/google/gerrit/pgm/rules/PrologCompiler.java

@@ -66,7 +66,7 @@ public class PrologCompiler implements Callable<PrologCompiler.Status> {
     PrologCompiler create(Repository git);
   }
 
-  public static enum Status {
+  public enum Status {
     NO_RULES, COMPILED
   }
 

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Account.java

@@ -59,7 +59,7 @@ import java.sql.Timestamp;
  * </ul>
  */
 public final class Account {
-  public static enum FieldName {
+  public enum FieldName {
     FULL_NAME, USER_NAME, REGISTER_NEW_EMAIL
   }
 

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java

@@ -281,7 +281,7 @@ public final class Change {
    * codes ('A'..'Z') indicate a change that is closed and cannot be further
    * modified.
    * */
-  public static enum Status {
+  public enum Status {
     /**
      * Change is open and pending review, or review is in progress.
      *
@@ -356,7 +356,7 @@ public final class Change {
     private final boolean closed;
     private final ChangeStatus changeStatus;
 
-    private Status(char c, ChangeStatus cs) {
+    Status(char c, ChangeStatus cs) {
       code = c;
       closed = !(MIN_OPEN <= c && c <= MAX_OPEN);
       changeStatus = cs;

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Patch.java

@@ -68,7 +68,7 @@ public final class Patch {
   }
 
   /** Type of modification made to the file path. */
-  public static enum ChangeType implements CodedEnum {
+  public enum ChangeType implements CodedEnum {
     /** Path is being created/introduced by this patch. */
     ADDED('A'),
 
@@ -89,7 +89,7 @@ public final class Patch {
 
     private final char code;
 
-    private ChangeType(final char c) {
+    ChangeType(final char c) {
       code = c;
     }
 
@@ -113,7 +113,7 @@ public final class Patch {
   }
 
   /** Type of formatting for this patch. */
-  public static enum PatchType implements CodedEnum {
+  public enum PatchType implements CodedEnum {
     /**
      * A textual difference between two versions.
      *
@@ -148,7 +148,7 @@ public final class Patch {
 
     private final char code;
 
-    private PatchType(final char c) {
+    PatchType(final char c) {
       code = c;
     }
 

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchLineComment.java

@@ -60,14 +60,14 @@ public final class PatchLineComment {
   public static final char STATUS_DRAFT = 'd';
   public static final char STATUS_PUBLISHED = 'P';
 
-  public static enum Status {
+  public enum Status {
     DRAFT(STATUS_DRAFT),
 
     PUBLISHED(STATUS_PUBLISHED);
 
     private final char code;
 
-    private Status(final char c) {
+    Status(final char c) {
       code = c;
     }
 

gerrit-server/src/main/java/com/google/gerrit/metrics/Description.java

@@ -44,7 +44,7 @@ public class Description {
     }
   }
 
-  public static enum FieldOrdering {
+  public enum FieldOrdering {
     /** Default ordering places fields at end of the parent metric name. */
     AT_END,
 

gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java

@@ -54,7 +54,7 @@ public class PrologEnvironment extends BufferingPrologControl {
   private static final Logger log =
       LoggerFactory.getLogger(PrologEnvironment.class);
 
-  public static interface Factory {
+  public interface Factory {
     /**
      * Construct a new Prolog interpreter.
      *

gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 /** Access control management for server-wide capabilities. */
 public class CapabilityControl {
-  public static interface Factory {
+  public interface Factory {
     CapabilityControl create(CurrentUser user);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java

@@ -66,7 +66,7 @@ public class CreateAccount implements RestModifyView<TopLevelResource, Input> {
     public List<String> groups;
   }
 
-  public static interface Factory {
+  public interface Factory {
     CreateAccount create(String username);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java

@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 public class CreateEmail implements RestModifyView<AccountResource, EmailInput> {
   private static final Logger log = LoggerFactory.getLogger(CreateEmail.class);
 
-  public static interface Factory {
+  public interface Factory {
     CreateEmail create(String email);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/change/ArchiveFormat.java

@@ -31,7 +31,7 @@ public enum ArchiveFormat {
   private final ArchiveCommand.Format<?> format;
   private final String mimeType;
 
-  private ArchiveFormat(String mimeType, ArchiveCommand.Format<?> format) {
+  ArchiveFormat(String mimeType, ArchiveCommand.Format<?> format) {
     this.format = format;
     this.mimeType = mimeType;
     ArchiveCommand.registerFormat(name(), format);

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java

@@ -77,7 +77,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 public class ChangeInserter extends BatchUpdate.InsertChangeOp {
-  public static interface Factory {
+  public interface Factory {
     ChangeInserter create(Change.Id cid, RevCommit rc, String refName);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java

@@ -403,7 +403,7 @@ public class GetDiff implements RestReadView<FileResource> {
 
     private final DiffPreferencesInfo.Whitespace whitespace;
 
-    private IgnoreWhitespace(DiffPreferencesInfo.Whitespace whitespace) {
+    IgnoreWhitespace(DiffPreferencesInfo.Whitespace whitespace) {
       this.whitespace = whitespace;
     }
   }

gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java

@@ -68,7 +68,7 @@ public class PatchSetInserter extends BatchUpdate.Op {
   private static final Logger log =
       LoggerFactory.getLogger(PatchSetInserter.class);
 
-  public static interface Factory {
+  public interface Factory {
     PatchSetInserter create(RefControl refControl, PatchSet.Id psId,
         RevCommit commit);
   }

gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java

@@ -81,7 +81,7 @@ public class RebaseUtil {
   }
 
   @AutoValue
-  static abstract class Base {
+  abstract static class Base {
     private static Base create(ChangeControl ctl, PatchSet ps) {
       if (ctl == null) {
         return null;

gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java

@@ -28,7 +28,7 @@ public class ReviewerResource implements RestResource {
   public static final TypeLiteral<RestView<ReviewerResource>> REVIEWER_KIND =
       new TypeLiteral<RestView<ReviewerResource>>() {};
 
-  public static interface Factory {
+  public interface Factory {
     ReviewerResource create(ChangeResource change, Account.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java

@@ -41,7 +41,7 @@ import java.util.TreeMap;
 public class ListCaches implements RestReadView<ConfigResource> {
   private final DynamicMap<Cache<?, ?>> cacheMap;
 
-  public static enum OutputFormat {
+  public enum OutputFormat {
     LIST, TEXT_LIST
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java

@@ -52,7 +52,7 @@ public class PostCaches implements RestModifyView<ConfigResource, Input> {
     }
   }
 
-  public static enum Operation {
+  public enum Operation {
     FLUSH_ALL, FLUSH
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java

@@ -82,7 +82,7 @@ import java.util.TimeZone;
 @Singleton
 public class ChangeEditModifier {
 
-  private static enum TreeOperation {
+  private enum TreeOperation {
     CHANGE_ENTRY,
     DELETE_ENTRY,
     RENAME_ENTRY,

gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java

@@ -100,7 +100,7 @@ public class BatchUpdate implements AutoCloseable {
   }
 
   /** Order of execution of the various phases. */
-  public static enum Order {
+  public enum Order {
     /**
      * Update the repository and execute all ref updates before touching the
      * database.

gerrit-server/src/main/java/com/google/gerrit/server/git/GroupCollector.java

@@ -103,7 +103,7 @@ public class GroupCollector {
     return rsrc.getPatchSet().getGroups();
   }
 
-  private static interface Lookup {
+  private interface Lookup {
     List<String> lookup(PatchSet.Id psId)
         throws OrmException, NoSuchChangeException;
   }

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

@@ -706,7 +706,7 @@ public class MergeOp implements AutoCloseable {
   }
 
   @AutoValue
-  static abstract class BranchBatch {
+  abstract static class BranchBatch {
     @Nullable abstract SubmitType submitType();
     abstract List<ChangeData> changes();
   }

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java

@@ -106,7 +106,7 @@ public class MergeUtil {
         : MergeStrategy.RESOLVE;
   }
 
-  public static interface Factory {
+  public interface Factory {
     MergeUtil create(ProjectState project);
     MergeUtil create(ProjectState project, boolean useContentMerge);
   }

gerrit-server/src/main/java/com/google/gerrit/server/git/NotifyConfig.java

@@ -24,7 +24,7 @@ import java.util.EnumSet;
 import java.util.Set;
 
 public class NotifyConfig implements Comparable<NotifyConfig> {
-  public static enum Header {
+  public enum Header {
     TO, CC, BCC
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java

@@ -262,7 +262,7 @@ public class WorkQueue {
      * <li>{@link #DONE}: finished executing, if not periodic.</li>
      * </ol>
      */
-    public static enum State {
+    public enum State {
       // Ordered like this so ordinal matches the order we would
       // prefer to see tasks sorted in: done before running,
       // running before ready, ready before sleeping.

gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java

@@ -59,7 +59,7 @@ public enum CommitMergeStatus {
 
   private String message;
 
-  private CommitMergeStatus(String message) {
+  CommitMergeStatus(String message) {
     this.message = message;
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java

@@ -66,7 +66,7 @@ public class CommitValidators {
   private static final Logger log = LoggerFactory
       .getLogger(CommitValidators.class);
 
-  public static enum Policy {
+  public enum Policy {
     /** Use {@link #validateForGerritCommits}. */
     GERRIT,
 

gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java

@@ -56,7 +56,7 @@ import java.util.Locale;
 
 @RequiresCapability(GlobalCapability.CREATE_GROUP)
 public class CreateGroup implements RestModifyView<TopLevelResource, GroupInput> {
-  public static interface Factory {
+  public interface Factory {
     CreateGroup create(@Assisted String name);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java

@@ -24,7 +24,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a change being abandoned by its owner. */
 public class AbandonedSender extends ReplyToChangeSender {
-  public static interface Factory extends
+  public interface Factory extends
       ReplyToChangeSender.Factory<AbandonedSender> {
     @Override
     AbandonedSender create(Project.NameKey project, Change.Id change);

gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java

@@ -23,7 +23,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Asks a user to review a change. */
 public class AddReviewerSender extends NewChangeSender {
-  public static interface Factory {
+  public interface Factory {
     AddReviewerSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java

@@ -52,7 +52,7 @@ public class CommentSender extends ReplyToChangeSender {
   private static final Logger log = LoggerFactory
       .getLogger(CommentSender.class);
 
-  public static interface Factory {
+  public interface Factory {
     CommentSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java

@@ -33,7 +33,7 @@ public class CreateChangeSender extends NewChangeSender {
   private static final Logger log =
       LoggerFactory.getLogger(CreateChangeSender.class);
 
-  public static interface Factory {
+  public interface Factory {
     CreateChangeSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/DeleteVoteSender.java

@@ -24,7 +24,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a vote that was removed from a change. */
 public class DeleteVoteSender extends ReplyToChangeSender {
-  public static interface Factory extends
+  public interface Factory extends
       ReplyToChangeSender.Factory<DeleteVoteSender> {
     @Override
     DeleteVoteSender create(Project.NameKey project, Change.Id change);

gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java

@@ -23,7 +23,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a change failing to merged. */
 public class MergeFailSender extends ReplyToChangeSender {
-  public static interface Factory {
+  public interface Factory {
     MergeFailSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java

@@ -31,7 +31,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a change successfully merged. */
 public class MergedSender extends ReplyToChangeSender {
-  public static interface Factory {
+  public interface Factory {
     MergedSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java

@@ -31,7 +31,7 @@ import java.util.Set;
 
 /** Send notice of new patch sets for reviewers. */
 public class ReplacePatchSetSender extends ReplyToChangeSender {
-  public static interface Factory {
+  public interface Factory {
     ReplacePatchSetSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java

@@ -22,7 +22,7 @@ import com.google.gwtorm.server.OrmException;
 
 /** Alert a user to a reply to a change, usually commentary made during review. */
 public abstract class ReplyToChangeSender extends ChangeEmail {
-  public static interface Factory<T extends ReplyToChangeSender> {
+  public interface Factory<T extends ReplyToChangeSender> {
     T create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java

@@ -24,7 +24,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a change being restored by its owner. */
 public class RestoredSender extends ReplyToChangeSender {
-  public static interface Factory extends
+  public interface Factory extends
       ReplyToChangeSender.Factory<RestoredSender> {
     @Override
     RestoredSender create(Project.NameKey project, Change.Id id);

gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java

@@ -24,7 +24,7 @@ import com.google.inject.assistedinject.Assisted;
 
 /** Send notice about a change being reverted. */
 public class RevertedSender extends ReplyToChangeSender {
-  public static interface Factory {
+  public interface Factory {
     RevertedSender create(Project.NameKey project, Change.Id id);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java

@@ -57,7 +57,7 @@ public class SmtpEmailSender implements EmailSender {
     }
   }
 
-  public static enum Encryption {
+  public enum Encryption {
     NONE, SSL, TLS
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeNotes.java

@@ -75,7 +75,7 @@ public abstract class AbstractChangeNotes<T> {
   }
 
   @AutoValue
-  public static abstract class LoadHandle implements AutoCloseable {
+  public abstract static class LoadHandle implements AutoCloseable {
     public static LoadHandle create(RevWalk walk, ObjectId id) {
       return new AutoValue_AbstractChangeNotes_LoadHandle(
           checkNotNull(walk), id != null ? id.copy() : null);

gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java

@@ -447,7 +447,8 @@ public class ChangeBundle {
     checkArgument(a.getClass() == b.getClass());
     Class<?> clazz = a.getClass();
 
-    Timestamp ta, tb;
+    Timestamp ta;
+    Timestamp tb;
     try {
       Field f = clazz.getDeclaredField(field);
       checkArgument(f.getAnnotation(Column.class) != null);

gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeDraftUpdate.java

@@ -65,7 +65,7 @@ public class ChangeDraftUpdate extends AbstractChangeUpdate {
   }
 
   @AutoValue
-  static abstract class Key {
+  abstract static class Key {
     abstract RevId revId();
     abstract PatchLineComment.Key key();
   }

gerrit-server/src/main/java/com/google/gerrit/server/notedb/ReviewerStateInternal.java

@@ -49,7 +49,7 @@ public enum ReviewerStateInternal {
   private final FooterKey footerKey;
   private final ReviewerState state;
 
-  private ReviewerStateInternal(FooterKey footerKey, ReviewerState state) {
+  ReviewerStateInternal(FooterKey footerKey, ReviewerState state) {
     this.footerKey = footerKey;
     this.state = state;
   }

gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java

@@ -37,7 +37,7 @@ import java.util.List;
 public class IntraLineDiff implements Serializable {
   static final long serialVersionUID = IntraLineDiffKey.serialVersionUID;
 
-  public static enum Status implements CodedEnum {
+  public enum Status implements CodedEnum {
     EDIT_LIST('e'), DISABLED('D'), TIMEOUT('T'), ERROR('E');
 
     private final char code;

gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java

@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
 class IntraLineLoader implements Callable<IntraLineDiff> {
   static final Logger log = LoggerFactory.getLogger(IntraLineLoader.class);
 
-  static interface Factory {
+  interface Factory {
     IntraLineLoader create(IntraLineDiffKey key, IntraLineDiffArgs args);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/plugins/HttpModuleGenerator.java

@@ -18,7 +18,7 @@ package com.google.gerrit.server.plugins;
 public interface HttpModuleGenerator extends ModuleGenerator {
   void export(String javascript);
 
-  static class NOP extends ModuleGenerator.NOP
+  class NOP extends ModuleGenerator.NOP
       implements HttpModuleGenerator {
     @Override
     public void export(String javascript) {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/ModuleGenerator.java

@@ -27,7 +27,7 @@ public interface ModuleGenerator {
 
   Module create() throws InvalidPluginException;
 
-  static class NOP implements ModuleGenerator {
+  class NOP implements ModuleGenerator {
 
     @Override
     public void setPluginName(String name) {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java

@@ -32,7 +32,7 @@ import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
 public abstract class Plugin {
-  public static enum ApiType {
+  public enum ApiType {
     EXTENSION, PLUGIN, JS
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java

@@ -623,7 +623,7 @@ public class PluginLoader implements LifecycleListener {
     for (String name : pluginPaths.keys()) {
       for (Path pluginPath : pluginPaths.asMap().get(name)) {
         if (!pluginPath.getFileName().toString().endsWith(".disabled")) {
-          assert(!activePlugins.containsKey(name));
+          assert !activePlugins.containsKey(name);
           activePlugins.put(name, pluginPath);
         }
       }
@@ -656,7 +656,7 @@ public class PluginLoader implements LifecycleListener {
         continue;
       }
       Path winner = Iterables.getFirst(enabled, null);
-      assert(winner != null);
+      assert winner != null;
       // Disable all loser plugins by renaming their file names to
       // "file.disabled" and replace the disabled files in the multimap.
       Collection<Path> elementsToRemove = Lists.newArrayList();

gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java

@@ -64,7 +64,7 @@ public class CreateBranch implements RestModifyView<ProjectResource, Input> {
     public String revision;
   }
 
-  public static interface Factory {
+  public interface Factory {
     CreateBranch create(String ref);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java

@@ -80,7 +80,7 @@ import java.util.List;
 
 @RequiresCapability(GlobalCapability.CREATE_PROJECT)
 public class CreateProject implements RestModifyView<TopLevelResource, ProjectInput> {
-  public static interface Factory {
+  public interface Factory {
     CreateProject create(String name);
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java

@@ -76,7 +76,7 @@ import java.util.TreeSet;
 public class ListProjects implements RestReadView<TopLevelResource> {
   private static final Logger log = LoggerFactory.getLogger(ListProjects.class);
 
-  public static enum FilterType {
+  public enum FilterType {
     CODE {
       @Override
       boolean matches(Repository git) throws IOException {

gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java

@@ -69,7 +69,7 @@ public class OutputStreamQuery {
   private static final DateTimeFormatter dtf =
       DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss zzz");
 
-  public static enum OutputFormat {
+  public enum OutputFormat {
     TEXT, JSON
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java

@@ -91,7 +91,7 @@ public class DataSourceProvider implements Provider<DataSource>,
     }
   }
 
-  public static enum Context {
+  public enum Context {
     SINGLE_USER, MULTI_USER
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java

@@ -135,7 +135,7 @@ public class ToolsCatalog {
 
   /** A file served out of the tools root directory. */
   public static class Entry {
-    public static enum Type {
+    public enum Type {
       DIR, FILE
     }
 

gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java

@@ -19,7 +19,7 @@ import java.util.SortedSet;
 
 public class TreeFormatter {
 
-  public static interface TreeNode {
+  public interface TreeNode {
     String getDisplayName();
     boolean isVisible();
     SortedSet<? extends TreeNode> getChildren();

gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java

@@ -488,12 +488,12 @@ public abstract class BaseCommand implements Command {
   }
 
   /** Runnable function which can throw an exception. */
-  public static interface CommandRunnable {
+  public interface CommandRunnable {
     void run() throws Exception;
   }
 
   /** Runnable function which can retrieve a project name related to the task */
-  public static interface ProjectCommandRunnable extends CommandRunnable {
+  public interface ProjectCommandRunnable extends CommandRunnable {
     // execute parser command before running, in order to be able to retrieve
     // project name
     void executeParseCommand() throws Exception;

gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java

@@ -140,7 +140,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
   private static final Logger sshDaemonLog =
       LoggerFactory.getLogger(SshDaemon.class);
 
-  public static enum SshSessionBackend {
+  public enum SshSessionBackend {
     MINA,
     NIO2
   }

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java

@@ -51,7 +51,7 @@ public class QueryShell {
     QueryShell create(@Assisted InputStream in, @Assisted OutputStream out);
   }
 
-  public static enum OutputFormat {
+  public enum OutputFormat {
     PRETTY, JSON, JSON_SINGLE
   }
 

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java

@@ -40,7 +40,7 @@ public class SetLoggingLevelCommand extends SshCommand {
   private static final String LOG_CONFIGURATION = "log4j.properties";
   private static final String JAVA_OPTIONS_LOG_CONFIG = "log4j.configuration";
 
-  private static enum LevelOption {
+  private enum LevelOption {
     ALL,
     TRACE,
     DEBUG,

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java

@@ -81,7 +81,7 @@ final class StreamEvents extends BaseCommand {
 
   /** Special event to notify clients they missed other events. */
   private static final class DroppedOutputEvent extends Event {
-    private final static String TYPE = "dropped-output";
+    private static final String TYPE = "dropped-output";
     public DroppedOutputEvent() {
       super(TYPE);
     }