Minoir refactorings

Author: vsilaev

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/CompositeTransformer.java renamed to net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/CompositeResourceTransformer.java

@@ -16,18 +16,20 @@
  */
 package org.apache.commons.javaflow.spi;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * {@link ResourceTransformer} whose transformation is defined in terms of
  * multiple {@link ResourceTransformer}s.
  *
  * @author Kohsuke Kawaguchi
  */
-public class CompositeTransformer extends AbstractResourceTransformer {
+public class CompositeResourceTransformer extends AbstractResourceTransformer {
     private final ResourceTransformer[] transformers;
 
-    public CompositeTransformer(ResourceTransformer[] transformers) {
+    public CompositeResourceTransformer(ResourceTransformer[] transformers) {
         this.transformers = transformers;
     }
 
@@ -46,4 +48,32 @@ public void release() {
             transformer.release();
         }
     }
+    
+    public static ResourceTransformationFactory composeFactories(ResourceTransformationFactory... factories) {
+        return composeFactories(Arrays.asList(factories));
+    }
+    
+    public static ResourceTransformationFactory composeFactories(final List<ResourceTransformationFactory> factories) {
+        return new ResourceTransformationFactory() {
+            
+            @Override
+            public String readClassName(byte[] classBytes) {
+                if (factories.isEmpty()) {
+                    throw new IllegalStateException("No factories to perform operation");
+                } else {
+                    return factories.get(0).readClassName(classBytes);
+                }
+            }
+            
+            @Override
+            public ResourceTransformer createTransformer(ResourceLoader resourceLoader) {
+                ResourceTransformer[] transformers = new ResourceTransformer[factories.size()];
+                int idx = 0;
+                for (ResourceTransformationFactory factory : factories) {
+                    transformers[idx++] = factory.createTransformer(resourceLoader);
+                }
+                return new CompositeResourceTransformer(transformers);
+            }
+        };
+    }
 }

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

@@ -19,9 +19,10 @@
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.Method;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
 import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class CGLibProxyClassProcessor extends ProxyClassProcessor {
 

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

@@ -19,9 +19,10 @@
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.Method;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
 import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class CustomProxyClassProcessor extends ProxyClassProcessor {
 

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

@@ -19,9 +19,10 @@
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.Method;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
 import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class JavaProxyClassProcessor extends ProxyClassProcessor {
 

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

@@ -19,9 +19,10 @@
 import net.tascalate.asmx.MethodVisitor;
 import net.tascalate.asmx.Type;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ExtendedClassVisitor;
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class OwbProxyClassProcessor extends ProxyClassProcessor {
     private Type owbProxiedInstanceType;

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

@@ -19,9 +19,10 @@
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.Method;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
 import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class SpringProxyClassProcessor extends ProxyClassProcessor {
 

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

@@ -20,10 +20,11 @@
 import net.tascalate.asmx.Type;
 import net.tascalate.asmx.commons.Method;
 
+import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
+
 import org.apache.commons.javaflow.instrumentation.cdi.ExtendedClassVisitor;
 import org.apache.commons.javaflow.instrumentation.cdi.ProxyClassProcessor;
 import org.apache.commons.javaflow.instrumentation.cdi.common.ProxiedMethodAdvice;
-import org.apache.commons.javaflow.providers.asmx.ContinuableClassInfo;
 
 public class WeldProxyClassProcessor extends ProxyClassProcessor {