HSEARCH-1347 Move SearchProjection to the projection package

For consistency with SearchQuery and SearchAggregation
hibernate · Sep 16, 2019 · f6c6335 · f6c6335
1 parent dd9eeaa
commit f6c6335
Show file tree

Hide file tree

Showing 58 changed files with 58 additions and 58 deletions.
diff --git a/...sticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java b/...sticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java
@@ -26,7 +26,7 @@
 import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter;
 import org.hibernate.search.engine.logging.spi.AggregationKeyFormatter;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.SearchSort;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
 import org.hibernate.search.engine.search.aggregation.SearchAggregation;

diff --git a/...elasticsearch/search/projection/dsl/impl/ElasticsearchExplanationProjectionFinalStep.java b/...elasticsearch/search/projection/dsl/impl/ElasticsearchExplanationProjectionFinalStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.backend.elasticsearch.search.projection.dsl.impl;
 
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.ElasticsearchSearchProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 

diff --git a/...kend/elasticsearch/search/projection/dsl/impl/ElasticsearchSourceProjectionFinalStep.java b/...kend/elasticsearch/search/projection/dsl/impl/ElasticsearchSourceProjectionFinalStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.backend.elasticsearch.search.projection.dsl.impl;
 
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.ElasticsearchSearchProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 

diff --git a/...backend/elasticsearch/search/projection/impl/ElasticsearchCompositeProjectionBuilder.java b/...backend/elasticsearch/search/projection/impl/ElasticsearchCompositeProjectionBuilder.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.backend.elasticsearch.search.projection.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.CompositeProjectionBuilder;
 
 

diff --git a/...d/elasticsearch/search/projection/impl/ElasticsearchDistanceToFieldProjectionBuilder.java b/...d/elasticsearch/search/projection/impl/ElasticsearchDistanceToFieldProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.DistanceToFieldProjectionBuilder;
 import org.hibernate.search.engine.spatial.DistanceUnit;
 import org.hibernate.search.engine.spatial.GeoPoint;

diff --git a/...elasticsearch/search/projection/impl/ElasticsearchDocumentReferenceProjectionBuilder.java b/...elasticsearch/search/projection/impl/ElasticsearchDocumentReferenceProjectionBuilder.java
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 import org.hibernate.search.engine.search.DocumentReference;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.DocumentReferenceProjectionBuilder;
 
 

diff --git a/...ch/backend/elasticsearch/search/projection/impl/ElasticsearchEntityProjectionBuilder.java b/...ch/backend/elasticsearch/search/projection/impl/ElasticsearchEntityProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.EntityProjectionBuilder;
 
 

diff --git a/...d/elasticsearch/search/projection/impl/ElasticsearchEntityReferenceProjectionBuilder.java b/...d/elasticsearch/search/projection/impl/ElasticsearchEntityReferenceProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.EntityReferenceProjectionBuilder;
 
 

diff --git a/...ckend/elasticsearch/search/projection/impl/ElasticsearchExplanationProjectionBuilder.java b/...ckend/elasticsearch/search/projection/impl/ElasticsearchExplanationProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 
 import com.google.gson.Gson;

diff --git a/...rch/backend/elasticsearch/search/projection/impl/ElasticsearchFieldProjectionBuilder.java b/...rch/backend/elasticsearch/search/projection/impl/ElasticsearchFieldProjectionBuilder.java
@@ -10,7 +10,7 @@
 
 import org.hibernate.search.backend.elasticsearch.types.codec.impl.ElasticsearchFieldCodec;
 import org.hibernate.search.engine.backend.types.converter.FromDocumentFieldValueConverter;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.FieldProjectionBuilder;
 
 

diff --git a/...rch/backend/elasticsearch/search/projection/impl/ElasticsearchScoreProjectionBuilder.java b/...rch/backend/elasticsearch/search/projection/impl/ElasticsearchScoreProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.ScoreProjectionBuilder;
 
 

diff --git a/...te/search/backend/elasticsearch/search/projection/impl/ElasticsearchSearchProjection.java b/...te/search/backend/elasticsearch/search/projection/impl/ElasticsearchSearchProjection.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 

diff --git a/...end/elasticsearch/search/projection/impl/ElasticsearchSearchProjectionBuilderFactory.java b/...end/elasticsearch/search/projection/impl/ElasticsearchSearchProjectionBuilderFactory.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.backend.elasticsearch.scope.model.impl.ElasticsearchScopeModel;
 import org.hibernate.search.backend.elasticsearch.scope.model.impl.IndexSchemaFieldNodeComponentRetrievalStrategy;
 import org.hibernate.search.backend.elasticsearch.types.projection.impl.ElasticsearchFieldProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.projection.spi.CompositeProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.DistanceToFieldProjectionBuilder;

diff --git a/...ch/backend/elasticsearch/search/projection/impl/ElasticsearchSourceProjectionBuilder.java b/...ch/backend/elasticsearch/search/projection/impl/ElasticsearchSourceProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 
 import com.google.gson.Gson;

diff --git a/...te/search/backend/elasticsearch/search/query/dsl/ElasticsearchSearchQueryHitTypeStep.java b/...te/search/backend/elasticsearch/search/query/dsl/ElasticsearchSearchQueryHitTypeStep.java
@@ -11,7 +11,7 @@
 
 import org.hibernate.search.backend.elasticsearch.search.predicate.dsl.ElasticsearchSearchPredicateFactory;
 import org.hibernate.search.backend.elasticsearch.search.projection.dsl.ElasticsearchSearchProjectionFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryHitTypeStep;
 

diff --git a/.../backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryHitTypeStepImpl.java b/.../backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryHitTypeStepImpl.java
@@ -20,7 +20,7 @@
 import org.hibernate.search.backend.elasticsearch.search.query.impl.ElasticsearchSearchQueryBuilder;
 import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQueryHitTypeStep;

diff --git a/...earch/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java b/...earch/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.ElasticsearchSearchProjection;
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.ElasticsearchSearchProjectionBuilderFactory;
 import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilderFactory;
 

diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java
@@ -25,7 +25,7 @@
 import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter;
 import org.hibernate.search.engine.logging.spi.AggregationKeyFormatter;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.SearchSort;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
 import org.hibernate.search.engine.search.aggregation.SearchAggregation;

diff --git a/...e/search/backend/lucene/search/projection/dsl/impl/LuceneDocumentProjectionFinalStep.java b/...e/search/backend/lucene/search/projection/dsl/impl/LuceneDocumentProjectionFinalStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.backend.lucene.search.projection.dsl.impl;
 
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 

diff --git a/...earch/backend/lucene/search/projection/dsl/impl/LuceneExplanationProjectionFinalStep.java b/...earch/backend/lucene/search/projection/dsl/impl/LuceneExplanationProjectionFinalStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.backend.lucene.search.projection.dsl.impl;
 
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 

diff --git a/...ernate/search/backend/lucene/search/projection/impl/LuceneCompositeProjectionBuilder.java b/...ernate/search/backend/lucene/search/projection/impl/LuceneCompositeProjectionBuilder.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.backend.lucene.search.projection.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.CompositeProjectionBuilder;
 
 

diff --git a/.../search/backend/lucene/search/projection/impl/LuceneDistanceToFieldProjectionBuilder.java b/.../search/backend/lucene/search/projection/impl/LuceneDistanceToFieldProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.DistanceToFieldProjectionBuilder;
 import org.hibernate.search.engine.spatial.DistanceUnit;
 import org.hibernate.search.engine.spatial.GeoPoint;

diff --git a/...bernate/search/backend/lucene/search/projection/impl/LuceneDocumentProjectionBuilder.java b/...bernate/search/backend/lucene/search/projection/impl/LuceneDocumentProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 
 import org.apache.lucene.document.Document;

diff --git a/...earch/backend/lucene/search/projection/impl/LuceneDocumentReferenceProjectionBuilder.java b/...earch/backend/lucene/search/projection/impl/LuceneDocumentReferenceProjectionBuilder.java
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 import org.hibernate.search.engine.search.DocumentReference;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.DocumentReferenceProjectionBuilder;
 
 

diff --git a/...hibernate/search/backend/lucene/search/projection/impl/LuceneEntityProjectionBuilder.java b/...hibernate/search/backend/lucene/search/projection/impl/LuceneEntityProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.EntityProjectionBuilder;
 
 

diff --git a/.../search/backend/lucene/search/projection/impl/LuceneEntityReferenceProjectionBuilder.java b/.../search/backend/lucene/search/projection/impl/LuceneEntityReferenceProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.EntityReferenceProjectionBuilder;
 
 

diff --git a/...nate/search/backend/lucene/search/projection/impl/LuceneExplanationProjectionBuilder.java b/...nate/search/backend/lucene/search/projection/impl/LuceneExplanationProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilder;
 
 import org.apache.lucene.search.Explanation;

diff --git a/.../hibernate/search/backend/lucene/search/projection/impl/LuceneFieldProjectionBuilder.java b/.../hibernate/search/backend/lucene/search/projection/impl/LuceneFieldProjectionBuilder.java
@@ -10,7 +10,7 @@
 
 import org.hibernate.search.backend.lucene.types.codec.impl.LuceneFieldCodec;
 import org.hibernate.search.engine.backend.types.converter.FromDocumentFieldValueConverter;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.FieldProjectionBuilder;
 
 public class LuceneFieldProjectionBuilder<F, V> implements FieldProjectionBuilder<V> {

diff --git a/.../hibernate/search/backend/lucene/search/projection/impl/LuceneScoreProjectionBuilder.java b/.../hibernate/search/backend/lucene/search/projection/impl/LuceneScoreProjectionBuilder.java
@@ -8,7 +8,7 @@
 
 import java.util.Set;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.spi.ScoreProjectionBuilder;
 
 

diff --git a/...va/org/hibernate/search/backend/lucene/search/projection/impl/LuceneSearchProjection.java b/...va/org/hibernate/search/backend/lucene/search/projection/impl/LuceneSearchProjection.java
@@ -11,7 +11,7 @@
 import org.hibernate.search.backend.lucene.search.extraction.impl.LuceneCollectorProvider;
 import org.hibernate.search.backend.lucene.search.extraction.impl.LuceneResult;
 import org.hibernate.search.backend.lucene.search.extraction.impl.LuceneDocumentStoredFieldVisitorBuilder;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 

diff --git a/...te/search/backend/lucene/search/projection/impl/LuceneSearchProjectionBuilderFactory.java b/...te/search/backend/lucene/search/projection/impl/LuceneSearchProjectionBuilderFactory.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.backend.lucene.scope.model.impl.LuceneScopedIndexFieldComponent;
 import org.hibernate.search.backend.lucene.scope.model.impl.LuceneScopeModel;
 import org.hibernate.search.backend.lucene.types.projection.impl.LuceneFieldProjectionBuilderFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.projection.spi.CompositeProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.DistanceToFieldProjectionBuilder;

diff --git a/...va/org/hibernate/search/backend/lucene/search/query/dsl/LuceneSearchQueryHitTypeStep.java b/...va/org/hibernate/search/backend/lucene/search/query/dsl/LuceneSearchQueryHitTypeStep.java
@@ -11,7 +11,7 @@
 
 import org.hibernate.search.backend.lucene.search.predicate.dsl.LuceneSearchPredicateFactory;
 import org.hibernate.search.backend.lucene.search.projection.dsl.LuceneSearchProjectionFactory;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryHitTypeStep;
 

diff --git a/...bernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryHitTypeStepImpl.java b/...bernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryHitTypeStepImpl.java
@@ -20,7 +20,7 @@
 import org.hibernate.search.backend.lucene.search.query.impl.LuceneSearchQueryBuilder;
 import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQueryHitTypeStep;

diff --git a/...rg/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java b/...rg/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneEntityProjection;
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneReferenceProjection;
 import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilderFactory;
 

diff --git a/...earch/engine/search/SearchProjection.java → ...e/search/projection/SearchProjection.java b/...earch/engine/search/SearchProjection.java → ...e/search/projection/SearchProjection.java
@@ -4,7 +4,7 @@
  * 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.engine.search;
+package org.hibernate.search.engine.search.projection;
 
 /**
  * A query projection that can be used to obtain particular values of an indexed document.

diff --git a/.../src/main/java/org/hibernate/search/engine/search/projection/dsl/ProjectionFinalStep.java b/.../src/main/java/org/hibernate/search/engine/search/projection/dsl/ProjectionFinalStep.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.engine.search.projection.dsl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 
 /**
  * The final step in a projection definition, where the projection can be retrieved.

diff --git a/.../main/java/org/hibernate/search/engine/search/projection/dsl/SearchProjectionFactory.java b/.../main/java/org/hibernate/search/engine/search/projection/dsl/SearchProjectionFactory.java
@@ -11,7 +11,7 @@
 import java.util.function.Function;
 
 import org.hibernate.search.engine.search.DocumentReference;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.spatial.GeoPoint;
 import org.hibernate.search.util.common.SearchException;

diff --git a/...ibernate/search/engine/search/projection/dsl/impl/CompositeProjectionOptionsStepImpl.java b/...ibernate/search/engine/search/projection/dsl/impl/CompositeProjectionOptionsStepImpl.java
@@ -10,7 +10,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.CompositeProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.spi.CompositeProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilderFactory;

diff --git a/...rg/hibernate/search/engine/search/projection/dsl/impl/DefaultSearchProjectionFactory.java b/...rg/hibernate/search/engine/search/projection/dsl/impl/DefaultSearchProjectionFactory.java
@@ -11,7 +11,7 @@
 import java.util.function.Function;
 
 import org.hibernate.search.engine.common.dsl.spi.DslExtensionState;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.CompositeProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.dsl.DistanceToFieldProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.dsl.DocumentReferenceProjectionOptionsStep;

diff --git a/...te/search/engine/search/projection/dsl/impl/DistanceToFieldProjectionOptionsStepImpl.java b/...te/search/engine/search/projection/dsl/impl/DistanceToFieldProjectionOptionsStepImpl.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.engine.search.projection.dsl.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.DistanceToFieldProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.projection.spi.DistanceToFieldProjectionBuilder;

diff --git a/.../search/engine/search/projection/dsl/impl/DocumentReferenceProjectionOptionsStepImpl.java b/.../search/engine/search/projection/dsl/impl/DocumentReferenceProjectionOptionsStepImpl.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.engine.search.projection.dsl.impl;
 
 import org.hibernate.search.engine.search.DocumentReference;
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.DocumentReferenceProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.spi.DocumentReferenceProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilderFactory;

diff --git a/...g/hibernate/search/engine/search/projection/dsl/impl/EntityProjectionOptionsStepImpl.java b/...g/hibernate/search/engine/search/projection/dsl/impl/EntityProjectionOptionsStepImpl.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.engine.search.projection.dsl.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.EntityProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.spi.EntityProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilderFactory;

diff --git a/...te/search/engine/search/projection/dsl/impl/EntityReferenceProjectionOptionsStepImpl.java b/...te/search/engine/search/projection/dsl/impl/EntityReferenceProjectionOptionsStepImpl.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.engine.search.projection.dsl.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.EntityReferenceProjectionOptionsStep;
 import org.hibernate.search.engine.search.projection.spi.EntityReferenceProjectionBuilder;
 import org.hibernate.search.engine.search.projection.spi.SearchProjectionBuilderFactory;

diff --git a/...rg/hibernate/search/engine/search/projection/dsl/impl/FieldProjectionOptionsStepImpl.java b/...rg/hibernate/search/engine/search/projection/dsl/impl/FieldProjectionOptionsStepImpl.java
@@ -6,7 +6,7 @@
  */
 package org.hibernate.search.engine.search.projection.dsl.impl;
 
-import org.hibernate.search.engine.search.SearchProjection;
+import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.FieldProjectionOptionsStep;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.projection.spi.FieldProjectionBuilder;