Conditional closing of curated application

Also reverse workaround for over-eager closing of H2 database, since this fix is the proper solution.

Author: holly-cummins

core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java

@@ -340,11 +340,15 @@ public void close() throws IOException {
                                 log.error("Failed to run close task", t);
                             }
                         }
-                        if (curatedApplication.getQuarkusBootstrap().getMode() == QuarkusBootstrap.Mode.TEST &&
-                                !curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()) {
-                            //for tests, we just always shut down the curated application, as it is only used once
-                            //dev mode might be about to restart, so we leave it
-                            curatedApplication.close();
+                        // This will read the state of the curated application at the time of closing;
+                        // If the caller of close knows that the 'next' application shares a curated application, it can set eligible for reuse to true
+                        if (!curatedApplication.isEligibleForReuse()) {
+                            if (curatedApplication.getQuarkusBootstrap().getMode() == QuarkusBootstrap.Mode.TEST
+                                    && !curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()) {
+                                //for tests, we just always shut down the curated application, as it is only used once
+                                //dev mode might be about to restart, so we leave it
+                                curatedApplication.close();
+                            }
                         }
                     }
                 }

extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java

@@ -84,19 +84,12 @@ public void close() throws IOException {
                                         } catch (SQLException t) {
                                             t.printStackTrace();
                                         }
-                                        // TODO Yes, this is a port leak
-                                        // The good news is that because it's an in-memory database, it will get shut down
-                                        // when the JVM stops. Nonetheless, this clearly is not ok, and needs
-                                        // a fix so that we do not start databases in the augmentation phase
-                                        // TODO remove this when #45786 and #45785 are done
-                                        final boolean hackPendingDeferredDevServiceStart = true;
-                                        if (!hackPendingDeferredDevServiceStart) {
-                                            tcpServer.stop();
-                                            LOG.info("Dev Services for H2 shut down; server status: " + tcpServer.getStatus());
-
-                                        }
-                                        // End of #45786 and #45785 workaround
-
+                                        tcpServer.stop();
+                                        LOG.info("Dev Services for H2 shut down; server status: " + tcpServer.getStatus());
+                                    } else {
+                                        LOG.info(
+                                                "Dev Services for H2 was NOT shut down as it appears it was down already; server status: "
+                                                        + tcpServer.getStatus());
                                     }
                                 }
                             });

independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java

@@ -68,6 +68,7 @@ public class CuratedApplication implements Serializable, AutoCloseable {
     final ApplicationModel appModel;
 
     final AtomicInteger runtimeClassLoaderCount = new AtomicInteger();
+    private boolean eligibleForReuse = false;
 
     CuratedApplication(QuarkusBootstrap quarkusBootstrap, CurationResult curationResult,
             ConfiguredClassLoading configuredClassLoading) {
@@ -77,6 +78,10 @@ public class CuratedApplication implements Serializable, AutoCloseable {
         this.configuredClassLoading = configuredClassLoading;
     }
 
+    public void setEligibleForReuse(boolean eligible) {
+        this.eligibleForReuse = eligible;
+    }
+
     public boolean isFlatClassPath() {
         return configuredClassLoading.isFlatTestClassPath();
     }
@@ -459,6 +464,10 @@ public void close() {
         augmentationElements.clear();
     }
 
+    public boolean isEligibleForReuse() {
+        return eligibleForReuse;
+    }
+
     /**
      * TODO: Fix everything in the universe to do loading properly
      *

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

@@ -616,6 +616,16 @@ private QuarkusTestExtensionState ensureStarted(ExtensionContext extensionContex
             currentJUnitTestClass = extensionContext.getRequiredTestClass();
         }
         boolean isNewApplication = isNewApplication(state, extensionContext.getRequiredTestClass());
+
+        QuarkusClassLoader cl = (QuarkusClassLoader) extensionContext.getRequiredTestClass().getClassLoader();
+
+        CuratedApplication curatedApplication = runningQuarkusApplication != null
+                ? ((QuarkusClassLoader) runningQuarkusApplication.getClassLoader())
+                        .getCuratedApplication()
+                : null;
+        boolean isSameCuratedApplication = cl.getCuratedApplication() == curatedApplication;
+        cl.getCuratedApplication().setEligibleForReuse(isSameCuratedApplication);
+
         // TODO if classes are misordered, say because someone overrode the ordering, and there are profiles or resources,
         // we could try to start and application which has already been started, and fail with a mysterious error about
         // null shutdown contexts; we should try and detect that case, and give a friendlier error message