8263658: Use the blessed modifier order in java.base

Reviewed-by: rriggs, redestad

Author: alblue

src/java.base/share/classes/java/io/ObjectInputFilter.java

@@ -226,12 +226,12 @@ private Config() {}
         /**
          * Lock object for system-wide filter.
          */
-        private final static Object serialFilterLock = new Object();
+        private static final Object serialFilterLock = new Object();
 
         /**
          * Debug: Logger
          */
-        private final static System.Logger configLog;
+        private static final System.Logger configLog;
 
         /**
          * Logger for debugging.
@@ -246,14 +246,14 @@ static void filterLog(System.Logger.Level level, String msg, Object... args) {
          * The name for the system-wide deserialization filter.
          * Used as a system property and a java.security.Security property.
          */
-        private final static String SERIAL_FILTER_PROPNAME = "jdk.serialFilter";
+        private static final String SERIAL_FILTER_PROPNAME = "jdk.serialFilter";
 
         /**
          * The system-wide filter; may be null.
          * Lookup the filter in java.security.Security or
          * the system property.
          */
-        private final static ObjectInputFilter configuredFilter;
+        private static final ObjectInputFilter configuredFilter;
 
         static {
             configuredFilter = AccessController
@@ -405,7 +405,7 @@ static ObjectInputFilter createFilter2(String pattern) {
          * used for all ObjectInputStreams that do not set their own filters.
          *
          */
-        final static class Global implements ObjectInputFilter {
+        static final class Global implements ObjectInputFilter {
             /**
              * The pattern used to create the filter.
              */

src/java.base/share/classes/java/lang/StackFrameInfo.java

@@ -31,7 +31,7 @@
 import java.lang.invoke.MethodType;
 
 class StackFrameInfo implements StackFrame {
-    private final static JavaLangInvokeAccess JLIA =
+    private static final JavaLangInvokeAccess JLIA =
         SharedSecrets.getJavaLangInvokeAccess();
 
     private final boolean retainClassRef;

src/java.base/share/classes/java/lang/StackStreamFactory.java

@@ -63,7 +63,7 @@ private StackStreamFactory() {}
 
     // Stack walk implementation classes to be excluded during stack walking
     // lazily add subclasses when they are loaded.
-    private final static Set<Class<?>> stackWalkImplClasses = init();
+    private static final Set<Class<?>> stackWalkImplClasses = init();
 
     private static final int SMALL_BATCH       = 8;
     private static final int BATCH_SIZE        = 32;
@@ -81,7 +81,7 @@ private StackStreamFactory() {}
      * Performance work and extensive testing is needed to replace the
      * VM built-in backtrace filled in Throwable with the StackWalker.
      */
-    final static boolean isDebug =
+    static final boolean isDebug =
             "true".equals(GetPropertyAction.privilegedGetProperty("stackwalk.debug"));
 
     static <T> StackFrameTraverser<T>

src/java.base/share/classes/java/lang/StackWalker.java

@@ -290,7 +290,7 @@ enum ExtendedOption {
 
     static final EnumSet<Option> DEFAULT_EMPTY_OPTION = EnumSet.noneOf(Option.class);
 
-    private final static StackWalker DEFAULT_WALKER =
+    private static final StackWalker DEFAULT_WALKER =
         new StackWalker(DEFAULT_EMPTY_OPTION);
 
     private final Set<Option> options;

src/java.base/share/classes/java/lang/StringLatin1.java

@@ -643,7 +643,7 @@ public static String stripTrailing(byte[] value) {
         return (right != value.length) ? newString(value, 0, right) : null;
     }
 
-    private final static class LinesSpliterator implements Spliterator<String> {
+    private static final class LinesSpliterator implements Spliterator<String> {
         private byte[] value;
         private int index;        // current index, modified on advance/split
         private final int fence;  // one past last index

src/java.base/share/classes/java/lang/StringUTF16.java

@@ -1065,7 +1065,7 @@ public static String stripTrailing(byte[] value) {
         return (right != length) ? newString(value, 0, right) : null;
     }
 
-    private final static class LinesSpliterator implements Spliterator<String> {
+    private static final class LinesSpliterator implements Spliterator<String> {
         private byte[] value;
         private int index;        // current index, modified on advance/split
         private final int fence;  // one past last index

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

@@ -664,7 +664,7 @@ static MethodHandle makeBlockInliningWrapper(MethodHandle target) {
                                    DONT_INLINE_THRESHOLD);
     }
 
-    private final static class Makers {
+    private static final class Makers {
         /** Constructs reinvoker lambda form which block inlining during JIT-compilation for a particular method handle */
         static final Function<MethodHandle, LambdaForm> PRODUCE_BLOCK_INLINING_FORM = new Function<MethodHandle, LambdaForm>() {
             @Override