HSEARCH-5367 Upgrade to Hibernate ORM 7.0.0.CR1

marko-bekhta · marko-bekhta · commit 625536d01c4b · 2025-04-25T16:13:41.000+02:00
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -94,8 +94,8 @@
             NOTE: when Hibernate ORM updates Byte Buddy, make sure to check Jenkinsfile to see if
             `net.bytebuddy.experimental` property can be removed.
          -->
-        <version.org.hibernate.orm>7.0.0.Beta5</version.org.hibernate.orm>
-        <version.org.hibernate.models>0.9.3</version.org.hibernate.models>
+        <version.org.hibernate.orm>7.0.0.CR1</version.org.hibernate.orm>
+        <version.org.hibernate.models>1.0.0.CR1</version.org.hibernate.models>
 
         <javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
         <documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java
@@ -9,13 +9,14 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.annotations.Target;
+import org.hibernate.annotations.TargetEmbeddable;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
@@ -38,7 +39,8 @@ public class Address {
 	private String street;
 
 	@IndexedEmbedded(depth = 1, prefix = "ownedBy_", targetElement = Owner.class)
-	@Target(Owner.class)
+	@TargetEmbeddable(Owner.class)
+	@Embedded
 	private Person ownedBy;
 
 	@ElementCollection
diff --git a/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java
@@ -8,8 +8,9 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.hibernate.ConnectionAcquisitionMode;
+import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.Session;
-import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.search.engine.backend.common.spi.EntityReferenceFactory;
 import org.hibernate.search.engine.backend.common.spi.MultiEntityOperationExecutionReport;
 import org.hibernate.search.engine.backend.work.execution.OperationSubmitter;
@@ -66,8 +67,7 @@ public CompletableFuture<MultiEntityOperationExecutionReport> sendAndReport(Oper
 		try ( Session temporarySession = session.sessionWithOptions()
 				.connection()
 				.autoClose( false )
-				.connectionHandlingMode(
-						PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION )
+				.connectionHandling( ConnectionAcquisitionMode.AS_NEEDED, ConnectionReleaseMode.AFTER_TRANSACTION )
 				.openSession() ) {
 			return sendAndReportOnSession( temporarySession, entityReferenceFactory );
 		}
diff --git a/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/AdditionalMappingBuilder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/AdditionalMappingBuilder.java
@@ -28,16 +28,16 @@
 import org.hibernate.models.internal.MutableClassDetailsRegistry;
 import org.hibernate.models.internal.jdk.JdkBuilders;
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.MutableClassDetails;
 import org.hibernate.models.spi.MutableMemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
 
 public class AdditionalMappingBuilder {
 
 	private final MetadataBuildingContext buildingContext;
 	private final Class<?> type;
 	private final String name;
-	private final List<BiConsumer<SourceModelBuildingContext, MutableClassDetails>> contributors = new ArrayList<>();
+	private final List<BiConsumer<ModelsContext, MutableClassDetails>> contributors = new ArrayList<>();
 
 	public AdditionalMappingBuilder(MetadataBuildingContext buildingContext, Class<?> type, String name) {
 		this.buildingContext = buildingContext;
@@ -134,7 +134,7 @@ public AdditionalMappingBuilder id(Integer type, String strategy) {
 	}
 
 	public ClassDetails build() {
-		SourceModelBuildingContext context = buildingContext.getBootstrapContext().getModelsContext();
+		ModelsContext context = buildingContext.getBootstrapContext().getModelsContext();
 		final MutableClassDetails classDetails = JdkBuilders.buildClassDetailsStatic(
 				type,
 				context
@@ -151,7 +151,7 @@ public ClassDetails build() {
 		);
 		accessUsage.value( AccessType.FIELD );
 
-		for ( BiConsumer<SourceModelBuildingContext, MutableClassDetails> contributor : contributors ) {
+		for ( BiConsumer<ModelsContext, MutableClassDetails> contributor : contributors ) {
 			contributor.accept( context, classDetails );
 		}
 
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/ConditionalExpressionQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/ConditionalExpressionQueryFactory.java
@@ -93,6 +93,7 @@ private <T> Query<T> createQueryWithConditionalExpressionsOrOrder(SharedSessionC
 		if ( order != null ) {
 			hqlBuilder.append( " order by " ).append( order );
 		}
+		@SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 		Query<T> query = session.createQuery( hqlBuilder.toString(), returnedType );
 		for ( ConditionalExpression expression : conditionalExpressions ) {
 			expression.applyParams( query );
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/CriteriaTypeQueryFactory.java
@@ -36,6 +36,7 @@ private CriteriaTypeQueryFactory(Class<E> entityClass,
 		this.entityClass = entityClass;
 	}
 
+	@SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 	@Override
 	public Query<Long> createQueryForCount(SharedSessionContractImplementor session,
 			Set<? extends Class<? extends E>> includedTypesFilter) {
@@ -49,6 +50,7 @@ public Query<Long> createQueryForCount(SharedSessionContractImplementor session,
 		return session.createQuery( criteriaQuery );
 	}
 
+	@SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 	@Override
 	public Query<I> createQueryForIdentifierListing(SharedSessionContractImplementor session,
 			Set<? extends Class<? extends E>> includedTypesFilter) {
@@ -64,7 +66,7 @@ public Query<I> createQueryForIdentifierListing(SharedSessionContractImplementor
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "removal", "deprecation" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 	public Query<E> createQueryForLoadByUniqueProperty(SessionImplementor session, String parameterName) {
 		CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
 		ParameterExpression<Collection> idsParameter = criteriaBuilder.parameter( Collection.class, parameterName );
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HqlTypeQueryFactory.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HqlTypeQueryFactory.java
@@ -41,7 +41,7 @@ public Query<I> createQueryForIdentifierListing(SharedSessionContractImplementor
 				uniquePropertyType, "e", includedTypesFilter );
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 	@Override
 	public Query<E> createQueryForLoadByUniqueProperty(SessionImplementor session, String parameterName) {
 		return session.createQuery(
@@ -62,6 +62,7 @@ private <T> Query<T> createQueryWithTypesFilter(SharedSessionContractImplementor
 		if ( !includedTypesFilter.isEmpty() ) {
 			hql += " where type(" + entityAlias + ") in (:types)";
 		}
+		@SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces
 		Query<T> query = session.createQuery( hql, returnedType );
 		if ( !includedTypesFilter.isEmpty() ) {
 			query.setParameterList( "types", includedTypesFilter );
diff --git a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/AbstractHibernateOrmBootstrapIntrospectorPerReflectionStrategyTest.java b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/AbstractHibernateOrmBootstrapIntrospectorPerReflectionStrategyTest.java
@@ -22,8 +22,8 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
-import org.hibernate.models.internal.BasicModelBuildingContextImpl;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.internal.BasicModelsContextImpl;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.search.util.common.impl.Closer;
 import org.hibernate.search.util.common.reflect.spi.ValueHandleFactory;
 
@@ -74,12 +74,12 @@ final HibernateOrmBootstrapIntrospector createIntrospector(ValueHandleFactory va
 		);
 	}
 
-	public static SourceModelBuildingContext createModelBuildingContext(BootstrapContext bootstrapContext) {
+	public static ModelsContext createModelBuildingContext(BootstrapContext bootstrapContext) {
 		ClassLoaderService classLoaderService =
 				getServiceOrEmpty( bootstrapContext.getServiceRegistry(), ClassLoaderService.class )
 						.orElseThrow();
 		ClassLoaderServiceLoading classLoading = new ClassLoaderServiceLoading( classLoaderService );
-		return new BasicModelBuildingContextImpl(
+		return new BasicModelsContextImpl(
 				classLoading,
 				ModelsHelper::preFillRegistries
 		);
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/models/spi/AbstractPojoModelsBootstrapIntrospector.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/models/spi/AbstractPojoModelsBootstrapIntrospector.java
@@ -20,8 +20,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.hibernate.models.internal.BasicModelBuildingContextImpl;
-import org.hibernate.models.jandex.internal.JandexModelBuildingContextImpl;
+import org.hibernate.models.internal.BasicModelsContextImpl;
+import org.hibernate.models.jandex.internal.JandexModelsContextImpl;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
@@ -59,12 +59,13 @@ protected AbstractPojoModelsBootstrapIntrospector(ClassDetailsRegistry classDeta
 
 	private static ClassDetailsRegistry simpleClassDetailsRegistry(ClassResolver classResolver, IndexView indexView) {
 		if ( indexView == null ) {
-			return new BasicModelBuildingContextImpl(
-					new HibernateSearchClassLoading( classResolver )
+			return new BasicModelsContextImpl(
+					new HibernateSearchClassLoading( classResolver ),
+					null
 			).getClassDetailsRegistry();
 		}
 		else {
-			return new JandexModelBuildingContextImpl(
+			return new JandexModelsContextImpl(
 					indexView,
 					new HibernateSearchClassLoading( classResolver ),
 					null
@@ -190,11 +191,6 @@ public <T> Class<T> findClassForName(String name) {
 			}
 		}
 
-		@Override
-		public Package packageForName(String name) {
-			return delegate.packageForName( name );
-		}
-
 		@Override
 		public URL locateResource(String resourceName) {
 			return delegate.locateResource( resourceName );
diff --git a/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmSoftAssertions.java b/util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/OrmSoftAssertions.java
@@ -7,12 +7,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import org.hibernate.Session;
 import org.hibernate.SessionEventListener;
 import org.hibernate.SessionFactory;
-import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.stat.Statistics;
 
 import org.assertj.core.api.AbstractIntegerAssert;
@@ -34,7 +34,7 @@ public static void assertWithinSession(SessionFactory sessionFactory,
 	}
 
 	private final Statistics statistics;
-	private final StatementInspector statementInspector;
+	private final UnaryOperator<String> statementInspector;
 	private final SessionEventListener sessionEventListener;
 
 	private int statementExecutionCount = 0;
diff --git a/v5migrationhelper/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java b/v5migrationhelper/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java
@@ -6,7 +6,10 @@
 
 import java.sql.Connection;
 import java.util.TimeZone;
+import java.util.function.UnaryOperator;
 
+import org.hibernate.ConnectionAcquisitionMode;
+import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.FlushMode;
 import org.hibernate.Interceptor;
 import org.hibernate.SessionEventListener;
@@ -90,6 +93,12 @@ public FullTextSharedSessionBuilder autoClose(boolean autoClose) {
 		return this;
 	}
 
+	@Override
+	public FullTextSharedSessionBuilder identifierRollback(boolean identifierRollback) {
+		builder.identifierRollback( identifierRollback );
+		return this;
+	}
+
 	@Override
 	public FullTextSession openSession() {
 		return Search.getFullTextSession( builder.openSession() );
@@ -126,6 +135,12 @@ public FullTextSharedSessionBuilder statementInspector(StatementInspector statem
 		return this;
 	}
 
+	@Override
+	public FullTextSharedSessionBuilder statementInspector(UnaryOperator<String> operator) {
+		builder.statementInspector( operator );
+		return this;
+	}
+
 	@Override
 	public FullTextSharedSessionBuilder connectionHandlingMode() {
 		builder.connectionHandlingMode();
@@ -144,6 +159,13 @@ public FullTextSharedSessionBuilder connectionHandlingMode(PhysicalConnectionHan
 		return this;
 	}
 
+	@Override
+	public FullTextSharedSessionBuilder connectionHandling(ConnectionAcquisitionMode acquisitionMode,
+			ConnectionReleaseMode releaseMode) {
+		builder.connectionHandling( acquisitionMode, releaseMode );
+		return this;
+	}
+
 	@Override
 	public FullTextSharedSessionBuilder autoClear(boolean autoClear) {
 		builder.autoClear( autoClear );

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ private <T> Query<T> createQueryWithConditionalExpressionsOrOrder(SharedSessionC`
`93`	`93`	`if ( order != null ) {`
`94`	`94`	`hqlBuilder.append( " order by " ).append( order );`
`95`	`95`	`}`
	`96`	`+ @SuppressWarnings({ "deprecation", "removal" }) // QueryProducerImplementor is marked for removal, while the createQuery() is also present in other interfaces`
`96`	`97`	`Query<T> query = session.createQuery( hqlBuilder.toString(), returnedType );`
`97`	`98`	`for ( ConditionalExpression expression : conditionalExpressions ) {`
`98`	`99`	`expression.applyParams( query );`