• Type: Bug
• Component: core-libs
• Affected Version: 18

• Priority: P4
• Status: Resolved
• Resolution: Fixed

• Submitted: 2021-11-02
• Updated: 2021-11-12
• Resolved: 2021-11-03

JDK 18
18 b23Fixed

Changeset: 61506336 Author: Pavel Rappo <prappo@openjdk.org> Date: 2021-11-03 10:07:48 +0000 URL: https://git.openjdk.java.net/jdk/commit/615063364ab6bdd3fa83401745e05b45e13eacdb 03-11-2021 [~martin] you might want to have a look at the linked PR on GitHub at your convenience. 02-11-2021 It's easy to re-run blessed-modifier-order.sh on any desired subset of the source code. The hardest part is making sure you're modifying the real master copy of the sources and ensuring that identical bytecode is generated. ``` $ bash bin/blessed-modifier-order.sh src/java.base/ && git diff -U0 diff --git a/src/java.base/share/classes/java/io/ObjectInputFilter.java b/src/java.base/share/classes/java/io/ObjectInputFilter.java index f339411593d..c9722ea23e7 100644 --- a/src/java.base/share/classes/java/io/ObjectInputFilter.java +++ b/src/java.base/share/classes/java/io/ObjectInputFilter.java @@ -564 +564 @@ public interface ObjectInputFilter { - private final static Object serialFilterLock = new Object(); + private static final Object serialFilterLock = new Object(); @@ -909 +909 @@ public interface ObjectInputFilter { - final static class Global implements ObjectInputFilter { + static final class Global implements ObjectInputFilter { diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java index 82ba054f61f..ff8a934a887 100644 --- a/src/java.base/share/classes/java/io/ObjectStreamClass.java +++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java @@ -2518 +2518 @@ public class ObjectStreamClass implements Serializable { - static abstract class Key { + abstract static class Key { diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java index d0ad7d43cd9..b8085b230af 100644 --- a/src/java.base/share/classes/java/lang/Object.java +++ b/src/java.base/share/classes/java/lang/Object.java @@ -281 +281 @@ public class Object { - * synchronized static method of that class. + * static synchronized method of that class. diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java index 5fad1b889d5..88e3e473e76 100644 --- a/src/java.base/share/classes/java/lang/Process.java +++ b/src/java.base/share/classes/java/lang/Process.java @@ -848 +848 @@ public abstract class Process { - private final static Charset nativeCharset; + private static final Charset nativeCharset; diff --git a/src/java.base/share/classes/java/lang/StackStreamFactory.java b/src/java.base/share/classes/java/lang/StackStreamFactory.java index 328154dc04e..0cdb81d1fc7 100644 --- a/src/java.base/share/classes/java/lang/StackStreamFactory.java +++ b/src/java.base/share/classes/java/lang/StackStreamFactory.java @@ -121 +121 @@ final class StackStreamFactory { - static abstract class AbstractStackWalker<R, T> { + abstract static class AbstractStackWalker<R, T> { @@ -786 +786 @@ final class StackStreamFactory { - static abstract class FrameBuffer<F> { + abstract static class FrameBuffer<F> { diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java index fac67162435..6d4137c7aa4 100644 --- a/src/java.base/share/classes/java/lang/System.java +++ b/src/java.base/share/classes/java/lang/System.java @@ -334 +334 @@ public final class System { - final static Map<Class<?>, Boolean> callers + static final Map<Class<?>, Boolean> callers @@ -1598 +1598 @@ public final class System { - public static abstract class LoggerFinder { + public abstract static class LoggerFinder { diff --git a/src/java.base/share/classes/java/lang/WeakPairMap.java b/src/java.base/share/classes/java/lang/WeakPairMap.java index 0e521dc901a..12bc3c552d6 100644 --- a/src/java.base/share/classes/java/lang/WeakPairMap.java +++ b/src/java.base/share/classes/java/lang/WeakPairMap.java @@ -343 +343 @@ final class WeakPairMap<K1, K2, V> { - private static abstract class WeakRefPeer<K> extends WeakReference<K> { + private abstract static class WeakRefPeer<K> extends WeakReference<K> { diff --git a/src/java.base/share/classes/java/lang/invoke/AbstractConstantGroup.java b/src/java.base/share/classes/java/lang/invoke/AbstractConstantGroup.java index b61875762a4..679bf70fa3f 100644 --- a/src/java.base/share/classes/java/lang/invoke/AbstractConstantGroup.java +++ b/src/java.base/share/classes/java/lang/invoke/AbstractConstantGroup.java @@ -247 +247 @@ abstract class AbstractConstantGroup implements ConstantGroup { - static abstract + abstract static diff --git a/src/java.base/share/classes/java/lang/invoke/CallSite.java b/src/java.base/share/classes/java/lang/invoke/CallSite.java index d6011851d9d..b7ece9932d3 100644 --- a/src/java.base/share/classes/java/lang/invoke/CallSite.java +++ b/src/java.base/share/classes/java/lang/invoke/CallSite.java @@ -87,2 +87,2 @@ private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String nam -abstract -public class CallSite { +public +abstract class CallSite { diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java index b43c88e4f0e..38e7fc62921 100644 --- a/src/java.base/share/classes/java/net/InetAddress.java +++ b/src/java.base/share/classes/java/net/InetAddress.java @@ -218 +218 @@ public class InetAddress implements java.io.Serializable { - static transient final int preferIPv6Address; + static final transient int preferIPv6Address; diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java index ca8c96c3e04..11c8eb29ca7 100644 --- a/src/java.base/share/classes/java/security/Provider.java +++ b/src/java.base/share/classes/java/security/Provider.java @@ -823 +823 @@ public abstract class Provider extends Properties { - private volatile transient boolean servicesChanged; + private transient volatile boolean servicesChanged; diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java index 52a83552f14..0157faecdb1 100644 --- a/src/java.base/share/classes/java/util/ImmutableCollections.java +++ b/src/java.base/share/classes/java/util/ImmutableCollections.java @@ -145 +145 @@ class ImmutableCollections { - static abstract class AbstractImmutableCollection<E> extends AbstractCollection<E> { + abstract static class AbstractImmutableCollection<E> extends AbstractCollection<E> { @@ -252 +252 @@ class ImmutableCollections { - static abstract class AbstractImmutableList<E> extends AbstractImmutableCollection<E> + abstract static class AbstractImmutableList<E> extends AbstractImmutableCollection<E> @@ -745 +745 @@ class ImmutableCollections { - static abstract class AbstractImmutableSet<E> extends AbstractImmutableCollection<E> + abstract static class AbstractImmutableSet<E> extends AbstractImmutableCollection<E> diff --git a/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java b/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java index 74dae2089a0..d15a7bcdaba 100644 --- a/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java +++ b/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java @@ -627 +627 @@ public abstract class CodePointTrie extends CodePointMap { - private static abstract class Data { + private abstract static class Data { @@ -771 +771 @@ public abstract class CodePointTrie extends CodePointMap { - public static abstract class Fast extends CodePointTrie { + public abstract static class Fast extends CodePointTrie { @@ -909 +909 @@ public abstract class CodePointTrie extends CodePointMap { - public static abstract class Small extends CodePointTrie { + public abstract static class Small extends CodePointTrie { diff --git a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java index 75cf8780bd1..7796512a715 100644 --- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java +++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java @@ -64 +64 @@ public class BasicImageReader implements AutoCloseable { - static private final boolean IS_64_BIT = + private static final boolean IS_64_BIT = @@ -66 +66 @@ public class BasicImageReader implements AutoCloseable { - static private final boolean USE_JVM_MAP = + private static final boolean USE_JVM_MAP = @@ -68 +68 @@ public class BasicImageReader implements AutoCloseable { - static private final boolean MAP_ALL = + private static final boolean MAP_ALL = diff --git a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java index cb22cbf4a03..8d228c050c6 100644 --- a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java +++ b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java @@ -48 +48 @@ class NativeImageBuffer { - native static ByteBuffer getNativeMap(String imagePath); + static native ByteBuffer getNativeMap(String imagePath); diff --git a/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java b/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java index 769e8d2a1b6..317e475d1a8 100644 --- a/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java +++ b/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java @@ -440 +440 @@ public class SimpleConsoleLogger extends LoggerConfiguration - static private final String[] skips; + private static final String[] skips; diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java b/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java index 7edc326bde2..346838b47d9 100644 --- a/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java +++ b/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java @@ -124 +124 @@ class ModuleReferences { - static abstract class SafeCloseModuleReader implements ModuleReader { + abstract static class SafeCloseModuleReader implements ModuleReader { diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java index a59206d0309..ec0bc767eb7 100644 --- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java +++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java @@ -891 +891 @@ public class FileChannelImpl - private static abstract class Unmapper + private abstract static class Unmapper diff --git a/src/java.base/share/classes/sun/security/jca/ProviderList.java b/src/java.base/share/classes/sun/security/jca/ProviderList.java index 90bb29e17f7..cf0bd736f9d 100644 --- a/src/java.base/share/classes/sun/security/jca/ProviderList.java +++ b/src/java.base/share/classes/sun/security/jca/ProviderList.java @@ -74 +74 @@ public final class ProviderList { - static private PreferredList preferredPropList = null; + private static PreferredList preferredPropList = null; diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java index 699a5db6367..efb3258a149 100644 --- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java +++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java @@ -63 +63 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey { - private transient final KeyType type; + private final transient KeyType type; @@ -68 +68 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey { - private transient final AlgorithmParameterSpec keyParams; + private final transient AlgorithmParameterSpec keyParams; diff --git a/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java b/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java index db68eb2b7d4..fe0f030f409 100644 --- a/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java +++ b/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java @@ -553 +553 @@ enum SSLHandshake implements SSLConsumer, HandshakeProducer { - static abstract class HandshakeMessage { + abstract static class HandshakeMessage { ``` 02-11-2021 [~martin] would thou like to re-bless the modifiers? 02-11-2021