8264062: Use the blessed modifier order in jdk.jfr

Reviewed-by: mgronlun

Author: alblue

src/jdk.jfr/share/classes/jdk/jfr/Enabled.java

@@ -47,7 +47,7 @@
      * Setting name {@code "enabled"}, signifies that the event should be
      * recorded.
      */
-    public final static String NAME = "enabled";
+    public static final String NAME = "enabled";
 
     /**
      * Returns {@code true} if by default the event should be enabled, {@code false} otherwise.

src/jdk.jfr/share/classes/jdk/jfr/Event.java

@@ -86,7 +86,7 @@
 @Enabled(true)
 @StackTrace(true)
 @Registered(true)
-abstract public class Event extends jdk.internal.event.Event {
+public abstract class Event extends jdk.internal.event.Event {
     /**
      * Sole constructor, for invocation by subclass constructors, typically
      * implicit.
@@ -98,7 +98,7 @@ protected Event() {
      * Starts the timing of this event.
      */
     @Override
-    final public void begin() {
+    public final void begin() {
     }
 
     /**
@@ -107,7 +107,7 @@ final public void begin() {
      * The {@code end} method must be invoked after the {@code begin} method.
      */
     @Override
-    final public void end() {
+    public final void end() {
     }
 
     /**
@@ -119,7 +119,7 @@ final public void end() {
      * ends when the {@code commit} method is invoked.
      */
     @Override
-    final public void commit() {
+    public final void commit() {
     }
 
     /**
@@ -130,7 +130,7 @@ final public void commit() {
      * @return {@code true} if event is enabled, {@code false} otherwise
      */
     @Override
-    final public boolean isEnabled() {
+    public final boolean isEnabled() {
         return false;
     }
 
@@ -144,7 +144,7 @@ final public boolean isEnabled() {
      *         system, {@code false} otherwise
      */
     @Override
-    final public boolean shouldCommit() {
+    public final boolean shouldCommit() {
         return false;
     }
 
@@ -170,6 +170,6 @@ final public boolean shouldCommit() {
      * @see EventFactory
      */
     @Override
-    final public void set(int index, Object value) {
+    public final void set(int index, Object value) {
     }
 }

src/jdk.jfr/share/classes/jdk/jfr/EventSettings.java

@@ -88,7 +88,7 @@ Map<String, String> toMap() {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    final public EventSettings withStackTrace() {
+    public final EventSettings withStackTrace() {
         return with(StackTrace.NAME, "true");
     }
 
@@ -99,7 +99,7 @@ final public EventSettings withStackTrace() {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    final public EventSettings withoutStackTrace() {
+    public final EventSettings withoutStackTrace() {
         return with(StackTrace.NAME, "false");
     }
 
@@ -111,7 +111,7 @@ final public EventSettings withoutStackTrace() {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    final public EventSettings withoutThreshold() {
+    public final EventSettings withoutThreshold() {
         return with(Threshold.NAME, "0 s");
     }
 
@@ -122,7 +122,7 @@ final public EventSettings withoutThreshold() {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    final public EventSettings withPeriod(Duration duration) {
+    public final EventSettings withPeriod(Duration duration) {
         return with(Period.NAME, duration.toNanos() + " ns");
     }
 
@@ -133,7 +133,7 @@ final public EventSettings withPeriod(Duration duration) {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    final public EventSettings withThreshold(Duration duration) {
+    public final EventSettings withThreshold(Duration duration) {
         if (duration == null) {
             return with(Threshold.NAME, "0 ns");
         } else {
@@ -151,7 +151,7 @@ final public EventSettings withThreshold(Duration duration) {
      *
      * @return event settings object for further configuration, not {@code null}
      */
-    abstract public EventSettings with(String name, String value);
+    public abstract EventSettings with(String name, String value);
 
     /**
      * Creates a settings {@code Map} for the event that is associated with this

src/jdk.jfr/share/classes/jdk/jfr/FlightRecorderPermission.java

@@ -104,7 +104,7 @@ public final class FlightRecorderPermission extends java.security.BasicPermissio
         PrivateAccess.setPrivateAccess(new InternalAccess());
     }
 
-    private final static class InternalAccess extends PrivateAccess {
+    private static final class InternalAccess extends PrivateAccess {
 
         @Override
         public Type getType(Object o) {

src/jdk.jfr/share/classes/jdk/jfr/Period.java

@@ -44,7 +44,7 @@
     /**
      * Settings name {@code "period"} for configuring periodic events
      */
-    public final static String NAME = "period";
+    public static final String NAME = "period";
 
     /**
      * Returns the default setting value for a periodic setting.

src/jdk.jfr/share/classes/jdk/jfr/StackTrace.java

@@ -45,7 +45,7 @@
     /**
      * Settings name {@code "stackTrace"} to be used for enabling event stack traces.
      */
-    public final static String NAME = "stackTrace";
+    public static final String NAME = "stackTrace";
 
     /**
      * Returns if the stack trace from the {@code Event#commit()} method should be recorded.

src/jdk.jfr/share/classes/jdk/jfr/Threshold.java

@@ -45,7 +45,7 @@
     /**
      * Setting name {@code "threshold"} for configuring event thresholds.
      */
-    public final static String NAME = "threshold";
+    public static final String NAME = "threshold";
 
     /**
      * The threshold (for example, {@code "20 ms"}).

src/jdk.jfr/share/classes/jdk/jfr/Timestamp.java

@@ -46,13 +46,13 @@
      * The unit for the difference, measured in milliseconds, between the current
      * time and midnight, January 1, 1970 UTC.
      */
-    public final static String MILLISECONDS_SINCE_EPOCH = "MILLISECONDS_SINCE_EPOCH";
+    public static final String MILLISECONDS_SINCE_EPOCH = "MILLISECONDS_SINCE_EPOCH";
 
     /**
      * The unit for the number of ticks that have transpired since some arbitrary
      * starting date.
      */
-    public final static String TICKS = "TICKS";
+    public static final String TICKS = "TICKS";
 
     /**
      * Unit for the time stamp.

src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java

@@ -150,7 +150,7 @@ public MetadataEvent newMetadataEvent(List<EventType> previous, List<EventType>
         JdkJfrConsumer.setAccess(access);
     }
 
-    private final static class UnsignedValue {
+    private static final class UnsignedValue {
         private final Object o;
 
         UnsignedValue(Object o) {
@@ -261,7 +261,7 @@ public boolean hasField(String name) {
      * @see #hasField(String)
      *
      */
-    final public <T> T getValue(String name) {
+    public final <T> T getValue(String name) {
         @SuppressWarnings("unchecked")
         T t = (T) getValue(name, false);
         return t;
@@ -978,7 +978,7 @@ public final RecordedThread getThread(String name) {
      * @return textual description of this object
      */
     @Override
-    final public String toString() {
+    public final String toString() {
         StringWriter s = new StringWriter();
         PrettyWriter p = new PrettyWriter(new PrintWriter(s));
         p.setStackDepth(5);

src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingStream.java

@@ -67,7 +67,7 @@
  */
 public final class RecordingStream implements AutoCloseable, EventStream {
 
-    final static class ChunkConsumer implements Consumer<Long> {
+    static final class ChunkConsumer implements Consumer<Long> {
 
         private final Recording recording;
 

src/jdk.jfr/share/classes/jdk/jfr/events/Handlers.java

@@ -28,11 +28,11 @@
 import jdk.jfr.internal.Utils;
 
 public final class Handlers {
-    public final static EventHandler SOCKET_READ = Utils.getHandler(SocketReadEvent.class);
-    public final static EventHandler SOCKET_WRITE = Utils.getHandler(SocketWriteEvent.class);
-    public final static EventHandler FILE_READ = Utils.getHandler(FileReadEvent.class);
-    public final static EventHandler FILE_WRITE = Utils.getHandler(FileWriteEvent.class);
-    public final static EventHandler FILE_FORCE = Utils.getHandler(FileForceEvent.class);
-    public final static EventHandler ERROR_THROWN = Utils.getHandler(ErrorThrownEvent.class);
-    public final static EventHandler EXCEPTION_THROWN = Utils.getHandler(ExceptionThrownEvent.class);
+    public static final EventHandler SOCKET_READ = Utils.getHandler(SocketReadEvent.class);
+    public static final EventHandler SOCKET_WRITE = Utils.getHandler(SocketWriteEvent.class);
+    public static final EventHandler FILE_READ = Utils.getHandler(FileReadEvent.class);
+    public static final EventHandler FILE_WRITE = Utils.getHandler(FileWriteEvent.class);
+    public static final EventHandler FILE_FORCE = Utils.getHandler(FileForceEvent.class);
+    public static final EventHandler ERROR_THROWN = Utils.getHandler(ErrorThrownEvent.class);
+    public static final EventHandler EXCEPTION_THROWN = Utils.getHandler(ExceptionThrownEvent.class);
 }

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

@@ -38,7 +38,7 @@
 
 public final class Control {
     private final AccessControlContext context;
-    private final static int CACHE_SIZE = 5;
+    private static final int CACHE_SIZE = 5;
     private final Set<?>[] cachedUnions = new HashSet<?>[CACHE_SIZE];
     private final String[] cachedValues = new String[CACHE_SIZE];
     private final SettingControl delegate;

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

@@ -49,8 +49,8 @@
     /**
      * Settings name {@code "cutoff"} for configuring event cutoffs.
      */
-    public final static String NAME = "cutoff";
-    public final static String INFINITY = "infinity";
+    public static final String NAME = "cutoff";
+    public static final String INFINITY = "infinity";
 
     /**
      * Cutoff, for example {@code "20 ms"}.

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

@@ -56,7 +56,7 @@
 // holds SettingControl instances that need to be released
 // when a class is unloaded (to avoid memory leaks).
 public final class EventControl {
-    final static class NamedControl {
+    static final class NamedControl {
         public final String name;
         public final Control control;
         NamedControl(String name, Control control) {

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

@@ -63,17 +63,17 @@ final class EventHandlerCreator {
     private static final String FIELD_EVENT_TYPE = "platformEventType";
     private static final String FIELD_PREFIX_STRING_POOL = "stringPool";
 
-    private final static Type TYPE_STRING_POOL = Type.getType(StringPool.class);
-    private final static Type TYPE_EVENT_WRITER = Type.getType(EventWriter.class);
-    private final static Type TYPE_PLATFORM_EVENT_TYPE = Type.getType(PlatformEventType.class);
-    private final static Type TYPE_EVENT_HANDLER = Type.getType(EventHandler.class);
-    private final static Type TYPE_SETTING_CONTROL = Type.getType(SettingControl.class);
-    private final static Type TYPE_EVENT_TYPE = Type.getType(EventType.class);
-    private final static Type TYPE_EVENT_CONTROL = Type.getType(EventControl.class);
-    private final static String DESCRIPTOR_EVENT_HANDLER = "(" + Type.BOOLEAN_TYPE.getDescriptor() + TYPE_EVENT_TYPE.getDescriptor() + TYPE_EVENT_CONTROL.getDescriptor() + ")V";
-    private final static Method METHOD_GET_EVENT_WRITER = new Method("getEventWriter", "()" + TYPE_EVENT_WRITER.getDescriptor());
-    private final static Method METHOD_EVENT_HANDLER_CONSTRUCTOR = new Method("<init>", DESCRIPTOR_EVENT_HANDLER);
-    private final static Method METHOD_RESET = new Method("reset", "()V");
+    private static final Type TYPE_STRING_POOL = Type.getType(StringPool.class);
+    private static final Type TYPE_EVENT_WRITER = Type.getType(EventWriter.class);
+    private static final Type TYPE_PLATFORM_EVENT_TYPE = Type.getType(PlatformEventType.class);
+    private static final Type TYPE_EVENT_HANDLER = Type.getType(EventHandler.class);
+    private static final Type TYPE_SETTING_CONTROL = Type.getType(SettingControl.class);
+    private static final Type TYPE_EVENT_TYPE = Type.getType(EventType.class);
+    private static final Type TYPE_EVENT_CONTROL = Type.getType(EventControl.class);
+    private static final String DESCRIPTOR_EVENT_HANDLER = "(" + Type.BOOLEAN_TYPE.getDescriptor() + TYPE_EVENT_TYPE.getDescriptor() + TYPE_EVENT_CONTROL.getDescriptor() + ")V";
+    private static final Method METHOD_GET_EVENT_WRITER = new Method("getEventWriter", "()" + TYPE_EVENT_WRITER.getDescriptor());
+    private static final Method METHOD_EVENT_HANDLER_CONSTRUCTOR = new Method("<init>", DESCRIPTOR_EVENT_HANDLER);
+    private static final Method METHOD_RESET = new Method("reset", "()V");
 
     private final ClassWriter classWriter;
     private final String className;

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

@@ -78,7 +78,7 @@ public SettingInfo(String fieldName, int index) {
     }
 
     static final class FieldInfo {
-        private final static Type STRING = Type.getType(String.class);
+        private static final Type STRING = Type.getType(String.class);
         final String fieldName;
         final String fieldDescriptor;
         final String internalClassName;

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

@@ -39,7 +39,7 @@ public final class EventWriter {
     // Event may not exceed size for a padded integer
     private static final long MAX_EVENT_SIZE = (1 << 28) -1;
     private static final Unsafe unsafe = Unsafe.getUnsafe();
-    private final static JVM jvm = JVM.getJVM();
+    private static final JVM jvm = JVM.getJVM();
 
     // The JVM needs access to these values. Don't remove
     private final long threadID;

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

@@ -36,7 +36,7 @@
 // so they can a later staged be removed.
 final class FilePurger {
 
-    private final static Set<SafePath> paths = new LinkedHashSet<>();
+    private static final Set<SafePath> paths = new LinkedHashSet<>();
 
     public synchronized static void add(SafePath p) {
         paths.add(p);

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

@@ -32,7 +32,7 @@
 
 public final class Logger {
 
-    private final static int MAX_SIZE = 10000;
+    private static final int MAX_SIZE = 10000;
     static {
         // This will try to initialize the JVM logging system
         JVMSupport.tryToInitializeJVM();

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

@@ -67,7 +67,7 @@ public final class MetadataLoader {
     private final Type PERIOD_TYPE = TypeLibrary.createAnnotationType(Period.class);
 
     // <Event>, <Type> and <Relation>
-    private final static class TypeElement {
+    private static final class TypeElement {
         private final List<FieldElement> fields;
         private final String name;
         private final String label;

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

@@ -36,10 +36,10 @@
  */
 public final class Options {
 
-    private final static JVM jvm = JVM.getJVM();
-    private final static long WAIT_INTERVAL = 1000; // ms;
+    private static final JVM jvm = JVM.getJVM();
+    private static final long WAIT_INTERVAL = 1000; // ms;
 
-    private final static long MIN_MAX_CHUNKSIZE = 1024 * 1024;
+    private static final long MIN_MAX_CHUNKSIZE = 1024 * 1024;
 
     private static final long DEFAULT_GLOBAL_BUFFER_COUNT = 20;
     private static final long DEFAULT_GLOBAL_BUFFER_SIZE = 524288;

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

@@ -63,9 +63,9 @@ public final class PlatformRecorder {
 
 
     private final List<PlatformRecording> recordings = new ArrayList<>();
-    private final static List<SecureRecorderListener> changeListeners = new ArrayList<>();
+    private static final List<SecureRecorderListener> changeListeners = new ArrayList<>();
     private final Repository repository;
-    private final static JVM jvm = JVM.getJVM();
+    private static final JVM jvm = JVM.getJVM();
     private final EventType activeRecordingEvent;
     private final EventType activeSettingEvent;
     private final Thread shutdownHook;

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

@@ -40,9 +40,9 @@
 
 public final class RequestEngine {
 
-    private final static JVM jvm = JVM.getJVM();
+    private static final JVM jvm = JVM.getJVM();
 
-    final static class RequestHook {
+    static final class RequestHook {
         private final Runnable hook;
         private final PlatformEventType type;
         private final AccessControlContext accessControllerContext;
@@ -99,7 +99,7 @@ public Void run() {
         }
     }
 
-    private final static List<RequestHook> entries = new CopyOnWriteArrayList<>();
+    private static final List<RequestHook> entries = new CopyOnWriteArrayList<>();
     private static long lastTimeMillis;
     private static long flushInterval = Long.MAX_VALUE;
     private static long streamDelta;