Support for deltaspike 1.9.6

Author: skybber

plugin/hotswap-agent-deltaspike-plugin/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>hotswap-agent-deltaspike-plugin</artifactId>
 
     <properties>
-        <deltaspike.version>1.9.1</deltaspike.version>
-        <org.hibernateframework.version>5.2.10.Final</org.hibernateframework.version>
+        <deltaspike.version>1.9.6</deltaspike.version>
+        <org.hibernateframework.version>5.6.8.Final</org.hibernateframework.version>
         <jaxb.version>2.3.0</jaxb.version>
     </properties>
 
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>2.2.10</version>
+            <version>2.3.9</version>
             <scope>test</scope>
         </dependency>
 

plugin/hotswap-agent-deltaspike-plugin/src/main/java/org/hotswap/agent/plugin/deltaspike/command/ProxyClassLoadingDelegate.java

@@ -107,4 +107,41 @@ public static Class<?> loadClass(ClassLoader loader, String className, byte[] by
         }
         return null;
     }
+
+    // for DS >= 1.9.6
+    public static Class<?> defineClass(ClassLoader loader, String className, byte[] bytes, Class<?> originalClass, ProtectionDomain protectionDomain) {
+        if (MAGIC_IN_PROGRESS.get()) {
+            try {
+                final Class<?> originalProxyClass = loader.loadClass(className);
+                try {
+                    Map<Class<?>, byte[]> reloadMap = new HashMap<>();
+                    reloadMap.put(originalProxyClass, bytes);
+                    PluginManager.getInstance().hotswap(reloadMap);
+                    return originalProxyClass;
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            } catch (ClassNotFoundException e) {
+                //it has not actually been loaded yet
+            }
+        }
+        try {
+            Class<?> classDefiner = null;
+            try {
+                // ClassDefiner introduced in ds 1.9.6
+                classDefiner = loader.loadClass("org.apache.deltaspike.proxy.impl.ClassDefiner");
+            } catch (ClassNotFoundException e1) {
+                LOGGER.error("ClassDefiner class not found!");
+            }
+            if (classDefiner != null) {
+                return (Class<?>) ReflectionHelper.invoke(null, classDefiner, "defineClass",
+                        new Class[]{ClassLoader.class, String.class, byte[].class, Class.class, ProtectionDomain.class},
+                        loader, className, bytes, originalClass, protectionDomain);
+            }
+        } catch (Exception e) {
+            LOGGER.error("loadClass() exception {}", e.getMessage());
+        }
+        return null;
+    }
+
 }

plugin/hotswap-agent-deltaspike-plugin/src/main/java/org/hotswap/agent/plugin/deltaspike/transformer/DeltaSpikeProxyTransformer.java

@@ -95,8 +95,11 @@ public static void patchAsmDeltaSpikeProxyClassGenerator(CtClass ctClass) throws
         generateProxyClassMethod.instrument(
                 new ExprEditor() {
                     public void edit(MethodCall m) throws CannotCompileException {
-                        if (m.getClassName().equals("org.apache.deltaspike.proxy.impl.AsmDeltaSpikeProxyClassGenerator") && m.getMethodName().equals("loadClass"))
+                        if (m.getClassName().equals("org.apache.deltaspike.proxy.impl.AsmDeltaSpikeProxyClassGenerator") && m.getMethodName().equals("loadClass")) {
                             m.replace("{ $_ = org.hotswap.agent.plugin.deltaspike.command.ProxyClassLoadingDelegate.loadClass($$); }");
+                        } else if (m.getClassName().equals("org.apache.deltaspike.proxy.impl.ClassDefiner") && m.getMethodName().equals("defineClass")) {
+                            m.replace("{ $_ = org.hotswap.agent.plugin.deltaspike.command.ProxyClassLoadingDelegate.defineClass($$); }");
+                        }
                     }
                 });
         LOGGER.debug("org.apache.deltaspike.proxy.impl.AsmDeltaSpikeProxyClassGenerator patched.");