issue-50138-hibernate-orm-named-qualifier

Consistently apply @nAmed and @PersistenceUnit qualifiers to Hibernate ORM beans

Fixes #50138

Previously, the @nAmed and @PersistenceUnit qualifiers were added conditionally to Hibernate ORM beans. This change ensures that both qualifiers are always applied for every persistence unit, aligning the behavior with Hibernate Search and improving consistency and CDI injection reliability across the codebase.

Tests are updated to confirm that beans are correctly qualified and injected for each persistence unit.

Author: Aryant-Tripathi

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

@@ -374,10 +374,9 @@ private static <T> ExtendedBeanConfigurator createSyntheticBean(PersistenceUnitR
         if (defaultPuName || puRef.forceAllQualifiers) {
             configurator.addQualifier(Default.class);
         }
-        if (!defaultPuName || puRef.forceAllQualifiers) {
-            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", puRef.persistenceUnitName).done();
-            configurator.addQualifier().annotation(PersistenceUnit.class).addValue("value", puRef.persistenceUnitName).done();
-        }
+
+        configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", puRef.persistenceUnitName).done();
+        configurator.addQualifier().annotation(PersistenceUnit.class).addValue("value", puRef.persistenceUnitName).done();
 
         return configurator;
     }

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java

@@ -13,6 +13,7 @@
 import jakarta.transaction.Transactional;
 
 import org.hibernate.SessionFactory;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -167,4 +168,22 @@ public void testUserInInventoryEntityManager() {
         assertThatThrownBy(() -> inventoryEntityManager.persist(user)).isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("Unknown entity type");
     }
+
+    @Test
+    public void injectedEntityManagersAndSessionFactoriesAreProperlyQualified() {
+        Assertions.assertNotNull(usersEntityManager,
+                "@PersistenceUnit(\"users\") EntityManager should be injected and non-null");
+        Assertions.assertNotNull(inventoryEntityManager,
+                "@PersistenceUnit(\"inventory\") EntityManager should be injected and non-null");
+
+        Assertions.assertNotNull(usersFactory, "@Named(\"users\") SessionFactory should be injected and non-null");
+        Assertions.assertNotNull(inventoryFactory, "@Named(\"inventory\") SessionFactory should be injected and non-null");
+    }
+
+    @Test
+    public void injectedDefaultEntityManagerAndSessionFactoryAreNonNull() {
+
+        Assertions.assertNotNull(defaultEntityManager, "Default EntityManager should be injected and non-null");
+        Assertions.assertNotNull(defaultSessionFactory, "Default SessionFactory should be injected and non-null");
+    }
 }