HSEARCH-4465 Avoid deprecated ORM API/SPI

integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java

@@ -84,7 +84,7 @@ public List<?> setupParams() {
 
 	@Test
 	public void metamodel_onlyUserEntities() {
-		assertThat( setupHolder.sessionFactory().getMetamodel().getEntities() )
+		assertThat( setupHolder.sessionFactory().getJpaMetamodel().getEntities() )
 				.extracting( EntityType::getName )
 				.containsOnly( IndexedEntity.NAME );
 	}

integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java

@@ -104,7 +104,7 @@ public void resetFilter() {
 
 	@Test
 	public void metamodel_userEntitiesAndOutboxEventAndAgent() {
-		assertThat( setupHolder.sessionFactory().getMetamodel().getEntities() )
+		assertThat( setupHolder.sessionFactory().getJpaMetamodel().getEntities() )
 				.<Class<?>>extracting( Type::getJavaType )
 				.containsExactlyInAnyOrder( IndexedEntity.class, OutboxEvent.class, Agent.class );
 	}

integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BackRefPropertyIT.java

@@ -62,7 +62,7 @@ public void test() {
 
 		// Hibernate Search started successfully.
 		// Check that there actually is a backref:
-		MappingMetamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getMappingMetamodel();
 		assertThat( metamodel.getEntityDescriptor( IndexedEntity.class ).getPropertyNames() )
 				.contains( "_containing_fk_containingidBackref" )
 				.contains( "_containingIndexBackref" );

integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/SyntheticPropertyIT.java

@@ -59,7 +59,7 @@ public void test() {
 
 		// Hibernate Search started successfully.
 		// Check that there actually is a synthetic property:
-		MappingMetamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getMappingMetamodel();
 		assertThat( metamodel.getEntityDescriptor( ContainedEntity.class ).getPropertyNames() )
 				.contains( "_" + IndexedEntity.class.getName().replace( '.', '_' ) + "_contained" );
 

mapper/orm-batch-jsr352/core/src/main/java/org/hibernate/search/batch/jsr352/core/massindexing/util/impl/PersistenceUtil.java

@@ -96,7 +96,7 @@ public static IndexScope getIndexScope(String hql) {
 	public static List<EntityTypeDescriptor> createDescriptors(EntityManagerFactory entityManagerFactory, Set<Class<?>> types) {
 		SessionFactoryImplementor sessionFactory = entityManagerFactory.unwrap( SessionFactoryImplementor.class );
 		List<EntityTypeDescriptor> result = new ArrayList<>( types.size() );
-		MappingMetamodel metamodel = sessionFactory.getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.getMappingMetamodel();
 		for ( Class<?> type : types ) {
 			result.add( createDescriptor( metamodel, type ) );
 		}

mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java

@@ -14,6 +14,7 @@
 import org.hibernate.Session;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.query.MutationQuery;
 import org.hibernate.query.Query;
 import org.hibernate.search.mapper.orm.common.spi.TransactionHelper;
 import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategyStartContext;
@@ -78,7 +79,7 @@ public int reprocessAbortedEvents() {
 
 		try ( Session session = sessionFactory.openSession() ) {
 			return transactionHelper.inTransaction( (SharedSessionContractImplementor) session, () -> {
-				Query<?> query = session.createQuery( UPDATE_EVENTS_WITH_STATUS );
+				MutationQuery query = session.createMutationQuery( UPDATE_EVENTS_WITH_STATUS );
 				query.setParameter( "status", OutboxEvent.Status.ABORTED );
 				query.setParameter( "newStatus", OutboxEvent.Status.PENDING );
 				return query.executeUpdate();
@@ -92,7 +93,7 @@ public int reprocessAbortedEvents(String tenantId) {
 
 		try ( Session session = sessionFactory.withOptions().tenantIdentifier( tenantId ).openSession() ) {
 			return transactionHelper.inTransaction( (SharedSessionContractImplementor) session, () -> {
-				Query<?> query = session.createQuery( UPDATE_EVENTS_WITH_STATUS );
+				MutationQuery query = session.createMutationQuery( UPDATE_EVENTS_WITH_STATUS );
 				query.setParameter( "status", OutboxEvent.Status.ABORTED );
 				query.setParameter( "newStatus", OutboxEvent.Status.PENDING );
 				return query.executeUpdate();
@@ -106,7 +107,7 @@ public int clearAllAbortedEvents() {
 
 		try ( Session session = sessionFactory.openSession() ) {
 			return transactionHelper.inTransaction( (SharedSessionContractImplementor) session, () -> {
-				Query<?> query = session.createQuery( DELETE_EVENTS_WITH_STATUS );
+				MutationQuery query = session.createMutationQuery( DELETE_EVENTS_WITH_STATUS );
 				query.setParameter( "status", OutboxEvent.Status.ABORTED );
 				return query.executeUpdate();
 			} );
@@ -119,7 +120,7 @@ public int clearAllAbortedEvents(String tenantId) {
 
 		try ( Session session = sessionFactory.withOptions().tenantIdentifier( tenantId ).openSession() ) {
 			return transactionHelper.inTransaction( (SharedSessionContractImplementor) session, () -> {
-				Query<?> query = session.createQuery( DELETE_EVENTS_WITH_STATUS );
+				MutationQuery query = session.createMutationQuery( DELETE_EVENTS_WITH_STATUS );
 				query.setParameter( "status", OutboxEvent.Status.ABORTED );
 				return query.executeUpdate();
 			} );

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/common/impl/HibernateOrmUtils.java

@@ -78,7 +78,7 @@ public static EntityPersister toRootEntityType(SessionFactoryImplementor session
 		 * where A and C are entity types and B is a mapped superclass.
 		 * So we need to exclude non-entity types, and for that we need the Hibernate ORM metamodel.
 		 */
-		MappingMetamodel metamodel = sessionFactory.getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.getMappingMetamodel();
 		String rootEntityName = entityType.getRootEntityName();
 		return metamodel.getEntityDescriptor( rootEntityName );
 	}
@@ -118,7 +118,7 @@ public static boolean targetsAllConcreteSubTypes(SessionFactoryImplementor sessi
 			return true;
 		}
 
-		MappingMetamodel metamodel = sessionFactory.getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.getMappingMetamodel();
 		int concreteSubTypesCount = 0;
 		for ( String subClassEntityName : subClassEntityNames ) {
 			if ( !metamodel.getEntityDescriptor( subClassEntityName ).getEntityMetamodel().isAbstract() ) {

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

@@ -151,7 +151,7 @@ private PojoSelectionEntityLoader<?> doCreate(EntityPersister entityPersister,
 
 	private static EntityPersister toMostSpecificCommonEntitySuperType(SessionImplementor session,
 			Iterable<? extends LoadingTypeContext<?>> targetEntityTypeContexts) {
-		MappingMetamodel metamodel = session.getSessionFactory().getMetamodel();
+		MappingMetamodel metamodel = session.getSessionFactory().getMappingMetamodel();
 		EntityPersister result = null;
 		for ( LoadingTypeContext<?> targetTypeContext : targetEntityTypeContexts ) {
 			EntityPersister type = targetTypeContext.entityPersister();

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

@@ -23,7 +23,7 @@ public interface TypeQueryFactory<E, I> {
 
 	static TypeQueryFactory<?, ?> create(SessionFactoryImplementor sessionFactory, EntityPersister entityPersister,
 			String uniquePropertyName) {
-		JpaMetamodel metamodel = sessionFactory.getMetamodel();
+		JpaMetamodel metamodel = sessionFactory.getJpaMetamodel();
 		EntityDomainType<?> typeOrNull = metamodel.entity( entityPersister.getEntityName() );
 		if ( typeOrNull != null && !( entityPersister.getMappedClass().equals( Map.class ) ) ) {
 			return CriteriaTypeQueryFactory.create( typeOrNull, uniquePropertyName );

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/AbstractHibernateOrmTypeContext.java

@@ -44,7 +44,7 @@ abstract class AbstractHibernateOrmTypeContext<E>
 	AbstractHibernateOrmTypeContext(AbstractBuilder<E> builder, SessionFactoryImplementor sessionFactory) {
 		this.typeIdentifier = builder.typeIdentifier;
 		this.jpaEntityName = builder.jpaEntityName;
-		MappingMetamodel metamodel = sessionFactory.getMetamodel();
+		MappingMetamodel metamodel = sessionFactory.getMappingMetamodel();
 		this.entityPersister = metamodel.getEntityDescriptor( builder.hibernateOrmEntityName );
 		this.ascendingSuperTypes = builder.ascendingSuperTypes;
 		if ( builder.documentIdSourcePropertyName != null ) {

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMappingConfigurationContributor.java

@@ -59,9 +59,8 @@ public void configure(MappingBuildContext buildContext, PojoMappingConfiguration
 			}
 
 			// Sort the properties before processing for deterministic iteration
-			@SuppressWarnings("unchecked") // Hibernate ORM gives us raw types, we must make do.
 			List<Property> properties =
-					HibernateOrmUtils.sortedNonSyntheticProperties( persistentClass.getPropertyIterator() );
+					HibernateOrmUtils.sortedNonSyntheticProperties( persistentClass.getProperties().iterator() );
 
 			Property identifierProperty = persistentClass.getIdentifierProperty();
 			Optional<Property> identifierPropertyOptional = Optional.ofNullable( identifierProperty );
@@ -125,9 +124,8 @@ private void contributeEmbeddableTypeMetadata(
 			 */
 			if ( processedEmbeddableTypes.add( componentTypeModel ) ) {
 				// Sort the properties before processing for deterministic iteration
-				@SuppressWarnings("unchecked") // Hibernate ORM gives us raw types, we must make do.
 				List<Property> properties =
-						HibernateOrmUtils.sortedNonSyntheticProperties( componentValue.getPropertyIterator() );
+						HibernateOrmUtils.sortedNonSyntheticProperties( componentValue.getProperties().iterator() );
 				configurationCollector.collectContributor( componentTypeModel,
 						new ErrorCollectingPojoTypeMetadataContributor()
 								// Ensure Hibernate ORM metadata about properties is translated into Hibernate Search metadata

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMappingPropertiesMetadataContributor.java

@@ -18,7 +18,6 @@
 import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.OneToOne;
 import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
@@ -98,16 +97,12 @@ else if ( value instanceof SimpleValue ) {
 	}
 
 	private void collectScale(PojoAdditionalMetadataCollectorPropertyNode collector, Value value) {
-		Iterator<Selectable> columnIterator = value.getColumnIterator();
+		Iterator<Column> columnIterator = value.getColumns().iterator();
 		Dialect dialect = basicTypeMetadataProvider.getDialect();
 		Metadata metadata = basicTypeMetadataProvider.getMetadata();
 
 		while ( columnIterator.hasNext() ) {
-			Selectable mappedColumn = columnIterator.next();
-			if ( !(mappedColumn instanceof Column) ) {
-				continue;
-			}
-			Column column = (Column) mappedColumn;
+			Column column = columnIterator.next();
 			Size size = column.getColumnSize( dialect, metadata );
 			Integer scale = size.getScale();
 			if ( scale == null ) {

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadataProvider.java

@@ -56,7 +56,7 @@ private static void collectPersistentClass(Builder metadataProviderBuilder, Pers
 
 			collectClassType(
 					metadataProviderBuilder, javaClass,
-					persistentClass.getIdentifierProperty(), persistentClass.getPropertyIterator()
+					persistentClass.getIdentifierProperty(), persistentClass.getProperties().iterator()
 			);
 
 			metadataProviderBuilder.typeIdentifierResolverBuilder.addClassEntityType(
@@ -67,7 +67,7 @@ private static void collectPersistentClass(Builder metadataProviderBuilder, Pers
 			collectDynamicMapType(
 					metadataProviderBuilder, hibernateOrmEntityName,
 					persistentClass.getSuperclass(),
-					persistentClass.getIdentifierProperty(), persistentClass.getPropertyIterator()
+					persistentClass.getIdentifierProperty(), persistentClass.getProperties().iterator()
 			);
 
 			metadataProviderBuilder.typeIdentifierResolverBuilder.addDynamicMapEntityType(
@@ -204,7 +204,7 @@ private static HibernateOrmTypeModelFactory<?> collectEmbedded(Builder metadataP
 				collectDynamicMapType(
 						metadataProviderBuilder, name,
 						null, /* No supertype */
-						null /* No ID */, component.getPropertyIterator()
+						null /* No ID */, component.getProperties().iterator()
 				);
 			}
 			return HibernateOrmTypeModelFactory.dynamicMap( name );
@@ -215,7 +215,7 @@ private static HibernateOrmTypeModelFactory<?> collectEmbedded(Builder metadataP
 			if ( !metadataProviderBuilder.classTypeMetadata.containsKey( javaClass ) ) {
 				collectClassType(
 						metadataProviderBuilder, javaClass,
-						null /* No ID */, component.getPropertyIterator()
+						null /* No ID */, component.getProperties().iterator()
 				);
 			}
 			return HibernateOrmTypeModelFactory.rawType( javaClass );

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathDefinitionProvider.java

@@ -7,7 +7,6 @@
 package org.hibernate.search.mapper.orm.model.impl;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.hibernate.mapping.PersistentClass;
@@ -38,8 +37,7 @@ public HibernateOrmPathDefinitionProvider(PojoRawTypeModel<?> typeModel, Persist
 		this.typeModel = typeModel;
 		this.persistentClass = persistentClass;
 		this.propertyStringRepresentationByOrdinal = new ArrayList<>();
-		for ( Iterator<Property> iterator = persistentClass.getPropertyClosureIterator(); iterator.hasNext(); ) {
-			Property property = iterator.next();
+		for ( Property property : persistentClass.getPropertyClosure() ) {
 			propertyStringRepresentationByOrdinal.add( property.getName() );
 		}
 	}

util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/ReusableOrmSetupHolder.java

@@ -458,7 +458,7 @@ private void clearDatabase(SessionFactoryImplementor sessionFactory, HibernateOr
 		for ( Class<?> entityClass : config.entityClearOrder ) {
 			EntityType<?> entityType;
 			try {
-				entityType = sessionFactory.getMetamodel().entity( entityClass );
+				entityType = sessionFactory.getJpaMetamodel().entity( entityClass );
 			}
 			catch (IllegalArgumentException e) {
 				// When using annotatedTypes to infer the clear order,
@@ -475,7 +475,7 @@ private void clearDatabase(SessionFactoryImplementor sessionFactory, HibernateOr
 		// we try to delete all remaining entity types.
 		// Note we're stabilizing the order, because ORM uses a HashSet internally
 		// and the order may change from one execution to the next.
-		List<EntityType<?>> sortedEntityTypes = sessionFactory.getMetamodel().getEntities().stream()
+		List<EntityType<?>> sortedEntityTypes = sessionFactory.getJpaMetamodel().getEntities().stream()
 				.sorted( Comparator.comparing( EntityType::getName ) )
 				.collect( Collectors.toList() );
 		for ( EntityType<?> entityType : sortedEntityTypes ) {
@@ -564,6 +564,7 @@ private static Query<?> createSelectOrDeleteAllOfSpecificTypeQuery(EntityType<?>
 			builder.append( " where type( e ) in (:type)" );
 			typeArg = entityType.getJavaType();
 		}
+		@SuppressWarnings("deprecation")
 		Query<?> query = QueryType.SELECT.equals( queryType )
 				? session.createQuery( builder.toString(), entityType.getJavaType() )
 				: session.createQuery( builder.toString() );
@@ -574,7 +575,7 @@ private static Query<?> createSelectOrDeleteAllOfSpecificTypeQuery(EntityType<?>
 	}
 
 	private static boolean hasEntitySubclass(SessionFactory sessionFactory, EntityType<?> parentEntity) {
-		Metamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getMetamodel();
+		Metamodel metamodel = sessionFactory.unwrap( SessionFactoryImplementor.class ).getJpaMetamodel();
 		for ( EntityType<?> entity : metamodel.getEntities() ) {
 			if ( parentEntity.equals( entity.getSupertype() ) ) {
 				return true;
@@ -596,7 +597,7 @@ private static boolean hasPotentiallyJoinTable(SessionFactoryImplementor session
 				case ELEMENT_COLLECTION:
 					return true;
 				case EMBEDDED:
-					EmbeddableType<?> embeddable = sessionFactory.getMetamodel().embeddable( attribute.getJavaType() );
+					EmbeddableType<?> embeddable = sessionFactory.getJpaMetamodel().embeddable( attribute.getJavaType() );
 					if ( hasPotentiallyJoinTable( sessionFactory, embeddable ) ) {
 						return true;
 					}

util/internal/integrationtest/mapper/orm/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/multitenancy/impl/MultitenancyTestHelperSchemaManagementTool.java

@@ -52,8 +52,7 @@ public Class<SchemaManagementTool> getServiceInitiated() {
 		}
 
 		@Override
-		@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-		public SchemaManagementTool initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
+		public SchemaManagementTool initiateService(Map<String,Object> configurationValues, ServiceRegistryImplementor registry) {
 			return new MultitenancyTestHelperSchemaManagementTool( tenantIds );
 		}
 	}
@@ -89,8 +88,7 @@ private GenerationTargetToDatabase[] createSchemaTargets(ServiceRegistryImplemen
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-	public SchemaCreator getSchemaCreator(Map options) {
+	public SchemaCreator getSchemaCreator(Map<String,Object> options) {
 		return new SchemaCreator() {
 			final SchemaCreatorImpl delegate = (SchemaCreatorImpl) toolDelegate.getSchemaCreator( options );
 
@@ -104,8 +102,7 @@ public void doCreation(Metadata metadata, ExecutionOptions executionOptions,
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-	public SchemaDropper getSchemaDropper(Map options) {
+	public SchemaDropper getSchemaDropper(Map<String,Object> options) {
 		return new SchemaDropper() {
 			final SchemaDropperImpl delegate = (SchemaDropperImpl) toolDelegate.getSchemaDropper( options );
 
@@ -130,14 +127,12 @@ public void perform(ServiceRegistry serviceRegistry) {
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-	public SchemaMigrator getSchemaMigrator(Map options) {
+	public SchemaMigrator getSchemaMigrator(Map<String,Object> options) {
 		throw notSupported();
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-	public SchemaValidator getSchemaValidator(Map options) {
+	public SchemaValidator getSchemaValidator(Map<String,Object> options) {
 		throw notSupported();
 	}