HV-1628 Add a NewProxyInstance privileged action

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/util/annotation/AnnotationFactory.java

@@ -7,16 +7,11 @@
 package org.hibernate.validator.internal.util.annotation;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Proxy;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.hibernate.validator.internal.util.privilegedactions.ConstructorInstance;
 import org.hibernate.validator.internal.util.privilegedactions.GetClassLoader;
-import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredConstructor;
+import org.hibernate.validator.internal.util.privilegedactions.NewProxyInstance;
 
 /**
  * Creates live annotations (actually {@link AnnotationProxy} instances) from {@code AnnotationDescriptor}s.
@@ -32,31 +27,11 @@ private AnnotationFactory() {
 	}
 
 	public static <T extends Annotation> T create(AnnotationDescriptor<T> descriptor) {
-		@SuppressWarnings("unchecked")
-		Class<T> proxyClass = (Class<T>) Proxy.getProxyClass(
+		return run( NewProxyInstance.action(
 				run( GetClassLoader.fromClass( descriptor.getType() ) ),
-				descriptor.getType()
-		);
-		InvocationHandler handler = new AnnotationProxy( descriptor );
-		try {
-			return getProxyInstance( proxyClass, handler );
-		}
-		catch (RuntimeException e) {
-			throw e;
-		}
-		catch (Exception e) {
-			throw new RuntimeException( e );
-		}
-	}
-
-	private static <T extends Annotation> T getProxyInstance(Class<T> proxyClass, InvocationHandler handler) throws
-			SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException,
-			IllegalAccessException, InvocationTargetException {
-		final Constructor<T> constructor = run( GetDeclaredConstructor.action(
-				proxyClass,
-				InvocationHandler.class
+				descriptor.getType(),
+				new AnnotationProxy( descriptor )
 		) );
-		return run( ConstructorInstance.action( constructor, handler ) );
 	}
 
 	/**

engine/src/main/java/org/hibernate/validator/internal/util/privilegedactions/NewProxyInstance.java

@@ -0,0 +1,49 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.util.privilegedactions;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.security.PrivilegedAction;
+
+/**
+ * Execute proxy creation as privileged action.
+ *
+ * @author Guillaume Smet
+ */
+public final class NewProxyInstance<T> implements PrivilegedAction<T> {
+
+	private final ClassLoader classLoader;
+	private final Class<?>[] interfaces;
+	private final InvocationHandler invocationHandler;
+
+	public static <T> NewProxyInstance<T> action(ClassLoader classLoader, Class<T> interfaze, InvocationHandler invocationHandler) {
+		return new NewProxyInstance<T>( classLoader, interfaze, invocationHandler );
+	}
+
+	public static NewProxyInstance<Object> action(ClassLoader classLoader, Class<?>[] interfaces, InvocationHandler invocationHandler) {
+		return new NewProxyInstance<Object>( classLoader, interfaces, invocationHandler );
+	}
+
+	private NewProxyInstance(ClassLoader classLoader, Class<?>[] interfaces, InvocationHandler invocationHandler) {
+		this.classLoader = classLoader;
+		this.interfaces = interfaces;
+		this.invocationHandler = invocationHandler;
+	}
+
+	private NewProxyInstance(ClassLoader classLoader, Class<T> interfaze, InvocationHandler invocationHandler) {
+		this.classLoader = classLoader;
+		this.interfaces = new Class<?>[] { interfaze };
+		this.invocationHandler = invocationHandler;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public T run() {
+		return (T) Proxy.newProxyInstance( classLoader, interfaces, invocationHandler );
+	}
+}