HSEARCH-4175 Generate event contexts trough SearchScope directly

So that we can reuse that in other classes in the next commits.
hibernate · Jul 9, 2021 · 8c25c6d · 8c25c6d
1 parent fb18f98
commit 8c25c6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/...src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java b/...src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java
@@ -74,13 +74,17 @@ protected AbstractSearchIndexScope(AbstractSearchIndexScope<S, M, N, C> parentSc
 		this.overriddenRoot = overriddenRoot;
 	}
 
-	protected final EventContext eventContext() {
-		EventContext indexes = EventContexts.fromIndexNames( hibernateSearchIndexNames );
+	@Override
+	public EventContext eventContext() {
+		return EventContexts.fromIndexNames( hibernateSearchIndexNames );
+	}
+
+	protected final EventContext indexesAndRootEventContext() {
 		if ( overriddenRoot == null ) {
-			return indexes;
+			return eventContext();
 		}
 		else {
-			return indexes.append( overriddenRoot.relativeEventContext() );
+			return eventContext().append( overriddenRoot.relativeEventContext() );
 		}
 	}
 
@@ -158,7 +162,7 @@ private N fieldInternal(String absoluteFieldPath) {
 			resultOrNull = createMultiIndexFieldContext( absoluteFieldPath );
 		}
 		if ( resultOrNull == null ) {
-			throw log.unknownFieldForSearch( absoluteFieldPath, eventContext() );
+			throw log.unknownFieldForSearch( absoluteFieldPath, indexesAndRootEventContext() );
 		}
 		return resultOrNull;
 	}

diff --git a/...g/hibernate/search/engine/search/common/spi/AbstractMultiIndexSearchIndexNodeContext.java b/...g/hibernate/search/engine/search/common/spi/AbstractMultiIndexSearchIndexNodeContext.java
@@ -70,7 +70,7 @@ public final EventContext eventContext() {
 	}
 
 	protected final EventContext indexesEventContext() {
-		return EventContexts.fromIndexNames( scope.hibernateSearchIndexNames() );
+		return scope.eventContext();
 	}
 
 	@Override

diff --git a/engine/src/main/java/org/hibernate/search/engine/search/common/spi/SearchIndexScope.java b/engine/src/main/java/org/hibernate/search/engine/search/common/spi/SearchIndexScope.java
@@ -12,14 +12,16 @@
 import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext;
 import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter;
 import org.hibernate.search.engine.search.common.ValueConvert;
+import org.hibernate.search.util.common.reporting.spi.EventContextProvider;
 
 /**
  * Information about indexes targeted by search,
  * be it in a projection, a predicate, a sort, ...
  *
  * @param <S> The self type, i.e. the exposed type of this scope.
  */
-public interface SearchIndexScope<S extends SearchIndexScope<?>> {
+public interface SearchIndexScope<S extends SearchIndexScope<?>>
+		extends EventContextProvider {
 
 	Set<String> hibernateSearchIndexNames();