Rename ContinuableClassLoader -> ResourceTransformingClassLoader; pre…

…paring release
vsilaev · Feb 7, 2022 · 8b74088 · 8b74088
1 parent 8d0c912
commit 8b74088
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,12 @@
 [![Maven Central](https://img.shields.io/maven-central/v/net.tascalate.javaflow/net.tascalate.javaflow.parent.svg)](https://search.maven.org/artifact/net.tascalate.javaflow/net.tascalate.javaflow.parent/2.7.0/pom) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-javaflow.svg)](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.7.0) [![license](https://img.shields.io/github/license/vsilaev/tascalate-javaflow.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+# IMPORTANT NOTICE FOR RELEASE 2.7.0!!!
+- Agents & Tools projects were refactored to follow consisntent naming of classes and to avoid package name clashes
+- Separate provider was extracted from `CdiProxy` to allow reuse in mutliple scenarious (not only in Java Agent)
+- `net.tascalate.javaflow.provider.asm[VERSION]` artifacts are deprecated now and scheduled for removal in next release
+
 # IMPORTANT NOTICE FOR RELEASE 2.5.0!!!
-Java 9+ is fully supported now, all artefacts are modular multi-release JAR-s that works correctly with Java versions 1.6 to 17. The library code was tested with JDK 17, and all features of the Java 17 bytecode (including nest of inner classes) works correctly.
+Java 9+ is fully supported now, all artefacts are modular multi-release JAR-s that works correctly with Java versions 1.6 to 17. The library code was tested with JDK 17, and all features of the Java 17 bytecode (including nest of inner classes, sealed classes, records) works correctly.
 
 # IMPORTANT NOTICE FOR RELEASE 2.3.0!!!
 - `net.tascalate.javaflow.extras` artifact is withdrawn, its code serves as a basis for the project [Tascalate JavaFlow Util](https://github.com/vsilaev/tascalate-javaflow-util)

diff --git a/...ls.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ApplicationWeaver.java b/...ls.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ApplicationWeaver.java
@@ -142,7 +142,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
             }
         }
 
-        if ((originalLoader instanceof ContinuableClassLoader) &&
+        if ((originalLoader instanceof ResourceTransformingClassLoader) &&
             isProcessed(originalClass)) {
             // Correct loader and annotations applied
             return false;
@@ -154,7 +154,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
         }
 
         try {
-            ContinuableClassLoader.Builder builder = new ContinuableClassLoader.Builder(factory);
+            ResourceTransformingClassLoader.Builder builder = new ResourceTransformingClassLoader.Builder(factory);
             if (null == continuablePackageRoots || continuablePackageRoots.isEmpty()) {
                 builder.parentFirst(false);
             } else {
@@ -166,7 +166,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
                     builder.addLoaderPackageRoot(s);
                 }
             }
-            ContinuableClassLoader loader = builder.parent(originalLoader).create();
+            ResourceTransformingClassLoader loader = builder.parent(originalLoader).create();
 
             CURRENT_INITIATOR.set(loader);
             try {
@@ -184,7 +184,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
         return true;
     }
 
-    private static void run(ContinuableClassLoader classLoader, String className, String method, String... args) throws Exception {
+    private static void run(ResourceTransformingClassLoader classLoader, String className, String method, String... args) throws Exception {
         Class<?> mainClass = classLoader.forceLoadClass(className);
         if (!isProcessed(mainClass)) {
             throw new IllegalStateException("Class " + className + " has no continuable methods");

diff --git a/...tools/runtime/ContinuableClassLoader.java → ...time/ResourceTransformingClassLoader.java b/...tools/runtime/ContinuableClassLoader.java → ...time/ResourceTransformingClassLoader.java
@@ -57,11 +57,11 @@
  * the continuation-enabled portion of your application into a separate jar
  * file.
  */
-public class ContinuableClassLoader extends ClassLoader {
+public class ResourceTransformingClassLoader extends ClassLoader {
 
-    private final static Logger log = LoggerFactory.getLogger(ContinuableClassLoader.class);
+    private final static Logger log = LoggerFactory.getLogger(ResourceTransformingClassLoader.class);
 
-    public static abstract class AbstractBuilder<L extends ContinuableClassLoader, B extends AbstractBuilder<L, B>> {
+    public static abstract class AbstractBuilder<L extends ResourceTransformingClassLoader, B extends AbstractBuilder<L, B>> {
         protected final ResourceTransformationFactory transformationFactory;
 
         protected ClassLoader parent;
@@ -173,7 +173,7 @@ final private B self() {
         }
     }
 
-    public static class Builder extends AbstractBuilder<ContinuableClassLoader, Builder> {
+    public static class Builder extends AbstractBuilder<ResourceTransformingClassLoader, Builder> {
         /**
          * Creates a classloader builder.
          *
@@ -187,8 +187,8 @@ public Builder(ResourceTransformationFactory transformationFactory) {
         }
 
         @Override
-        public ContinuableClassLoader create() {
-            return new ContinuableClassLoader(
+        public ResourceTransformingClassLoader create() {
+            return new ResourceTransformingClassLoader(
                 parent, transformationFactory, 
                 parentFirst, isolated, systemPackages, loaderPackages
             );
@@ -240,7 +240,7 @@ public ContinuableClassLoader create() {
      *            This factory is used to create necessary resolver/transformer
      *            to perform the byte-code enhancement. May not be null.
      */
-    public ContinuableClassLoader(ClassLoader parent, ResourceTransformationFactory transformationFactory) {
+    public ResourceTransformingClassLoader(ClassLoader parent, ResourceTransformationFactory transformationFactory) {
         this(parent, transformationFactory, true, false, null, null);
     }
 
@@ -270,7 +270,7 @@ public ContinuableClassLoader(ClassLoader parent, ResourceTransformationFactory
      *            regardless of whether the parent class loader is being
      *            searched first or not.
      */
-    public ContinuableClassLoader(ClassLoader parent, 
+    public ResourceTransformingClassLoader(ClassLoader parent, 
                                   ResourceTransformationFactory transformationFactory,
                                   boolean parentFirst, 
                                   boolean isolated, 
@@ -602,7 +602,7 @@ private Object safeGetClassLoadingLock(String name) {
     private static Method getClassLoaderMethodOrNull(String name, Class<?>... args) {
         try {
             //Method method = ClassLoader.class.getDeclaredMethod(name, args);
-            return ContinuableClassLoader.class.getMethod(name, args);
+            return ResourceTransformingClassLoader.class.getMethod(name, args);
         } catch (NoSuchMethodException ex) {
             // OK, JDK version is less then 1.7
             return null;
@@ -663,7 +663,7 @@ private static boolean findInPackages(String resourceName, Collection<String> su
 
     private static Collection<String> OWN_PACKAGES = Collections.unmodifiableSet(
         InstrumentationUtils.packagePrefixesOf(
-            ContinuableClassLoader.class,
+            ResourceTransformingClassLoader.class,
             ResourceTransformer.class,
             Logger.class
         )