Hibernate ORM dev only module fixes

mbellade · Sanne · commit 280a186290c0 · 2025-08-07T17:28:13.000+01:00
Main change is `HibernateOrmDevIntegrator` so we don't have to have a cyclic dependency on it in the runtime module
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -113,6 +113,7 @@
 import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem;
 import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem;
 import io.quarkus.hibernate.orm.deployment.spi.DatabaseKindDialectBuildItem;
+import io.quarkus.hibernate.orm.dev.HibernateOrmDevIntegrator;
 import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder;
 import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
 import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
@@ -125,7 +126,6 @@
 import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
 import io.quarkus.hibernate.orm.runtime.customized.FormatMapperKind;
 import io.quarkus.hibernate.orm.runtime.customized.JsonFormatterCustomizationCheck;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevIntegrator;
 import io.quarkus.hibernate.orm.runtime.graal.RegisterServicesForReflectionFeature;
 import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
 import io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy;
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevUIProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevUIProcessor.java
@@ -15,9 +15,9 @@
 import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
 import io.quarkus.hibernate.orm.deployment.HibernateOrmEnabled;
 import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
+import io.quarkus.hibernate.orm.dev.HibernateOrmDevInfoCreateDDLSupplier;
+import io.quarkus.hibernate.orm.dev.ui.HibernateOrmDevJsonRpcService;
 import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevInfoCreateDDLSupplier;
-import io.quarkus.hibernate.orm.runtime.dev.ui.HibernateOrmDevJsonRpcService;
 
 @BuildSteps(onlyIf = { HibernateOrmEnabled.class, IsLocalDevelopment.class })
 public class HibernateOrmDevUIProcessor {
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoServiceTestResource.java
@@ -10,8 +10,6 @@
 import jakarta.ws.rs.core.MediaType;
 
 import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevController;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevInfo;
 
 @Path("/dev-info")
 public class HibernateOrmDevInfoServiceTestResource {
diff --git a/extensions/hibernate-orm/runtime-dev/pom.xml b/extensions/hibernate-orm/runtime-dev/pom.xml
@@ -19,7 +19,8 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev</artifactId>
+            <artifactId>quarkus-devui</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevController.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevController.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.runtime.dev;
+package io.quarkus.hibernate.orm.dev;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfo.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfo.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.runtime.dev;
+package io.quarkus.hibernate.orm.dev;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoCreateDDLSupplier.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevInfoCreateDDLSupplier.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.runtime.dev;
+package io.quarkus.hibernate.orm.dev;
 
 import java.util.Collection;
 import java.util.Objects;
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevIntegrator.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/HibernateOrmDevIntegrator.java
@@ -1,42 +1,35 @@
-package io.quarkus.hibernate.orm.runtime.dev;
+package io.quarkus.hibernate.orm.dev;
 
 import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_LOAD_SCRIPT_SOURCE;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder;
 import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDescriptor;
 
 public class HibernateOrmDevIntegrator implements Integrator {
-    private static final Map<String, QuarkusPersistenceUnitDescriptor> puDescriptorMap = new ConcurrentHashMap<>();
-
-    public static void clearPuMap() {
-        puDescriptorMap.clear();
-    }
-
-    public static void mapPersistenceUnit(String pu, QuarkusPersistenceUnitDescriptor descriptor) {
-        puDescriptorMap.put(pu, descriptor);
-    }
-
     @Override
-    public void integrate(Metadata metadata, BootstrapContext bootstrapContext,
-            SessionFactoryImplementor sessionFactoryImplementor) {
-        String name = (String) sessionFactoryImplementor.getProperties()
+    public void integrate(Metadata metadata, BootstrapContext bootstrapContext, SessionFactoryImplementor sf) {
+        String name = (String) sf.getProperties()
                 .get(AvailableSettings.PERSISTENCE_UNIT_NAME);
         HibernateOrmDevController.get().pushPersistenceUnit(
-                sessionFactoryImplementor,
-                puDescriptorMap.get(name),
+                sf,
+                getPersistenceUnitDescriptor(name, sf),
                 name,
                 metadata,
-                sessionFactoryImplementor.getServiceRegistry(),
-                (String) sessionFactoryImplementor.getProperties().get(JAKARTA_HBM2DDL_LOAD_SCRIPT_SOURCE));
+                sf.getServiceRegistry(),
+                (String) sf.getProperties().get(JAKARTA_HBM2DDL_LOAD_SCRIPT_SOURCE));
+    }
+
+    private static QuarkusPersistenceUnitDescriptor getPersistenceUnitDescriptor(String name, SessionFactoryImplementor sf) {
+        // This is not great but avoids needing to depend on reactive
+        boolean isReactive = sf.getClass().getPackage().getName().contains("reactive");
+        return PersistenceUnitsHolder.getPersistenceUnitDescriptor(name, isReactive);
     }
 
     @Override
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/ui/HibernateOrmDevJsonRpcService.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/ui/HibernateOrmDevJsonRpcService.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.runtime.dev.ui;
+package io.quarkus.hibernate.orm.dev.ui;
 
 import static org.hibernate.query.sqm.internal.SqmUtil.isMutation;
 
@@ -25,9 +25,9 @@
 import io.quarkus.devui.runtime.comms.JsonRpcMessage;
 import io.quarkus.devui.runtime.comms.JsonRpcRouter;
 import io.quarkus.devui.runtime.comms.MessageType;
+import io.quarkus.hibernate.orm.dev.HibernateOrmDevController;
+import io.quarkus.hibernate.orm.dev.HibernateOrmDevInfo;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProvider;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevController;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevInfo;
 import io.quarkus.runtime.LaunchMode;
 
 public class HibernateOrmDevJsonRpcService {
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java
@@ -29,7 +29,6 @@
 import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.hibernate.orm.PersistenceUnit;
 import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDefinition;
-import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevIntegrator;
 import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
 import io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy;
 import io.quarkus.hibernate.orm.runtime.proxies.PreGeneratedProxies;
@@ -76,12 +75,10 @@ public void setupPersistenceProvider(
     public BeanContainerListener initMetadata(List<QuarkusPersistenceUnitDefinition> parsedPersistenceXmlDescriptors,
             Scanner scanner, Collection<Class<? extends Integrator>> additionalIntegrators) {
         SchemaManagementIntegrator.clearDsMap();
-        HibernateOrmDevIntegrator.clearPuMap();
         for (QuarkusPersistenceUnitDefinition i : parsedPersistenceXmlDescriptors) {
             if (i.getConfig().getDataSource().isPresent()) {
                 SchemaManagementIntegrator.mapDatasource(i.getConfig().getDataSource().get(), i.getName());
             }
-            HibernateOrmDevIntegrator.mapPersistenceUnit(i.getName(), i.getPersistenceUnitDescriptor());
         }
         return new BeanContainerListener() {
             @Override
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
@@ -27,22 +27,23 @@ public class JPAConfig {
 
     public static final String IS_REACTIVE_KEY = "isReactive";
 
-    private final Map<PersistenceUnitsHolder.RecordedStateKey, LazyPersistenceUnit> persistenceUnits = new HashMap<>();
+    private final Map<PersistenceUnitKey, LazyPersistenceUnit> persistenceUnits = new HashMap<>();
     private final Set<String> deactivatedPersistenceUnitNames = new HashSet<>();
     private final boolean requestScopedSessionEnabled;
 
     @Inject
     public JPAConfig(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig) {
-        for (QuarkusPersistenceUnitDescriptor descriptor : PersistenceUnitsHolder.getPersistenceUnitDescriptors()) {
+        for (Map.Entry<PersistenceUnitKey, QuarkusPersistenceUnitDescriptor> entry : PersistenceUnitsHolder
+                .getPersistenceUnits().entrySet()) {
+            QuarkusPersistenceUnitDescriptor descriptor = entry.getValue();
             String puName = descriptor.getName();
-            var puConfig = hibernateOrmRuntimeConfig.persistenceUnits().get(descriptor.getName());
+            var puConfig = hibernateOrmRuntimeConfig.persistenceUnits().get(puName);
             if (puConfig.active().isPresent() && !puConfig.active().get()) {
                 LOGGER.infof("Hibernate ORM persistence unit '%s' was deactivated through configuration properties",
                         puName);
                 deactivatedPersistenceUnitNames.add(puName);
             } else {
-                persistenceUnits.put(new PersistenceUnitsHolder.RecordedStateKey(puName, descriptor.isReactive()),
-                        new LazyPersistenceUnit(puName, descriptor.isReactive()));
+                persistenceUnits.put(entry.getKey(), new LazyPersistenceUnit(puName, descriptor.isReactive()));
             }
         }
         this.requestScopedSessionEnabled = hibernateOrmRuntimeConfig.requestScopedSessionEnabled();
@@ -57,7 +58,7 @@ void startAll() {
         //don't access the datasource directly, but only over HTTP calls
         boolean moreThanOneThread = persistenceUnits.size() > 1;
         //start PUs in parallel, for faster startup
-        for (Map.Entry<PersistenceUnitsHolder.RecordedStateKey, LazyPersistenceUnit> i : persistenceUnits.entrySet()) {
+        for (Map.Entry<PersistenceUnitKey, LazyPersistenceUnit> i : persistenceUnits.entrySet()) {
             CompletableFuture<Object> future = new CompletableFuture<>();
             start.add(future);
             new Thread(new Runnable() {
@@ -100,7 +101,7 @@ public EntityManagerFactory getEntityManagerFactory(String unitName, boolean rea
                 lazyPersistenceUnit = persistenceUnits.values().iterator().next();
             }
         } else {
-            lazyPersistenceUnit = persistenceUnits.get(new PersistenceUnitsHolder.RecordedStateKey(unitName, reactive));
+            lazyPersistenceUnit = persistenceUnits.get(new PersistenceUnitKey(unitName, reactive));
         }
 
         if (lazyPersistenceUnit == null) {
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitKey.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitKey.java
@@ -0,0 +1,4 @@
+package io.quarkus.hibernate.orm.runtime;
+
+public record PersistenceUnitKey(String name, boolean isReactive) {
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java
@@ -1,10 +1,11 @@
 package io.quarkus.hibernate.orm.runtime;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.integrator.spi.Integrator;
@@ -25,65 +26,63 @@ public final class PersistenceUnitsHolder {
     /**
      * Initialize JPA for use in Quarkus. In a native image. This must be called
      * from within a static init method.
-     *
+     * <p>
      * The scanner may be null to use the default scanner, or a custom scanner can be
      * used to stop Hibernate scanning. It is expected that the scanner will be
      * provided by Quarkus via its hold of Jandex info.
-     *
-     * @param puDefinitions
-     * @param scanner
      */
-    static void initializeJpa(List<QuarkusPersistenceUnitDefinition> puDefinitions,
-            Scanner scanner, Collection<Class<? extends Integrator>> additionalIntegrators,
+    static void initializeJpa(
+            List<QuarkusPersistenceUnitDefinition> puDefinitions,
+            Scanner scanner,
+            Collection<Class<? extends Integrator>> additionalIntegrators,
             PreGeneratedProxies preGeneratedProxies) {
-        final List<QuarkusPersistenceUnitDescriptor> units = convertPersistenceUnits(puDefinitions);
-        final Map<RecordedStateKey, RecordedState> metadata = constructMetadataAdvance(puDefinitions, scanner,
-                additionalIntegrators,
-                preGeneratedProxies);
-
-        persistenceUnits = new PersistenceUnits(units, metadata);
+        persistenceUnits = constructMetadataAdvance(puDefinitions, scanner, additionalIntegrators, preGeneratedProxies);
     }
 
-    public static List<QuarkusPersistenceUnitDescriptor> getPersistenceUnitDescriptors() {
+    public static Map<PersistenceUnitKey, QuarkusPersistenceUnitDescriptor> getPersistenceUnits() {
         checkJPAInitialization();
         return persistenceUnits.units;
     }
 
-    public static RecordedState popRecordedState(String persistenceUnitName, boolean isReactive) {
-        checkJPAInitialization();
-        RecordedStateKey key = new RecordedStateKey(persistenceUnitName, isReactive);
-        if (persistenceUnitName == null) {
-            key = new RecordedStateKey(NO_NAME_TOKEN, isReactive);
-        }
-        return persistenceUnits.recordedStates.remove(key);
+    public static Collection<QuarkusPersistenceUnitDescriptor> getPersistenceUnitDescriptors() {
+        return getPersistenceUnits().values();
     }
 
-    private static List<QuarkusPersistenceUnitDescriptor> convertPersistenceUnits(
-            final List<QuarkusPersistenceUnitDefinition> parsedPersistenceXmlDescriptors) {
-        return parsedPersistenceXmlDescriptors.stream().map(QuarkusPersistenceUnitDefinition::getPersistenceUnitDescriptor)
-                .collect(Collectors.toList());
+    public static QuarkusPersistenceUnitDescriptor getPersistenceUnitDescriptor(String persistenceUnitName,
+            boolean isReactive) {
+        checkJPAInitialization();
+        return persistenceUnits.units.get(new PersistenceUnitKey(unitName(persistenceUnitName), isReactive));
     }
 
-    record RecordedStateKey(String name, boolean isReactive) {
+    public static RecordedState popRecordedState(String persistenceUnitName, boolean isReactive) {
+        checkJPAInitialization();
+        PersistenceUnitKey key = new PersistenceUnitKey(unitName(persistenceUnitName), isReactive);
+        return persistenceUnits.recordedStates.remove(key);
     }
 
-    private static Map<RecordedStateKey, RecordedState> constructMetadataAdvance(
+    private static PersistenceUnits constructMetadataAdvance(
             final List<QuarkusPersistenceUnitDefinition> parsedPersistenceXmlDescriptors, Scanner scanner,
             Collection<Class<? extends Integrator>> additionalIntegrators,
             PreGeneratedProxies proxyClassDefinitions) {
-        Map<RecordedStateKey, RecordedState> recordedStates = new HashMap<>();
+        int size = parsedPersistenceXmlDescriptors.size();
+        Map<PersistenceUnitKey, QuarkusPersistenceUnitDescriptor> units = new HashMap<>(size);
+        Map<PersistenceUnitKey, RecordedState> recordedStates = new HashMap<>(size);
 
         for (QuarkusPersistenceUnitDefinition unit : parsedPersistenceXmlDescriptors) {
-            RecordedState m = createMetadata(unit, scanner, additionalIntegrators, proxyClassDefinitions);
-            String name = unitName(unit);
-            RecordedStateKey key = new RecordedStateKey(name, unit.isReactive());
-            Object previous = recordedStates.put(key, m);
+            PersistenceUnitKey key = new PersistenceUnitKey(unitName(unit.getName()), unit.isReactive());
+            Object previous = units.put(key, unit.getPersistenceUnitDescriptor());
             if (previous != null) {
-                throw new IllegalStateException("Duplicate persistence unit name: " + unit.getName());
+                throw new IllegalStateException(String.format(
+                        Locale.ROOT,
+                        "Duplicate persistence unit name: %s",
+                        unit.getName() + (unit.isReactive() ? " (reactive)" : "")));
             }
+
+            RecordedState metadata = createMetadata(unit, scanner, additionalIntegrators, proxyClassDefinitions);
+            recordedStates.put(key, metadata);
         }
 
-        return recordedStates;
+        return new PersistenceUnits(units, recordedStates);
     }
 
     private static void checkJPAInitialization() {
@@ -92,8 +91,7 @@ private static void checkJPAInitialization() {
         }
     }
 
-    private static String unitName(QuarkusPersistenceUnitDefinition unit) {
-        String name = unit.getName();
+    private static String unitName(String name) {
         if (name == null) {
             return NO_NAME_TOKEN;
         }
@@ -109,13 +107,13 @@ public static RecordedState createMetadata(QuarkusPersistenceUnitDefinition unit
 
     private static class PersistenceUnits {
 
-        private final List<QuarkusPersistenceUnitDescriptor> units;
+        private final Map<PersistenceUnitKey, QuarkusPersistenceUnitDescriptor> units;
 
-        private final Map<RecordedStateKey, RecordedState> recordedStates;
+        private final Map<PersistenceUnitKey, RecordedState> recordedStates;
 
-        public PersistenceUnits(final List<QuarkusPersistenceUnitDescriptor> units,
-                final Map<RecordedStateKey, RecordedState> recordedStates) {
-            this.units = units;
+        public PersistenceUnits(final Map<PersistenceUnitKey, QuarkusPersistenceUnitDescriptor> units,
+                final Map<PersistenceUnitKey, RecordedState> recordedStates) {
+            this.units = Collections.unmodifiableMap(units);
             this.recordedStates = recordedStates;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.quarkus.hibernate.orm.runtime.dev;`
	`1`	`+package io.quarkus.hibernate.orm.dev;`
`2`	`2`
`3`	`3`	`import java.io.PrintWriter;`
`4`	`4`	`import java.io.StringWriter;`