Reinstate support for class-clone-pattern

Author: holly-cummins

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java

@@ -122,7 +122,6 @@ public class QuarkusTestExtension extends AbstractJvmQuarkusTestExtension
     // needed for @Nested
     private static final Deque<Object> outerInstances = new ArrayDeque<>(1);
     private static RunningQuarkusApplication runningQuarkusApplication;
-    private static Pattern clonePattern;
     private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted
 
     private static Class<?> quarkusTestMethodContextClass;

test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/NewSerializingDeepClone.java

@@ -5,6 +5,7 @@
 import java.io.UncheckedIOException;
 import java.lang.reflect.Method;
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
 
 import org.jboss.marshalling.cloner.ClassCloner;
 import org.jboss.marshalling.cloner.ClonerConfiguration;
@@ -19,6 +20,7 @@
  */
 public final class NewSerializingDeepClone implements DeepClone {
     private final ObjectCloner cloner;
+    private static Pattern clonePattern;
     private RunningQuarkusApplication runningQuarkusApplication;
 
     public NewSerializingDeepClone(final ClassLoader sourceLoader, final ClassLoader targetLoader) {
@@ -49,45 +51,46 @@ public Class<?> cloneProxy(final Class<?> proxyClass) {
                         theClassWeCareAbout = theClassWeCareAbout.getComponentType();
                     }
 
-                    // TODO  } else if (clonePattern.matcher(theclass.getName()).matches()) {
-                    //                        cloneRequired = true;
-                    //                    }
-                    if (theClassWeCareAbout.isPrimitive()) {
-                        // avoid copying things that do not need to be copied
-                        return original;
-                    } else if (isUncloneable(theClassWeCareAbout)) {
-                        if (original instanceof Supplier<?> s) {
-                            // sneaky
-                            return (Supplier<?>) () -> clone(s.get());
-                        } else {
-                            return original;
-                        }
-                    } else if (original instanceof TestInfo info) {
-                        // copy the test info correctly
-                        return new TestInfoImpl(info.getDisplayName(), info.getTags(),
-                                info.getTestClass()
-                                        .map(this::cloneClass),
-                                info.getTestMethod()
-                                        .map(this::cloneMethod));
-                    } else {
-                        try {
-                            if (runningQuarkusApplication != null && runningQuarkusApplication.getClassLoader()
-                                    .loadClass(theClassWeCareAbout.getName()) == theClassWeCareAbout) {
-                                // Don't clone things which are already loaded by the quarkus application's classloader side of the tree
-                                return original;
-                            }
-                        } catch (ClassNotFoundException e) {
+                    // Short-circuit the checks if we've been configured to clone this
+                    if (!clonePattern.matcher(theClassWeCareAbout.getName()).matches()) {
 
+                        if (theClassWeCareAbout.isPrimitive()) {
+                            // avoid copying things that do not need to be copied
+                            return original;
+                        } else if (isUncloneable(theClassWeCareAbout)) {
                             if (original instanceof Supplier<?> s) {
                                 // sneaky
                                 return (Supplier<?>) () -> clone(s.get());
                             } else {
-                                throw e;
+                                return original;
+                            }
+                        } else if (original instanceof TestInfo info) {
+                            // copy the test info correctly
+                            return new TestInfoImpl(info.getDisplayName(), info.getTags(),
+                                    info.getTestClass()
+                                            .map(this::cloneClass),
+                                    info.getTestMethod()
+                                            .map(this::cloneMethod));
+                        } else {
+                            try {
+                                if (runningQuarkusApplication != null && runningQuarkusApplication.getClassLoader()
+                                        .loadClass(theClassWeCareAbout.getName()) == theClassWeCareAbout) {
+                                    // Don't clone things which are already loaded by the quarkus application's classloader side of the tree
+                                    return original;
+                                }
+                            } catch (ClassNotFoundException e) {
+
+                                if (original instanceof Supplier<?> s) {
+                                    // sneaky
+                                    return (Supplier<?>) () -> clone(s.get());
+                                } else {
+                                    throw e;
+                                }
                             }
-                        }
 
-                        if (original == sourceLoader) {
-                            return targetLoader;
+                            if (original == sourceLoader) {
+                                return targetLoader;
+                            }
                         }
                     }
 
@@ -133,6 +136,9 @@ public Object clone(final Object objectToClone) {
     @Override
     public void setRunningQuarkusApplication(RunningQuarkusApplication runningQuarkusApplication) {
         this.runningQuarkusApplication = runningQuarkusApplication;
+        String patternString = runningQuarkusApplication.getConfigValue("quarkus.test.class-clone-pattern", String.class)
+                .orElse("java\\..*");
+        clonePattern = Pattern.compile(patternString);
     }
 
 }