Merge pull request #40906 from holly-cummins/reinstate-40601

Reinstate changes to use JBoss serializer instead of xstream
quarkusio · Jul 2, 2024 · 6ecbfc5 · 6ecbfc5
2 parents 6d70b84 + eef5138
commit 6ecbfc5
Show file tree

Hide file tree

Showing 14 changed files with 166 additions and 399 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -4858,6 +4858,11 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.marshalling</groupId>
+                <artifactId>jboss-marshalling</artifactId>
+                <version>${jboss-marshalling.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.threads</groupId>
                 <artifactId>jboss-threads</artifactId>

diff --git a/...test-extension/tests/src/test/java/io/quarkus/it/extension/it/TestParameterDevModeIT.java b/...test-extension/tests/src/test/java/io/quarkus/it/extension/it/TestParameterDevModeIT.java
@@ -7,7 +7,6 @@
 
 import org.apache.maven.shared.invoker.MavenInvocationException;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
@@ -22,7 +21,6 @@
  * mvn install -Dit.test=DevMojoIT#methodName
  */
 @DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
-@Disabled("Needs https://github.com/junit-team/junit5/pull/3820 and #40601")
 public class TestParameterDevModeIT extends RunAndCheckMojoTestBase {
 
     protected int getPort() {

diff --git a/test-framework/junit5/pom.xml b/test-framework/junit5/pom.xml
@@ -49,10 +49,8 @@
             <artifactId>quarkus-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <!-- Avoid adding this to the BOM -->
-            <version>1.4.20</version>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
         </dependency>
 
         <dependency>

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -40,8 +40,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.regex.Pattern;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.jandex.AnnotationInstance;
@@ -52,7 +50,6 @@
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
@@ -106,7 +103,7 @@
 import io.quarkus.test.junit.callback.QuarkusTestContext;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
 import io.quarkus.test.junit.internal.DeepClone;
-import io.quarkus.test.junit.internal.SerializationWithXStreamFallbackDeepClone;
+import io.quarkus.test.junit.internal.NewSerializingDeepClone;
 
 public class QuarkusTestExtension extends AbstractJvmQuarkusTestExtension
         implements BeforeEachCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback, AfterEachCallback,
@@ -124,7 +121,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;
@@ -260,11 +256,11 @@ public Thread newThread(Runnable r) {
                 runningQuarkusApplication = startupAction
                         .runMainClass(profileInstance.commandLineParameters());
             }
-            String patternString = runningQuarkusApplication.getConfigValue("quarkus.test.class-clone-pattern", String.class)
-                    .orElse("java\\..*");
-            clonePattern = Pattern.compile(patternString);
+
             TracingHandler.quarkusStarted();
 
+            deepClone.setRunningQuarkusApplication(runningQuarkusApplication);
+
             //now we have full config reset the hang timer
 
             if (hangTaskKey != null) {
@@ -351,7 +347,7 @@ private void shutdownHangDetection() {
     }
 
     private void populateDeepCloneField(StartupAction startupAction) {
-        deepClone = new SerializationWithXStreamFallbackDeepClone(startupAction.getClassLoader());
+        deepClone = new NewSerializingDeepClone(originalCl, startupAction.getClassLoader());
     }
 
     private void populateTestMethodInvokers(ClassLoader quarkusClassLoader) {
@@ -957,50 +953,14 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
             List<Object> argumentsFromTccl = new ArrayList<>();
             Parameter[] parameters = invocationContext.getExecutable().getParameters();
             for (int i = 0; i < originalArguments.size(); i++) {
-                Object arg = originalArguments.get(i);
-                boolean cloneRequired = false;
-                Object replacement = null;
-                Class<?> argClass = parameters[i].getType();
-                if (arg != null) {
-                    Class<?> theclass = argClass;
-                    while (theclass.isArray()) {
-                        theclass = theclass.getComponentType();
-                    }
-                    if (theclass.isPrimitive()) {
-                        cloneRequired = false;
-                    } else if (TestInfo.class.isAssignableFrom(theclass)) {
-                        TestInfo info = (TestInfo) arg;
-                        Method newTestMethod = info.getTestMethod().isPresent()
-                                ? determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL)
-                                : null;
-                        replacement = new TestInfoImpl(info.getDisplayName(), info.getTags(),
-                                Optional.of(testClassFromTCCL),
-                                Optional.ofNullable(newTestMethod));
-                    } else if (clonePattern.matcher(theclass.getName()).matches()) {
-                        cloneRequired = true;
-                    } else {
-                        try {
-                            cloneRequired = runningQuarkusApplication.getClassLoader()
-                                    .loadClass(theclass.getName()) != theclass;
-                        } catch (ClassNotFoundException e) {
-                            if (arg instanceof Supplier) {
-                                cloneRequired = true;
-                            } else {
-                                throw e;
-                            }
-                        }
-                    }
-                }
+                if (testMethodInvokerToUse != null) {
+                    Class<?> argClass = parameters[i].getType();
 
-                if (replacement != null) {
-                    argumentsFromTccl.add(replacement);
-                } else if (cloneRequired) {
-                    argumentsFromTccl.add(deepClone.clone(arg));
-                } else if (testMethodInvokerToUse != null) {
                     argumentsFromTccl.add(testMethodInvokerToUse.getClass().getMethod("methodParamInstance", String.class)
                             .invoke(testMethodInvokerToUse, argClass.getName()));
                 } else {
-                    argumentsFromTccl.add(arg);
+                    Object arg = originalArguments.get(i);
+                    argumentsFromTccl.add(deepClone.clone(arg));
                 }
             }
 
@@ -1235,7 +1195,6 @@ protected void doClose() throws IOException {
                 log.error("Failed to shutdown Quarkus", e);
             } finally {
                 runningQuarkusApplication = null;
-                clonePattern = null;
                 Thread.currentThread().setContextClassLoader(old);
                 ConfigProviderResolver.setInstance(null);
             }

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomListConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomListConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapConverter.java
diff --git a/...ramework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapEntryConverter.java b/...ramework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapEntryConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomSetConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomSetConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/DeepClone.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/DeepClone.java
@@ -1,11 +1,15 @@
 package io.quarkus.test.junit.internal;
 
+import io.quarkus.bootstrap.app.RunningQuarkusApplication;
+
 /**
  * Strategy to deep clone an object
- *
+ * <p>
  * Used in order to clone an object loaded from one ClassLoader into another
  */
 public interface DeepClone {
 
     Object clone(Object objectToClone);
+
+    void setRunningQuarkusApplication(RunningQuarkusApplication runningQuarkusApplication);
 }