8325109: Sort method modifiers in canonical order

Reviewed-by: aivanov, rriggs, darcy, prappo

Author: magicus

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

@@ -272,7 +272,7 @@ public ThreadFactory factory() {
     /**
      * Base ThreadFactory implementation.
      */
-    private static abstract class BaseThreadFactory implements ThreadFactory {
+    private abstract static class BaseThreadFactory implements ThreadFactory {
         private static final VarHandle COUNT;
         static {
             try {

src/java.base/share/classes/java/util/FormatItem.java

@@ -424,7 +424,7 @@ public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
         }
     }
 
-    static abstract sealed class FormatItemModifier implements FormatConcatItem
+    abstract static sealed class FormatItemModifier implements FormatConcatItem
         permits FormatItemFillLeft,
                 FormatItemFillRight
     {

src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java

@@ -1624,7 +1624,7 @@ public String toString() {
      * been cancelled on entry and might not otherwise be cancelled by
      * others.
      */
-    static abstract class InterruptibleTask<T> extends ForkJoinTask<T>
+    abstract static class InterruptibleTask<T> extends ForkJoinTask<T>
         implements RunnableFuture<T> {
         transient volatile Thread runner;
         abstract T compute() throws Exception;

src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java

@@ -114,7 +114,7 @@ public AbstractInstruction(Opcode op, int size) {
     @Override
     public abstract void writeTo(DirectCodeBuilder writer);
 
-    public static abstract sealed class BoundInstruction extends AbstractInstruction {
+    public abstract static sealed class BoundInstruction extends AbstractInstruction {
         final CodeImpl code;
         final int pos;
 
@@ -760,7 +760,7 @@ public int slot() {
 
     }
 
-    public static abstract sealed class UnboundInstruction extends AbstractInstruction {
+    public abstract static sealed class UnboundInstruction extends AbstractInstruction {
 
         UnboundInstruction(Opcode op) {
             super(op, op.sizeIfFixed());

src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java

@@ -471,7 +471,7 @@ public void writeTo(BufWriter pool) {
         }
     }
 
-    static abstract sealed class AbstractRefEntry<T extends PoolEntry> extends AbstractPoolEntry {
+    abstract static sealed class AbstractRefEntry<T extends PoolEntry> extends AbstractPoolEntry {
         protected final T ref1;
 
         public AbstractRefEntry(ConstantPool constantPool, int tag, int index, T ref1) {
@@ -494,7 +494,7 @@ public String toString() {
         }
     }
 
-    static abstract sealed class AbstractRefsEntry<T extends PoolEntry, U extends PoolEntry>
+    abstract static sealed class AbstractRefsEntry<T extends PoolEntry, U extends PoolEntry>
             extends AbstractPoolEntry {
         protected final T ref1;
         protected final U ref2;
@@ -525,7 +525,7 @@ public String toString() {
         }
     }
 
-    static abstract sealed class AbstractNamedEntry extends AbstractRefEntry<Utf8EntryImpl> {
+    abstract static sealed class AbstractNamedEntry extends AbstractRefEntry<Utf8EntryImpl> {
 
         public AbstractNamedEntry(ConstantPool constantPool, int tag, int index, Utf8EntryImpl ref1) {
             super(constantPool, tag, index, ref1);
@@ -697,7 +697,7 @@ public boolean equals(Object o) {
         }
     }
 
-    public static abstract sealed class AbstractMemberRefEntry
+    public abstract static sealed class AbstractMemberRefEntry
             extends AbstractRefsEntry<ClassEntryImpl, NameAndTypeEntryImpl>
             implements MemberRefEntry {
 
@@ -773,7 +773,7 @@ public InterfaceMethodRefEntry clone(ConstantPoolBuilder cp) {
         }
     }
 
-    public static abstract sealed class AbstractDynamicConstantPoolEntry extends AbstractPoolEntry {
+    public abstract static sealed class AbstractDynamicConstantPoolEntry extends AbstractPoolEntry {
 
         private final int bsmIndex;
         private BootstrapMethodEntryImpl bootstrapMethod;
@@ -1043,7 +1043,7 @@ public boolean equals(Object o) {
 
     }
 
-    static abstract sealed class PrimitiveEntry<T extends ConstantDesc>
+    abstract static sealed class PrimitiveEntry<T extends ConstantDesc>
             extends AbstractPoolEntry {
         protected final T val;
 

src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java

@@ -154,7 +154,7 @@ public void writeTo(DirectCodeBuilder writer) {
 
     }
 
-    private static abstract sealed class AbstractLocalPseudo extends AbstractPseudoInstruction {
+    private abstract static sealed class AbstractLocalPseudo extends AbstractPseudoInstruction {
         protected final int slot;
         protected final Utf8Entry name;
         protected final Utf8Entry descriptor;

src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java

@@ -935,7 +935,7 @@ public List<ClassEntry> permittedSubclasses() {
         }
     }
 
-    public static abstract sealed class BoundCodeAttribute
+    public abstract static sealed class BoundCodeAttribute
             extends BoundAttribute<CodeAttribute>
             implements CodeAttribute
             permits CodeImpl {

src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java

@@ -897,7 +897,7 @@ public List<ModuleProvideInfo> provides() {
         }
     }
 
-    public static abstract non-sealed class AdHocAttribute<T extends Attribute<T>>
+    public abstract static non-sealed class AdHocAttribute<T extends Attribute<T>>
             extends UnboundAttribute<T> {
 
         public AdHocAttribute(AttributeMapper<T> mapper) {

src/java.base/share/classes/jdk/internal/event/SecurityProviderServiceEvent.java

@@ -30,7 +30,7 @@
  */
 
 public final class SecurityProviderServiceEvent extends Event {
-    private final static SecurityProviderServiceEvent EVENT = new SecurityProviderServiceEvent();
+    private static final SecurityProviderServiceEvent EVENT = new SecurityProviderServiceEvent();
 
     /**
      * Returns {@code true} if event is enabled, {@code false} otherwise.

src/java.base/share/classes/jdk/internal/event/VirtualThreadEndEvent.java

@@ -28,7 +28,7 @@
  * Event recording that a virtual thread has terminated.
  */
 public class VirtualThreadEndEvent extends Event {
-    private final static VirtualThreadEndEvent EVENT = new VirtualThreadEndEvent();
+    private static final VirtualThreadEndEvent EVENT = new VirtualThreadEndEvent();
 
     /**
      * Returns {@code true} if event is enabled, {@code false} otherwise.

src/java.base/share/classes/jdk/internal/event/VirtualThreadStartEvent.java

@@ -28,7 +28,7 @@
  * Event recording that a virtual thread has been started.
  */
 public class VirtualThreadStartEvent extends Event {
-    private final static VirtualThreadStartEvent EVENT = new VirtualThreadStartEvent();
+    private static final VirtualThreadStartEvent EVENT = new VirtualThreadStartEvent();
 
     /**
      * Returns {@code true} if event is enabled, {@code false} otherwise.

src/java.base/share/classes/jdk/internal/math/FloatToDecimal.java

@@ -35,7 +35,7 @@
 /**
  * This class exposes a method to render a {@code float} as a string.
  */
-final public class FloatToDecimal {
+public final class FloatToDecimal {
     /*
      * For full details about this code see the following references:
      *

src/java.base/share/classes/jdk/internal/vm/Continuation.java

@@ -296,10 +296,10 @@ private void finish() {
     }
 
     @IntrinsicCandidate
-    private native static int doYield();
+    private static native int doYield();
 
     @IntrinsicCandidate
-    private native static void enterSpecial(Continuation c, boolean isContinue, boolean isVirtualThread);
+    private static native void enterSpecial(Continuation c, boolean isContinue, boolean isVirtualThread);
 
 
     @Hidden
@@ -448,7 +448,7 @@ public static boolean isPinned(ContinuationScope scope) {
         return res != 0;
     }
 
-    static private native int isPinned0(ContinuationScope scope);
+    private static native int isPinned0(ContinuationScope scope);
 
     private boolean fence() {
         U.storeFence(); // needed to prevent certain transformations by the compiler

src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java

@@ -208,7 +208,7 @@ private static ThreadContainer next(ThreadContainer container) {
      * Root container that "contains" all platform threads not started in a container.
      * It may include all virtual threads started directly with the Thread API.
      */
-    private static abstract class RootContainer extends ThreadContainer {
+    private abstract static class RootContainer extends ThreadContainer {
         protected RootContainer() {
             super(true);
         }

src/java.base/share/classes/sun/net/util/IPAddressUtil.java

@@ -882,8 +882,8 @@ public static boolean delayURLParsing() {
     private static final int[] SUPPORTED_RADIXES = new int[]{HEXADECIMAL, OCTAL, DECIMAL};
 
     // BSD parser's return values
-    private final static long CANT_PARSE_IN_RADIX = -1L;
-    private final static long TERMINAL_PARSE_ERROR = -2L;
+    private static final long CANT_PARSE_IN_RADIX = -1L;
+    private static final long TERMINAL_PARSE_ERROR = -2L;
 
     private static final String ALLOW_AMBIGUOUS_IPADDRESS_LITERALS_SP = "jdk.net.allowAmbiguousIPAddressLiterals";
     private static final boolean ALLOW_AMBIGUOUS_IPADDRESS_LITERALS_SP_VALUE = Boolean.valueOf(

src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java

@@ -205,7 +205,7 @@ protected void square(long[] a, long[] r) {
     /**
      * The field of integers modulo the order of the Curve25519 subgroup
      */
-    public final static class Curve25519OrderField extends IntegerPolynomialModBinP {
+    public static final class Curve25519OrderField extends IntegerPolynomialModBinP {
 
         public Curve25519OrderField() {
             super(26, 10, 252,
@@ -216,7 +216,7 @@ public Curve25519OrderField() {
     /**
      * The field of integers modulo the order of the Curve448 subgroup
      */
-    public final static class Curve448OrderField extends IntegerPolynomialModBinP {
+    public static final class Curve448OrderField extends IntegerPolynomialModBinP {
 
         public Curve448OrderField() {
             super(28, 16, 446,

src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java

@@ -245,7 +245,7 @@ private static void writeLog(String str) {
      * A holder for general primitives to avoid circular dependencies
      * between GraphicsPrimitiveMgr and Blit/etc classes.
      */
-    final static class GeneralPrimitives {
+    static final class GeneralPrimitives {
 
         private static GraphicsPrimitive[] primitives;
 

src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java

@@ -70,11 +70,11 @@ final class Connections implements PoolCallback {
         com.sun.jndi.ldap.LdapPoolManager.trace;
     private static final int DEFAULT_SIZE = 10;
 
-    final private int initSize;
+    private final int initSize;
     private final int maxSize;
     private final int prefSize;
     private final List<ConnectionDesc> conns;
-    final private PooledConnectionFactory factory;
+    private final PooledConnectionFactory factory;
 
     private boolean closed = false;   // Closed for business
     private Reference<Object> ref; // maintains reference to id to prevent premature GC

src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java

@@ -54,7 +54,7 @@ public class GSSNameElement implements GSSNameSpi {
     final long pName; // Pointer to the gss_name_t structure
     private String printableName;
     private Oid printableType;
-    final private GSSLibStub cStub;
+    private final GSSLibStub cStub;
 
     static final GSSNameElement DEF_ACCEPTOR = new GSSNameElement();
 

src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java

@@ -7424,7 +7424,7 @@ T getResult() throws Exception {
      * A helper class to handle coordinate conversion between screen and user spaces.
      * See {@link sun.java2d.SunGraphicsEnvironment}
      */
-    private static abstract class AccessibilityGraphicsEnvironment extends GraphicsEnvironment {
+    private abstract static class AccessibilityGraphicsEnvironment extends GraphicsEnvironment {
         /**
          * Returns the graphics configuration which bounds contain the given point in the user's space.
          *

src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java

@@ -62,7 +62,7 @@ public class JavaTokenizer extends UnicodeReader {
     /**
      * Sentinel for non-value.
      */
-    private final static int NOT_FOUND = -1;
+    private static final int NOT_FOUND = -1;
 
     /**
      * The source language setting. Copied from scanner factory.

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java

@@ -414,7 +414,7 @@ static PrivateKey privateKey(Session session, long keyID, String algorithm,
     }
 
     // base class for all PKCS11 private keys
-    private static abstract class P11PrivateKey extends P11Key implements
+    private abstract static class P11PrivateKey extends P11Key implements
             PrivateKey {
         @Serial
         private static final long serialVersionUID = -2138581185214187615L;
@@ -479,7 +479,7 @@ byte[] getEncodedInternal() {
     }
 
     // base class for all PKCS11 public keys
-    private static abstract class P11PublicKey extends P11Key implements
+    private abstract static class P11PublicKey extends P11Key implements
             PublicKey {
         @Serial
         private static final long serialVersionUID = 1L;

src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java

@@ -129,7 +129,7 @@ static boolean checkUse(KeyInfo ki, KeyInfo si) {
         }
     }
 
-    static abstract sealed class PBEKeyInfo extends KeyInfo
+    abstract static sealed class PBEKeyInfo extends KeyInfo
             permits AESPBEKeyInfo, PBKDF2KeyInfo, P12MacPBEKeyInfo {
         public static final long INVALID_PRF = -1;
         public final long kdfMech;

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java

@@ -801,7 +801,7 @@ private static Comparison compare(String name, String opName, int opCode, int fl
                                     kind, dom, ran);
     }
 
-    private static abstract class OperatorImpl implements Operator {
+    private abstract static class OperatorImpl implements Operator {
         private final String symName;
         private final String opName;
         private final int opInfo;
@@ -1111,7 +1111,7 @@ private final void check(char kind, LaneType dom, LaneType ran) {
         private static final @Stable ConversionImpl<?,?>[][][]
             CACHES = new ConversionImpl<?,?>[KIND_LIMIT][LINE_LIMIT][LINE_LIMIT];
 
-        private synchronized static void initCaches() {
+        private static synchronized void initCaches() {
             for (var f : VectorOperators.class.getFields()) {
                 if (f.getType() != Conversion.class)  continue;
                 ConversionImpl<?,?> conv;

src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java

@@ -70,7 +70,7 @@ public final class WindowsAnsiWriter extends AnsiWriter {
             BACKGROUND_WHITE,
     };
 
-    private final static int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
+    private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
 
     private final Pointer console;
 

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/PreviewAPIListBuilder.java

@@ -41,8 +41,8 @@
  */
 public class PreviewAPIListBuilder extends SummaryAPIListBuilder {
 
-    final private Map<Element, JEP> elementJeps = new HashMap<>();
-    final private Map<String, JEP> jeps = new HashMap<>();
+    private final Map<Element, JEP> elementJeps = new HashMap<>();
+    private final Map<String, JEP> jeps = new HashMap<>();
 
     /**
      * The JEP for a preview feature in this release.

src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java

@@ -47,7 +47,7 @@ public class SunCommandLineLauncher extends AbstractLauncher {
     private static final String ARG_QUOTE = "quote";
     private static final String ARG_VM_EXEC = "vmexec";
 
-    static private final String ARG_VM_INCLUDE_VTHREADS = "includevirtualthreads";
+    private static final String ARG_VM_INCLUDE_VTHREADS = "includevirtualthreads";
 
     TransportService transportService;
     Transport transport;

src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java

@@ -31,7 +31,7 @@
 // without the need to load classes or have an impact on security
 // related events, like SecureRandom::getAlgorithm("NativePRNGNonBlocking") does
 public final class EventWriterKey {
-    private final static long KEY = createKey();
+    private static final long KEY = createKey();
     private static boolean loaded;
     private static boolean logged;
 

src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java

@@ -50,7 +50,7 @@ private static class ChunkRotationMonitor {}
      */
     public static final Object CHUNK_ROTATION_MONITOR = new ChunkRotationMonitor();
 
-    private volatile static boolean nativeOK;
+    private static volatile boolean nativeOK;
 
     private static native void registerNatives();
 

src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java

@@ -339,7 +339,7 @@ private static void addUserFields(Class<?> clazz, Type type, List<ValueDescripto
     }
 
     // By convention all events have these fields.
-    public synchronized static void addImplicitFields(Type type, boolean requestable, boolean hasDuration, boolean hasThread, boolean hasStackTrace, boolean hasCutoff) {
+    public static synchronized void addImplicitFields(Type type, boolean requestable, boolean hasDuration, boolean hasThread, boolean hasStackTrace, boolean hasCutoff) {
         if (!implicitFieldTypes) {
             createAnnotationType(Timespan.class);
             createAnnotationType(Timestamp.class);