ARIES-2165: Create proxied object with objenesis

Author: alien11689

proxy/proxy-impl/pom.xml

@@ -58,6 +58,7 @@
             org.apache.aries.proxy*;provide:=true,
             org.objectweb.asm*;resolution:=optional;version="[9,10)",
             sun.reflect*;resolution:=optional,
+            org.objenesis*;resolution:=optional,
             *
         </aries.osgi.import.pkg>
         <aries.osgi.private.pkg>
@@ -70,6 +71,7 @@
         <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
         <javax.transaction-api.version>1.3</javax.transaction-api.version>
         <mockito-core.version>3.7.7</mockito-core.version>
+        <objenesis.version>3.4</objenesis.version>
         <org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
     </properties>
 
@@ -80,6 +82,12 @@
             <version>${org.apache.aries.proxy.api.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>${objenesis.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassGenerator.java

@@ -40,6 +40,8 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
+import org.objenesis.Objenesis;
+import org.objenesis.ObjenesisStd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -170,31 +172,16 @@ public static Object newProxySubclassInstance(Class<?> classToProxy, ClassLoader
     try {
       Class<?> generatedProxySubclass = getProxySubclass(classToProxy, loader);
       LOGGER.debug("Getting the proxy subclass constructor");
-      // Because the newer JVMs throw a VerifyError if a class attempts to in a constructor other than their superclasses constructor,
-      // and because we can't know what objects/values we need to pass into the class being proxied constructor, 
-      // we instantiate the proxy class using the ReflectionFactory.newConstructorForSerialization() method which allows us to instantiate the 
-      // proxy class without calling the proxy class' constructor. It is in fact using the java.lang.Object constructor so is in effect 
-      // doing what we were doing before.
-//      ReflectionFactory factory = ReflectionFactory.getReflectionFactory();
-//      Constructor<?> constr = Object.class.getConstructor();
-      Constructor<?> subclassConstructor = generatedProxySubclass.getConstructor();
-      proxySubclassInstance = subclassConstructor.newInstance();
-      
+      // Simple newInstance or constructor call cannot be used since constructor may be private
+      // or we may not know constructor parameters
+      Objenesis objenesis = new ObjenesisStd();
+      proxySubclassInstance = objenesis.newInstance(generatedProxySubclass);;
       Method setIHMethod = proxySubclassInstance.getClass().getMethod("setInvocationHandler", InvocationHandler.class);
       setIHMethod.invoke(proxySubclassInstance, ih);
       LOGGER.debug("Invoked proxy subclass constructor");
-    } catch (NoSuchMethodException nsme) {
-      LOGGER.debug(Constants.LOG_EXCEPTION, nsme);
-      throw new ProxyClassInstantiationException(classToProxy, nsme);
-    } catch (InvocationTargetException ite) {
-      LOGGER.debug(Constants.LOG_EXCEPTION, ite);
-      throw new ProxyClassInstantiationException(classToProxy, ite);
-    } catch (InstantiationException ie) {
-      LOGGER.debug(Constants.LOG_EXCEPTION, ie);
-      throw new ProxyClassInstantiationException(classToProxy, ie);
-    } catch (IllegalAccessException iae) {
-      LOGGER.debug(Constants.LOG_EXCEPTION, iae);
-      throw new ProxyClassInstantiationException(classToProxy, iae);
+    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+      LOGGER.debug(Constants.LOG_EXCEPTION, e);
+      throw new ProxyClassInstantiationException(classToProxy, e);
     } catch (VerifyError ve) {
         LOGGER.info(String.format("The no-argument constructor of class %s is private and therefore it may not be possible to generate a valid proxy.", 
                                   classToProxy));

proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxySubclassGeneratorTest.java

@@ -50,7 +50,6 @@
 import org.apache.aries.proxy.impl.gen.ProxySubclassMethodHashSet;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -174,7 +173,6 @@ public void testFinalClass() throws Exception
    * Test a private constructor
    */
   @Test
-  @Ignore
   public void testPrivateConstructor() throws Exception
   {
     Object o = ProxySubclassGenerator.newProxySubclassInstance(

proxy/proxy-itests/pom.xml

@@ -52,6 +52,7 @@
         <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
         <tinybundles.version>2.0.0</tinybundles.version>
         <url.version>2.6.16</url.version>
+        <objenesis.version>3.4</objenesis.version>
     </properties>
 
     <dependencies>
@@ -72,6 +73,12 @@
             <scope>test</scope>
             <version>${org.apache.aries.proxy.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>${objenesis.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>

proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java

@@ -301,6 +301,7 @@ protected Option proxyOptions() {
               mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
               mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
               mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
+              mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
               mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
               mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
               mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),