Merge pull request #47855 from yrodiere/orm-metamodel

Do not expose Hibernate-specific metamodels through CDI

Author: yrodiere

docs/src/main/asciidoc/hibernate-orm.adoc

@@ -514,12 +514,6 @@ HibernateCriteriaBuilder hibernateCriteriaBuilder;
 @Inject
 Metamodel metamodel;
 
-@Inject
-org.hibernate.Metamodel metamodel;
-
-@Inject
-JpaMetamodel jpaMetamodel;
-
 @Inject
 Cache cache;
 

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

@@ -57,8 +57,6 @@ private static DotName createConstant(String fqcn) {
     public static final DotName HIBERNATE_CRITERIA_BUILDER = createConstant(
             "org.hibernate.query.criteria.HibernateCriteriaBuilder");
     public static final DotName METAMODEL = createConstant("jakarta.persistence.metamodel.Metamodel");
-    public static final DotName HIBERNATE_METAMODEL = createConstant("org.hibernate.Metamodel");
-    public static final DotName JPA_METAMODEL = createConstant("org.hibernate.metamodel.model.domain.JpaMetamodel");
     public static final DotName SCHEMA_MANAGER = createConstant("org.hibernate.relational.SchemaManager");
     public static final DotName CACHE = createConstant("jakarta.persistence.Cache");
     public static final DotName HIBERNATE_CACHE = createConstant("org.hibernate.Cache");

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

@@ -86,8 +86,7 @@ public class HibernateOrmCdiProcessor {
     private static final List<DotName> STATELESS_SESSION_EXPOSED_TYPES = List.of(ClassNames.STATELESS_SESSION);
     private static final List<DotName> CRITERIA_BUILDER_EXPOSED_TYPES = List.of(ClassNames.CRITERIA_BUILDER,
             ClassNames.HIBERNATE_CRITERIA_BUILDER);
-    private static final List<DotName> METAMODEL_EXPOSED_TYPES = List.of(ClassNames.METAMODEL, ClassNames.JPA_METAMODEL,
-            ClassNames.HIBERNATE_METAMODEL);
+    private static final List<DotName> METAMODEL_EXPOSED_TYPES = List.of(ClassNames.METAMODEL);
     private static final List<DotName> SCHEMA_MANAGER_EXPOSED_TYPES = List.of(ClassNames.SCHEMA_MANAGER);
     private static final List<DotName> CACHE_EXPOSED_TYPES = List.of(ClassNames.CACHE, ClassNames.HIBERNATE_CACHE);
     private static final List<DotName> PERSISTENCE_UNIT_UTIL_EXPOSED_TYPES = List.of(ClassNames.PERSISTENCE_UNIT_UTIL);
@@ -471,7 +470,7 @@ private void produceFactoryDependentBeans(
         // Create Metamodel bean
         producer.produce(createSyntheticBean(persistenceUnitName,
                 isDefaultPU, isNamedPU,
-                org.hibernate.Metamodel.class, METAMODEL_EXPOSED_TYPES, false)
+                jakarta.persistence.metamodel.Metamodel.class, METAMODEL_EXPOSED_TYPES, false)
                 .createWith(recorder.metamodelSupplier(persistenceUnitName))
                 .addInjectionPoint(ClassType.create(DotName.createSimple(SessionFactory.class)),
                         sessionFactoryQualifier)

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

@@ -8,7 +8,6 @@
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.Metamodel;
 
-import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -35,18 +34,10 @@ public class MultiplePersistenceUnitsCdiMetamodelTest {
     @PersistenceUnit("users")
     Metamodel usersMetamodel;
 
-    @Inject
-    @PersistenceUnit("users")
-    JpaMetamodel usersJpaMetamodel;
-
     @Inject
     @PersistenceUnit("inventory")
     Metamodel inventoryMetamodel;
 
-    @Inject
-    @PersistenceUnit("inventory")
-    org.hibernate.Metamodel hibernateInventoryMetamodel;
-
     @Test
     public void defaultMetamodel() {
         assertNotNull(defaultMetamodel);
@@ -68,16 +59,6 @@ public void usersMetamodel() {
         assertEquals(User.class.getSimpleName(), entityType.getName());
     }
 
-    @Test
-    public void usersJpaMetamodel() {
-        assertNotNull(usersJpaMetamodel);
-
-        EntityType<User> entityType = usersJpaMetamodel.entity(User.class);
-        assertNotNull(entityType);
-
-        assertEquals(User.class.getSimpleName(), entityType.getName());
-    }
-
     @Test
     public void inventoryMetamodel() {
         assertNotNull(inventoryMetamodel);
@@ -88,16 +69,6 @@ public void inventoryMetamodel() {
         assertEquals(Plane.class.getSimpleName(), entityType.getName());
     }
 
-    @Test
-    public void hibernateInventoryMetamodel() {
-        assertNotNull(hibernateInventoryMetamodel);
-
-        EntityType<Plane> entityType = hibernateInventoryMetamodel.entity(Plane.class);
-        assertNotNull(entityType);
-
-        assertEquals(Plane.class.getSimpleName(), entityType.getName());
-    }
-
     @Test
     public void testUserInInventoryMetamodel() {
         assertThatThrownBy(() -> {
@@ -106,11 +77,4 @@ public void testUserInInventoryMetamodel() {
                 .hasMessageContaining("Not an entity");
     }
 
-    @Test
-    public void testUserInHibernateInventoryMetamodel() {
-        assertThatThrownBy(() -> {
-            hibernateInventoryMetamodel.entity(User.class);
-        }).isInstanceOf(IllegalArgumentException.class)
-                .hasMessageContaining("Not an entity");
-    }
 }

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiMetamodelTest.java

@@ -8,7 +8,6 @@
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.Metamodel;
 
-import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -24,10 +23,6 @@ public class SinglePersistenceUnitCdiMetamodelTest {
 
     @Inject
     Metamodel metamodel;
-    @Inject
-    org.hibernate.Metamodel hibernateMetamodel;
-    @Inject
-    JpaMetamodel jpaMetamodel;
 
     @Test
     public void testMetamodel() {
@@ -41,27 +36,4 @@ public void testMetamodel() {
         assertEquals(DefaultEntity.class.getSimpleName(), entityType.getName());
     }
 
-    @Test
-    public void testHibernateMetamodel() {
-        assertNotNull(hibernateMetamodel);
-        EntityType<DefaultEntity> entityType = hibernateMetamodel.entity(DefaultEntity.class);
-        assertNotNull(entityType);
-        assertTrue(
-                hibernateMetamodel.getEntities().stream()
-                        .anyMatch(et -> et.getJavaType().equals(DefaultEntity.class)),
-                "Hibernate Metamodel should contain DefaultEntity");
-        assertEquals(DefaultEntity.class.getSimpleName(), entityType.getName());
-    }
-
-    @Test
-    public void testJpaMetamodel() {
-        assertNotNull(jpaMetamodel);
-        EntityType<DefaultEntity> entityType = jpaMetamodel.entity(DefaultEntity.class);
-        assertNotNull(entityType);
-        assertTrue(
-                jpaMetamodel.getEntities().stream()
-                        .anyMatch(et -> et.getJavaType().equals(DefaultEntity.class)),
-                "Hibernate Metamodel should contain DefaultEntity");
-        assertEquals(DefaultEntity.class.getSimpleName(), entityType.getName());
-    }
 }