Merge pull request #50453 from Aryant-Tripathi/issue-50138-hibernate-orm-named-qualifier

issue-50138-hibernate-orm-named-qualifier

Author: geoand

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

@@ -393,10 +393,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;
 
@@ -55,6 +56,24 @@ public class MultiplePersistenceUnitsCdiEntityManagerTest {
     @Named("inventory")
     SessionFactory inventoryFactory;
 
+    @Inject
+    @PersistenceUnit("<default>")
+    EntityManager defaultEntityManagerWithQualifier;
+
+    @Inject
+    @PersistenceUnit("<default>")
+    SessionFactory defaultSessionFactoryWithQualifier;
+
+    @Inject
+    @Named("<default>")
+    @PersistenceUnit("<default>")
+    EntityManager defaultEntityManagerWithBothQualifiers;
+
+    @Inject
+    @Named("<default>")
+    @PersistenceUnit("<default>")
+    SessionFactory defaultSessionFactoryWithBothQualifiers;
+
     @Test
     @Transactional
     public void defaultEntityManagerInTransaction() {
@@ -167,4 +186,20 @@ public void testUserInInventoryEntityManager() {
         assertThatThrownBy(() -> inventoryEntityManager.persist(user)).isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("Unknown entity type");
     }
+
+    @Test
+    public void defaultQualifiedEntityManagerAndSessionFactoryAreInjected() {
+        Assertions.assertNotNull(defaultEntityManagerWithQualifier,
+                "@PersistenceUnit(\"<default>\") EntityManager should be injected and non-null");
+        Assertions.assertNotNull(defaultSessionFactoryWithQualifier,
+                "@PersistenceUnit(\"<default>\") SessionFactory should be injected and non-null");
+    }
+
+    @Test
+    public void defaultEntityManagerAndSessionFactoryWithBothQualifiersAreInjected() {
+        Assertions.assertNotNull(defaultEntityManagerWithBothQualifiers,
+                "EntityManager should be injectable with both @Named and @PersistenceUnit qualifiers for <default>");
+        Assertions.assertNotNull(defaultSessionFactoryWithBothQualifiers,
+                "SessionFactory should be injectable with both @Named and @PersistenceUnit qualifiers for <default>");
+    }
 }