Remove dependencies to API from tools (ant, maven, javaflow agent, cdi agent)

vsilaev · vsilaev · commit ab31e4b84e95 · 2018-01-12T12:26:40.000+03:00
diff --git a/net.tascalate.javaflow.providers.asm3/pom.xml b/net.tascalate.javaflow.providers.asm3/pom.xml
@@ -19,11 +19,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.spi</artifactId>
diff --git a/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ContinuableClassInfoResolver.java b/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ContinuableClassInfoResolver.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.ContinuableAnnotation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceLoader;
@@ -37,7 +36,7 @@ public class Asm3ContinuableClassInfoResolver implements ContinuableClassInfoRes
 
     Asm3ContinuableClassInfoResolver(final ResourceLoader classLoader) {
         this.resourceLoader = classLoader;
-        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE);
+        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());
     }
 
     public ResourceLoader resourceLoader() {
@@ -139,7 +138,7 @@ public boolean isContinuableAnnotation(final String annotationClassDescriptor) {
         }
     }
 
-    final private static String CONTINUABLE_ANNOTATION_TYPE = Type.getDescriptor(ContinuableAnnotation.class);
+    final private static Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");
     final private static ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {
 
         public void markClassProcessed() {}
diff --git a/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodNode.java b/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodNode.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.Continuation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.objectweb.asm.Label;
@@ -315,7 +314,7 @@ boolean needsFrameGuard(int opcode, String owner, String name, String desc) {
         return false;
     }
 
-    final private static String CONTINUATION_CLASS_INTERNAL_NAME = Type.getInternalName(Continuation.class);
+    final private static String CONTINUATION_CLASS_INTERNAL_NAME = "org/apache/commons/javaflow/api/Continuation";
     final private static Set<String> CONTINUATION_CLASS_CONTINUABLE_METHODS = new HashSet<String>(Arrays.asList(
             "suspend", "again", "cancel" 
             // we are suspending here with potential resume later
diff --git a/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodVisitor.java b/net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodVisitor.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.apache.commons.javaflow.core.StackRecorder;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodAdapter;
 import org.objectweb.asm.Opcodes;
@@ -36,7 +35,7 @@
 import org.objectweb.asm.tree.analysis.Frame;
 
 public final class ContinuableMethodVisitor extends MethodAdapter implements Opcodes {
-    private static final String STACK_RECORDER = Type.getInternalName(StackRecorder.class);
+    private static final String STACK_RECORDER = "org/apache/commons/javaflow/core/StackRecorder";
     private static final String POP_METHOD = "pop";
     private static final String PUSH_METHOD = "push";
 
diff --git a/net.tascalate.javaflow.providers.asm4/pom.xml b/net.tascalate.javaflow.providers.asm4/pom.xml
@@ -19,11 +19,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.spi</artifactId>
diff --git a/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/Asm4ContinuableClassInfoResolver.java b/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/Asm4ContinuableClassInfoResolver.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.ContinuableAnnotation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceLoader;
@@ -37,7 +36,7 @@ class Asm4ContinuableClassInfoResolver implements ContinuableClassInfoResolver {
 
     Asm4ContinuableClassInfoResolver(final ResourceLoader classLoader) {
         this.resourceLoader = classLoader;
-        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE);
+        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());
     }
 
     public ResourceLoader resourceLoader() {
@@ -139,7 +138,7 @@ public boolean isContinuableAnnotation(final String annotationClassDescriptor) {
         }
     }
 
-    final private static String CONTINUABLE_ANNOTATION_TYPE = Type.getDescriptor(ContinuableAnnotation.class);
+    final private static Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");
     final private static ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {
 
         public void markClassProcessed() {}
diff --git a/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/ContinuableMethodNode.java b/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/ContinuableMethodNode.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.Continuation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.objectweb.asm.Handle;
@@ -333,7 +332,7 @@ boolean needsFrameGuard(int opcode, String owner, String name, String desc) {
         return false;
     }
 
-    final private static String CONTINUATION_CLASS_INTERNAL_NAME = Type.getInternalName(Continuation.class);
+    final private static String CONTINUATION_CLASS_INTERNAL_NAME = "org/apache/commons/javaflow/api/Continuation";
     final private static Set<String> CONTINUATION_CLASS_CONTINUABLE_METHODS = new HashSet<String>(Arrays.asList(
             "suspend", "again", "cancel" 
             // we are suspending here with potential resume later
diff --git a/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/ContinuableMethodVisitor.java b/net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/ContinuableMethodVisitor.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.apache.commons.javaflow.core.StackRecorder;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
@@ -40,7 +39,7 @@
 import static org.objectweb.asm.Opcodes.*;
 
 public final class ContinuableMethodVisitor extends MethodVisitor {
-    private static final String STACK_RECORDER = Type.getInternalName(StackRecorder.class);
+    private static final String STACK_RECORDER = "org/apache/commons/javaflow/core/StackRecorder";
     private static final String POP_METHOD = "pop";
     private static final String PUSH_METHOD = "push";
 
diff --git a/net.tascalate.javaflow.providers.asm5/pom.xml b/net.tascalate.javaflow.providers.asm5/pom.xml
@@ -19,11 +19,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.spi</artifactId>
diff --git a/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/Asm5ContinuableClassInfoResolver.java b/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/Asm5ContinuableClassInfoResolver.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.ContinuableAnnotation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.apache.commons.javaflow.spi.ResourceLoader;
@@ -37,7 +36,7 @@ class Asm5ContinuableClassInfoResolver implements ContinuableClassInfoResolver {
 
     Asm5ContinuableClassInfoResolver(final ResourceLoader classLoader) {
         this.resourceLoader = classLoader;
-        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE);
+        markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());
     }
 
     public ResourceLoader resourceLoader() {
@@ -139,7 +138,7 @@ public boolean isContinuableAnnotation(final String annotationClassDescriptor) {
         }
     }
 
-    final private static String CONTINUABLE_ANNOTATION_TYPE = Type.getDescriptor(ContinuableAnnotation.class);
+    final private static Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");
     final private static ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {
 
         public void markClassProcessed() {}
diff --git a/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/ContinuableMethodNode.java b/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/ContinuableMethodNode.java
@@ -33,7 +33,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.javaflow.api.Continuation;
 import org.apache.commons.javaflow.spi.ContinuableClassInfo;
 import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
 import org.objectweb.asm.Handle;
@@ -390,7 +389,7 @@ boolean needsFrameGuard(int opcode, String owner, String name, String desc) {
         return false;
     }
 
-    final private static String CONTINUATION_CLASS_INTERNAL_NAME = Type.getInternalName(Continuation.class);
+    final private static String CONTINUATION_CLASS_INTERNAL_NAME = "org/apache/commons/javaflow/api/Continuation";
     final private static Set<String> CONTINUATION_CLASS_CONTINUABLE_METHODS = new HashSet<String>(Arrays.asList(
             "suspend", "again", "cancel" 
             // we are suspending here with potential resume later
diff --git a/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/ContinuableMethodVisitor.java b/net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/ContinuableMethodVisitor.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.apache.commons.javaflow.core.StackRecorder;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
@@ -40,7 +39,7 @@
 import static org.objectweb.asm.Opcodes.*;
 
 public final class ContinuableMethodVisitor extends MethodVisitor {
-    private static final String STACK_RECORDER = Type.getInternalName(StackRecorder.class);
+    private static final String STACK_RECORDER = "org/apache/commons/javaflow/core/StackRecorder";
     private static final String POP_METHOD = "pop";
     private static final String PUSH_METHOD = "push";
 
diff --git a/net.tascalate.javaflow.tools.ant/pom.xml b/net.tascalate.javaflow.tools.ant/pom.xml
@@ -19,16 +19,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.spi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.tools.jar</artifactId>
diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml b/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml
@@ -23,16 +23,6 @@
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.spi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.providers.asm5</artifactId>
diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/AroundCdiProxyInvocationAdvice.java b/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/org/apache/commons/javaflow/instrumentation/cdi/AroundCdiProxyInvocationAdvice.java
@@ -15,13 +15,11 @@
  */
 package org.apache.commons.javaflow.instrumentation.cdi;
 
-import org.apache.commons.javaflow.core.StackRecorder;
-
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.AdviceAdapter;
-import org.objectweb.asm.commons.Method;
 
 abstract class AroundCdiProxyInvocationAdvice extends AdviceAdapter {
     final protected String className;
@@ -45,7 +43,7 @@ protected void onMethodEnter() {
         Label startDelegated = new Label();
 
         // PC: StackRecorder stackRecorder = StackRecorder.get();
-        invokeStatic(STACK_RECORDER_TYPE, STACK_RECORDER_GET);
+        stackRecorderGet();
         dup();
         storeLocal(stackRecorderVar, STACK_RECORDER_TYPE);
         // PC: if (stackRecorder != null && stackRecorder.isRestoring) {
@@ -55,12 +53,12 @@ protected void onMethodEnter() {
         visitJumpInsn(IFEQ, startDelegated);
 
         loadLocal(stackRecorderVar, STACK_RECORDER_TYPE);
-        invokeVirtual(STACK_RECORDER_TYPE, STACK_RECORDER_POP_REF);
+        stackRecorderPopRef();
         pop();
 
         loadLocal(stackRecorderVar, STACK_RECORDER_TYPE);
         loadProxiedInstance();
-        invokeVirtual(STACK_RECORDER_TYPE, STACK_RECORDER_PUSH_REF);
+        stackRecorderPushRef();
 
         visitLabel(startDelegated);
 
@@ -100,30 +98,46 @@ private void onFinally(int opcode) {
         visitJumpInsn(IFEQ, done);
 
         loadLocal(stackRecorderVar, STACK_RECORDER_TYPE);
-        invokeVirtual(STACK_RECORDER_TYPE, STACK_RECORDER_POP_REF);
+        stackRecorderPopRef();
         pop();
         loadLocal(stackRecorderVar, STACK_RECORDER_TYPE);
         loadThis();
-        invokeVirtual(STACK_RECORDER_TYPE, STACK_RECORDER_PUSH_REF);
+        stackRecorderPushRef();
         visitLabel(done);
 
     }
-
-    private static final Type STACK_RECORDER_TYPE = Type.getType(StackRecorder.class);
-    private static final Method STACK_RECORDER_GET;
-    private static final Method STACK_RECORDER_POP_REF;
-    private static final Method STACK_RECORDER_PUSH_REF;
-
-    static {
-        try {
-            STACK_RECORDER_GET = Method.getMethod(StackRecorder.class.getMethod("get"));
-            STACK_RECORDER_POP_REF = Method.getMethod(StackRecorder.class.getMethod("popReference"));
-            STACK_RECORDER_PUSH_REF = Method.getMethod(StackRecorder.class.getMethod("pushReference", Object.class));
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        }
+    
+    private void stackRecorderGet() {
+        mv.visitMethodInsn(
+            Opcodes.INVOKESTATIC, 
+            STACK_RECORDER_TYPE.getInternalName(), 
+            "get", 
+            Type.getMethodDescriptor(STACK_RECORDER_TYPE), 
+            false
+        );
     }
+    
+    private void stackRecorderPopRef() {
+        mv.visitMethodInsn(
+            Opcodes.INVOKEVIRTUAL, 
+            STACK_RECORDER_TYPE.getInternalName(), 
+            "popReference", 
+            Type.getMethodDescriptor(OBJECT_TYPE), 
+            false
+        );
+    }
+    
+    private void stackRecorderPushRef() {
+        mv.visitMethodInsn(
+            Opcodes.INVOKEVIRTUAL, 
+            STACK_RECORDER_TYPE.getInternalName(), 
+            "pushReference", 
+            Type.getMethodDescriptor(Type.VOID_TYPE, OBJECT_TYPE), 
+            false
+        );
+    }
+
+    private static final Type OBJECT_TYPE = Type.getObjectType("java/lang/Object");
+    private static final Type STACK_RECORDER_TYPE = Type.getObjectType("org/apache/commons/javaflow/core/StackRecorder");
 
 }
diff --git a/net.tascalate.javaflow.tools.jar/pom.xml b/net.tascalate.javaflow.tools.jar/pom.xml
@@ -23,11 +23,6 @@
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.spi</artifactId>
diff --git a/net.tascalate.javaflow.tools.javaagent/pom.xml b/net.tascalate.javaflow.tools.javaagent/pom.xml
@@ -23,11 +23,6 @@
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.spi</artifactId>
diff --git a/net.tascalate.javaflow.tools.maven/pom.xml b/net.tascalate.javaflow.tools.maven/pom.xml
@@ -22,16 +22,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.spi</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.tools.jar</artifactId>
diff --git a/net.tascalate.javaflow.utils/pom.xml b/net.tascalate.javaflow.utils/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`import java.util.Map;`
`23`	`23`	`import java.util.Set;`
`24`	`24`
`25`		`-import org.apache.commons.javaflow.api.ContinuableAnnotation;`
`26`	`25`	`import org.apache.commons.javaflow.spi.ContinuableClassInfo;`
`27`	`26`	`import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;`
`28`	`27`	`import org.apache.commons.javaflow.spi.ResourceLoader;`
`@@ -37,7 +36,7 @@ public class Asm3ContinuableClassInfoResolver implements ContinuableClassInfoRes`
`37`	`36`
`38`	`37`	`Asm3ContinuableClassInfoResolver(final ResourceLoader classLoader) {`
`39`	`38`	`this.resourceLoader = classLoader;`
`40`		`- markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE);`
	`39`	`+ markContinuableAnnotation(CONTINUABLE_ANNOTATION_TYPE.getDescriptor());`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public ResourceLoader resourceLoader() {`
`@@ -139,7 +138,7 @@ public boolean isContinuableAnnotation(final String annotationClassDescriptor) {`
`139`	`138`	`}`
`140`	`139`	`}`
`141`	`140`
`142`		`- final private static String CONTINUABLE_ANNOTATION_TYPE = Type.getDescriptor(ContinuableAnnotation.class);`
	`141`	`+ final private static Type CONTINUABLE_ANNOTATION_TYPE = Type.getObjectType("org/apache/commons/javaflow/api/ContinuableAnnotation");`
`143`	`142`	`final private static ContinuableClassInfo UNSUPPORTED_CLASS_INFO = new ContinuableClassInfo() {`
`144`	`143`
`145`	`144`	`public void markClassProcessed() {}`