#67 - Coordinate JPA 3.2 work in ORM

- remove local `hibernate-orm` module - add dependency on `hibernate-core:7.0.0-SNAPSHOT`
sebersole · Nov 9, 2023 · c693502 · c693502
1 parent 23a8b07
commit c693502
Show file tree

Hide file tree

Showing 106 changed files with 23 additions and 7,947 deletions.
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/SimpleClassLoading.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/SimpleClassLoading.java
@@ -6,7 +6,6 @@
  */
 package org.hibernate.models.internal;
 
-import java.lang.instrument.UnmodifiableClassException;
 import java.net.URL;
 
 import org.hibernate.models.spi.ClassLoading;

diff --git a/hibernate-models-orm/hibernate-models-orm.gradle b/hibernate-models-orm/hibernate-models-orm.gradle
@@ -1,10 +1,16 @@
 apply from: rootProject.file( "gradle/java-module.gradle" )
 
+configurations.api {
+    // temporarily limit caching for hibernate-core SNAPSHOT
+    resolutionStrategy.cacheChangingModulesFor 10, 'minutes'
+}
+
 dependencies {
+    api platform( libs.hibernatePlatform )
+    api libs.hibernateCore
+
     implementation project( ":hibernate-models-common" )
     implementation project( ":hibernate-models-source" )
-
-    implementation project( ":hibernate-orm" )
     implementation libs.jandex
     implementation libs.byteBuddy
     implementation libs.classmate

diff --git a/...m/src/main/java/org/hibernate/models/orm/categorize/internal/GlobalRegistrationsImpl.java b/...m/src/main/java/org/hibernate/models/orm/categorize/internal/GlobalRegistrationsImpl.java
@@ -438,7 +438,7 @@ public void collectFilterDefinitions(List<JaxbFilterDefImpl> filterDefinitions)
 
 		filterDefinitions.forEach( (filterDefinition) -> collectFilterDefinition(
 				filterDefinition.getName(),
-				filterDefinition.getCondition(),
+				filterDefinition.getDefaultCondition(),
 				extractFilterParameters( filterDefinition )
 		) );
 	}

diff --git a/...m/src/main/java/org/hibernate/models/orm/categorize/xml/internal/XmlAnnotationHelper.java b/...m/src/main/java/org/hibernate/models/orm/categorize/xml/internal/XmlAnnotationHelper.java
@@ -286,7 +286,7 @@ public static void applyUserType(
 		final DynamicAnnotationUsage<Type> typeAnn = new DynamicAnnotationUsage<>( Type.class, memberDetails );
 		memberDetails.addAnnotationUsage( typeAnn );
 
-		final ClassDetails userTypeImpl = resolveJavaType( jaxbType.getType(), buildingContext );
+		final ClassDetails userTypeImpl = resolveJavaType( jaxbType.getValue(), buildingContext );
 		typeAnn.setAttributeValue( "value", userTypeImpl );
 		typeAnn.setAttributeValue( "parameters", collectParameters( jaxbType.getParameters(), memberDetails ) );
 	}
@@ -904,8 +904,8 @@ static <A extends Annotation> void applyCustomSql(
 			annotation.setAttributeValue( "sql", jaxbCustomSql.getValue() );
 			annotation.setAttributeValue( "callable", jaxbCustomSql.isCallable() );
 			applyAttributeIfSpecified( annotation, "table", jaxbCustomSql.getTable() );
-			if ( jaxbCustomSql.getCheck() != null ) {
-				annotation.setAttributeValue( "check", getResultCheckStyle( jaxbCustomSql.getCheck() ) );
+			if ( jaxbCustomSql.getResultCheck() != null ) {
+				annotation.setAttributeValue( "check", getResultCheckStyle( jaxbCustomSql.getResultCheck() ) );
 			}
 		}
 	}

diff --git a/...models-orm/src/main/java/org/hibernate/models/orm/categorize/xml/spi/XmlPreProcessor.java b/...models-orm/src/main/java/org/hibernate/models/orm/categorize/xml/spi/XmlPreProcessor.java
@@ -7,7 +7,7 @@
 package org.hibernate.models.orm.categorize.xml.spi;
 
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
-import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
+import org.hibernate.boot.jaxb.spi.JaxbBindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.models.orm.categorize.xml.internal.XmlPreProcessingResultImpl;
@@ -26,7 +26,7 @@ public class XmlPreProcessor {
 	public static XmlPreProcessingResult preProcessXmlResources(ManagedResources managedResources) {
 		final XmlPreProcessingResultImpl collected = new XmlPreProcessingResultImpl();
 
-		for ( Binding<BindableMappingDescriptor> mappingXmlBinding : managedResources.getXmlMappingBindings() ) {
+		for ( Binding<JaxbBindableMappingDescriptor> mappingXmlBinding : managedResources.getXmlMappingBindings() ) {
 			collected.addDocument( (JaxbEntityMappingsImpl) mappingXmlBinding.getRoot() );
 		}
 

diff --git a/...rnate-models-orm/src/test/java/org/hibernate/models/orm/process/ManagedResourcesImpl.java b/...rnate-models-orm/src/test/java/org/hibernate/models/orm/process/ManagedResourcesImpl.java
@@ -15,7 +15,6 @@
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.internal.MappingBinder;
-import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.jaxb.spi.JaxbBindableMappingDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
@@ -59,7 +58,7 @@ public Collection<String> getAnnotatedPackageNames() {
 	}
 
 	@Override
-	public Collection<Binding<BindableMappingDescriptor>> getXmlMappingBindings() {
+	public Collection<Binding<JaxbBindableMappingDescriptor>> getXmlMappingBindings() {
 		if ( xmlMappings == null ) {
 			return Collections.emptyList();
 		}

diff --git a/hibernate-models-orm/src/test/resources/mappings/complete/simple-complete.xml b/hibernate-models-orm/src/test/resources/mappings/complete/simple-complete.xml
@@ -7,11 +7,12 @@
   -->
 <entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 version="3.1">
+                 version="3.2">
     <entity class="org.hibernate.models.orm.xml.SimpleEntity" metadata-complete="true" access="FIELD">
         <sql-restriction>name is not null</sql-restriction>
-        <sql-insert callable="true" check="rowcount" table="SimpleEntity">insert into SimpleEntity(name) values(?)</sql-insert>
-        <filter name="name_filter" condition="{t}.name = :name">
+        <sql-insert callable="true" result-check="COUNT" table="SimpleEntity">insert into SimpleEntity(name) values(?)</sql-insert>
+        <filter name="name_filter">
+            <condition>{t}.name = :name</condition>
             <aliases alias="t" table="SimpleEntity" entity="org.hibernate.models.orm.xml.SimpleEntity"/>
          </filter>
 

diff --git a/hibernate-models-orm/src/test/resources/mappings/dynamic/dynamic-semi-simple.xml b/hibernate-models-orm/src/test/resources/mappings/dynamic/dynamic-semi-simple.xml
@@ -13,7 +13,7 @@
                 <target>Integer</target>
                 <jdbc-type-name>BIGINT</jdbc-type-name>
             </id>
-            <element-collection name="labels" target-class="string" classification="set">
+            <element-collection name="labels" target-class="string" classification="SET">
                 <sort-natural/>
                 <collection-table name="labels">
                     <join-column name="contact_fk"/>

diff --git a/hibernate-models-orm/src/test/resources/mappings/globals.xml b/hibernate-models-orm/src/test/resources/mappings/globals.xml
@@ -7,7 +7,7 @@
   -->
 <entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 version="3.1">
+                 version="3.2">
     <persistence-unit-metadata>
         <persistence-unit-defaults>
             <entity-listeners>
@@ -25,11 +25,11 @@
     <conversion converter="org.hibernate.type.YesNoConverter" class="boolean" auto-apply="true"/>
 
     <filter-def name="amount_filter">
+        <default-condition>amount = :amount</default-condition>
         <filter-param name="amount" type="int"/>
-        <condition>amount = :amount</condition>
     </filter-def>
     <filter-def name="name_filter">
+        <default-condition>name = :name</default-condition>
         <filter-param name="name" type="string"/>
-        <condition>name = :name</condition>
     </filter-def>
 </entity-mappings>
diff --git a/hibernate-orm/hibernate-orm.gradle b/hibernate-orm/hibernate-orm.gradle
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/internal/Abstract.java b/hibernate-orm/src/main/java/org/hibernate/boot/internal/Abstract.java
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/internal/CollectionClassification.java b/hibernate-orm/src/main/java/org/hibernate/boot/internal/CollectionClassification.java
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/internal/Extends.java b/hibernate-orm/src/main/java/org/hibernate/boot/internal/Extends.java
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java b/hibernate-orm/src/main/java/org/hibernate/boot/internal/LimitedCollectionClassification.java
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/internal/Target.java b/hibernate-orm/src/main/java/org/hibernate/boot/internal/Target.java