HSEARCH-3319 Use mapper specific root-scope-creators

Author: marko-bekhta

documentation/src/test/java/org/hibernate/search/documentation/search/predicate/FieldReferenceIT.java

@@ -19,15 +19,14 @@
 import org.hibernate.search.documentation.testsupport.BackendConfigurations;
 import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper;
 import org.hibernate.search.engine.backend.types.Projectable;
-import org.hibernate.search.engine.common.EntityReference;
-import org.hibernate.search.engine.mapper.scope.SearchScopeProvider;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.reference.RootReferenceScope;
 import org.hibernate.search.engine.search.reference.predicate.MatchPredicateFieldReference;
 import org.hibernate.search.engine.search.reference.projection.FieldProjectionFieldReference;
 import org.hibernate.search.mapper.orm.Search;
+import org.hibernate.search.mapper.orm.scope.HibernateOrmRootReferenceScope;
 import org.hibernate.search.mapper.orm.scope.SearchScope;
+import org.hibernate.search.mapper.orm.scope.SearchScopeProvider;
 import org.hibernate.search.mapper.orm.session.SearchSession;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
@@ -198,7 +197,7 @@ public static class EntityC extends EntityB {
 	public static class EntityA_ {
 		public static ValueFieldReference1<EntityA_, String, String, String> stringA;
 
-		public static RootReferenceScope<EntityA_, EntityA> scope;
+		public static HibernateOrmRootReferenceScope<EntityA_, EntityA> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", EntityA_.class, String.class, String.class, String.class );
@@ -210,7 +209,7 @@ public static class EntityA_ {
 	public static class EntityB_ extends EntityA_ {
 		public static ValueFieldReference1<EntityB_, String, String, String> stringB;
 
-		public static RootReferenceScope<EntityB_, EntityB> scope;
+		public static HibernateOrmRootReferenceScope<EntityB_, EntityB> scope;
 
 		static {
 			stringB = ValueFieldReference1.of( "stringB", EntityB_.class, String.class, String.class, String.class );
@@ -222,7 +221,7 @@ public static class EntityB_ extends EntityA_ {
 	public static class EntityC_ extends EntityB_ {
 		public static ValueFieldReference1<EntityC_, String, String, String> stringC;
 
-		public static RootReferenceScope<EntityC_, EntityC> scope;
+		public static HibernateOrmRootReferenceScope<EntityC_, EntityC> scope;
 
 		static {
 			stringC = ValueFieldReference1.of( "stringC", EntityC_.class, String.class, String.class, String.class );
@@ -235,7 +234,7 @@ public static class EntityB_union_EntityC_ {
 		public static ValueFieldReference1<EntityB_union_EntityC_, String, String, String> stringA;
 		public static ValueFieldReference1<EntityB_union_EntityC_, String, String, String> stringB;
 
-		public static RootReferenceScope<EntityB_union_EntityC_, EntityB> scope;
+		public static HibernateOrmRootReferenceScope<EntityB_union_EntityC_, EntityB> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", EntityB_union_EntityC_.class, String.class, String.class,
@@ -286,7 +285,7 @@ public static class Entity2C {
 	public static class Entity2A_union_Entity2B_ {
 		public static ValueFieldReference1<Entity2A_union_Entity2B_, String, String, String> stringA;
 
-		public static RootReferenceScope<Entity2A_union_Entity2B_, Object> scope;
+		public static HibernateOrmRootReferenceScope<Entity2A_union_Entity2B_, Object> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", Entity2A_union_Entity2B_.class, String.class, String.class,
@@ -298,7 +297,7 @@ public static class Entity2A_union_Entity2B_ {
 	public static class Entity2A_ {
 		public static ValueFieldReference1<Entity2A_, String, String, String> stringA;
 
-		public static RootReferenceScope<Entity2A_, Entity2A> scope;
+		public static HibernateOrmRootReferenceScope<Entity2A_, Entity2A> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", Entity2A_.class, String.class, String.class, String.class );
@@ -311,7 +310,7 @@ public static class Entity2B_ {
 		public static ValueFieldReference1<Entity2B_, String, String, String> stringA;
 		public static ValueFieldReference1<Entity2B_, String, String, String> stringB;
 
-		public static RootReferenceScope<Entity2B_, Entity2B> scope;
+		public static HibernateOrmRootReferenceScope<Entity2B_, Entity2B> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", Entity2B_.class, String.class, String.class, String.class );
@@ -325,7 +324,7 @@ public static class Entity2C_ {
 		public static ValueFieldReference1<Entity2C_, String, String, String> stringA;
 		public static ValueFieldReference1<Entity2C_, String, String, String> stringC;
 
-		public static RootReferenceScope<Entity2C_, Entity2C> scope;
+		public static HibernateOrmRootReferenceScope<Entity2C_, Entity2C> scope;
 
 		static {
 			stringA = ValueFieldReference1.of( "stringA", Entity2C_.class, String.class, String.class, String.class );
@@ -415,12 +414,13 @@ public Class<P> projectionType() {
 
 	}
 
-	private static class RootReferenceScopeImpl<SR, E> implements RootReferenceScope<SR, E> {
+	private static class RootReferenceScopeImpl<SR, E> implements HibernateOrmRootReferenceScope<SR, E> {
 
 		private final Class<SR> rootReferenceType;
 		private final Class<? extends E>[] entityClass;
 
-		static <SR, E> RootReferenceScope<SR, E> of(Class<SR> rootReferenceType, Class<? extends E>... entityClass) {
+		static <SR, E> HibernateOrmRootReferenceScope<SR, E> of(Class<SR> rootReferenceType,
+				Class<? extends E>... entityClass) {
 			return new RootReferenceScopeImpl<>( rootReferenceType, entityClass );
 		}
 
@@ -435,11 +435,8 @@ public Class<SR> rootReferenceType() {
 		}
 
 		@Override
-		public <
-				ER extends EntityReference,
-				S extends org.hibernate.search.engine.mapper.scope.SearchScope<SR, E, ER>,
-				P extends SearchScopeProvider<ER>> S create(P scopeProvider) {
-			return (S) scopeProvider.scope( Arrays.asList( entityClass ) );
+		public SearchScope<SR, E> create(SearchScopeProvider scopeProvider) {
+			return scopeProvider.scope( Arrays.asList( entityClass ) );
 		}
 	}
 

engine/src/main/java/org/hibernate/search/engine/mapper/scope/SearchScope.java

@@ -6,12 +6,9 @@
  */
 package org.hibernate.search.engine.search.reference;
 
-import org.hibernate.search.engine.common.EntityReference;
-import org.hibernate.search.engine.mapper.scope.SearchScope;
-import org.hibernate.search.engine.mapper.scope.SearchScopeProvider;
+import org.hibernate.search.util.common.annotation.Incubating;
 
+@Incubating
 public interface RootReferenceScope<SR, T> {
 	Class<SR> rootReferenceType();
-
-	<ER extends EntityReference, S extends SearchScope<SR, T, ER>, P extends SearchScopeProvider<ER>> S create(P scopeProvider);
 }

engine/src/main/java/org/hibernate/search/engine/mapper/scope/SearchScopeProvider.java

@@ -0,0 +1,16 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.mapper.orm.scope;
+
+import org.hibernate.search.engine.search.reference.RootReferenceScope;
+import org.hibernate.search.util.common.annotation.Incubating;
+
+@Incubating
+public interface HibernateOrmRootReferenceScope<SR, T> extends RootReferenceScope<SR, T> {
+
+	SearchScope<SR, T> create(SearchScopeProvider scopeProvider);
+}

engine/src/main/java/org/hibernate/search/engine/search/reference/RootReferenceScope.java

@@ -40,7 +40,7 @@
  * @param <E> A supertype of all types in this scope.
  */
 @SuppressWarnings("deprecation")
-public interface SearchScope<SR, E> extends org.hibernate.search.engine.mapper.scope.SearchScope<SR, E, EntityReference> {
+public interface SearchScope<SR, E> {
 
 	/**
 	 * Initiate the building of a search predicate.

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/HibernateOrmRootReferenceScope.java

@@ -18,9 +18,7 @@
  * @see org.hibernate.search.mapper.orm.session.SearchSession
  */
 @SuppressWarnings("deprecation")
-public interface SearchScopeProvider
-		extends
-		org.hibernate.search.engine.mapper.scope.SearchScopeProvider<org.hibernate.search.mapper.orm.common.EntityReference> {
+public interface SearchScopeProvider {
 
 	/**
 	 * Creates a {@link SearchScope} limited to

mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/SearchScope.java

@@ -14,10 +14,10 @@
 
 import org.hibernate.Session;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
-import org.hibernate.search.engine.search.reference.RootReferenceScope;
 import org.hibernate.search.mapper.orm.mapping.SearchMapping;
 import org.hibernate.search.mapper.orm.massindexing.MassIndexer;
 import org.hibernate.search.mapper.orm.schema.management.SearchSchemaManager;
+import org.hibernate.search.mapper.orm.scope.HibernateOrmRootReferenceScope;
 import org.hibernate.search.mapper.orm.scope.SearchScope;
 import org.hibernate.search.mapper.orm.scope.SearchScopeProvider;
 import org.hibernate.search.mapper.orm.search.loading.dsl.SearchLoadingOptionsStep;
@@ -115,7 +115,7 @@ public interface SearchSession extends SearchScopeProvider {
 			T,
 			SearchLoadingOptionsStep,
 			?,
-			?> search(RootReferenceScope<SR, T> scope);
+			?> search(HibernateOrmRootReferenceScope<SR, T> scope);
 
 	/**
 	 * Create a {@link SearchSchemaManager} for all indexes.