Merge pull request #51052 from yrodiere/i50955

Prevent multiple contributions to Panache's "entityToPersistenceUnit"  from overriding each other

Author: FroMage

extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java

@@ -25,12 +25,22 @@
 import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
 
 public abstract class AbstractJpaOperations<PanacheQueryType> {
-    private static volatile Map<String, String> entityToPersistenceUnit = Collections.emptyMap();
-    private static volatile boolean entityToPersistenceUnitIsIncomplete = true;
-
-    public static void setEntityToPersistenceUnit(Map<String, String> map, boolean incomplete) {
-        entityToPersistenceUnit = Collections.unmodifiableMap(map);
-        entityToPersistenceUnitIsIncomplete = incomplete;
+    private static final Map<String, String> entityToPersistenceUnit = new HashMap<>();
+    private static volatile Boolean entityToPersistenceUnitIsIncomplete = null;
+
+    // Putting synchronized here because fields involved were marked as volatile initially,
+    // so I expect recorders can be called concurrently?
+    public static synchronized void addEntityTypesToPersistenceUnit(Map<String, String> map, boolean incomplete) {
+        // Note: this may be called multiple times if an app uses both Java and Kotlin.
+        // We don't really test what happens if entities are defined both in Java and Kotlin at the moment,
+        // so we mostly care about the case where this gets called once with an empty map, and once with a non-empty map:
+        // in that case, we don't want the empty map to erase the other one.
+        entityToPersistenceUnit.putAll(map);
+        if (entityToPersistenceUnitIsIncomplete == null) {
+            entityToPersistenceUnitIsIncomplete = incomplete;
+        } else {
+            entityToPersistenceUnitIsIncomplete = entityToPersistenceUnitIsIncomplete || incomplete;
+        }
     }
 
     protected abstract PanacheQueryType createPanacheQuery(Session session, String query, String originalQuery, String orderBy,
@@ -58,7 +68,7 @@ public Session getSession(Class<?> clazz) {
         String clazzName = clazz.getName();
         String persistentUnitName = entityToPersistenceUnit.get(clazzName);
         if (persistentUnitName == null) {
-            if (entityToPersistenceUnitIsIncomplete) {
+            if (entityToPersistenceUnitIsIncomplete == null || entityToPersistenceUnitIsIncomplete) {
                 // When using persistence.xml, `entityToPersistenceUnit` is most likely empty,
                 // so we'll just return the default PU and hope for the best.
                 // The error will be thrown later by Hibernate ORM if necessary;

extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java

@@ -165,7 +165,8 @@ private void processEntities(CombinedIndexBuildItem index,
 
             panacheEntityToPersistenceUnit.put(entityName, selectedPersistenceUnits.get(0));
         }
-        recorder.setEntityToPersistenceUnit(panacheEntityToPersistenceUnit, incomplete);
+        // This is called even if there are no entity types, so that Panache gets properly initialized.
+        recorder.addEntityTypesToPersistenceUnit(panacheEntityToPersistenceUnit, incomplete);
     }
 
     private void processRepositories(CombinedIndexBuildItem index,

extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheKotlinHibernateOrmRecorder.kt

@@ -5,10 +5,10 @@ import io.quarkus.runtime.annotations.Recorder
 
 @Recorder
 open class PanacheKotlinHibernateOrmRecorder {
-    open fun setEntityToPersistenceUnit(
+    open fun addEntityTypesToPersistenceUnit(
         entityToPersistenceUnit: Map<String?, String?>?,
         incomplete: Boolean,
     ) {
-        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit, incomplete)
+        AbstractJpaOperations.addEntityTypesToPersistenceUnit(entityToPersistenceUnit, incomplete)
     }
 }

extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java

@@ -141,7 +141,8 @@ void recordEntityToPersistenceUnit(Optional<JpaModelPersistenceUnitMappingBuildI
         for (EntityToPersistenceUnitBuildItem item : items) {
             map.put(item.getEntityClass(), item.getPersistenceUnitName());
         }
-        recorder.setEntityToPersistenceUnit(map,
+        // This is called even if there are no entity types, so that Panache gets properly initialized.
+        recorder.addEntityTypesToPersistenceUnit(map,
                 jpaModelPersistenceUnitMapping.map(JpaModelPersistenceUnitMappingBuildItem::isIncomplete)
                         // This happens if there is no persistence unit, in which case we definitely know this metadata is complete.
                         .orElse(false));

extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheHibernateOrmRecorder.java

@@ -7,7 +7,7 @@
 
 @Recorder
 public class PanacheHibernateOrmRecorder {
-    public void setEntityToPersistenceUnit(Map<String, String> entityToPersistenceUnit, boolean incomplete) {
-        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit, incomplete);
+    public void addEntityTypesToPersistenceUnit(Map<String, String> entityToPersistenceUnit, boolean incomplete) {
+        AbstractJpaOperations.addEntityTypesToPersistenceUnit(entityToPersistenceUnit, incomplete);
     }
 }

extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -23,10 +24,16 @@
 import io.smallrye.mutiny.Uni;
 
 public abstract class AbstractJpaOperations<PanacheQueryType> {
-    private static volatile Map<String, String> entityToPersistenceUnit = Collections.emptyMap();
-
-    public static void setEntityToPersistenceUnit(Map<String, String> map) {
-        entityToPersistenceUnit = Collections.unmodifiableMap(map);
+    private static final Map<String, String> entityToPersistenceUnit = new HashMap<>();
+
+    // Putting synchronized here because fields involved were marked as volatile initially,
+    // so I expect recorders can be called concurrently?
+    public static void addEntityTypesToPersistenceUnit(Map<String, String> map) {
+        // Note: this may be called multiple times if an app uses both Java and Kotlin.
+        // We don't really test what happens if entities are defined both in Java and Kotlin at the moment,
+        // so we mostly care about the case where this gets called once with an empty map, and once with a non-empty map:
+        // in that case, we don't want the empty map to erase the other one.
+        entityToPersistenceUnit.putAll(map);
     }
 
     // FIXME: make it configurable?

extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java

@@ -139,7 +139,8 @@ private void processEntities(CombinedIndexBuildItem index, BuildProducer<Bytecod
 
             panacheEntityToPersistenceUnit.put(entityName, selectedPersistenceUnits.get(0));
         }
-        recorder.setEntityToPersistenceUnit(panacheEntityToPersistenceUnit, incomplete);
+        // This is called even if there are no entity types, so that Panache gets properly initialized.
+        recorder.addEntityTypesToPersistenceUnit(panacheEntityToPersistenceUnit, incomplete);
     }
 
     private void processCompanions(CombinedIndexBuildItem index, BuildProducer<BytecodeTransformerBuildItem> transformers,

extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/runtime/PanacheKotlinReactiveRecorder.kt

@@ -5,10 +5,10 @@ import io.quarkus.runtime.annotations.Recorder
 
 @Recorder
 open class PanacheKotlinReactiveRecorder {
-    open fun setEntityToPersistenceUnit(
+    open fun addEntityTypesToPersistenceUnit(
         entityToPersistenceUnit: Map<String?, String?>?,
         incomplete: Boolean,
     ) {
-        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit)
+        AbstractJpaOperations.addEntityTypesToPersistenceUnit(entityToPersistenceUnit)
     }
 }

extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java

@@ -160,7 +160,8 @@ void recordEntityToPersistenceUnit(List<EntityToPersistenceUnitBuildItem> items,
         for (EntityToPersistenceUnitBuildItem item : items) {
             map.put(item.getEntityClass(), item.getPersistenceUnitName());
         }
-        recorder.setEntityToPersistenceUnit(map);
+        // This is called even if there are no entity types, so that Panache gets properly initialized.
+        recorder.addEntityTypesToPersistenceUnit(map);
     }
 
     @BuildStep

extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheHibernateReactiveRecorder.java

@@ -7,7 +7,7 @@
 
 @Recorder
 public class PanacheHibernateReactiveRecorder {
-    public void setEntityToPersistenceUnit(Map<String, String> entityToPersistenceUnit) {
-        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit);
+    public void addEntityTypesToPersistenceUnit(Map<String, String> entityToPersistenceUnit) {
+        AbstractJpaOperations.addEntityTypesToPersistenceUnit(entityToPersistenceUnit);
     }
 }