Refactor CDI proxy processors (separate classes / packages); Support Weld 3.1.0 and higher

Author: vsilaev

net.tascalate.javaflow.spi/src/main/resources/META-INF/net.tascalate.javaflow.veto.cmf

@@ -4,11 +4,13 @@ implements-interface:name=org/jboss/weld/bean/proxy/ProxyObject
 implements-interface:name=org/jboss/as/ee/component/serialization/WriteReplaceInterface
 class:name-pattern=.*\$\$EnhancerByCGLIB\$\$.*
 # possible values are:
+# implements-interface:name
 # implements-interface:name-part
 # implements-interface:name-pattern
 # extends-class:name
 # extends-class:name-part
 # extends-class:name-pattern
 # class:name
 # class:name-part
-# class:name-pattern
+# class:name-pattern
+# Classes should be named in internal format, i.e. com/company/myapp/MyClass

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/CdiProxyClassAdapter.java

@@ -24,16 +24,17 @@
 import net.tascalate.asmx.ClassVisitor;
 import net.tascalate.asmx.FieldVisitor;
 import net.tascalate.asmx.MethodVisitor;
-import net.tascalate.asmx.Type;
-import net.tascalate.asmx.Opcodes;
 
+import org.apache.commons.javaflow.instrumentation.cdi.owb.OwbProxyClassProcessor;
+import org.apache.commons.javaflow.instrumentation.cdi.spring.SpringProxyClassProcessor;
+import org.apache.commons.javaflow.instrumentation.cdi.weld.WeldProxyClassProcessor;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.StopException;
 
-class CdiProxyClassAdapter extends ClassVisitor {
+class CdiProxyClassAdapter extends ExtendedClassVisitor {
 
-    static enum CdiEnvironmentType {
+    static enum ContainerType {
         WELD("org/jboss/weld/bean/proxy/ProxyObject") {
 
             @Override
@@ -44,68 +45,58 @@ boolean accept(String className, String interfaceName) {
             }
 
             @Override
-            MethodVisitor createAdviceAdapter(CdiProxyClassAdapter ca, MethodVisitor mv, int acc, String name, String desc) {
-                return new AroundWeldProxyInvocationAdvice(ca.api, mv, acc, ca.className, name, desc);
-            }
+            ProxyClassProcessor createProcessor(int api, String className, ContinuableClassInfo classInfo) {
+                return new WeldProxyClassProcessor(api, className, classInfo);
+            }            
+
         }, 
         SPRING("org/springframework/aop/framework/Advised") {
 
             @Override
-            MethodVisitor createAdviceAdapter(CdiProxyClassAdapter ca, MethodVisitor mv, int acc, String name, String desc) {
-                return new AroundSpringProxyInvocationAdvice(ca.api, mv, acc, ca.className, name, desc);
+            ProxyClassProcessor createProcessor(int api, String className, ContinuableClassInfo classInfo) {
+                return new SpringProxyClassProcessor(api, className, classInfo);
             }
+            
         }, 
         OWB(
             "org/apache/webbeans/proxy/OwbInterceptorProxy",
             "org/apache/webbeans/proxy/OwbNormalScopeProxy" 
             ) {
 
             @Override
-            MethodVisitor createAdviceAdapter(CdiProxyClassAdapter ca, MethodVisitor mv, int acc, String name, String desc) {
-                if (null != ca.owbProxiedInstanceType) {
-                    return new AroundOwbInterceptorProxyAdvice(ca.api, mv, acc, ca.className, name, desc, ca.owbProxiedInstanceType); 
-                } else if (null != ca.owbProxiedInstanceProviderType) {
-                    return new AroundOwbScopeProxyAdvice(ca.api, mv, acc, ca.className, name, desc, ca.owbProxiedInstanceProviderType); 
-                } else {
-                    return mv;
-                }
-            }            
+            ProxyClassProcessor createProcessor(int api, String className, ContinuableClassInfo classInfo) {
+                return new OwbProxyClassProcessor(api, className, classInfo);
+            }
+            
         }
         ;
 
         private Set<String> markerInterfaces;
 
-        private CdiEnvironmentType(String... markerInterfaces) {
+        private ContainerType(String... markerInterfaces) {
             this.markerInterfaces = 
                 Collections.unmodifiableSet( new HashSet<String>(Arrays.asList(markerInterfaces)) );
         }
 
-        abstract MethodVisitor createAdviceAdapter(CdiProxyClassAdapter ca, MethodVisitor mv, int acc, String name, String desc);
         boolean accept(String className, String interfaceName) {
             return markerInterfaces.contains(interfaceName);
         }
+        
+        abstract ProxyClassProcessor createProcessor(int api, String className, ContinuableClassInfo classInfo);
     }
 
-    String className;
-    Type owbProxiedInstanceType;
-    Type owbProxiedInstanceProviderType;
-    
-    private CdiEnvironmentType cdiEnvironmentType;
-    private ContinuableClassInfo classInfo;
-
     private final ContinuableClassInfoResolver cciResolver;
+    private ProxyClassProcessor processor;
 
     CdiProxyClassAdapter(ClassVisitor delegate, ContinuableClassInfoResolver cciResolver) {
-        super(Opcodes.ASM7, delegate);
+        super(delegate);
         this.cciResolver = cciResolver;
     }
 
-
     @Override
     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        className = name;
-        CdiEnvironmentType selectedType = null;
-        CdiEnvironmentType[] cdiEnvironmentTypes = CdiEnvironmentType.values();
+        ContainerType selectedType = null;
+        ContainerType[] cdiEnvironmentTypes = ContainerType.values();
         outerLoop:
         for (final String interfaze : interfaces) {
             for (int i = cdiEnvironmentTypes.length - 1; i >= 0; i--) {
@@ -123,8 +114,7 @@ public void visit(int version, int access, String name, String signature, String
             throw StopException.INSTANCE;
         }
 
-        cdiEnvironmentType = selectedType;
-
+        ContinuableClassInfo classInfo;
         try {
             classInfo = cciResolver.resolve(superName);
             if (null == classInfo) {
@@ -133,34 +123,23 @@ public void visit(int version, int access, String name, String signature, String
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        
+        processor = selectedType.createProcessor(api, name, classInfo);
         super.visit(version, access, name, signature, superName, interfaces);
     }
 
     @Override
-    public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
-        if (AroundOwbInterceptorProxyAdvice.FIELD_PROXIED_INSTANCE.equals(name)) {
-            owbProxiedInstanceType = Type.getType(desc);
-        }
-        if (AroundOwbScopeProxyAdvice.FIELD_INSTANCE_PROVIDER.equals(name)) {
-            owbProxiedInstanceProviderType = Type.getType(desc);
-        }
-        return super.visitField(access, name, desc, signature, value);
+    public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+        return processor.visitField(this, access, name, descriptor, signature, value);
     }
-
+    
     @Override
-    public MethodVisitor visitMethod(int acc, String name, String desc, String signature, String[] exceptions) {
-        MethodVisitor mv = cv.visitMethod(acc, name, desc, signature, exceptions);
-        if (isContinuableMethodProxy(acc, name, desc, signature, exceptions) && null != cdiEnvironmentType) {
-            mv = cdiEnvironmentType.createAdviceAdapter(this, mv, acc, name, desc);
-        }
-        return mv;
+    public void visitEnd() {
+        processor.visitEnd(this);
     }
-
-    private boolean isContinuableMethodProxy(int acc, String name, String desc, String signature, String[] exceptions) {
-        int idx = name.lastIndexOf("$$super");
-        if (idx > 0) {
-            name = name.substring(0, idx);
-        }
-        return ! "<init>".equals(name) && classInfo.isContinuableMethod(acc, name, desc, signature);
+    
+    @Override
+    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+        return processor.visitMethod(this, access, name, descriptor, signature, exceptions);
     }
 }

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/CdiProxyClassTransformer.java

@@ -103,6 +103,7 @@ protected ContinuableClassInfoResolver getCachedResolver(ClassLoader classLoader
         synchronized (classLoader2resolver) {
             ContinuableClassInfoResolver cachedResolver = classLoader2resolver.get(classLoader);
             if (null == cachedResolver) {
+                log.debug("Create classInfoResolver for class loader " + classLoader);
                 ContinuableClassInfoResolver newResolver = resourceTransformationFactory
                     .createResolver(new ExtendedClasspathResourceLoader(classLoader));
                 classLoader2resolver.put(classLoader, newResolver);

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/ExtendedClassVisitor.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.javaflow.instrumentation.cdi;
+
+import net.tascalate.asmx.ClassVisitor;
+import net.tascalate.asmx.FieldVisitor;
+import net.tascalate.asmx.MethodVisitor;
+import net.tascalate.asmx.Opcodes;
+
+public abstract class ExtendedClassVisitor extends ClassVisitor {
+    
+    ExtendedClassVisitor(ClassVisitor delegate) {
+        super(Opcodes.ASM7, delegate);
+    }
+    
+    public final FieldVisitor defaultVisitField(int access, String name, String descriptor, String signature, Object value) {
+        return super.visitField(access, name, descriptor, signature, value);
+    }
+    
+    public final MethodVisitor defaultVisitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+        return super.visitMethod(access, name, descriptor, signature, exceptions);
+    }
+    
+    public final void defaultVisitEnd() {
+        super.visitEnd();
+    }
+}

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/ProxyClassProcessor.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.javaflow.instrumentation.cdi;
+
+import org.apache.commons.javaflow.spi.ContinuableClassInfo;
+
+import net.tascalate.asmx.FieldVisitor;
+import net.tascalate.asmx.MethodVisitor;
+
+abstract public class ProxyClassProcessor {
+    protected final int api;
+    protected final String className;
+    protected final ContinuableClassInfo classInfo;
+    
+    protected ProxyClassProcessor(int api, String className, ContinuableClassInfo classInfo) {
+        this.api = api;
+        this.className = className;
+        this.classInfo = classInfo;
+    }
+    
+    protected MethodVisitor visitMethod(ExtendedClassVisitor cv, int access, String name, String descriptor, String signature, String[] exceptions) {
+        MethodVisitor mv = cv.defaultVisitMethod(access, name, descriptor, signature, exceptions);
+        if (isContinuableMethodProxy(access, name, descriptor, signature, exceptions)) {
+            mv = createAdviceAdapter(mv, access, name, descriptor);
+        }
+        return mv;
+    }
+    
+    protected FieldVisitor visitField(ExtendedClassVisitor cv, int access, String name, String descriptor, String signature, Object value) {
+        return cv.defaultVisitField(access, name, descriptor, signature, value);
+    }
+    
+    protected void visitEnd(ExtendedClassVisitor cv) {
+        cv.defaultVisitEnd();
+    }
+    
+    abstract protected MethodVisitor createAdviceAdapter(MethodVisitor mv, int access, String name, String descriptor);
+    
+    protected boolean isContinuableMethodProxy(int access, String name, String descriptor, String signature, String[] exceptions) {
+        int idx = name.lastIndexOf("$$super");
+        if (idx > 0) {
+            name = name.substring(0, idx);
+        }
+        return ! "<init>".equals(name) && classInfo.isContinuableMethod(access, name, descriptor, signature);
+    }
+}

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/AroundCdiProxyInvocationAdvice.java renamed to net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/common/ProxiedMethodAdvice.java

@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.javaflow.instrumentation.cdi;
+package org.apache.commons.javaflow.instrumentation.cdi.common;
 
 import net.tascalate.asmx.Label;
 import net.tascalate.asmx.MethodVisitor;
 import net.tascalate.asmx.Opcodes;
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.AdviceAdapter;
 
-abstract class AroundCdiProxyInvocationAdvice extends AdviceAdapter {
+abstract public class ProxiedMethodAdvice extends AdviceAdapter {
     final protected String className;
 
     private Label startFinally;
 
-    protected AroundCdiProxyInvocationAdvice(int api, MethodVisitor mv, int acc, String className, String methodName, String desc) {
-        super(api, mv, acc, methodName, desc);
+    protected ProxiedMethodAdvice(int api, MethodVisitor mv, int access, String className, String methodName, String descriptor) {
+        super(api, mv, access, methodName, descriptor);
         this.className = className;
     }
 
     abstract protected void loadProxiedInstance();
 
     @Override
     protected void onMethodEnter() {
-        loadProxiedInstance();        
+        loadProxiedInstance();
         mv.visitMethodInsn(
             Opcodes.INVOKESTATIC, 
             INTERCEPTOR_SUPPORT_TYPE.getInternalName(), 

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/AroundOwbInterceptorProxyAdvice.java renamed to net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/owb/OwbInterceptorProxyMethodAdvice.java

@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.javaflow.instrumentation.cdi;
+package org.apache.commons.javaflow.instrumentation.cdi.owb;
 
 import net.tascalate.asmx.MethodVisitor;
 import net.tascalate.asmx.Type;
 
-class AroundOwbInterceptorProxyAdvice extends AroundCdiProxyInvocationAdvice {
+import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
+
+class OwbInterceptorProxyMethodAdvice extends ProxiedMethodAdvice {
 
     final private Type proxiedInstanceType;
 
-    AroundOwbInterceptorProxyAdvice(int api, MethodVisitor mv, int acc, String className, String methodName, String desc, Type proxiedInstanceType) {
+    OwbInterceptorProxyMethodAdvice(int api, MethodVisitor mv, int acc, String className, String methodName, String desc, Type proxiedInstanceType) {
         super(api, mv, acc, className, methodName, desc);
         this.proxiedInstanceType = proxiedInstanceType;
     }