HSEARCH-5380 Upgrade to Hibernate ORM 7.0.0.CR2 / HSEARCH-5383 Upgrade to Hibernate ORM 7.0.0.Final

build/config/pom.xml

@@ -96,11 +96,6 @@
                                             <artifact>jakarta.persistence:jakarta.persistence-api</artifact>
                                             <failOnNotFound>true</failOnNotFound>
                                         </item>
-                                        <item>
-                                            <property>${version.org.hibernate.models}</property>
-                                            <artifact>org.hibernate.models:hibernate-models</artifact>
-                                            <failOnNotFound>true</failOnNotFound>
-                                        </item>
                                     </propertiesToCheck>
                                 </versionAlignRule>
                             </rules>
@@ -232,6 +227,7 @@
                                     This would mean that a corresponding pattern will only be applied to filtering of internal/public rules.
                                     If no prefix is specified then rule is considered to be both public and internal at the same time.
                                 -->
+
                                 <argument>^org\.hibernate\.query\.Query$</argument>
                                 <argument>^org\.hibernate\.query\.SelectionQuery$</argument>
                                 <argument>^org\.hibernate\.query\.MutationQuery$</argument>
@@ -243,6 +239,7 @@
                                 <argument>^org\.hibernate\.metamodel\.mapping\.SelectableMapping$</argument>
                                 <argument>^org\.hibernate\.metamodel\.mapping\.SelectablePath$</argument>
                                 <argument>^org\.hibernate\.metamodel\.model\.domain\.JpaMetamodel$</argument>
+                                <argument>^org\.hibernate\.metamodel\.model\.domain\.NavigableRole$</argument>
 
                                 <argument>^org\.hibernate\.boot\.spi\.BootstrapContext\b.*+$</argument>
                                 <argument>^org\.hibernate\.boot\.spi\.AdditionalMappingContributor$</argument>

build/parents/build/pom.xml

@@ -94,8 +94,7 @@
             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.CR1</version.org.hibernate.orm>
-        <version.org.hibernate.models>1.0.0.CR1</version.org.hibernate.models>
+        <version.org.hibernate.orm>7.0.0.Final</version.org.hibernate.orm>
 
         <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>
@@ -407,11 +406,6 @@
                 <artifactId>jboss-logging</artifactId>
                 <version>${version.org.jboss.logging.jboss-logging}</version>
             </dependency>
-            <dependency>
-                <groupId>org.hibernate.models</groupId>
-                <artifactId>hibernate-models-jandex</artifactId>
-                <version>${version.org.hibernate.models}</version>
-            </dependency>
 
             <!-- Other public dependencies -->
             <!-- Elasticsearch backend -->

engine/src/main/java/org/hibernate/search/engine/environment/classpath/spi/ClassResolver.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.search.engine.environment.classpath.spi;
 
-import java.net.URL;
-import java.util.Collection;
 
 import org.hibernate.search.util.common.annotation.Incubating;
 
@@ -37,24 +35,4 @@ public interface ClassResolver {
 	@Incubating
 	Package packageForName(String packageName);
 
-	/**
-	 * Locate a resource by name
-	 *
-	 * @param resourceName The name of the resource to resolve
-	 * @return The located resource;
-	 *         may return {@code null} to indicate the resource was not found
-	 */
-	@Incubating
-	URL locateResource(String resourceName);
-
-	/**
-	 * Discovers and instantiates implementations of the given {@link java.util.ServiceLoader Java service} contract.
-	 *
-	 * @param serviceType The java type defining the service contract
-	 * @param <S> The type of the service contract
-	 *
-	 * @return The ordered set of discovered services.
-	 */
-	@Incubating
-	<S> Collection<S> loadJavaServices(Class<S> serviceType);
 }

engine/src/main/java/org/hibernate/search/engine/environment/classpath/spi/DefaultClassResolver.java

@@ -4,15 +4,9 @@
  */
 package org.hibernate.search.engine.environment.classpath.spi;
 
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.ServiceLoader;
-import java.util.Set;
 
 import org.hibernate.search.engine.logging.impl.EngineMiscLog;
-
+import org.hibernate.search.util.common.annotation.Incubating;
 
 /**
  * Default implementation of {@code ClassResolver} relying on an {@link AggregatedClassLoader}.
@@ -52,27 +46,8 @@ public Package packageForName(String packageName) {
 		}
 	}
 
-	@Override
-	public URL locateResource(String resourceName) {
-		try {
-			return aggregatedClassLoader.getResource( resourceName );
-		}
-		catch (Exception e) {
-			return null;
-		}
+	@Incubating
+	public AggregatedClassLoader aggregatedClassLoader() {
+		return aggregatedClassLoader;
 	}
-
-	@Override
-	public <S> Collection<S> loadJavaServices(Class<S> serviceType) {
-		ServiceLoader<S> loadedServices = ServiceLoader.load( serviceType, aggregatedClassLoader );
-		Iterator<S> iterator = loadedServices.iterator();
-		Set<S> services = new HashSet<>();
-
-		while ( iterator.hasNext() ) {
-			services.add( iterator.next() );
-		}
-
-		return services;
-	}
-
 }

engine/src/main/java/org/hibernate/search/engine/environment/classpath/spi/DefaultResourceResolver.java

@@ -69,4 +69,14 @@ public InputStream locateResourceStream(String name) {
 		return null;
 	}
 
+	@Override
+	public URL locateResource(String resourceName) {
+		try {
+			return aggregatedClassLoader.getResource( resourceName );
+		}
+		catch (Exception e) {
+			return null;
+		}
+	}
+
 }

engine/src/main/java/org/hibernate/search/engine/environment/classpath/spi/ResourceResolver.java

@@ -5,6 +5,9 @@
 package org.hibernate.search.engine.environment.classpath.spi;
 
 import java.io.InputStream;
+import java.net.URL;
+
+import org.hibernate.search.util.common.annotation.Incubating;
 
 /**
  * A resolver of Java resources.
@@ -22,4 +25,14 @@ public interface ResourceResolver {
 	 * @return The stream of the located resource; may return {@code null} to indicate the resource was not found
 	 */
 	InputStream locateResourceStream(String name);
+
+	/**
+	 * Locate a resource by name
+	 *
+	 * @param resourceName The name of the resource to resolve
+	 * @return The located resource;
+	 *         may return {@code null} to indicate the resource was not found
+	 */
+	@Incubating
+	URL locateResource(String resourceName);
 }

mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventLoader.java

@@ -15,7 +15,6 @@
 import jakarta.persistence.PessimisticLockException;
 
 import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.query.Query;
@@ -27,7 +26,7 @@ final class OutboxEventLoader implements ToStringTreeAppendable {
 
 	private static final String LOAD_QUERY_STRING = "select e from " + ENTITY_NAME + " e where e.id in (:ids)";
 
-	private final LockOptions lockOptions;
+	private final LockMode lockMode;
 
 	OutboxEventLoader(Dialect dialect) {
 		// HSEARCH-4289: some databases encounter deadlocks when multiple processors query or delete events
@@ -46,7 +45,7 @@ final class OutboxEventLoader implements ToStringTreeAppendable {
 		// so we can afford to just skip events that are already locked,
 		// and process them later when they are no longer locked.
 		if ( dialect.supportsSkipLocked() ) {
-			lockOptions = new LockOptions( LockMode.UPGRADE_SKIPLOCKED );
+			lockMode = LockMode.UPGRADE_SKIPLOCKED;
 		}
 		// If LockMode.UPGRADE_SKIPLOCKED is not supported, we just do basic locking and hope for the best
 		// (in particular we hope for transaction deadlocks to be detected by the database and result in a failure,
@@ -57,7 +56,7 @@ final class OutboxEventLoader implements ToStringTreeAppendable {
 		// so as long as we target a distinct set of events in each processor (we do),
 		// locking shouldn't trigger any deadlocks.
 		else {
-			lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
+			lockMode = LockMode.PESSIMISTIC_WRITE;
 		}
 	}
 
@@ -69,16 +68,15 @@ public String toString() {
 	@Override
 	public void appendTo(ToStringTreeAppender appender) {
 		appender.startObject( "lockOptions" )
-				.attribute( "lockMode", lockOptions.getLockMode() )
-				.attribute( "timeout", lockOptions.getTimeOut() )
+				.attribute( "lockMode", lockMode )
 				.endObject();
 	}
 
 	List<OutboxEvent> loadLocking(Session session, Set<UUID> ids, String processorName) {
 		try {
 			Query<OutboxEvent> query = session.createQuery( LOAD_QUERY_STRING, OutboxEvent.class );
 			query.setParameter( "ids", ids );
-			query.setLockOptions( lockOptions );
+			query.setHibernateLockMode( lockMode );
 			return query.getResultList();
 		}
 		catch (PessimisticLockException | OptimisticLockException lockException) {

mapper/orm/pom.xml

@@ -41,10 +41,6 @@
             <groupId>org.hibernate.models</groupId>
             <artifactId>hibernate-models</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.models</groupId>
-            <artifactId>hibernate-models-jandex</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/HibernateOrmClassLoaderServiceClassAndResourceAndServiceResolver.java

@@ -86,7 +86,7 @@ public URL locateResource(String resourceName) {
 			// ignore
 		}
 		if ( url == null ) {
-			url = internalClassResolver.locateResource( resourceName );
+			url = internalResourceResolver.locateResource( resourceName );
 		}
 		return url;
 	}

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmMassEntityLoader.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import org.hibernate.LockOptions;
+import org.hibernate.LockMode;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.query.QueryFlushMode;
 import org.hibernate.search.mapper.orm.common.spi.TransactionHelper;
@@ -57,15 +57,15 @@ public void load(List<I> identifiers) throws InterruptedException {
 	private List<E> multiLoad(List<I> identifiers) {
 		return typeQueryLoader.createMultiIdentifierLoadAccess( session )
 				.with( options.cacheMode() )
-				.with( LockOptions.NONE )
+				.with( LockMode.NONE )
 				.multiLoad( identifiers );
 	}
 
 	private List<E> queryByIds(List<I> identifiers) {
 		return typeQueryLoader.createLoadingQuery( session, ID_PARAMETER_NAME )
 				.setParameter( ID_PARAMETER_NAME, identifiers )
 				.setCacheMode( options.cacheMode() )
-				.setLockOptions( LockOptions.NONE )
+				.setHibernateLockMode( LockMode.NONE )
 				.setCacheable( false )
 				.setQueryFlushMode( QueryFlushMode.NO_FLUSH )
 				.setFetchSize( identifiers.size() )

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java

@@ -289,7 +289,9 @@ public LockModeType getLockMode() {
 		throw lockOptionsNotSupported();
 	}
 
+	@Deprecated(since = "8.0")
 	@Override
+	@SuppressWarnings("removal")
 	public LockOptions getLockOptions() {
 		/*
 		 * Ideally we'd throw an UnsupportedOperationException,

mapper/orm/src/test/java/org/hibernate/search/mapper/orm/model/impl/AbstractHibernateOrmBootstrapIntrospectorPerReflectionStrategyTest.java

@@ -22,7 +22,7 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
-import org.hibernate.models.internal.BasicModelsContextImpl;
+import org.hibernate.models.spi.ModelsConfiguration;
 import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.search.util.common.impl.Closer;
 import org.hibernate.search.util.common.reflect.spi.ValueHandleFactory;
@@ -78,12 +78,9 @@ public static ModelsContext createModelBuildingContext(BootstrapContext bootstra
 		ClassLoaderService classLoaderService =
 				getServiceOrEmpty( bootstrapContext.getServiceRegistry(), ClassLoaderService.class )
 						.orElseThrow();
-		ClassLoaderServiceLoading classLoading = new ClassLoaderServiceLoading( classLoaderService );
-		return new BasicModelsContextImpl(
-				classLoading,
-				ModelsHelper::preFillRegistries
-		);
+		return new ModelsConfiguration()
+				.setClassLoading( new ClassLoaderServiceLoading( classLoaderService ) )
+				.setRegistryPrimer( ModelsHelper::preFillRegistries )
+				.bootstrap();
 	}
-
-
 }

mapper/pojo-base/pom.xml

@@ -32,10 +32,6 @@
             <groupId>org.hibernate.models</groupId>
             <artifactId>hibernate-models</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.models</groupId>
-            <artifactId>hibernate-models-jandex</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -51,4 +47,27 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <configuration>
+                            <module>
+                                <moduleInfo>
+                                    <uses>
+                                        org.hibernate.models.spi.ModelsContextProvider;
+                                    </uses>
+                                </moduleInfo>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>