diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java index 4ddb017a04a..bd30ac4b8bd 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java @@ -11,7 +11,7 @@ import org.hibernate.search.backend.lucene.search.impl.LuceneSearchTargetModel; import org.hibernate.search.backend.lucene.search.predicate.impl.LuceneSearchPredicateBuilderFactoryImpl; import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjectionBuilderFactoryImpl; -import org.hibernate.search.backend.lucene.search.sort.impl.SearchSortBuilderFactoryImpl; +import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilderFactoryImpl; import org.hibernate.search.engine.mapper.mapping.context.spi.MappingContextImplementor; import org.hibernate.search.engine.search.dsl.spi.SearchTargetContext; @@ -23,7 +23,7 @@ public class LuceneSearchTargetContext private final LuceneSearchTargetModel searchTargetModel; private final LuceneSearchPredicateBuilderFactoryImpl searchPredicateFactory; - private final SearchSortBuilderFactoryImpl searchSortFactory; + private final LuceneSearchSortBuilderFactoryImpl searchSortFactory; private final SearchQueryBuilderFactoryImpl searchQueryFactory; private final LuceneSearchProjectionBuilderFactoryImpl searchProjectionFactory; @@ -33,7 +33,7 @@ public LuceneSearchTargetContext(SearchBackendContext searchBackendContext, LuceneSearchContext searchContext = new LuceneSearchContext( mappingContext ); this.searchTargetModel = searchTargetModel; this.searchPredicateFactory = new LuceneSearchPredicateBuilderFactoryImpl( searchContext, searchTargetModel ); - this.searchSortFactory = new SearchSortBuilderFactoryImpl( searchContext, searchTargetModel ); + this.searchSortFactory = new LuceneSearchSortBuilderFactoryImpl( searchContext, searchTargetModel ); this.searchProjectionFactory = new LuceneSearchProjectionBuilderFactoryImpl( searchTargetModel ); this.searchQueryFactory = new SearchQueryBuilderFactoryImpl( searchBackendContext, searchTargetModel, this.searchProjectionFactory ); } @@ -53,7 +53,7 @@ public LuceneSearchPredicateBuilderFactoryImpl getSearchPredicateBuilderFactory( } @Override - public SearchSortBuilderFactoryImpl getSearchSortBuilderFactory() { + public LuceneSearchSortBuilderFactoryImpl getSearchSortBuilderFactory() { return searchSortFactory; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractSearchSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractLuceneSearchSortBuilder.java similarity index 86% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractSearchSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractLuceneSearchSortBuilder.java index ac86a4e7c03..5306410eabe 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractSearchSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/AbstractLuceneSearchSortBuilder.java @@ -13,7 +13,7 @@ /** * @author Guillaume Smet */ -public abstract class AbstractSearchSortBuilder implements SearchSortBuilder, +public abstract class AbstractLuceneSearchSortBuilder implements SearchSortBuilder, LuceneSearchSortBuilder { protected SortOrder order; diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/IndexOrderSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneIndexOrderSortBuilder.java similarity index 70% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/IndexOrderSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneIndexOrderSortBuilder.java index b7ed67efa3d..ed50fd101a4 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/IndexOrderSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneIndexOrderSortBuilder.java @@ -8,11 +8,11 @@ import org.apache.lucene.search.SortField; -class IndexOrderSortBuilder implements LuceneSearchSortBuilder { +class LuceneIndexOrderSortBuilder implements LuceneSearchSortBuilder { - public static final IndexOrderSortBuilder INSTANCE = new IndexOrderSortBuilder(); + public static final LuceneIndexOrderSortBuilder INSTANCE = new LuceneIndexOrderSortBuilder(); - private IndexOrderSortBuilder() { + private LuceneIndexOrderSortBuilder() { } @Override diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/ScoreSortBuilderImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneScoreSortBuilder.java similarity index 93% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/ScoreSortBuilderImpl.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneScoreSortBuilder.java index f2695c9bea9..1dd43150473 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/ScoreSortBuilderImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneScoreSortBuilder.java @@ -11,7 +11,7 @@ import org.hibernate.search.engine.search.dsl.sort.SortOrder; import org.hibernate.search.engine.search.sort.spi.ScoreSortBuilder; -class ScoreSortBuilderImpl extends AbstractSearchSortBuilder +class LuceneScoreSortBuilder extends AbstractLuceneSearchSortBuilder implements ScoreSortBuilder { private static final SortField FIELD_SCORE_ASC = new SortField( null, Type.SCORE, true ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortBuilderFactoryImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortBuilderFactoryImpl.java similarity index 91% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortBuilderFactoryImpl.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortBuilderFactoryImpl.java index 3159d6e9e55..4c3f2243582 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortBuilderFactoryImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortBuilderFactoryImpl.java @@ -30,7 +30,7 @@ /** * @author Guillaume Smet */ -public class SearchSortBuilderFactoryImpl implements LuceneSearchSortBuilderFactory { +public class LuceneSearchSortBuilderFactoryImpl implements LuceneSearchSortBuilderFactory { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); @@ -40,7 +40,7 @@ public class SearchSortBuilderFactoryImpl implements LuceneSearchSortBuilderFact private final LuceneSearchContext searchContext; private final LuceneSearchTargetModel searchTargetModel; - public SearchSortBuilderFactoryImpl(LuceneSearchContext searchContext, + public LuceneSearchSortBuilderFactoryImpl(LuceneSearchContext searchContext, LuceneSearchTargetModel searchTargetModel) { this.searchContext = searchContext; this.searchTargetModel = searchTargetModel; @@ -68,7 +68,7 @@ public void contribute(LuceneSearchSortCollector collector, List score() { - return new ScoreSortBuilderImpl(); + return new LuceneScoreSortBuilder(); } @Override @@ -87,17 +87,17 @@ public DistanceSortBuilder distance(String absoluteFiel @Override public LuceneSearchSortBuilder indexOrder() { - return IndexOrderSortBuilder.INSTANCE; + return LuceneIndexOrderSortBuilder.INSTANCE; } @Override public LuceneSearchSortBuilder fromLuceneSortField(SortField luceneSortField) { - return new UserProvidedLuceneSortFieldSortBuilder( luceneSortField ); + return new LuceneUserProvidedLuceneSortFieldSortBuilder( luceneSortField ); } @Override public LuceneSearchSortBuilder fromLuceneSort(Sort luceneSort) { - return new UserProvidedLuceneSortSortBuilder( luceneSort ); + return new LuceneUserProvidedLuceneSortSortBuilder( luceneSort ); } private static class SortBuilderFactoryRetrievalStrategy diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java index 319572a2635..e38f801b284 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java @@ -16,7 +16,7 @@ *

* Used by Lucene-specific sort contributors. * - * @see SearchSortBuilderFactoryImpl#contribute(Object, List) + * @see LuceneSearchSortBuilderFactoryImpl#contribute(Object, List) * @see LuceneSearchSortBuilder */ public interface LuceneSearchSortCollector { diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortFieldSortBuilder.java similarity index 77% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortFieldSortBuilder.java index 43020542f12..6669d9ffd32 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortFieldSortBuilder.java @@ -9,11 +9,11 @@ import org.apache.lucene.search.SortField; -class UserProvidedLuceneSortFieldSortBuilder implements LuceneSearchSortBuilder { +class LuceneUserProvidedLuceneSortFieldSortBuilder implements LuceneSearchSortBuilder { private final SortField luceneSortField; - UserProvidedLuceneSortFieldSortBuilder(SortField luceneSortField) { + LuceneUserProvidedLuceneSortFieldSortBuilder(SortField luceneSortField) { this.luceneSortField = luceneSortField; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortSortBuilder.java similarity index 79% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortSortBuilder.java index 93abb1873a8..837d6af5198 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/UserProvidedLuceneSortSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneUserProvidedLuceneSortSortBuilder.java @@ -9,11 +9,11 @@ import org.apache.lucene.search.Sort; -class UserProvidedLuceneSortSortBuilder implements LuceneSearchSortBuilder { +class LuceneUserProvidedLuceneSortSortBuilder implements LuceneSearchSortBuilder { private final Sort luceneSort; - UserProvidedLuceneSortSortBuilder(Sort luceneSort) { + LuceneUserProvidedLuceneSortSortBuilder(Sort luceneSort) { this.luceneSort = luceneSort; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneBooleanIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneBooleanIndexSchemaFieldContextImpl.java index 12c26fdeecb..61896b6e2d7 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneBooleanIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneBooleanIndexSchemaFieldContextImpl.java @@ -15,7 +15,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.BooleanFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneIntegerFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.IntegerFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneIntegerFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -49,7 +49,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Luce converter, codec, new LuceneIntegerFieldPredicateBuilderFactory( converter ), - new IntegerFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneIntegerFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneGeoPointIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneGeoPointIndexSchemaFieldContextImpl.java index aa3bd6ed368..0dc860aa163 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneGeoPointIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneGeoPointIndexSchemaFieldContextImpl.java @@ -15,7 +15,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.StandardFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneGeoPointFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.GeoPointFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.GeoPointFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneGeoPointFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; import org.hibernate.search.engine.spatial.GeoPoint; @@ -55,7 +55,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Luc converter, codec, LuceneGeoPointFieldPredicateBuilderFactory.INSTANCE, - new GeoPointFieldSortBuilderFactory( resolvedSortable ), + new LuceneGeoPointFieldSortBuilderFactory( resolvedSortable ), new GeoPointFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneInstantIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneInstantIndexSchemaFieldContextImpl.java index b539c8eeea5..980e2283f3c 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneInstantIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneInstantIndexSchemaFieldContextImpl.java @@ -17,7 +17,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.InstantFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneInstantFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.InstantFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneInstantFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -51,7 +51,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Luce converter, codec, new LuceneInstantFieldPredicateBuilderFactory( converter ), - new InstantFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneInstantFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneIntegerIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneIntegerIndexSchemaFieldContextImpl.java index 048e13365d9..9b9ded795b6 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneIntegerIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneIntegerIndexSchemaFieldContextImpl.java @@ -15,7 +15,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.StandardFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneIntegerFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.IntegerFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneIntegerFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -52,7 +52,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Luce converter, codec, new LuceneIntegerFieldPredicateBuilderFactory( converter ), - new IntegerFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneIntegerFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLocalDateIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLocalDateIndexSchemaFieldContextImpl.java index 7a0dbe3a658..8a3cf698ca6 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLocalDateIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLocalDateIndexSchemaFieldContextImpl.java @@ -17,7 +17,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LocalDateFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneLocalDateFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.LocalDateFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneLocalDateFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -54,7 +54,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Lu converter, codec, new LuceneLocalDateFieldPredicateBuilderFactory( converter ), - new LocalDateFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneLocalDateFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLongIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLongIndexSchemaFieldContextImpl.java index 500910a38a1..23831d99cbc 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLongIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneLongIndexSchemaFieldContextImpl.java @@ -15,7 +15,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.StandardFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneLongFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.LongFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneLongFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -49,7 +49,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, LuceneI converter, codec, new LuceneLongFieldPredicateBuilderFactory( converter ), - new LongFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneLongFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexSchemaFieldContextImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexSchemaFieldContextImpl.java index 36c8d30f6dc..3db5070990a 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexSchemaFieldContextImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexSchemaFieldContextImpl.java @@ -23,7 +23,7 @@ import org.hibernate.search.backend.lucene.types.converter.impl.StringFieldConverter; import org.hibernate.search.backend.lucene.types.predicate.impl.LuceneStringFieldPredicateBuilderFactory; import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory; -import org.hibernate.search.backend.lucene.types.sort.impl.StringFieldSortBuilderFactory; +import org.hibernate.search.backend.lucene.types.sort.impl.LuceneStringFieldSortBuilderFactory; import org.hibernate.search.engine.backend.document.model.dsl.Sortable; import org.hibernate.search.engine.backend.document.model.dsl.StringIndexSchemaFieldTypedContext; import org.hibernate.search.engine.backend.document.spi.IndexSchemaFieldDefinitionHelper; @@ -111,7 +111,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper helper, Lucen converter, codec, new LuceneStringFieldPredicateBuilderFactory( converter, analyzer != null, queryBuilder ), - new StringFieldSortBuilderFactory( resolvedSortable, converter ), + new LuceneStringFieldSortBuilderFactory( resolvedSortable, converter ), new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter ) ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractFieldSortBuilderImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneFieldSortBuilder.java similarity index 95% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractFieldSortBuilderImpl.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneFieldSortBuilder.java index 65e23a65d05..1602aabc0df 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractFieldSortBuilderImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneFieldSortBuilder.java @@ -11,7 +11,7 @@ import org.apache.lucene.search.SortField; import org.hibernate.search.backend.lucene.logging.impl.Log; import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext; -import org.hibernate.search.backend.lucene.search.sort.impl.AbstractSearchSortBuilder; +import org.hibernate.search.backend.lucene.search.sort.impl.AbstractLuceneSearchSortBuilder; import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilder; import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.logging.spi.EventContexts; @@ -19,7 +19,7 @@ import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; import org.hibernate.search.util.impl.common.LoggerFactory; -abstract class AbstractFieldSortBuilderImpl extends AbstractSearchSortBuilder +abstract class AbstractLuceneFieldSortBuilder extends AbstractLuceneSearchSortBuilder implements FieldSortBuilder { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); @@ -36,7 +36,7 @@ abstract class AbstractFieldSortBuilderImpl extends AbstractSearchSortBuilder private Object sortMissingValueLastPlaceholder; - protected AbstractFieldSortBuilderImpl( + protected AbstractLuceneFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter, Object sortMissingValueFirstPlaceholder, Object sortMissingValueLastPlaceholder) { diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractStandardLuceneFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneStandardFieldSortBuilderFactory.java similarity index 88% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractStandardLuceneFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneStandardFieldSortBuilderFactory.java index ef2f4ca4911..947baa87148 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractStandardLuceneFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/AbstractLuceneStandardFieldSortBuilderFactory.java @@ -16,7 +16,7 @@ import org.hibernate.search.engine.spatial.GeoPoint; import org.hibernate.search.util.impl.common.LoggerFactory; -abstract class AbstractStandardLuceneFieldSortBuilderFactory implements LuceneFieldSortBuilderFactory { +abstract class AbstractLuceneStandardFieldSortBuilderFactory implements LuceneFieldSortBuilderFactory { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); @@ -24,7 +24,7 @@ abstract class AbstractStandardLuceneFieldSortBuilderFactory implements Lucen protected final LuceneFieldConverter converter; - protected AbstractStandardLuceneFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { + protected AbstractLuceneStandardFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { this.sortable = sortable; this.converter = converter; } @@ -46,7 +46,7 @@ public boolean isDslCompatibleWith(LuceneFieldSortBuilderFactory obj) { return false; } - AbstractStandardLuceneFieldSortBuilderFactory other = (AbstractStandardLuceneFieldSortBuilderFactory) obj; + AbstractLuceneStandardFieldSortBuilderFactory other = (AbstractLuceneStandardFieldSortBuilderFactory) obj; return sortable == other.sortable && converter.isConvertDslToIndexCompatibleWith( other.converter ); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointDistanceSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointDistanceSortBuilder.java similarity index 90% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointDistanceSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointDistanceSortBuilder.java index 044a3917560..79d95cea244 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointDistanceSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointDistanceSortBuilder.java @@ -10,7 +10,7 @@ import org.apache.lucene.document.LatLonDocValuesField; import org.hibernate.search.backend.lucene.logging.impl.Log; -import org.hibernate.search.backend.lucene.search.sort.impl.AbstractSearchSortBuilder; +import org.hibernate.search.backend.lucene.search.sort.impl.AbstractLuceneSearchSortBuilder; import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilder; import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortCollector; import org.hibernate.search.engine.logging.spi.EventContexts; @@ -19,7 +19,7 @@ import org.hibernate.search.engine.spatial.GeoPoint; import org.hibernate.search.util.impl.common.LoggerFactory; -public class GeoPointDistanceSortBuilder extends AbstractSearchSortBuilder +public class LuceneGeoPointDistanceSortBuilder extends AbstractLuceneSearchSortBuilder implements DistanceSortBuilder { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); @@ -28,7 +28,7 @@ public class GeoPointDistanceSortBuilder extends AbstractSearchSortBuilder private final GeoPoint location; - GeoPointDistanceSortBuilder(String absoluteFieldPath, GeoPoint location) { + LuceneGeoPointDistanceSortBuilder(String absoluteFieldPath, GeoPoint location) { this.absoluteFieldPath = absoluteFieldPath; this.location = location; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointFieldSortBuilderFactory.java similarity index 85% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointFieldSortBuilderFactory.java index 1ff4741a36b..cd8c1ab7ac5 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/GeoPointFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneGeoPointFieldSortBuilderFactory.java @@ -17,13 +17,13 @@ import org.hibernate.search.engine.spatial.GeoPoint; import org.hibernate.search.util.impl.common.LoggerFactory; -public class GeoPointFieldSortBuilderFactory implements LuceneFieldSortBuilderFactory { +public class LuceneGeoPointFieldSortBuilderFactory implements LuceneFieldSortBuilderFactory { private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); private final boolean sortable; - public GeoPointFieldSortBuilderFactory(boolean sortable) { + public LuceneGeoPointFieldSortBuilderFactory(boolean sortable) { this.sortable = sortable; } @@ -39,7 +39,7 @@ public DistanceSortBuilder createDistanceSortBuilder(St GeoPoint center) { checkSortable( absoluteFieldPath ); - return new GeoPointDistanceSortBuilder( absoluteFieldPath, center ); + return new LuceneGeoPointDistanceSortBuilder( absoluteFieldPath, center ); } @Override @@ -48,7 +48,7 @@ public boolean isDslCompatibleWith(LuceneFieldSortBuilderFactory obj) { return false; } - GeoPointFieldSortBuilderFactory other = (GeoPointFieldSortBuilderFactory) obj; + LuceneGeoPointFieldSortBuilderFactory other = (LuceneGeoPointFieldSortBuilderFactory) obj; return other.sortable == this.sortable; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilder.java similarity index 88% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilder.java index e40609b9762..8314bc7dd6a 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilder.java @@ -13,9 +13,9 @@ import org.apache.lucene.search.SortField; -public class InstantFieldSortBuilder extends AbstractFieldSortBuilderImpl { +public class LuceneInstantFieldSortBuilder extends AbstractLuceneFieldSortBuilder { - InstantFieldSortBuilder(LuceneSearchContext searchContext, + LuceneInstantFieldSortBuilder(LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter) { super( searchContext, absoluteFieldPath, converter, Long.MIN_VALUE, Long.MAX_VALUE ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilderFactory.java similarity index 73% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilderFactory.java index 2874bf35f56..64e1eb3ec7c 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/InstantFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneInstantFieldSortBuilderFactory.java @@ -11,9 +11,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.InstantFieldConverter; import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; -public class InstantFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory { +public class LuceneInstantFieldSortBuilderFactory extends AbstractLuceneStandardFieldSortBuilderFactory { - public InstantFieldSortBuilderFactory(boolean sortable, InstantFieldConverter converter) { + public LuceneInstantFieldSortBuilderFactory(boolean sortable, InstantFieldConverter converter) { super( sortable, converter ); } @@ -22,6 +22,6 @@ public FieldSortBuilder createFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath) { checkSortable( absoluteFieldPath ); - return new InstantFieldSortBuilder( searchContext, absoluteFieldPath, converter ); + return new LuceneInstantFieldSortBuilder( searchContext, absoluteFieldPath, converter ); } } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilder.java similarity index 88% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilder.java index 60d83ccee0c..26a75e32f0c 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilder.java @@ -13,9 +13,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.dsl.sort.SortOrder; -public class IntegerFieldSortBuilder extends AbstractFieldSortBuilderImpl { +public class LuceneIntegerFieldSortBuilder extends AbstractLuceneFieldSortBuilder { - IntegerFieldSortBuilder(LuceneSearchContext searchContext, + LuceneIntegerFieldSortBuilder(LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter) { super( searchContext, absoluteFieldPath, converter, Integer.MIN_VALUE, Integer.MAX_VALUE ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilderFactory.java similarity index 72% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilderFactory.java index 8dc7eb6a65f..562ed3efbb2 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneIntegerFieldSortBuilderFactory.java @@ -11,9 +11,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; -public class StringFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory { +public class LuceneIntegerFieldSortBuilderFactory extends AbstractLuceneStandardFieldSortBuilderFactory { - public StringFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { + public LuceneIntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { super( sortable, converter ); } @@ -22,6 +22,6 @@ public FieldSortBuilder createFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath) { checkSortable( absoluteFieldPath ); - return new StringFieldSortBuilder( searchContext, absoluteFieldPath, converter ); + return new LuceneIntegerFieldSortBuilder( searchContext, absoluteFieldPath, converter ); } } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilder.java similarity index 87% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilder.java index 89b6117dd80..b5828529760 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilder.java @@ -13,9 +13,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.dsl.sort.SortOrder; -public class LocalDateFieldSortBuilder extends AbstractFieldSortBuilderImpl { +public class LuceneLocalDateFieldSortBuilder extends AbstractLuceneFieldSortBuilder { - LocalDateFieldSortBuilder(LuceneSearchContext searchContext, + LuceneLocalDateFieldSortBuilder(LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter) { super( searchContext, absoluteFieldPath, converter, Long.MIN_VALUE, Long.MAX_VALUE ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilderFactory.java similarity index 72% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilderFactory.java index f0ec0ea20f5..86b01eabace 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LocalDateFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLocalDateFieldSortBuilderFactory.java @@ -11,9 +11,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; -public class LocalDateFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory { +public class LuceneLocalDateFieldSortBuilderFactory extends AbstractLuceneStandardFieldSortBuilderFactory { - public LocalDateFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { + public LuceneLocalDateFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { super( sortable, converter ); } @@ -22,6 +22,6 @@ public FieldSortBuilder createFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath) { checkSortable( absoluteFieldPath ); - return new LocalDateFieldSortBuilder( searchContext, absoluteFieldPath, converter ); + return new LuceneLocalDateFieldSortBuilder( searchContext, absoluteFieldPath, converter ); } } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilder.java similarity index 88% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilder.java index 383f983254c..ef7511802d9 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilder.java @@ -13,9 +13,9 @@ import org.apache.lucene.search.SortField; -public class LongFieldSortBuilder extends AbstractFieldSortBuilderImpl { +public class LuceneLongFieldSortBuilder extends AbstractLuceneFieldSortBuilder { - LongFieldSortBuilder(LuceneSearchContext searchContext, + LuceneLongFieldSortBuilder(LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter) { super( searchContext, absoluteFieldPath, converter, Long.MIN_VALUE, Long.MAX_VALUE ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilderFactory.java similarity index 73% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilderFactory.java index 304e73fead9..d9d52f42d15 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/IntegerFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneLongFieldSortBuilderFactory.java @@ -11,9 +11,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; -public class IntegerFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory { +public class LuceneLongFieldSortBuilderFactory extends AbstractLuceneStandardFieldSortBuilderFactory { - public IntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { + public LuceneLongFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { super( sortable, converter ); } @@ -22,6 +22,6 @@ public FieldSortBuilder createFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath) { checkSortable( absoluteFieldPath ); - return new IntegerFieldSortBuilder( searchContext, absoluteFieldPath, converter ); + return new LuceneLongFieldSortBuilder( searchContext, absoluteFieldPath, converter ); } } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilder.java similarity index 88% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilder.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilder.java index fcd3306d495..5facd93a7a5 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilder.java @@ -13,9 +13,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.dsl.sort.SortOrder; -public class StringFieldSortBuilder extends AbstractFieldSortBuilderImpl { +public class LuceneStringFieldSortBuilder extends AbstractLuceneFieldSortBuilder { - StringFieldSortBuilder(LuceneSearchContext searchContext, + LuceneStringFieldSortBuilder(LuceneSearchContext searchContext, String absoluteFieldPath, LuceneFieldConverter converter) { super( searchContext, absoluteFieldPath, converter, SortField.STRING_FIRST, SortField.STRING_LAST ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilderFactory.java similarity index 73% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilderFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilderFactory.java index ae7c13cb884..43cce615927 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilderFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LuceneStringFieldSortBuilderFactory.java @@ -11,9 +11,9 @@ import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter; import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder; -public class LongFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory { +public class LuceneStringFieldSortBuilderFactory extends AbstractLuceneStandardFieldSortBuilderFactory { - public LongFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { + public LuceneStringFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter converter) { super( sortable, converter ); } @@ -22,6 +22,6 @@ public FieldSortBuilder createFieldSortBuilder( LuceneSearchContext searchContext, String absoluteFieldPath) { checkSortable( absoluteFieldPath ); - return new LongFieldSortBuilder( searchContext, absoluteFieldPath, converter ); + return new LuceneStringFieldSortBuilder( searchContext, absoluteFieldPath, converter ); } }