Add JavaObjectInputStreamReadString and JavaObjectInputStreamAccess

minborg · minborg · commit 09365043ed98 · 2025-12-17T15:28:04.000+01:00
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -38,6 +38,8 @@
 import java.util.Objects;
 
 import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.JavaObjectInputStreamAccess;
+import jdk.internal.access.JavaObjectInputStreamReadString;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.event.DeserializationEvent;
 import jdk.internal.misc.Unsafe;
@@ -4036,8 +4038,8 @@ private static Object cloneArray(Object array) {
     }
 
     static {
-        SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::checkArray);
-        SharedSecrets.setJavaObjectInputStreamReadString(ObjectInputStream::readString);
+        SharedSecrets.set(JavaObjectInputStreamAccess.class, ObjectInputStream::checkArray);
+        SharedSecrets.set(JavaObjectInputStreamReadString.class, ObjectInputStream::readString);
     }
 
 }
diff --git a/src/java.base/share/classes/java/util/ArrayDeque.java b/src/java.base/share/classes/java/util/ArrayDeque.java
@@ -37,6 +37,8 @@
 import java.io.Serializable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ArraysSupport;
 
@@ -1199,7 +1201,7 @@ private void readObject(java.io.ObjectInputStream s)
 
         // Read in size and allocate array
         int size = s.readInt();
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size + 1);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, size + 1);
         elements = new Object[size + 1];
         this.tail = size;
 
diff --git a/src/java.base/share/classes/java/util/ArrayList.java b/src/java.base/share/classes/java/util/ArrayList.java
@@ -28,6 +28,8 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ArraysSupport;
 
@@ -982,7 +984,7 @@ private void readObject(java.io.ObjectInputStream s)
 
         if (size > 0) {
             // like clone(), allocate array based upon size not capacity
-            SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
+            SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, size);
             Object[] elements = new Object[size];
 
             // Read in all elements in the proper order.
diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
@@ -41,6 +41,8 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 
@@ -5664,7 +5666,7 @@ public Spliterator<E> spliterator() {
         @java.io.Serial
         private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
             ois.defaultReadObject();
-            SharedSecrets.getJavaObjectInputStreamAccess().checkArray(ois, Object[].class, n);
+            SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(ois, Object[].class, n);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java
@@ -35,6 +35,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 
 /**
@@ -1548,7 +1550,7 @@ private void readObject(ObjectInputStream s)
 
             // Check Map.Entry[].class since it's the nearest public type to
             // what we're actually creating.
-            SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, cap);
+            SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Map.Entry[].class, cap);
             @SuppressWarnings({"rawtypes","unchecked"})
             Node<K,V>[] tab = (Node<K,V>[])new Node[cap];
             table = tab;
diff --git a/src/java.base/share/classes/java/util/HashSet.java b/src/java.base/share/classes/java/util/HashSet.java
@@ -26,6 +26,8 @@
 package java.util;
 
 import java.io.InvalidObjectException;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 
 /**
@@ -340,7 +342,7 @@ private void readObject(java.io.ObjectInputStream s)
         // added, so check it before construction. Call HashMap.tableSizeFor to compute the
         // actual allocation size. Check Map.Entry[].class since it's the nearest public type to
         // what is actually created.
-        SharedSecrets.getJavaObjectInputStreamAccess()
+        SharedSecrets.get(JavaObjectInputStreamAccess.class)
                      .checkArray(s, Map.Entry[].class, HashMap.tableSizeFor(capacity));
 
         // Create backing HashMap
diff --git a/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java
@@ -29,6 +29,8 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.BiFunction;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ArraysSupport;
 
@@ -1298,7 +1300,7 @@ void readHashtable(ObjectInputStream s)
 
         // Check Map.Entry[].class since it's the nearest public type to
         // what we're actually creating.
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, length);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Map.Entry[].class, length);
         Hashtable.UnsafeHolder.putLoadFactor(this, lf);
         table = new Entry<?,?>[length];
         threshold = (int)Math.min(length * lf, MAX_ARRAY_SIZE + 1);
diff --git a/src/java.base/share/classes/java/util/IdentityHashMap.java b/src/java.base/share/classes/java/util/IdentityHashMap.java
@@ -31,6 +31,8 @@
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 
 /**
@@ -1327,7 +1329,7 @@ private void readObject(ObjectInputStream s)
             throw new java.io.StreamCorruptedException
                 ("Illegal mappings count: " + size);
         int cap = capacity(size);
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, cap*2);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, cap*2);
         this.size = size;
         init(cap);
 
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -39,6 +39,7 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.JavaUtilCollectionAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.CDS;
@@ -1506,7 +1507,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
             throw new InvalidObjectException("negative length " + len);
         }
 
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(ois, Object[].class, len);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(ois, Object[].class, len);
         Object[] a = new Object[len];
         for (int i = 0; i < len; i++) {
             a[i] = ois.readObject();
diff --git a/src/java.base/share/classes/java/util/PriorityQueue.java b/src/java.base/share/classes/java/util/PriorityQueue.java
@@ -27,6 +27,8 @@
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ArraysSupport;
 
@@ -789,7 +791,7 @@ private void readObject(java.io.ObjectInputStream s)
         // Read in (and discard) array length
         s.readInt();
 
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, size);
         final Object[] es = queue = new Object[Math.max(size, 1)];
 
         // Read in all elements.
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
@@ -46,6 +46,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.util.StaticProperty;
 import sun.nio.cs.ISO_8859_1;
 import sun.nio.cs.UTF_8;
@@ -1584,7 +1585,7 @@ void readHashtable(ObjectInputStream s) throws IOException,
         // (CHM uses the same power-of-two computation as HashMap, and HashMap.tableSizeFor is
         // accessible here.) Check Map.Entry[].class since it's the nearest public type to
         // what is actually created.
-        SharedSecrets.getJavaObjectInputStreamAccess()
+        SharedSecrets.get(JavaObjectInputStreamAccess.class)
                      .checkArray(s, Map.Entry[].class, HashMap.tableSizeFor((int)(elements / 0.75)));
 
         // create CHM of appropriate capacity
diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -55,6 +55,8 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.util.ArraysSupport;
@@ -1035,7 +1037,7 @@ private void readObject(java.io.ObjectInputStream s)
 
         // Read in array length and allocate array
         int len = s.readInt();
-        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, len);
+        SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, len);
         Object[] es = (len == 0 ? EMPTY_ELEMENTDATA : new Object[len]);
 
         // Read in all elements in the proper order.
diff --git a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
@@ -52,6 +52,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.invoke.MhUtil;
 import jdk.internal.util.ArraysSupport;
@@ -921,7 +923,7 @@ private void readObject(java.io.ObjectInputStream s)
         try {
             s.defaultReadObject();
             int sz = q.size();
-            SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, sz);
+            SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(s, Object[].class, sz);
             this.queue = new Object[Math.max(1, sz)];
             comparator = q.comparator();
             addAll(q);
diff --git a/src/java.base/share/classes/jdk/internal/access/Access.java b/src/java.base/share/classes/jdk/internal/access/Access.java
@@ -1,4 +1,4 @@
 package jdk.internal.access;
 
-public sealed interface Access permits JavaBeansAccess, JavaIOAccess, JavaIOFileDescriptorAccess, JavaIORandomAccessFileAccess, JavaLangAccess, JavaLangInvokeAccess, JavaLangModuleAccess, JavaLangRefAccess, JavaLangReflectAccess, JavaUtilJarAccess {
+public sealed interface Access permits JavaBeansAccess, JavaIOAccess, JavaIOFileDescriptorAccess, JavaIORandomAccessFileAccess, JavaLangAccess, JavaLangInvokeAccess, JavaLangModuleAccess, JavaLangRefAccess, JavaLangReflectAccess, JavaObjectInputStreamAccess, JavaObjectInputStreamReadString, JavaUtilJarAccess {
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaObjectInputStreamAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaObjectInputStreamAccess.java
@@ -32,7 +32,7 @@
  * Interface to specify methods for accessing {@code ObjectInputStream}.
  */
 @FunctionalInterface
-public interface JavaObjectInputStreamAccess {
+public non-sealed interface JavaObjectInputStreamAccess extends Access {
     void checkArray(ObjectInputStream ois, Class<?> arrayType, int arrayLength)
         throws ObjectStreamException;
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaObjectInputStreamReadString.java b/src/java.base/share/classes/jdk/internal/access/JavaObjectInputStreamReadString.java
@@ -32,7 +32,7 @@
  * Interface to specify methods for accessing {@code ObjectInputStream}.
  */
 @FunctionalInterface
-public interface JavaObjectInputStreamReadString {
+public non-sealed interface JavaObjectInputStreamReadString extends Access {
     String readString(ObjectInputStream ois) throws IOException;
 }
 
diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -85,16 +85,18 @@ public final class SharedSecrets {
     // the implementation of said interface resides
     private static final Map<Class<? extends Access>, ? extends Constable> IMPLEMENTATIONS =
             Map.ofEntries(
-                    Map.entry(JavaIOAccess.class                , Console.class),
-                    Map.entry(JavaLangAccess.class              , System.class),
-                    Map.entry(JavaLangInvokeAccess.class        , "java.lang.invoke.MethodHandleImpl"),
-                    Map.entry(JavaBeansAccess.class             , NO_INIT),
-                    Map.entry(JavaLangModuleAccess.class        , ModuleDescriptor.class),
-                    Map.entry(JavaUtilJarAccess.class           , JarFile.class),
-                    Map.entry(JavaLangRefAccess.class           , NO_INIT),
-                    Map.entry(JavaLangReflectAccess.class       , NO_INIT),
-                    Map.entry(JavaIOFileDescriptorAccess.class  , FileDescriptor.class),
-                    Map.entry(JavaIORandomAccessFileAccess.class, RandomAccessFile.class)
+                    Map.entry(JavaIOAccess.class                   , Console.class),
+                    Map.entry(JavaLangAccess.class                 , System.class),
+                    Map.entry(JavaLangInvokeAccess.class           , "java.lang.invoke.MethodHandleImpl"),
+                    Map.entry(JavaBeansAccess.class                , NO_INIT),
+                    Map.entry(JavaLangModuleAccess.class           , ModuleDescriptor.class),
+                    Map.entry(JavaUtilJarAccess.class              , JarFile.class),
+                    Map.entry(JavaLangRefAccess.class              , NO_INIT),
+                    Map.entry(JavaLangReflectAccess.class          , NO_INIT),
+                    Map.entry(JavaIOFileDescriptorAccess.class     , FileDescriptor.class),
+                    Map.entry(JavaIORandomAccessFileAccess.class   , RandomAccessFile.class),
+                    Map.entry(JavaObjectInputStreamReadString.class, ObjectInputStream.class),
+                    Map.entry(JavaObjectInputStreamAccess.class    , ObjectInputStream.class)
             );
 
     private static final StableComponentContainer<Access> COMPONENTS =
@@ -135,8 +137,8 @@ public static <T extends Access> void set(Class<T> type, T access) {
     //@Stable private static JavaIOAccess javaIOAccess;
 //    @Stable private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess;
 //    @Stable private static JavaIORandomAccessFileAccess javaIORandomAccessFileAccess;
-    @Stable private static JavaObjectInputStreamReadString javaObjectInputStreamReadString;
-    @Stable private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
+//    @Stable private static JavaObjectInputStreamReadString javaObjectInputStreamReadString;
+//    @Stable private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
     @Stable private static JavaObjectInputFilterAccess javaObjectInputFilterAccess;
     @Stable private static JavaObjectStreamReflectionAccess javaObjectStreamReflectionAccess;
     @Stable private static JavaNetInetAddressAccess javaNetInetAddressAccess;
@@ -316,32 +318,6 @@ public static void setJavaUtilResourceBundleAccess(JavaUtilResourceBundleAccess
         javaUtilResourceBundleAccess = access;
     }
 
-    public static JavaObjectInputStreamReadString getJavaObjectInputStreamReadString() {
-        var access = javaObjectInputStreamReadString;
-        if (access == null) {
-            ensureClassInitialized(ObjectInputStream.class);
-            access = javaObjectInputStreamReadString;
-        }
-        return access;
-    }
-
-    public static void setJavaObjectInputStreamReadString(JavaObjectInputStreamReadString access) {
-        javaObjectInputStreamReadString = access;
-    }
-
-    public static JavaObjectInputStreamAccess getJavaObjectInputStreamAccess() {
-        var access = javaObjectInputStreamAccess;
-        if (access == null) {
-            ensureClassInitialized(ObjectInputStream.class);
-            access = javaObjectInputStreamAccess;
-        }
-        return access;
-    }
-
-    public static void setJavaObjectInputStreamAccess(JavaObjectInputStreamAccess access) {
-        javaObjectInputStreamAccess = access;
-    }
-
     public static JavaObjectInputFilterAccess getJavaObjectInputFilterAccess() {
         var access = javaObjectInputFilterAccess;
         if (access == null) {
diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
@@ -40,6 +40,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import jdk.internal.access.JavaObjectInputStreamAccess;
 import jdk.internal.access.SharedSecrets;
 
 
@@ -906,7 +908,7 @@ private void readObject(ObjectInputStream in)
       in.defaultReadObject();
       List<String> tmpNames = tabularType.getIndexNames();
       int size = tmpNames.size();
-      SharedSecrets.getJavaObjectInputStreamAccess().checkArray(in, String[].class, size);
+      SharedSecrets.get(JavaObjectInputStreamAccess.class).checkArray(in, String[].class, size);
       indexNamesArray = tmpNames.toArray(new String[size]);
     }
 }
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
+import jdk.internal.access.JavaObjectInputStreamReadString;
 import jdk.internal.access.SharedSecrets;
 import sun.rmi.transport.StreamRemoteCall;
 
@@ -87,7 +88,7 @@ public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall,
                 try {
                     ObjectInputStream in = (ObjectInputStream)call.getInputStream();
                     $param_String_1 =
-                            SharedSecrets.getJavaObjectInputStreamReadString().readString(in);
+                            SharedSecrets.get(JavaObjectInputStreamReadString.class).readString(in);
                     $param_Remote_2 = (java.rmi.Remote) in.readObject();
                 } catch (ClassCastException | IOException | ClassNotFoundException e) {
                     call.discardPendingRefs();
@@ -123,7 +124,7 @@ public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall,
                 try {
                     ObjectInputStream in = (ObjectInputStream)call.getInputStream();
                     $param_String_1 =
-                            SharedSecrets.getJavaObjectInputStreamReadString().readString(in);
+                            SharedSecrets.get(JavaObjectInputStreamReadString.class).readString(in);
                 } catch (ClassCastException | IOException e) {
                     call.discardPendingRefs();
                     throw new java.rmi.UnmarshalException("error unmarshalling arguments", e);
@@ -150,7 +151,7 @@ public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall,
                 try {
                     ObjectInputStream in = (ObjectInputStream)call.getInputStream();
                     $param_String_1 =
-                            SharedSecrets.getJavaObjectInputStreamReadString().readString(in);
+                            SharedSecrets.get(JavaObjectInputStreamReadString.class).readString(in);
                     $param_Remote_2 = (java.rmi.Remote) in.readObject();
                 } catch (ClassCastException | IOException | java.lang.ClassNotFoundException e) {
                     call.discardPendingRefs();
@@ -176,7 +177,7 @@ public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall,
                 try {
                     ObjectInputStream in = (ObjectInputStream)call.getInputStream();
                     $param_String_1 =
-                            SharedSecrets.getJavaObjectInputStreamReadString().readString(in);
+                            SharedSecrets.get(JavaObjectInputStreamReadString.class).readString(in);
                 } catch (ClassCastException | IOException e) {
                     call.discardPendingRefs();
                     throw new java.rmi.UnmarshalException("error unmarshalling arguments", e);
diff --git a/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@`
`38`	`38`	`import java.util.Objects;`
`39`	`39`
`40`	`40`	`import jdk.internal.access.JavaLangAccess;`
	`41`	`+import jdk.internal.access.JavaObjectInputStreamAccess;`
	`42`	`+import jdk.internal.access.JavaObjectInputStreamReadString;`
`41`	`43`	`import jdk.internal.access.SharedSecrets;`
`42`	`44`	`import jdk.internal.event.DeserializationEvent;`
`43`	`45`	`import jdk.internal.misc.Unsafe;`
`@@ -4036,8 +4038,8 @@ private static Object cloneArray(Object array) {`
`4036`	`4038`	`}`
`4037`	`4039`
`4038`	`4040`	`static {`
`4039`		`- SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::checkArray);`
`4040`		`- SharedSecrets.setJavaObjectInputStreamReadString(ObjectInputStream::readString);`
	`4041`	`+ SharedSecrets.set(JavaObjectInputStreamAccess.class, ObjectInputStream::checkArray);`
	`4042`	`+ SharedSecrets.set(JavaObjectInputStreamReadString.class, ObjectInputStream::readString);`
`4041`	`4043`	`}`
`4042`	`4044`
`4043`	`4045`	`}`