HSEARCH-4843 Remove generics from EntityReferenceFactory

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/execution/impl/ElasticsearchIndexIndexingPlan.java

@@ -31,7 +31,7 @@ public class ElasticsearchIndexIndexingPlan implements IndexIndexingPlan {
 	private final ElasticsearchWorkFactory workFactory;
 	private final ElasticsearchSerialWorkOrchestrator orchestrator;
 	private final WorkExecutionIndexManagerContext indexManagerContext;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final String tenantId;
 	private final DocumentRefreshStrategy refreshStrategy;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/execution/impl/ElasticsearchIndexIndexingPlanExecution.java

@@ -22,14 +22,14 @@
 class ElasticsearchIndexIndexingPlanExecution {
 
 	private final ElasticsearchSerialWorkOrchestrator orchestrator;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 
 	private final List<SingleDocumentIndexingWork> works;
 	private final CompletableFuture<Void>[] futures;
 
 	@SuppressWarnings("unchecked")
 	ElasticsearchIndexIndexingPlanExecution(ElasticsearchSerialWorkOrchestrator orchestrator,
-			EntityReferenceFactory<?> entityReferenceFactory,
+			EntityReferenceFactory entityReferenceFactory,
 			List<SingleDocumentIndexingWork> works) {
 		this.orchestrator = orchestrator;
 		this.entityReferenceFactory = entityReferenceFactory;

backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/work/execution/impl/ElasticsearchIndexIndexingPlanExecutionTest.java

@@ -53,7 +53,7 @@ public class ElasticsearchIndexIndexingPlanExecutionTest {
 	private ElasticsearchSerialWorkOrchestrator orchestratorMock;
 
 	@Mock(strictness = Mock.Strictness.LENIENT)
-	private EntityReferenceFactory<StubEntityReference> entityReferenceFactoryMock;
+	private EntityReferenceFactory entityReferenceFactoryMock;
 
 	private final List<SingleDocumentIndexingWork> workMocks = new ArrayList<>();
 

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/work/execution/impl/LuceneIndexIndexingPlan.java

@@ -32,7 +32,7 @@ public class LuceneIndexIndexingPlan implements IndexIndexingPlan {
 	private final LuceneWorkFactory factory;
 	private final LuceneIndexEntryFactory indexEntryFactory;
 	private final WorkExecutionIndexManagerContext indexManagerContext;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final String tenantId;
 	private final DocumentCommitStrategy commitStrategy;
 	private final DocumentRefreshStrategy refreshStrategy;

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/work/execution/impl/LuceneIndexIndexingPlanExecution.java

@@ -24,7 +24,7 @@
 class LuceneIndexIndexingPlanExecution {
 
 	private final LuceneSerialWorkOrchestrator orchestrator;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final DocumentCommitStrategy commitStrategy;
 	private final DocumentRefreshStrategy refreshStrategy;
 
@@ -33,7 +33,7 @@ class LuceneIndexIndexingPlanExecution {
 
 	@SuppressWarnings("unchecked")
 	LuceneIndexIndexingPlanExecution(LuceneSerialWorkOrchestrator orchestrator,
-			EntityReferenceFactory<?> entityReferenceFactory,
+			EntityReferenceFactory entityReferenceFactory,
 			DocumentCommitStrategy commitStrategy,
 			DocumentRefreshStrategy refreshStrategy,
 			List<SingleDocumentIndexingWork> works) {

backend/lucene/src/test/java/org/hibernate/search/backend/lucene/work/execution/impl/LuceneIndexIndexingPlanExecutionTest.java

@@ -74,7 +74,7 @@ public static Object[][] params() {
 	private LuceneSerialWorkOrchestrator orchestratorMock;
 
 	@Mock(strictness = Mock.Strictness.LENIENT)
-	private EntityReferenceFactory<EntityReference> entityReferenceFactoryMock;
+	private EntityReferenceFactory entityReferenceFactoryMock;
 
 	private final List<SingleDocumentIndexingWork> workMocks = new ArrayList<>();
 

engine/src/main/java/org/hibernate/search/engine/backend/common/spi/EntityReferenceFactory.java

@@ -10,15 +10,15 @@
 
 import org.hibernate.search.engine.common.EntityReference;
 
-public interface EntityReferenceFactory<R extends EntityReference> {
+public interface EntityReferenceFactory {
 
 	/**
 	 * @param typeName The name of the entity type.
 	 * @param identifier The identifier of the entity.
 	 * @return A reference to the entity.
 	 * @throws RuntimeException If something goes wrong (exception while rendering an identifier, ...)
 	 */
-	R createEntityReference(String typeName, Object identifier);
+	EntityReference createEntityReference(String typeName, Object identifier);
 
 	/**
 	 * @param factory The factory for entity references.
@@ -28,9 +28,8 @@ public interface EntityReferenceFactory<R extends EntityReference> {
 	 * Any exception thrown while creating the entity reference should be {@link Consumer#accept(Object) put into}
 	 * that sink and should not be propagated.
 	 * @return A reference to the entity, or null if an exception was thrown while creating the entity reference.
-	 * @param <R> The type of entity reference.
 	 */
-	static <R extends EntityReference> R safeCreateEntityReference(EntityReferenceFactory<R> factory, String typeName, Object identifier,
+	static EntityReference safeCreateEntityReference(EntityReferenceFactory factory, String typeName, Object identifier,
 			Consumer<Exception> exceptionSink) {
 		try {
 			return factory.createEntityReference( typeName, identifier );

engine/src/main/java/org/hibernate/search/engine/backend/common/spi/MultiEntityOperationExecutionReport.java

@@ -97,7 +97,7 @@ public Builder failingEntityReference(EntityReference reference) {
 			return this;
 		}
 
-		public Builder failingEntityReference(EntityReferenceFactory<?> referenceFactory,
+		public Builder failingEntityReference(EntityReferenceFactory referenceFactory,
 				String typeName, Object entityIdentifier) {
 			EntityReference reference = EntityReferenceFactory.safeCreateEntityReference( referenceFactory,
 					typeName, entityIdentifier, this::throwable );

engine/src/main/java/org/hibernate/search/engine/backend/mapping/spi/BackendMappingContext.java

@@ -29,6 +29,6 @@ public interface BackendMappingContext {
 	/**
 	 * @return A {@link EntityReferenceFactory}.
 	 */
-	EntityReferenceFactory<?> entityReferenceFactory();
+	EntityReferenceFactory entityReferenceFactory();
 
 }

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

@@ -29,7 +29,7 @@ final class OutboxEventProcessingPlan {
 
 	private final AutomaticIndexingQueueEventProcessingPlan processingPlan;
 	private final FailureHandler failureHandler;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final List<OutboxEvent> failedEvents = new ArrayList<>();
 
 	private List<OutboxEvent> events = new ArrayList<>();

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

@@ -31,11 +31,11 @@ public final class OutboxPollingOutboxEventSendingPlan implements AutomaticIndex
 	// otherwise existing indexes will no longer work correctly.
 	private static final RangeCompatibleHashFunction HASH_FUNCTION = ShardAssignment.HASH_FUNCTION;
 
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final Session session;
 	private final List<OutboxEvent> events = new ArrayList<>();
 
-	public OutboxPollingOutboxEventSendingPlan(EntityReferenceFactory<?> entityReferenceFactory,
+	public OutboxPollingOutboxEventSendingPlan(EntityReferenceFactory entityReferenceFactory,
 			Session session) {
 		this.entityReferenceFactory = entityReferenceFactory;
 		this.session = session;
@@ -79,8 +79,8 @@ public CompletableFuture<MultiEntityOperationExecutionReport> sendAndReport(Oper
 		}
 	}
 
-	private <R> CompletableFuture<MultiEntityOperationExecutionReport> sendAndReportOnSession(
-			Session currentSession, EntityReferenceFactory<? extends R> entityReferenceFactory) {
+	private CompletableFuture<MultiEntityOperationExecutionReport> sendAndReportOnSession(
+			Session currentSession, EntityReferenceFactory entityReferenceFactory) {
 		try {
 			MultiEntityOperationExecutionReport.Builder builder = MultiEntityOperationExecutionReport.builder();
 			for ( OutboxEvent event : events ) {

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/automaticindexing/spi/AutomaticIndexingEventSendingSessionContext.java

@@ -11,7 +11,7 @@
 
 public interface AutomaticIndexingEventSendingSessionContext {
 
-	EntityReferenceFactory<?> entityReferenceFactory();
+	EntityReferenceFactory entityReferenceFactory();
 
 	Session session();
 

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/automaticindexing/spi/AutomaticIndexingMappingContext.java

@@ -33,6 +33,6 @@ public interface AutomaticIndexingMappingContext {
 	 */
 	AutomaticIndexingQueueEventProcessingPlan createIndexingQueueEventProcessingPlan(Session session);
 
-	EntityReferenceFactory<?> entityReferenceFactory();
+	EntityReferenceFactory entityReferenceFactory();
 
 }

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSession.java

@@ -213,7 +213,7 @@ public SessionImplementor session() {
 	}
 
 	@Override
-	public EntityReferenceFactory<?> entityReferenceFactory() {
+	public EntityReferenceFactory entityReferenceFactory() {
 		return mappingContext.entityReferenceFactory();
 	}
 

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/AbstractPojoTypeManager.java

@@ -159,7 +159,7 @@ public final void resolveEntitiesToReindex(PojoReindexingCollector collector, Po
 			reindexingResolver.resolveEntitiesToReindex( collector, entitySupplier.get(), context );
 		}
 		catch (RuntimeException e) {
-			EntityReferenceFactory<?> entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
+			EntityReferenceFactory entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
 			EntityReference entityReference = EntityReferenceFactory.safeCreateEntityReference(
 					entityReferenceFactory, entityName, identifier, e::addSuppressed );
 			throw log.errorResolvingEntitiesToReindex( entityReference, e.getMessage(), e );

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/PojoEntityReferenceFactory.java

@@ -11,7 +11,7 @@
 import org.hibernate.search.mapper.pojo.common.spi.PojoEntityReferenceFactoryDelegate;
 import org.hibernate.search.mapper.pojo.work.impl.PojoWorkTypeContext;
 
-final class PojoEntityReferenceFactory implements EntityReferenceFactory<EntityReference> {
+final class PojoEntityReferenceFactory implements EntityReferenceFactory {
 
 	public final PojoEntityReferenceFactoryDelegate delegate;
 	private final PojoTypeManagerContainer typeManagers;

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/mapping/spi/AbstractPojoMappingImplementor.java

@@ -43,7 +43,7 @@ public abstract class AbstractPojoMappingImplementor<M>
 	private boolean stopped = false;
 
 	private final PojoEntityReferenceFactoryDelegate entityReferenceFactoryDelegate;
-	private final EntityReferenceFactory<?> entityReferenceFactory;
+	private final EntityReferenceFactory entityReferenceFactory;
 	private final ToDocumentValueConvertContext toDocumentValueConvertContext;
 	private final IdentifierBridgeToDocumentIdentifierContext toDocumentIdentifierContext;
 	private final ValueBridgeToIndexedValueContext toIndexedValueContext;
@@ -115,7 +115,7 @@ public final PojoEntityReferenceFactoryDelegate entityReferenceFactoryDelegate()
 	}
 
 	@Override
-	public final EntityReferenceFactory<?> entityReferenceFactory() {
+	public final EntityReferenceFactory entityReferenceFactory() {
 		return entityReferenceFactory;
 	}
 

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/mapping/spi/PojoMappingDelegate.java

@@ -41,7 +41,7 @@ public interface PojoMappingDelegate extends AutoCloseable {
 
 	ProjectionRegistry projectionRegistry();
 
-	EntityReferenceFactory<?> createEntityReferenceFactory(PojoEntityReferenceFactoryDelegate delegate);
+	EntityReferenceFactory createEntityReferenceFactory(PojoEntityReferenceFactoryDelegate delegate);
 
 	<R extends EntityReference, E, C> PojoScopeDelegate<R, E, C> createPojoScope(
 			PojoScopeMappingContext mappingContext,

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/work/impl/AbstractPojoTypeIndexingPlan.java

@@ -360,7 +360,7 @@ void resolveDirty(PojoLoadingPlanProvider loadingPlanProvider, PojoReindexingCol
 				typeContext().reindexingResolver().resolveEntitiesToReindex( collector, entitySupplier.get(), this );
 			}
 			catch (RuntimeException e) {
-				EntityReferenceFactory<?> entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
+				EntityReferenceFactory entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
 				EntityReference entityReference = EntityReferenceFactory.safeCreateEntityReference(
 						entityReferenceFactory, typeContext().entityName(), identifier, e::addSuppressed );
 				throw log.errorResolvingEntitiesToReindex( entityReference, e.getMessage(), e );

mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/work/impl/PojoDocumentContributor.java

@@ -51,7 +51,7 @@ public void contribute(DocumentElement state) {
 			processor.process( state, entitySupplier.get(), processorContext );
 		}
 		catch (RuntimeException e) {
-			EntityReferenceFactory<?> entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
+			EntityReferenceFactory entityReferenceFactory = sessionContext.mappingContext().entityReferenceFactory();
 			EntityReference entityReference = EntityReferenceFactory.safeCreateEntityReference(
 					entityReferenceFactory, entityName, identifier, e::addSuppressed );
 			throw log.errorBuildingDocument( entityReference, e.getMessage(), e );

util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingImpl.java

@@ -28,7 +28,7 @@
 import org.hibernate.search.util.common.impl.Futures;
 
 public class StubMappingImpl
-		implements StubMapping, MappingImplementor<StubMappingImpl>, EntityReferenceFactory<StubEntityReference> {
+		implements StubMapping, MappingImplementor<StubMappingImpl>, EntityReferenceFactory {
 
 	private final Map<String, StubMappedIndex> mappedIndexesByTypeIdentifier;
 	private final StubMappingSchemaManagementStrategy schemaManagementStrategy;
@@ -65,7 +65,7 @@ public ProjectionMappedTypeContext mappedTypeContext(String mappedTypeName) {
 	}
 
 	@Override
-	public EntityReferenceFactory<?> entityReferenceFactory() {
+	public EntityReferenceFactory entityReferenceFactory() {
 		return this;
 	}