DELTASPIKE-1483 remove SecurityManager

Author: struberg

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java

@@ -20,7 +20,6 @@
 package org.apache.deltaspike.core.util.metadata.builder;
 
 import org.apache.deltaspike.core.util.ReflectionUtils;
-import org.apache.deltaspike.core.util.securitymanaged.SetAccessiblePrivilegedAction;
 
 import jakarta.enterprise.inject.spi.Annotated;
 import jakarta.enterprise.inject.spi.AnnotatedConstructor;

deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java

@@ -25,8 +25,6 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
 import java.net.URL;
@@ -61,37 +59,9 @@ private ClassUtils()
      */
     public static ClassLoader getClassLoader(Object o)
     {
-        if (System.getSecurityManager() != null)
-        {
-            return AccessController.doPrivileged(new GetClassLoaderAction(o));
-        }
-        else
-        {
-            return getClassLoaderInternal(o);
-        }
+        return getClassLoaderInternal(o);
     }
 
-    static class GetClassLoaderAction implements PrivilegedAction<ClassLoader>
-    {
-        private Object object;
-        GetClassLoaderAction(Object object)
-        {
-            this.object = object;
-        }
-
-        @Override
-        public ClassLoader run()
-        {
-            try
-            {
-                return getClassLoaderInternal(object);
-            }
-            catch (Exception e)
-            {
-                return null;
-            }
-        }
-    }
 
     private static ClassLoader getClassLoaderInternal(Object o)
     {

deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java

@@ -31,19 +31,15 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.deltaspike.core.util.securitymanaged.SetAccessiblePrivilegedAction;
 
 /**
  * Utilities for common reflection based actions. Some are basic Java Reflection based, others are CDI based.
  */
-//X TODO: Look at merging this with some of the other classes from CODI, or if they're really needed
-//X TODO: Also some methods need JavaDoc
 @Vetoed
 public abstract class ReflectionUtils
 {
@@ -179,14 +175,7 @@ public static <T> T invokeMethod(Object instance,
     {
         if (setAccessible && !method.isAccessible())
         {
-            if (System.getSecurityManager() != null)
-            {
-                AccessController.doPrivileged(new SetAccessiblePrivilegedAction(method));
-            }
-            else
-            {
-                method.setAccessible(true);
-            }
+            method.setAccessible(true);
         }
 
         try

deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java

@@ -24,8 +24,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -153,25 +151,19 @@ private static String buildInvokeMethodErrorMessage(Method method, Object obj, O
 
     /**
      * Set the accessibility flag on the {@link AccessibleObject} as described in
-     * {@link AccessibleObject#setAccessible(boolean)} within the context of a {@link PrivilegedAction}.
+     * {@link AccessibleObject#setAccessible(boolean)}.
      *
      * @param <A>
      *            member the accessible object type
      * @param member
      *            the accessible object
      * @return the accessible object after the accessible flag has been altered
+     * @deprecated call method directly as SecurityManager got deprecated and will soon be removed from Java
      */
+    @Deprecated
     public static <A extends AccessibleObject> A setAccessible(final A member)
     {
-        AccessController.doPrivileged(new PrivilegedAction<Void>()
-        {
-            @Override
-            public Void run()
-            {
-                member.setAccessible(true);
-                return null;
-            }
-        });
+        member.setAccessible(true);
         return member;
     }
 
@@ -202,7 +194,7 @@ public static Object invokeMethod(Method method, Object instance, Object... args
      * </p>
      * <p/>
      * <p>
-     * This method attempts to set the accessible flag of the method in a {@link PrivilegedAction} before invoking the
+     * This method attempts to set the accessible flag of the method before invoking the
      * method if the first argument is true.
      * </p>
      * <p/>
@@ -252,7 +244,7 @@ public static <T> T invokeMethod(Method method, Class<T> expectedReturnType, Obj
      * </p>
      * <p/>
      * <p>
-     * If instructed, this method attempts to set the accessible flag of the method in a {@link PrivilegedAction} before
+     * If instructed, this method attempts to set the accessible flag of the method before
      * invoking the method.
      * </p>
      *
@@ -329,8 +321,7 @@ public static <T> T invokeMethod(boolean setAccessible, Method method, Class<T>
      * <p/>
      * <p>
      * This method provides the same functionality and throws the same exceptions as
-     * {@link Reflections#setFieldValue(boolean, Method, Class, Object, Object...)}, honoring the accessibility of the
-     * field.
+     * {@link Reflections#setFieldValue(boolean, Field, Object, Object)} 
      * </p>
      */
     public static void setFieldValue(Field field, Object instance, Object value)
@@ -349,7 +340,7 @@ public static void setFieldValue(Field field, Object instance, Object value)
      * </p>
      * <p/>
      * <p>
-     * If instructed, this method attempts to set the accessible flag of the method in a {@link PrivilegedAction} before
+     * If instructed, this method attempts to set the accessible flag of the method before
      * invoking the method.
      * </p>
      *

deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/property/Reflections.java

@@ -19,8 +19,6 @@
 package org.apache.deltaspike.test.utils;
 
 import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -121,14 +119,7 @@ private static Class loadClassForName(String name) throws ClassNotFoundException
 
     private static ClassLoader getClassLoader(Object o)
     {
-        if (System.getSecurityManager() != null)
-        {
-            return AccessController.doPrivileged(new GetClassLoaderAction(o));
-        }
-        else
-        {
-            return getClassLoaderInternal(o);
-        }
+        return getClassLoaderInternal(o);
     }
 
     private static ClassLoader getClassLoaderInternal(Object o)
@@ -203,26 +194,4 @@ private static String getManifestLocation(Class targetClass)
         return classLocation.substring(0, classLocation.indexOf(classFilePath) - 1) + manifestFilePath;
     }
 
-    private static class GetClassLoaderAction implements PrivilegedAction<ClassLoader>
-    {
-        private Object object;
-
-        GetClassLoaderAction(Object object)
-        {
-            this.object = object;
-        }
-
-        @Override
-        public ClassLoader run()
-        {
-            try
-            {
-                return getClassLoaderInternal(object);
-            }
-            catch (Exception e)
-            {
-                return null;
-            }
-        }
-    }
 }