Deprecated Provider selection is RewrittingUtils (for long time it's always the latest ASM version)

Author: vsilaev

net.tascalate.javaflow.tools.ant/src/main/java/org/apache/commons/javaflow/tools/ant/ContinuableClassesInstrumentationTask.java

@@ -44,8 +44,6 @@
  */
 public class ContinuableClassesInstrumentationTask extends MatchingTask {
 
-    private RewritingUtils.TransformerType transformerType;
-
     private File dstDir;
     private File srcDir;
     private Path compileClasspath;
@@ -81,8 +79,9 @@ public void setSrcDir(File pFile) {
      * of the other (and this option will be removed then.)
      *
      * @param name
-     *      "ASM5". Case insensitive.
+     *      "ASMX". Case insensitive.
      */
+    @Deprecated
     public void setMode(String name) {
         try {
             RewritingUtils.TransformerType.valueOf(name.toUpperCase());
@@ -171,8 +170,7 @@ public void execute() throws BuildException {
             classPathByDir.add(srcDir.toURI().toURL());
 
             ResourceTransformer dirTransformer = RewritingUtils.createTransformer(
-                classPathByDir.toArray(new URL[]{}),
-                transformerType
+                classPathByDir.toArray(new URL[]{})
             );
             try {
                 for (String fileName : fileNames) {
@@ -207,8 +205,7 @@ public void execute() throws BuildException {
                         classPathByJar.add(source.toURI().toURL());
 
                         ResourceTransformer jarTransformer = RewritingUtils.createTransformer(
-                           classPathByJar.toArray(new URL[]{}), 
-                           transformerType
+                           classPathByJar.toArray(new URL[]{})
                         );
                         try {
                             RewritingUtils.rewriteJar(

net.tascalate.javaflow.tools.jar/.classpath

@@ -2,15 +2,15 @@
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="module-info.java" kind="src" output="target/classes" path="src/main/java">

net.tascalate.javaflow.tools.jar/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,16 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.6

net.tascalate.javaflow.tools.jar/pom.xml

@@ -37,8 +37,6 @@
 			<groupId>net.tascalate.javaflow</groupId>
 			<artifactId>net.tascalate.javaflow.providers.core</artifactId>
 			<version>${project.version}</version>
-			<scope>runtime</scope>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

net.tascalate.javaflow.tools.jar/src/main/java/module-info.java

@@ -17,6 +17,7 @@
     requires org.slf4j;
 
     requires transitive net.tascalate.javaflow.spi;
+    requires net.tascalate.javaflow.providers.core;
 
     exports org.apache.commons.javaflow.tools.jar;
 }

net.tascalate.javaflow.tools.jar/src/main/java/org/apache/commons/javaflow/tools/jar/RewritingUtils.java

@@ -42,6 +42,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.commons.javaflow.spi.ResourceTransformer;
+import org.apache.commons.javaflow.providers.core.ContinuableClassTransformationFactory;
 import org.apache.commons.javaflow.spi.AbstractResourceTransformer;
 import org.apache.commons.javaflow.spi.ClasspathResourceLoader;
 import org.apache.commons.javaflow.spi.FastByteArrayOutputStream;
@@ -212,11 +213,6 @@ public static ResourceTransformer createTransformer(URL[] extraURL) {
         return createTransformer(extraURL, createTransformerFactoryInstance());
     }
 
-    
-    public static ResourceTransformer createTransformer(URL[] extraURL, TransformerType type) {
-       return createTransformer(extraURL, createTransformerFactoryInstance(type));
-    }
-    
     public static ResourceTransformer createTransformer(URL[] extraURL, ResourceTransformationFactory factory) {
         final URLClassLoader classLoader = new URLClassLoader(extraURL, safeParentClassLoader());
 
@@ -247,9 +243,15 @@ private static ClassLoader safeParentClassLoader() {
     }
 
     public static ResourceTransformationFactory createTransformerFactoryInstance() {
-        return createTransformerFactoryInstance(null);
+        return new ContinuableClassTransformationFactory();
+    }
+    
+    @Deprecated
+    public static ResourceTransformer createTransformer(URL[] extraURL, TransformerType type) {
+       return createTransformer(extraURL, createTransformerFactoryInstance(type));
     }
 
+    @Deprecated
     public static ResourceTransformationFactory createTransformerFactoryInstance(TransformerType transformerType) {
         Class<? extends ResourceTransformationFactory> transformerFactoryClass;
         if (null == transformerType) {
@@ -285,15 +287,12 @@ public static Class<? extends ResourceTransformationFactory> getDefaultResourceT
         throw new RuntimeException("No bytecode transformation class is found for JavaFlow bytecode modifications");
     }
 
+    @Deprecated
     public static enum TransformerType {
         ASMX("org.apache.commons.javaflow.providers.core.ContinuableClassTransformationFactory"),
-        @Deprecated
         ASM5("org.apache.commons.javaflow.providers.asm5.Asm5ResourceTransformationFactory"),
-        @Deprecated
         ASM4("org.apache.commons.javaflow.providers.asm4.Asm4ResourceTransformationFactory"),
-        @Deprecated
         ASM3("org.apache.commons.javaflow.providers.asm3.Asm3ResourceTransformationFactory"),
-        @Deprecated
         BCEL("org.apache.commons.javaflow.providers.bcel.BcelResourceTransformationFactory");
 
         private String implementation;

net.tascalate.javaflow.tools.maven/.classpath

@@ -26,7 +26,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

net.tascalate.javaflow.tools.maven/src/main/java/org/apache/commons/javaflow/tools/maven/ContinuableClassesInstrumentationMojo.java

@@ -35,7 +35,6 @@
 
 import org.apache.commons.javaflow.spi.ResourceTransformer;
 import org.apache.commons.javaflow.tools.jar.RewritingUtils;
-import org.apache.commons.javaflow.tools.jar.RewritingUtils.TransformerType;
 
 /**
  * Maven plugin that will apply Continuation class transformations on compiled
@@ -111,7 +110,7 @@ public void execute() throws MojoExecutionException {
             loadAdditionalClassPath(classPath);
 
             ResourceTransformer dirTransformer = RewritingUtils.createTransformer(
-                classPath.toArray(new URL[] {}), TransformerType.ASMX
+                classPath.toArray(new URL[] {})
             );
             try {
                 long now = System.currentTimeMillis();