Fixes from prev revisions

Fix OWB test on jbr17 - allow MAJOR_VERSION overriding

(cherry picked from commit 8724444)

Added missing JDK versions in ClassFile

(cherry picked from commit 6fa6ee0)

fix #269 - using addSuperclassName()

(cherry picked from commit 0e3fa16)

Fix class not found excception in weld plugin

Fix problems with unknown OuterClass in classloader from intrumentation
callback

(cherry picked from commit c90337c)

Author: skybber

hotswap-agent-core/src/main/java/org/hotswap/agent/javassist/CtArray.java

@@ -103,6 +103,12 @@ public CtClass getSuperclass() throws NotFoundException
         return pool.get(javaLangObject);
     }
 
+    public String getSuperclassName() throws NotFoundException
+    {
+        CtClass superclass = getSuperclass();
+        return superclass != null ? superclass.getName() : null;
+    }
+
     @Override
     public CtMethod[] getMethods()
     {

hotswap-agent-core/src/main/java/org/hotswap/agent/javassist/CtClass.java

@@ -725,6 +725,10 @@ public CtClass getSuperclass() throws NotFoundException {
         return null;
     }
 
+    public String getSuperclassName() throws NotFoundException {
+        return null;
+    }
+
     /**
      * Changes a super class unless this object represents an interface.
      * The new super class must be compatible with the old one; for example,
@@ -783,6 +787,16 @@ public CtClass getDeclaringClass() throws NotFoundException {
         return null;
     }
 
+    /**
+     * Checks if ctClass is inner class.
+     *
+     * @return true, if is inner class
+     * @throws NotFoundException the not found exception
+     */
+    public boolean isInnerClass()  throws NotFoundException {
+        return false;
+    }
+
     /**
      * Returns the immediately enclosing method of this class.
      * This method works only with JDK 1.5 or later.

hotswap-agent-core/src/main/java/org/hotswap/agent/javassist/CtClassType.java

@@ -839,6 +839,11 @@ public CtClass getSuperclass() throws NotFoundException {
         return classPool.get(supername);
     }
 
+    @Override
+    public String getSuperclassName() throws NotFoundException {
+        return getClassFile2().getSuperclass();
+    }
+
     @Override
     public void setSuperclass(CtClass clazz) throws CannotCompileException {
         checkModify();
@@ -910,6 +915,33 @@ public CtClass getDeclaringClass() throws NotFoundException {
         return null;
     }
 
+    public boolean isInnerClass() throws NotFoundException {
+        ClassFile cf = getClassFile2();
+        InnerClassesAttribute ica = (InnerClassesAttribute)cf.getAttribute(
+                                                InnerClassesAttribute.tag);
+        if (ica == null)
+            return false;
+
+        String name = getName();
+        int n = ica.tableLength();
+        for (int i = 0; i < n; ++i)
+            if (name.equals(ica.innerClass(i))) {
+                String outName = ica.outerClass(i);
+                if (outName != null)
+                    return true;
+                else {
+                    // maybe anonymous or local class.
+                    EnclosingMethodAttribute ema
+                        = (EnclosingMethodAttribute)cf.getAttribute(
+                                                    EnclosingMethodAttribute.tag);
+                    if (ema != null)
+                        return true;
+                }
+            }
+
+        return false;
+    }
+
     @Override
     public CtBehavior getEnclosingBehavior() throws NotFoundException
     {

hotswap-agent-core/src/main/java/org/hotswap/agent/javassist/bytecode/ClassFile.java

@@ -136,6 +136,42 @@ public final class ClassFile {
      */
     public static final int JAVA_11 = 55;
 
+    /**
+     * The major version number of class files
+     * for JDK 12.
+     */
+    public static final int JAVA_12 = 56;
+
+    /**
+     * The major version number of class files
+     * for JDK 13.
+     */
+    public static final int JAVA_13 = 57;
+
+    /**
+     * The major version number of class files
+     * for JDK 14.
+     */
+    public static final int JAVA_14 = 58;
+
+    /**
+     * The major version number of class files
+     * for JDK 15.
+     */
+    public static final int JAVA_15 = 59;
+
+    /**
+     * The major version number of class files
+     * for JDK 16.
+     */
+    public static final int JAVA_16 = 60;
+
+    /**
+     * The major version number of class files
+     * for JDK 17.
+     */
+    public static final int JAVA_17 = 61;
+
     /**
      * The major version number of class files created
      * from scratch.  The default value is 47 (JDK 1.3).
@@ -153,8 +189,20 @@ public final class ClassFile {
      * if the JVM supports <code>java.util.List.copyOf(Collection)</code>.
      * It is 55 (JDK 11)
      * if the JVM supports <code>java.util.Optional.isEmpty()</code>.
-     */
-    public static final int MAJOR_VERSION;
+     * It is 56 (JDK 12)
+     * if the JVM supports <code>com.sun.source.tree.CaseTree.getExpressions()</code>.
+     * It is 57 (JDK 13)
+     * if the JVM supports <code>com.sun.source.tree.YieldTree</code>.
+     * It is 58 (JDK 14)
+     * if the JVM supports <code>com.sun.management.OperatingSystemMXBean.getFreeMemorySize()</code>.
+     * It is 59 (JDK 15)
+     * if the JVM supports <code>java.security.interfaces.EdECPublicKey</code>.
+     * It is 60 (JDK 16)
+     * if the JVM supports <code>com.sun.source.tree.PatternTree</code>.
+     * It is 61 (JDK 17)
+     * if the JVM supports <code>java.util.random.RandomGenerator</code>.
+     */
+    public static int MAJOR_VERSION;
 
     static {
         int ver = JAVA_3;
@@ -173,8 +221,19 @@ public final class ClassFile {
             ver = JAVA_10;
             Class.forName("java.util.Optional").getMethod("isEmpty");
             ver = JAVA_11;
-        }
-        catch (Throwable t) {}
+            Class.forName("com.sun.source.tree.CaseTree").getMethod("getExpressions");
+            ver = JAVA_12;
+            Class.forName("com.sun.source.tree.YieldTree");
+            ver = JAVA_13;
+            Class.forName("com.sun.management.OperatingSystemMXBean").getMethod("getFreeMemorySize");
+            ver = JAVA_14;
+            Class.forName("java.security.interfaces.EdECPublicKey");
+            ver = JAVA_15;
+            Class.forName("com.sun.source.tree.PatternTree");
+            ver = JAVA_16;
+            Class.forName("java.util.random.RandomGenerator");
+            ver = JAVA_17;
+        } catch (Throwable t) {}
         MAJOR_VERSION = ver;
     }
 

hotswap-agent-parent/pom.xml

@@ -337,6 +337,7 @@
         <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
 

plugin/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java

@@ -206,6 +206,7 @@ public void hotswapPrototypeTestNotFailWhenHoldingInstanceBecauseSingletonInject
     @Test
     public void newBeanClassIsManagedBeanReRunTestOnlyAfterMvnClean() throws Exception {
         try {
+            ClassFile.MAJOR_VERSION = ClassFile.JAVA_11; // hack, ASM9 does not support java17 (owb 2.0.26)
             OwbPlugin.isTestEnvironment = true;
             Class<?> clazz = getClass();
             String path = clazz.getResource(clazz.getSimpleName() + ".class")