ARIES-2165: Extract ASM api version to constant

Author: alien11689

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmApiVersion.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.proxy.impl;
+
+import org.objectweb.asm.Opcodes;
+
+public class AsmApiVersion {
+    public static final int apiVersion = Opcodes.ASM9;
+}

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java

@@ -37,6 +37,7 @@
 
 import org.apache.aries.proxy.InvocationListener;
 import org.apache.aries.proxy.UnableToProxyException;
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.apache.aries.proxy.impl.SystemModuleClassLoader;
 import org.apache.aries.proxy.impl.gen.Constants;
 import org.apache.aries.proxy.weaving.WovenProxy;
@@ -210,7 +211,7 @@ public abstract class AbstractWovenProxyAdapter extends ClassVisitor implements
    */
   public AbstractWovenProxyAdapter(ClassVisitor writer, String className,
       ClassLoader loader) {
-    super(Opcodes.ASM9, writer);
+    super(AsmApiVersion.apiVersion, writer);
     typeBeingWoven = Type.getType("L" + className.replace('.', '/') + ";");
     //By default we expect to see methods from a concrete class
     currentMethodDeclaringType = typeBeingWoven;
@@ -365,7 +366,7 @@ public final MethodVisitor visitMethod(int access, String name, String desc,
       //to write our init code to static_init_UUID instead
       staticInitMethod = new Method("static_init_" + UU_ID, Type.VOID_TYPE, NO_ARGS);
       staticInitMethodFlags = staticInitMethodFlags | ACC_FINAL;
-      methodVisitorToReturn = new AdviceAdapter(Opcodes.ASM9, cv.visitMethod(access, name, desc, signature,
+      methodVisitorToReturn = new AdviceAdapter(AsmApiVersion.apiVersion, cv.visitMethod(access, name, desc, signature,
           exceptions), access, name, desc){
         @Override
         protected void onMethodEnter()

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java

@@ -33,6 +33,7 @@
 import java.util.Arrays;
 
 import org.apache.aries.proxy.InvocationListener;
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -179,7 +180,7 @@ public AbstractWovenProxyMethodAdapter(MethodVisitor mv, int access, String name
       String methodStaticFieldName, Method currentTransformMethod, Type typeBeingWoven,
       Type methodDeclaringType, boolean isMethodDeclaringTypeInterface, boolean isDefaultMethod)
   {
-    super(ASM9, mv, access, name, desc);
+    super(AsmApiVersion.apiVersion, mv, access, name, desc);
     this.methodStaticFieldName = methodStaticFieldName;
     this.currentTransformMethod = currentTransformMethod;
     returnType = currentTransformMethod.getReturnType();

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java

@@ -20,9 +20,9 @@
 
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 public class ConstructorFinder extends ClassVisitor
@@ -35,9 +35,8 @@ public boolean hasNoArgsConstructor()
     return hasNoArgsConstructor;
   }
 
-  public ConstructorFinder()
-  {
-    super(Opcodes.ASM9);
+  public ConstructorFinder() {
+    super(AsmApiVersion.apiVersion);
   }
 
   @Override

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java

@@ -25,6 +25,7 @@
 
 import org.apache.aries.proxy.FinalModifierException;
 import org.apache.aries.proxy.UnableToProxyException;
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;
 import org.objectweb.asm.ClassReader;
@@ -64,7 +65,7 @@ final class MethodCopyingClassAdapter extends ClassVisitor implements Opcodes {
   public MethodCopyingClassAdapter(AbstractWovenProxyAdapter awpa, ClassLoader definingLoader,
       Class<?> superToCopy, Type overridingClassType, Set<Method> knownMethods, 
       Map<String, TypeMethod> transformedMethods) {
-    super(Opcodes.ASM9);
+    super(AsmApiVersion.apiVersion);
     this.wovenProxyAdapter = awpa;
     this.superToCopy = superToCopy;
     this.overridingClassType = overridingClassType;
@@ -178,7 +179,7 @@ private static final class CopyingMethodAdapter extends MethodVisitor {
 
     public CopyingMethodAdapter(GeneratorAdapter mv, Type superType, 
         Method currentTransformMethod) {
-      super(Opcodes.ASM9);
+      super(AsmApiVersion.apiVersion);
       this.mv = mv;
       this.superType = superType;
       this.currentTransformMethod = currentTransformMethod;

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java

@@ -18,10 +18,10 @@
  */
 package org.apache.aries.proxy.impl.common;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.JSRInlinerAdapter;
 /**
  * We need to override ASM's default behaviour in {@link #getCommonSuperClass(String, String)}
@@ -35,7 +35,7 @@ public final class OSGiFriendlyClassVisitor extends ClassVisitor {
 
   public OSGiFriendlyClassVisitor(ClassVisitor cv, int arg1) {
 
-    super(Opcodes.ASM9, cv);
+    super(AsmApiVersion.apiVersion, cv);
 
     inlineJSR = arg1 == ClassWriter.COMPUTE_FRAMES;
   }

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java

@@ -23,6 +23,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.apache.aries.proxy.impl.ProxyUtils;
 import org.apache.aries.proxy.impl.SystemModuleClassLoader;
 import org.objectweb.asm.AnnotationVisitor;
@@ -66,7 +67,7 @@ public class ProxySubclassAdapter extends ClassVisitor implements Opcodes
   public ProxySubclassAdapter(ClassVisitor writer, String newClassName, ClassLoader loader)
   {
     // call the superclass constructor
-    super(Opcodes.ASM9, writer);
+    super(AsmApiVersion.apiVersion, writer);
     // the writer is now the cv in the superclass of ClassAdapter
 
     LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassAdapter", new Object[] { this, writer,

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java

@@ -20,6 +20,7 @@
 
 import java.util.Collection;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;
 import org.objectweb.asm.ClassVisitor;
@@ -47,7 +48,7 @@ public class ProxySubclassHierarchyAdapter extends ClassVisitor implements Opcod
 
   ProxySubclassHierarchyAdapter(ProxySubclassAdapter adapter, Collection<String> methodsToImplement)
   {
-    super(Opcodes.ASM9);
+    super(AsmApiVersion.apiVersion);
     LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassHeirarchyAdapter", new Object[] {
         this, adapter, methodsToImplement });
 

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java

@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.apache.aries.proxy.UnableToProxyException;
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.apache.aries.proxy.impl.ProxyUtils;
 import org.apache.aries.proxy.impl.common.AbstractWovenProxyAdapter;
 import org.apache.aries.proxy.impl.common.OSGiFriendlyClassVisitor;
@@ -61,7 +62,7 @@ final class InterfaceCombiningClassAdapter extends ClassVisitor implements Opcod
    */
   InterfaceCombiningClassAdapter(String className,
       ClassLoader loader, Class<?> superclass, Collection<Class<?>> interfaces) {
-    super(Opcodes.ASM9);
+    super(AsmApiVersion.apiVersion);
     writer = new OSGiFriendlyClassWriter(ClassWriter.COMPUTE_FRAMES, loader);
     ClassVisitor cv = new OSGiFriendlyClassVisitor(writer, ClassWriter.COMPUTE_FRAMES);
     adapter = new InterfaceUsingWovenProxyAdapter(cv, className, loader);

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java

@@ -33,6 +33,7 @@
 import org.apache.aries.proxy.FinalModifierException;
 import org.apache.aries.proxy.InvocationListener;
 import org.apache.aries.proxy.UnableToProxyException;
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Opcodes;
 import org.osgi.framework.Bundle;
@@ -48,7 +49,7 @@ public final class InterfaceProxyGenerator extends ClassVisitor implements Opcod
 
   public InterfaceProxyGenerator()
   {
-    super(Opcodes.ASM9);
+    super(AsmApiVersion.apiVersion);
 
   }
 

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java

@@ -20,13 +20,12 @@
 
 import java.lang.reflect.Modifier;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.commons.SerialVersionUIDAdder;
 
-import static org.objectweb.asm.Opcodes.ASM9;
-
 class SyntheticSerialVerUIDAdder extends SerialVersionUIDAdder {
 
   private WovenProxyAdapter wpa;
@@ -43,7 +42,7 @@ class SyntheticSerialVerUIDAdder extends SerialVersionUIDAdder {
   private boolean hasSVUID;
 
   public SyntheticSerialVerUIDAdder(WovenProxyAdapter cv) {
-    super(ASM9, cv);
+    super(AsmApiVersion.apiVersion, cv);
     wpa = cv;
   }
 

proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java

@@ -22,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
+import org.apache.aries.proxy.impl.AsmApiVersion;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
@@ -82,7 +83,7 @@ public static class CustomClassVisitor extends ClassVisitor
 
     public CustomClassVisitor( ClassVisitor cv)
     {
-      super(Opcodes.ASM8, cv);
+      super(AsmApiVersion.apiVersion, cv);
 
     }
     @Override