diff --git a/engine/src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java b/engine/src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java index 4370b40ad39..13f4b39a072 100644 --- a/engine/src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java +++ b/engine/src/main/java/org/hibernate/search/engine/backend/scope/spi/AbstractSearchIndexScope.java @@ -74,13 +74,17 @@ protected AbstractSearchIndexScope(AbstractSearchIndexScope 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/engine/src/main/java/org/hibernate/search/engine/search/common/spi/AbstractMultiIndexSearchIndexNodeContext.java b/engine/src/main/java/org/hibernate/search/engine/search/common/spi/AbstractMultiIndexSearchIndexNodeContext.java index 99122895f35..636bd5bc5b2 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/common/spi/AbstractMultiIndexSearchIndexNodeContext.java +++ b/engine/src/main/java/org/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 index 799eb0b4e53..f8d22fc645c 100644 --- 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,6 +12,7 @@ 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, @@ -19,7 +20,8 @@ * * @param The self type, i.e. the exposed type of this scope. */ -public interface SearchIndexScope> { +public interface SearchIndexScope> + extends EventContextProvider { Set hibernateSearchIndexNames();