Merge pull request #10146 from geoand/testsource-close

quarkusio · Jun 23, 2020 · a002dcf · a002dcf
2 parents e2bbfdb + 8394406
commit a002dcf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
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
@@ -675,7 +675,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
         }
     }
 
-    class ExtensionState implements ExtensionContext.Store.CloseableResource {
+    class ExtensionState {
 
         private final Closeable testResourceManager;
         private final Closeable resource;
@@ -685,7 +685,6 @@ class ExtensionState implements ExtensionContext.Store.CloseableResource {
             this.resource = resource;
         }
 
-        @Override
         public void close() throws Throwable {
             try {
                 resource.close();

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/XStreamDeepClone.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/XStreamDeepClone.java
@@ -9,13 +9,17 @@
  */
 public class XStreamDeepClone implements DeepClone {
 
-    private final XStream xStream;
+    private final Supplier<XStream> xStreamSupplier;
 
     public XStreamDeepClone(ClassLoader classLoader) {
-        xStream = new XStream();
-        XStream.setupDefaultSecurity(xStream);
-        xStream.allowTypesByRegExp(new String[] { ".*" });
-        xStream.setClassLoader(classLoader);
+        // avoid doing any work eagerly since the cloner is rarely used
+        xStreamSupplier = () -> {
+            XStream result = new XStream();
+            XStream.setupDefaultSecurity(result);
+            result.allowTypesByRegExp(new String[] { ".*" });
+            result.setClassLoader(classLoader);
+            return result;
+        };
     }
 
     public Object clone(Object objectToClone) {
@@ -40,6 +44,7 @@ public Object get() {
     }
 
     private Object doClone(Object objectToClone) {
+        XStream xStream = xStreamSupplier.get();
         final String serialized = xStream.toXML(objectToClone);
         final Object result = xStream.fromXML(serialized);
         if (result == null) {