diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java
index 4c32f2ff82..74505659eb 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java
@@ -46,10 +46,10 @@ import java.util.Arrays;
 import java.util.Set;
 
 public class PushOneCommit {
-  public final static String SUBJECT = "test commit";
+  public static final String SUBJECT = "test commit";
 
-  private final static String FILE_NAME = "a.txt";
-  private final static String FILE_CONTENT = "some content";
+  private static final String FILE_NAME = "a.txt";
+  private static final String FILE_CONTENT = "some content";
 
   private final ReviewDb db;
   private final PersonIdent i;
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java
index 6c3e4fd8e2..72f1bc5c36 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java
@@ -22,7 +22,7 @@ public class CacheControl {
     NONE, PUBLIC, PRIVATE;
   }
 
-  public final static CacheControl NONE = new CacheControl(Type.NONE, 0, null);
+  public static final CacheControl NONE = new CacheControl(Type.NONE, 0, null);
 
   public static CacheControl PUBLIC(long age, TimeUnit unit) {
     return new CacheControl(Type.PUBLIC, age, unit);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
index 3298a06ca8..143c14888d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
@@ -23,19 +23,19 @@ import java.util.Date;
  * in the format defined by {@code git log --relative-date}.
  */
 public class RelativeDateFormatter {
-  final static long SECOND_IN_MILLIS = 1000;
+  static final long SECOND_IN_MILLIS = 1000;
 
-  final static long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS;
+  static final long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS;
 
-  final static long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS;
+  static final long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS;
 
-  final static long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
+  static final long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
 
-  final static long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS;
+  static final long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS;
 
-  final static long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS;
+  static final long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS;
 
-  final static long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS;
+  static final long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS;
 
   /**
    * @param when {@link Date} to format
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
index 0e815ed23d..ee0d7991b3 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
@@ -35,8 +35,8 @@ import java.util.zip.ZipFile;
 
 @Singleton
 public class InitPlugins implements InitStep {
-  private final static String PLUGIN_DIR = "WEB-INF/plugins/";
-  private final static String JAR = ".jar";
+  private static final String PLUGIN_DIR = "WEB-INF/plugins/";
+  private static final String JAR = ".jar";
 
   public static class PluginData {
     public final String name;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java
index 7d08173321..67257452e5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java
@@ -26,7 +26,7 @@ public class AuthUser {
   /**
    * Globally unique identifier for the user.
    */
-  public final static class UUID {
+  public static final class UUID {
     private final String uuid;
 
     /**
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
index 4dad3351e4..0441fd3f7b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
@@ -63,8 +63,8 @@ import java.util.List;
 import java.util.Set;
 
 public class PostReviewers implements RestModifyView<ChangeResource, Input> {
-  public final static int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10;
-  public final static int DEFAULT_MAX_REVIEWERS = 20;
+  public static final int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10;
+  public static final int DEFAULT_MAX_REVIEWERS = 20;
 
   public static class Input {
     @DefaultInput
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 3ca58489d3..c5e2739cb9 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
@@ -488,7 +488,7 @@ public class MergeUtil {
   public ObjectInserter createDryRunInserter() {
     return new ObjectInserter() {
       private final MutableObjectId buf = new MutableObjectId();
-      private final static int LAST_BYTE = Constants.OBJECT_ID_LENGTH - 1;
+      private static final int LAST_BYTE = Constants.OBJECT_ID_LENGTH - 1;
 
       @Override
       public ObjectId insert(int objectType, long length, InputStream in)
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/SubmoduleSectionParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/SubmoduleSectionParserTest.java
index 7294d4cc16..299a24564c 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/util/SubmoduleSectionParserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/SubmoduleSectionParserTest.java
@@ -41,7 +41,7 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 public class SubmoduleSectionParserTest extends LocalDiskRepositoryTestCase {
-  private final static String THIS_SERVER = "localhost";
+  private static final String THIS_SERVER = "localhost";
   private GitRepositoryManager repoManager;
   private BlobBasedConfig bbc;
 
@@ -245,7 +245,7 @@ public class SubmoduleSectionParserTest extends LocalDiskRepositoryTestCase {
     assertEquals(expectedSubscriptions, returnedSubscriptions);
   }
 
-  private final static class SubmoduleSection {
+  private static final class SubmoduleSection {
     private final String url;
     private final String path;
     private final String branch;