8344891: Remove uses of sun.misc.ReflectUtil in java.desktop

Reviewed-by: kizune, azvegint
openjdk · Nov 23, 2024 · 7be94d0 · 7be94d0 · openjdk-notifier · Nov 23, 2024
1 parent 822a155
commit 7be94d0
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 68 deletions.
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
@@ -38,7 +38,6 @@
 import sun.awt.AppContext;
 
 import sun.lwawt.macosx.CPlatformWindow;
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.SwingUtilities2;
 
 import com.apple.laf.AquaImageFactory.SlicedImageControl;
@@ -174,7 +173,6 @@ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSing
         @SuppressWarnings("deprecation")
         T getInstance() {
             try {
-                ReflectUtil.checkPackageAccess(clazz);
                 return clazz.newInstance();
             } catch (ReflectiveOperationException ignored) {
             }

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ClassFinder.java
@@ -24,8 +24,6 @@
  */
 package com.sun.beans.finder;
 
-import static sun.reflect.misc.ReflectUtil.checkPackageAccess;
-
 /**
  * This is utility class that provides {@code static} methods
  * to find a class with the specified name using the specified class loader.
@@ -56,7 +54,6 @@ public final class ClassFinder {
      * @see Thread#getContextClassLoader()
      */
     public static Class<?> findClass(String name) throws ClassNotFoundException {
-        checkPackageAccess(name);
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             if (loader == null) {
@@ -95,7 +92,6 @@ public static Class<?> findClass(String name) throws ClassNotFoundException {
      * @see Class#forName(String,boolean,ClassLoader)
      */
     public static Class<?> findClass(String name, ClassLoader loader) throws ClassNotFoundException {
-        checkPackageAccess(name);
         if (loader != null) {
             try {
                 return Class.forName(name, false, loader);

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/ConstructorFinder.java
@@ -30,7 +30,6 @@
 import java.lang.reflect.Modifier;
 
 import static com.sun.beans.util.Cache.Kind.SOFT;
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
 
 /**
  * This utility class provides {@code static} methods
@@ -81,7 +80,7 @@ public static Constructor<?> findConstructor(Class<?> type, Class<?>...args) thr
             throw new NoSuchMethodException("Abstract class cannot be instantiated: "
                 + type.getName());
         }
-        if (!Modifier.isPublic(type.getModifiers()) || !isPackageAccessible(type)) {
+        if (!Modifier.isPublic(type.getModifiers())) {
             throw new NoSuchMethodException("Class is not accessible: " + type.getName());
         }
         PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/FieldFinder.java
@@ -27,8 +27,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
 /**
  * This utility class provides {@code static} methods
  * to find a public field with specified name
@@ -62,7 +60,7 @@ public static Field findField(Class<?> type, String name) throws NoSuchFieldExce
             throw new NoSuchFieldException("Field '" + name + "' is not public");
         }
         type = field.getDeclaringClass();
-        if (!Modifier.isPublic(type.getModifiers()) || !isPackageAccessible(type)) {
+        if (!Modifier.isPublic(type.getModifiers())) {
             throw new NoSuchFieldException("Field '" + name + "' is not accessible");
         }
         return field;

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
@@ -34,7 +34,6 @@
 import java.util.Arrays;
 
 import static com.sun.beans.util.Cache.Kind.SOFT;
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
 
 /**
  * This utility class provides {@code static} methods
@@ -79,7 +78,7 @@ public static Method findMethod(Class<?> type, String name, Class<?>...args) thr
 
         try {
             Method method = CACHE.get(signature);
-            return (method == null) || isPackageAccessible(method.getDeclaringClass()) ? method : CACHE.create(signature);
+            return (method == null) ? method : CACHE.create(signature);
         }
         catch (SignatureException exception) {
             throw exception.toNoSuchMethodException("Method '" + name + "' is not found");
@@ -138,7 +137,7 @@ public static Method findAccessibleMethod(Method method) throws NoSuchMethodExce
         if (!FinderUtils.isExported(type)) {
             throw new NoSuchMethodException("Method '" + method.getName() + "' is not accessible");
         }
-        if (Modifier.isPublic(type.getModifiers()) && isPackageAccessible(type)) {
+        if (Modifier.isPublic(type.getModifiers())) {
             return method;
         }
         if (Modifier.isStatic(method.getModifiers())) {

diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/ClassInfo.java
@@ -31,8 +31,6 @@
 
 import com.sun.beans.util.Cache;
 
-import static sun.reflect.misc.ReflectUtil.checkPackageAccess;
-
 public final class ClassInfo {
     private static final ClassInfo DEFAULT = new ClassInfo(null);
     private static final Cache<Class<?>,ClassInfo> CACHE
@@ -48,7 +46,6 @@ public static ClassInfo get(Class<?> type) {
             return DEFAULT;
         }
         try {
-            checkPackageAccess(type);
             return CACHE.get(type);
         } catch (SecurityException exception) {
             return DEFAULT;

diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/JARSoundbankReader.java
@@ -39,8 +39,6 @@
 import javax.sound.midi.Soundbank;
 import javax.sound.midi.spi.SoundbankReader;
 
-import sun.reflect.misc.ReflectUtil;
-
 /**
  * JarSoundbankReader is used to read soundbank object from jar files.
  *
@@ -95,7 +93,6 @@ public Soundbank getSoundbank(URL url)
                     try {
                         Class<?> c = Class.forName(line.trim(), false, ucl);
                         if (Soundbank.class.isAssignableFrom(c)) {
-                            ReflectUtil.checkPackageAccess(c);
                             Object o = c.newInstance();
                             soundbanks.add((Soundbank) o);
                         }

diff --git a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -27,7 +27,7 @@
 import java.util.*;
 import java.lang.reflect.*;
 import java.util.Objects;
-import sun.reflect.misc.*;
+import sun.reflect.misc.MethodUtil;
 
 
 /**
@@ -222,9 +222,6 @@ static void invokeStatement(Object instance, String methodName, Object[] args, E
     // Write out the properties of this instance.
     private void initBean(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         for (Field field : type.getFields()) {
-            if (!ReflectUtil.isPackageAccessible(field.getDeclaringClass())) {
-                continue;
-            }
             int mod = field.getModifiers();
             if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
                 continue;

diff --git a/src/java.desktop/share/classes/java/beans/EventHandler.java b/src/java.desktop/share/classes/java/beans/EventHandler.java
@@ -30,7 +30,6 @@
 import java.lang.reflect.Method;
 
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * The {@code EventHandler} class provides
@@ -691,7 +690,6 @@ public static <T> T create(Class<T> listenerInterface,
     }
 
     private static ClassLoader getClassLoader(Class<?> type) {
-        ReflectUtil.checkPackageAccess(type);
         ClassLoader loader = type.getClassLoader();
         if (loader == null) {
             loader = Thread.currentThread().getContextClassLoader(); // avoid use of BCP

diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -47,7 +47,6 @@
 import com.sun.beans.introspect.PropertyInfo;
 import jdk.internal.access.JavaBeansAccess;
 import jdk.internal.access.SharedSecrets;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * The Introspector class provides a standard way for tools to learn about
@@ -186,9 +185,6 @@ public String[] getConstructorPropertiesValue(Constructor<?> ctr) {
     public static BeanInfo getBeanInfo(Class<?> beanClass)
         throws IntrospectionException
     {
-        if (!ReflectUtil.isPackageAccessible(beanClass)) {
-            return (new Introspector(beanClass, null, USE_ALL_BEANINFO)).getBeanInfo();
-        }
         ThreadGroupContext context = ThreadGroupContext.getContext();
         BeanInfo beanInfo = context.getBeanInfo(beanClass);
         if (beanInfo == null) {

diff --git a/src/java.desktop/share/classes/java/beans/MetaData.java b/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -50,8 +50,6 @@
 
 import sun.swing.PrintColorUIResource;
 
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
 /*
  * Like the {@code Introspector}, the {@code MetaData} class
  * contains <em>meta</em> objects that describe the way
@@ -749,7 +747,7 @@ protected Expression instantiate(Object oldInstance, Encoder out) {
 
 static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
     protected void installFields(Encoder out, Class<?> cls) {
-        if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
+        if (Modifier.isPublic(cls.getModifiers())) {
             Field[] fields = cls.getFields();
             for(int i = 0; i < fields.length; i++) {
                 Field field = fields[i];

diff --git a/src/java.desktop/share/classes/java/beans/MethodRef.java b/src/java.desktop/share/classes/java/beans/MethodRef.java
@@ -29,8 +29,6 @@
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 
-import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
 final class MethodRef {
     private String signature;
     private SoftReference<Method> methodRef;
@@ -68,7 +66,7 @@ Method get() {
             }
             this.methodRef = new SoftReference<>(method);
         }
-        return isPackageAccessible(method.getDeclaringClass()) ? method : null;
+        return method;
     }
 
     private static Method find(Class<?> type, String signature) {

diff --git a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
@@ -30,7 +30,6 @@
 import java.util.Map.Entry;
 
 import com.sun.beans.introspect.PropertyInfo;
-import sun.reflect.misc.ReflectUtil;
 
 /**
  * A PropertyDescriptor describes one property that a Java Bean
@@ -467,8 +466,7 @@ public PropertyEditor createPropertyEditor(Object bean) {
         Object editor = null;
 
         final Class<?> cls = getPropertyEditorClass();
-        if (cls != null && PropertyEditor.class.isAssignableFrom(cls)
-                && ReflectUtil.isPackageAccessible(cls)) {
+        if (cls != null && PropertyEditor.class.isAssignableFrom(cls)) {
             Constructor<?> ctor = null;
             if (bean != null) {
                 try {

diff --git a/src/java.desktop/share/classes/java/beans/Statement.java b/src/java.desktop/share/classes/java/beans/Statement.java
@@ -35,8 +35,6 @@
 import com.sun.beans.finder.MethodFinder;
 import sun.reflect.misc.MethodUtil;
 
-import static sun.reflect.misc.ReflectUtil.checkPackageAccess;
-
 /**
  * A {@code Statement} object represents a primitive statement
  * in which a single method is applied to a target and
@@ -189,13 +187,8 @@ Object invoke() throws Exception {
                 // Class.forName(String className) won't load classes outside
                 // of core from a class inside core. Special
                 // case this method.
-                // checkPackageAccess(name) will be called by ClassFinder
                 return ClassFinder.resolveClass(name, this.loader);
             }
-            // The 3 args Class.forName(String className, boolean, classloader)
-            // requires getClassLoader permission, but we will be stricter and
-            // will require access to the package as well.
-            checkPackageAccess(name);
         }
         Class<?>[] argClasses = new Class<?>[arguments.length];
         for(int i = 0; i < arguments.length; i++) {

diff --git a/src/java.desktop/share/classes/javax/print/SimpleDoc.java b/src/java.desktop/share/classes/javax/print/SimpleDoc.java
@@ -108,7 +108,6 @@ public SimpleDoc(Object printData,
        Class<?> repClass = null;
        try {
             String className = flavor.getRepresentationClassName();
-            sun.reflect.misc.ReflectUtil.checkPackageAccess(className);
             repClass = Class.forName(className, false,
                               Thread.currentThread().getContextClassLoader());
        } catch (Throwable e) {

diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -94,8 +94,6 @@
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 
-import sun.reflect.misc.ReflectUtil;
-
 /**
  * A text component to edit various kinds of content.
  * You can find how-to information and examples of using editor panes in
@@ -1238,7 +1236,6 @@ public static EditorKit createEditorKitForContentType(String type) {
             try {
                 Class<?> c;
                 if (loader != null) {
-                    ReflectUtil.checkPackageAccess(classname);
                     c = loader.loadClass(classname);
                 } else {
                     // Will only happen if developer has invoked

diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -113,7 +113,6 @@
 
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.MouseEventAccessor;
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.PrintingStatus;
 import sun.swing.SwingUtilities2;
 import sun.swing.SwingUtilities2.Section;
@@ -5585,7 +5584,6 @@ public Component getTableCellEditorComponent(JTable table, Object value,
                 if (type == Object.class) {
                     type = String.class;
                 }
-                ReflectUtil.checkPackageAccess(type);
                 SwingUtilities2.checkAccess(type.getModifiers());
                 constructor = type.getConstructor(argTypes);
             }

diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -24,7 +24,6 @@
  */
 package javax.swing;
 
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.SwingUtilities2;
 import sun.swing.UIAction;
 
@@ -2033,7 +2032,6 @@ static void appContextRemove(Object key) {
 
 
     static Class<?> loadSystemClass(String className) throws ClassNotFoundException {
-        ReflectUtil.checkPackageAccess(className);
         return Class.forName(className, true, Thread.currentThread().
                              getContextClassLoader());
     }

diff --git a/src/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
@@ -51,7 +51,6 @@
 import java.beans.PropertyChangeListener;
 
 import sun.reflect.misc.MethodUtil;
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 
@@ -702,7 +701,6 @@ public Dimension getDimension(Object key, Locale l) {
         try {
             String className = (String)get(uiClassID);
             if (className != null) {
-                ReflectUtil.checkPackageAccess(className);
 
                 Class<?> cls = (Class)get(className);
                 if (cls == null) {
@@ -1142,7 +1140,6 @@ public Object createValue(final UIDefaults table) {
                         cl = ClassLoader.getSystemClassLoader();
                     }
                 }
-                ReflectUtil.checkPackageAccess(className);
                 c = Class.forName(className, true, (ClassLoader)cl);
                 SwingUtilities2.checkAccess(c.getModifiers());
                 if (methodName != null) {

diff --git a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -33,8 +33,6 @@
 import java.lang.reflect.Array;
 import java.util.EventListener;
 
-import sun.reflect.misc.ReflectUtil;
-
 /**
  * A class that holds a list of EventListeners.  A single instance
  * can be used to hold all listeners (of all types) for the instance
@@ -303,7 +301,6 @@ private void readObject(ObjectInputStream s)
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
             EventListener l = (EventListener)s.readObject();
             String name = (String) listenerTypeOrNull;
-            ReflectUtil.checkPackageAccess(name);
             @SuppressWarnings("unchecked")
             Class<EventListener> tmp = (Class<EventListener>)Class.forName(name, true, cl);
             add(tmp, l);

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -67,7 +67,6 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.sun.beans.decoder.DocumentHandler;
-import sun.reflect.misc.ReflectUtil;
 
 class SynthParser extends DefaultHandler {
     //
@@ -646,7 +645,7 @@ else if (key.equals(ATTRIBUTE_TYPE)) {
                     }
                     else {
                         try {
-                            typeClass = ReflectUtil.forName(typeName.substring(
+                            typeClass = Class.forName(typeName.substring(
                                                       0, classIndex));
                         } catch (ClassNotFoundException cnfe) {
                             throw new SAXException("Unknown class: " +

diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
@@ -24,7 +24,6 @@
  */
 package javax.swing.text;
 
-import sun.reflect.misc.ReflectUtil;
 import sun.swing.SwingUtilities2;
 
 import java.io.Serializable;
@@ -248,7 +247,6 @@ public Object stringToValue(String string) throws ParseException {
             Constructor<?> cons;
 
             try {
-                ReflectUtil.checkPackageAccess(vc);
                 SwingUtilities2.checkAccess(vc.getModifiers());
                 cons = vc.getConstructor(new Class<?>[]{String.class});