Skip to content

Commit f8ce17d

Browse files
alien11689alien11689
committed
ARIES-2165: Create proxied object with objenesis
1 parent e1a84dc commit f8ce17d

File tree

6 files changed

+155
-64
lines changed

6 files changed

+155
-64
lines changed

‎blueprint/itests/blueprint-itests/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<commons-jexl.version>2.1.1</commons-jexl.version>
5757
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
5858
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
59+
<objenesis.version>3.4</objenesis.version>
5960
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
6061
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
6162
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
@@ -107,6 +108,12 @@
107108
<artifactId>org.apache.aries.proxy</artifactId>
108109
<version>${org.apache.aries.proxy.version}</version>
109110
</dependency>
111+
<dependency>
112+
<groupId>org.objenesis</groupId>
113+
<artifactId>objenesis</artifactId>
114+
<version>${objenesis.version}</version>
115+
<scope>test</scope>
116+
</dependency>
110117
<dependency>
111118
<groupId>org.apache.servicemix.bundles</groupId>
112119
<artifactId>org.apache.servicemix.bundles.spring-context</artifactId>

‎blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public static Option blueprintBundles(boolean startBlueprint) {
6565
mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
6666
mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
6767
mvnBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
68+
mvnBundle("org.objenesis", "objenesis"),
6869
mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
6970
mvnBundle("org.apache.commons", "commons-jexl"),
7071
mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),

‎proxy/proxy-impl/pom.xml‎

Lines changed: 97 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,22 @@
5858
org.apache.aries.proxy*;provide:=true,
5959
org.objectweb.asm*;resolution:=optional;version="[9,10)",
6060
sun.reflect*;resolution:=optional,
61+
org.objenesis*;resolution:=optional,
6162
*
6263
</aries.osgi.import.pkg>
6364
<aries.osgi.private.pkg>
6465
org.apache.aries.proxy.impl*
6566
</aries.osgi.private.pkg>
66-
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
67+
git push --set-upstream origin remove-unused-ci-build-profile-in-samples
68+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
6769
<lastReleaseVersion>1.1.14</lastReleaseVersion>
6870

6971
<asm.version>9.7.1</asm.version>
7072
<commons-io.version>2.18.0</commons-io.version>
7173
<geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
7274
<javax.transaction-api.version>1.3</javax.transaction-api.version>
7375
<mockito-core.version>4.11.0</mockito-core.version>
76+
<objenesis.version>3.4</objenesis.version>
7477
<org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
7578
</properties>
7679

@@ -81,6 +84,12 @@
8184
<version>${org.apache.aries.proxy.api.version}</version>
8285
<scope>provided</scope>
8386
</dependency>
87+
<dependency>
88+
<groupId>org.objenesis</groupId>
89+
<artifactId>objenesis</artifactId>
90+
<version>${objenesis.version}</version>
91+
<optional>true</optional>
92+
</dependency>
8493
<dependency>
8594
<groupId>org.ow2.asm</groupId>
8695
<artifactId>asm</artifactId>
@@ -148,33 +157,6 @@
148157

149158
<build>
150159
<plugins>
151-
<plugin>
152-
<groupId>org.apache.maven.plugins</groupId>
153-
<artifactId>maven-compiler-plugin</artifactId>
154-
</plugin>
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-antrun-plugin</artifactId>
158-
<executions>
159-
<execution>
160-
<phase>process-classes</phase>
161-
<configuration>
162-
<target>
163-
<!-- run the Synthesizer on the WovenProxy class -->
164-
<java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath" fork="false">
165-
<arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
166-
</java>
167-
168-
<delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
169-
170-
</target>
171-
</configuration>
172-
<goals>
173-
<goal>run</goal>
174-
</goals>
175-
</execution>
176-
</executions>
177-
</plugin>
178160
<plugin>
179161
<groupId>org.apache.aries.versioning</groupId>
180162
<artifactId>org.apache.aries.versioning.plugin</artifactId>
@@ -212,4 +194,91 @@
212194
</plugins>
213195
</build>
214196

197+
<profiles>
198+
<profile>
199+
<id>java9To21</id>
200+
<activation>
201+
<jdk>(8,22)</jdk>
202+
</activation>
203+
<build>
204+
<plugins>
205+
<plugin>
206+
<groupId>org.apache.maven.plugins</groupId>
207+
<artifactId>maven-surefire-plugin</artifactId>
208+
<configuration>
209+
<!-- necessary for making method defineClass accessible -->
210+
<argLine>
211+
--add-opens java.base/java.lang=ALL-UNNAMED
212+
</argLine>
213+
</configuration>
214+
</plugin>
215+
</plugins>
216+
</build>
217+
</profile>
218+
<profile>
219+
<id>java8To17</id>
220+
<activation>
221+
<jdk>[1.8,18)</jdk>
222+
</activation>
223+
<build>
224+
<plugins>
225+
<plugin>
226+
<groupId>org.apache.maven.plugins</groupId>
227+
<artifactId>maven-antrun-plugin</artifactId>
228+
<executions>
229+
<execution>
230+
<phase>process-classes</phase>
231+
<configuration>
232+
<target>
233+
<!-- run the Synthesizer on the WovenProxy class -->
234+
<java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath" fork="false">
235+
<arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
236+
</java>
237+
<delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
238+
</target>
239+
</configuration>
240+
<goals>
241+
<goal>run</goal>
242+
</goals>
243+
</execution>
244+
</executions>
245+
</plugin>
246+
</plugins>
247+
</build>
248+
</profile>
249+
<profile>
250+
<id>java21+</id>
251+
<activation>
252+
<jdk>21</jdk>
253+
</activation>
254+
<build>
255+
<plugins>
256+
<plugin>
257+
<groupId>org.apache.maven.plugins</groupId>
258+
<artifactId>maven-antrun-plugin</artifactId>
259+
<executions>
260+
<execution>
261+
<phase>process-classes</phase>
262+
<configuration>
263+
<target>
264+
<!-- run the Synthesizer on the WovenProxy class -->
265+
<!-- diff from previous java versions: fork and jvmarg -->
266+
<java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath" fork="true">
267+
<jvmarg value="-Djava.security.manager=allow" />
268+
<arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
269+
</java>
270+
<delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
271+
</target>
272+
</configuration>
273+
<goals>
274+
<goal>run</goal>
275+
</goals>
276+
</execution>
277+
</executions>
278+
</plugin>
279+
</plugins>
280+
</build>
281+
</profile>
282+
</profiles>
283+
215284
</project>

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

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@
4040
import org.objectweb.asm.ClassReader;
4141
import org.objectweb.asm.ClassVisitor;
4242
import org.objectweb.asm.ClassWriter;
43+
import org.objenesis.Objenesis;
44+
import org.objenesis.ObjenesisStd;
4345
import org.slf4j.Logger;
4446
import org.slf4j.LoggerFactory;
4547

46-
import sun.reflect.ReflectionFactory;
48+
//import sun.reflect.ReflectionFactory;
4749

4850
@SuppressWarnings("restriction")
4951
public class ProxySubclassGenerator
@@ -170,31 +172,16 @@ public static Object newProxySubclassInstance(Class<?> classToProxy, ClassLoader
170172
try {
171173
Class<?> generatedProxySubclass = getProxySubclass(classToProxy, loader);
172174
LOGGER.debug("Getting the proxy subclass constructor");
173-
// Because the newer JVMs throw a VerifyError if a class attempts to in a constructor other than their superclasses constructor,
174-
// and because we can't know what objects/values we need to pass into the class being proxied constructor,
175-
// we instantiate the proxy class using the ReflectionFactory.newConstructorForSerialization() method which allows us to instantiate the
176-
// proxy class without calling the proxy class' constructor. It is in fact using the java.lang.Object constructor so is in effect
177-
// doing what we were doing before.
178-
ReflectionFactory factory = ReflectionFactory.getReflectionFactory();
179-
Constructor<?> constr = Object.class.getConstructor();
180-
Constructor<?> subclassConstructor = factory.newConstructorForSerialization(generatedProxySubclass, constr);
181-
proxySubclassInstance = subclassConstructor.newInstance();
182-
175+
// Simple newInstance or constructor call cannot be used since constructor may be private
176+
// or we may not know constructor parameters
177+
Objenesis objenesis = new ObjenesisStd();
178+
proxySubclassInstance = objenesis.newInstance(generatedProxySubclass);;
183179
Method setIHMethod = proxySubclassInstance.getClass().getMethod("setInvocationHandler", InvocationHandler.class);
184180
setIHMethod.invoke(proxySubclassInstance, ih);
185181
LOGGER.debug("Invoked proxy subclass constructor");
186-
} catch (NoSuchMethodException nsme) {
187-
LOGGER.debug(Constants.LOG_EXCEPTION, nsme);
188-
throw new ProxyClassInstantiationException(classToProxy, nsme);
189-
} catch (InvocationTargetException ite) {
190-
LOGGER.debug(Constants.LOG_EXCEPTION, ite);
191-
throw new ProxyClassInstantiationException(classToProxy, ite);
192-
} catch (InstantiationException ie) {
193-
LOGGER.debug(Constants.LOG_EXCEPTION, ie);
194-
throw new ProxyClassInstantiationException(classToProxy, ie);
195-
} catch (IllegalAccessException iae) {
196-
LOGGER.debug(Constants.LOG_EXCEPTION, iae);
197-
throw new ProxyClassInstantiationException(classToProxy, iae);
182+
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
183+
LOGGER.debug(Constants.LOG_EXCEPTION, e);
184+
throw new ProxyClassInstantiationException(classToProxy, e);
198185
} catch (VerifyError ve) {
199186
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.",
200187
classToProxy));

‎proxy/proxy-itests/pom.xml‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<asm.version>9.7.1</asm.version>
4949
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
5050
<javax.inject.version>1</javax.inject.version>
51-
<logback.version>1.5.16</logback.version>
51+
<objenesis.version>3.4</objenesis.version>
5252
<org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
5353
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
5454
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
@@ -67,11 +67,6 @@
6767
<version>${org.eclipse.osgi.version}</version>
6868
<scope>provided</scope>
6969
</dependency>
70-
<dependency>
71-
<groupId>org.osgi</groupId>
72-
<artifactId>org.osgi.compendium</artifactId>
73-
<scope>provided</scope>
74-
</dependency>
7570
<dependency>
7671
<groupId>org.apache.aries.proxy</groupId>
7772
<artifactId>org.apache.aries.proxy.api</artifactId>
@@ -81,8 +76,24 @@
8176
<dependency>
8277
<groupId>org.apache.aries.proxy</groupId>
8378
<artifactId>org.apache.aries.proxy</artifactId>
84-
<scope>test</scope>
8579
<version>${org.apache.aries.proxy.version}</version>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.objenesis</groupId>
84+
<artifactId>objenesis</artifactId>
85+
<version>${objenesis.version}</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.osgi</groupId>
90+
<artifactId>org.osgi.compendium</artifactId>
91+
<scope>provided</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>junit</groupId>
95+
<artifactId>junit</artifactId>
96+
<scope>provided</scope>
8697
</dependency>
8798
<dependency>
8899
<groupId>org.apache.aries.testsupport</groupId>
@@ -92,7 +103,7 @@
92103
</dependency>
93104

94105
<!-- pax exam -->
95-
<dependency>
106+
<dependency>
96107
<groupId>org.ops4j.pax.exam</groupId>
97108
<artifactId>pax-exam</artifactId>
98109
<version>${pax-exam.version}</version>
@@ -127,11 +138,6 @@
127138
<artifactId>tinybundles</artifactId>
128139
<version>${pax-tinybundles.version}</version>
129140
</dependency>
130-
<dependency>
131-
<groupId>junit</groupId>
132-
<artifactId>junit</artifactId>
133-
<scope>test</scope>
134-
</dependency>
135141

136142
<dependency>
137143
<groupId>org.ow2.asm</groupId>
@@ -194,4 +200,24 @@
194200
</plugin>
195201
</plugins>
196202
</build>
203+
204+
<profiles>
205+
<profile>
206+
<id>java9To21</id>
207+
<activation>
208+
<jdk>(8,22)</jdk>
209+
</activation>
210+
<build>
211+
<plugins>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-surefire-plugin</artifactId>
215+
<configuration>
216+
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
217+
</configuration>
218+
</plugin>
219+
</plugins>
220+
</build>
221+
</profile>
222+
</profiles>
197223
</project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ protected Option proxyOptions() {
294294
setPaxExamLogLevel("INFO"),
295295
configurePaxUrlLocalMavenRepoIfNeeded(),
296296
addAsmBundles(),
297+
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
297298
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
298299
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
299300
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()

0 commit comments

Comments
 (0)