Replace hard-coded vetoed class with configurable version; added version to module-info

Author: vsilaev

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ClassTransformer.java

@@ -23,11 +23,12 @@
  */
 package org.apache.commons.javaflow.providers.asm3;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceTransformer;
 import org.apache.commons.javaflow.spi.StopException;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
 
 /**
  * AsmClassTransformer

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ContinuableClassInfoResolver.java

@@ -22,20 +22,26 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Type;
+
+import org.apache.commons.javaflow.spi.ClassMatcher;
+import org.apache.commons.javaflow.spi.ClassMatchers;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceLoader;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Type;
+import org.apache.commons.javaflow.spi.VetoableResourceLoader;
 
 class Asm3ContinuableClassInfoResolver implements ContinuableClassInfoResolver {
     private final Map<String, ContinuableClassInfo> visitedClasses = new HashMap<String, ContinuableClassInfo>();
     private final Set<String> processedAnnotations = new HashSet<String>();
     private final Set<String> continuableAnnotations = new HashSet<String>();
     private final ResourceLoader resourceLoader;
-
-    Asm3ContinuableClassInfoResolver(ResourceLoader classLoader) {
-        this.resourceLoader = classLoader;
+    private final ClassMatcher veto;
+    
+    Asm3ContinuableClassInfoResolver(ResourceLoader resourceLoader) {
+        this.resourceLoader = resourceLoader;
+        this.veto = createVeto(resourceLoader);
         markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());
     }
 
@@ -61,6 +67,10 @@ public ContinuableClassInfo resolve(String classInternalName) throws IOException
             }
         }
     }
+    
+    public ClassMatcher veto() {
+        return veto;
+    }
 
     private ContinuableClassInfo resolveContinuableClassInfo(String classInternalName, ClassReader reader) {
         ContinuableClassInfo classInfo = visitedClasses.get(classInternalName);
@@ -141,6 +151,18 @@ public boolean isContinuableAnnotation(String annotationClassDescriptor) {
                 throw new RuntimeException("Unknown annotation kind");
         }
     }
+    
+    private static ClassMatcher createVeto(ResourceLoader resourceLoader) {
+        if (resourceLoader instanceof VetoableResourceLoader) {
+            try {
+                return ((VetoableResourceLoader)resourceLoader).createVeto();
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        } else {
+            return ClassMatchers.MATCH_NONE;
+        }
+    }
 
     private static final Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");
     private static final ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ClassNameResolver.java

@@ -18,10 +18,11 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.commons.javaflow.spi.StopException;
 import org.objectweb.asm.ClassAdapter;
 import org.objectweb.asm.ClassReader;
 
+import org.apache.commons.javaflow.spi.StopException;
+
 public class ClassNameResolver {
     public static class Result {
         public final String className;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassVisitor.java

@@ -23,15 +23,16 @@
  */
 package org.apache.commons.javaflow.providers.asm3;
 
-import org.apache.commons.javaflow.spi.ContinuableClassInfo;
-import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
-import org.apache.commons.javaflow.spi.StopException;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassAdapter;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
+import org.apache.commons.javaflow.spi.ContinuableClassInfo;
+import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
+import org.apache.commons.javaflow.spi.StopException;
+
 /**
  * ContinuableClassVisitor
  * 
@@ -68,7 +69,7 @@ public void visit(int version, int access, String name, String signature, String
 
         if (null == classInfo || 
             classInfo.isClassProcessed() || 
-            StopException.__dirtyCheckSkipContinuationsOnClass(version, access, name, signature, superName, interfaces)) {
+            cciResolver.veto().matches(name, signature, superName, interfaces)) {
             skipEnchancing = true;
             // Must exit by throwing exception, otherwise NPE is possible in nested visitor
             throw StopException.INSTANCE;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodNode.java

@@ -32,15 +32,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.spi.ContinuableClassInfo;
-import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
@@ -51,6 +49,9 @@
 import org.objectweb.asm.tree.analysis.SourceInterpreter;
 import org.objectweb.asm.tree.analysis.SourceValue;
 
+import org.apache.commons.javaflow.spi.ContinuableClassInfo;
+import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
+
 class ContinuableMethodNode extends MethodNode implements Opcodes {
     private final InheritanceLookup inheritanceLookup;
     private final ContinuableClassInfoResolver cciResolver;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodVisitor.java

@@ -23,6 +23,8 @@
  */
 package org.apache.commons.javaflow.providers.asm3;
 
+import static org.objectweb.asm.Opcodes.*;
+
 import java.util.List;
 
 import org.objectweb.asm.Label;
@@ -33,8 +35,6 @@
 import org.objectweb.asm.tree.analysis.BasicValue;
 import org.objectweb.asm.tree.analysis.Frame;
 
-import static org.objectweb.asm.Opcodes.*;
-
 class ContinuableMethodVisitor extends MethodAdapter {
     private static final String STACK_RECORDER = "org/apache/commons/javaflow/core/StackRecorder";
     private static final String POP_METHOD = "pop";

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/InheritanceLookup.java

@@ -36,11 +36,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.javaflow.spi.ResourceLoader;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
+import org.apache.commons.javaflow.spi.ResourceLoader;
+
 /**
  * A class that computes the common super class of two classes without
  * actually loading them with a ClassLoader.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/MonitoringFrame.java

@@ -16,16 +16,16 @@
  */
 package org.apache.commons.javaflow.providers.asm3;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.analysis.AnalyzerException;
 import org.objectweb.asm.tree.analysis.Frame;
 import org.objectweb.asm.tree.analysis.Interpreter;
 import org.objectweb.asm.tree.analysis.Value;
 
-import java.util.LinkedList;
-import java.util.List;
-
 class MonitoringFrame extends Frame {
 
     // keeps track of monitored locals

net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/Asm4ClassTransformer.java

@@ -23,11 +23,12 @@
  */
 package org.apache.commons.javaflow.providers.asm4;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceTransformer;
 import org.apache.commons.javaflow.spi.StopException;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
 
 /**
  * AsmClassTransformer

net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/Asm4ContinuableClassInfoResolver.java

@@ -22,20 +22,26 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Type;
+
+import org.apache.commons.javaflow.spi.ClassMatcher;
+import org.apache.commons.javaflow.spi.ClassMatchers;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceLoader;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Type;
+import org.apache.commons.javaflow.spi.VetoableResourceLoader;
 
 class Asm4ContinuableClassInfoResolver implements ContinuableClassInfoResolver {
     private final Map<String, ContinuableClassInfo> visitedClasses = new HashMap<String, ContinuableClassInfo>();
     private final Set<String> processedAnnotations = new HashSet<String>();
     private final Set<String> continuableAnnotations = new HashSet<String>();
     private final ResourceLoader resourceLoader;
-
-    Asm4ContinuableClassInfoResolver(ResourceLoader classLoader) {
-        this.resourceLoader = classLoader;
+    private final ClassMatcher veto;
+    
+    Asm4ContinuableClassInfoResolver(ResourceLoader resourceLoader) {
+        this.resourceLoader = resourceLoader;
+        this.veto = createVeto(resourceLoader);
         markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());
     }
 
@@ -61,6 +67,10 @@ public ContinuableClassInfo resolve(String classInternalName) throws IOException
             }
         }
     }
+    
+    public ClassMatcher veto() {
+        return veto;
+    }
 
     private ContinuableClassInfo resolveContinuableClassInfo(String classInternalName, ClassReader reader) {
         ContinuableClassInfo classInfo = visitedClasses.get(classInternalName);
@@ -141,6 +151,18 @@ public boolean isContinuableAnnotation(String annotationClassDescriptor) {
                 throw new RuntimeException("Unknown annotation kind");
         }
     }
+    
+    private static ClassMatcher createVeto(ResourceLoader resourceLoader) {
+        if (resourceLoader instanceof VetoableResourceLoader) {
+            try {
+                return ((VetoableResourceLoader)resourceLoader).createVeto();
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        } else {
+            return ClassMatchers.MATCH_NONE;
+        }
+    }
 
     private static final Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");
     private static final ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {