Skip to content

Commit

Permalink
HSEARCH-3288 Comply with naming rules - Lucene sorts
Browse files Browse the repository at this point in the history
  • Loading branch information
@yrodiere
yrodiere committed Nov 28, 2018
1 parent b147d94 commit 6ef26d4
Show file tree
Hide file tree
Showing 29 changed files with 72 additions and 72 deletions.
8 changes: 4 additions & 4 deletions ...java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java
View file
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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 );
}
Expand All @@ -53,7 +53,7 @@ public LuceneSearchPredicateBuilderFactoryImpl getSearchPredicateBuilderFactory(
}

@Override
public SearchSortBuilderFactoryImpl getSearchSortBuilderFactory() {
public LuceneSearchSortBuilderFactoryImpl getSearchSortBuilderFactory() {
return searchSortFactory;
}

Expand Down
2 changes: 1 addition & 1 deletion .../sort/impl/AbstractSearchSortBuilder.java → ...impl/AbstractLuceneSearchSortBuilder.java
View file
Expand Up @@ -13,7 +13,7 @@
/**
* @author Guillaume Smet
*/
public abstract class AbstractSearchSortBuilder implements SearchSortBuilder<LuceneSearchSortBuilder>,
public abstract class AbstractLuceneSearchSortBuilder implements SearchSortBuilder<LuceneSearchSortBuilder>,
LuceneSearchSortBuilder {

protected SortOrder order;
Expand Down
6 changes: 3 additions & 3 deletions ...arch/sort/impl/IndexOrderSortBuilder.java → ...ort/impl/LuceneIndexOrderSortBuilder.java
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...earch/sort/impl/ScoreSortBuilderImpl.java → ...rch/sort/impl/LuceneScoreSortBuilder.java
View file
Expand Up @@ -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<LuceneSearchSortBuilder> {

private static final SortField FIELD_SCORE_ASC = new SortField( null, Type.SCORE, true );
Expand Down
12 changes: 6 additions & 6 deletions ...rt/impl/SearchSortBuilderFactoryImpl.java → ...l/LuceneSearchSortBuilderFactoryImpl.java
View file
Expand Up @@ -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() );

Expand All @@ -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;
Expand Down Expand Up @@ -68,7 +68,7 @@ public void contribute(LuceneSearchSortCollector collector, List<LuceneSearchSor

@Override
public ScoreSortBuilder<LuceneSearchSortBuilder> score() {
return new ScoreSortBuilderImpl();
return new LuceneScoreSortBuilder();
}

@Override
Expand All @@ -87,17 +87,17 @@ public DistanceSortBuilder<LuceneSearchSortBuilder> 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
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java
View file
Expand Up @@ -16,7 +16,7 @@
* <p>
* Used by Lucene-specific sort contributors.
*
* @see SearchSortBuilderFactoryImpl#contribute(Object, List)
* @see LuceneSearchSortBuilderFactoryImpl#contribute(Object, List)
* @see LuceneSearchSortBuilder
*/
public interface LuceneSearchSortCollector {
Expand Down
4 changes: 2 additions & 2 deletions ...erProvidedLuceneSortFieldSortBuilder.java → ...erProvidedLuceneSortFieldSortBuilder.java
View file
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...pl/UserProvidedLuceneSortSortBuilder.java → ...eneUserProvidedLuceneSortSortBuilder.java
View file
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...ernate/search/backend/lucene/types/dsl/impl/LuceneBooleanIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -49,7 +49,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<Boolean> helper, Luce
converter,
codec,
new LuceneIntegerFieldPredicateBuilderFactory( converter ),
new IntegerFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneIntegerFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...rnate/search/backend/lucene/types/dsl/impl/LuceneGeoPointIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -55,7 +55,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<GeoPoint> helper, Luc
converter,
codec,
LuceneGeoPointFieldPredicateBuilderFactory.INSTANCE,
new GeoPointFieldSortBuilderFactory( resolvedSortable ),
new LuceneGeoPointFieldSortBuilderFactory( resolvedSortable ),
new GeoPointFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...ernate/search/backend/lucene/types/dsl/impl/LuceneInstantIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -51,7 +51,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<Instant> helper, Luce
converter,
codec,
new LuceneInstantFieldPredicateBuilderFactory( converter ),
new InstantFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneInstantFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...ernate/search/backend/lucene/types/dsl/impl/LuceneIntegerIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -52,7 +52,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<Integer> helper, Luce
converter,
codec,
new LuceneIntegerFieldPredicateBuilderFactory( converter ),
new IntegerFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneIntegerFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...nate/search/backend/lucene/types/dsl/impl/LuceneLocalDateIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -54,7 +54,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<LocalDate> helper, Lu
converter,
codec,
new LuceneLocalDateFieldPredicateBuilderFactory( converter ),
new LocalDateFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneLocalDateFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...hibernate/search/backend/lucene/types/dsl/impl/LuceneLongIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -49,7 +49,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<Long> helper, LuceneI
converter,
codec,
new LuceneLongFieldPredicateBuilderFactory( converter ),
new LongFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneLongFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
4 changes: 2 additions & 2 deletions ...bernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexSchemaFieldContextImpl.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -111,7 +111,7 @@ protected void contribute(IndexSchemaFieldDefinitionHelper<String> helper, Lucen
converter,
codec,
new LuceneStringFieldPredicateBuilderFactory( converter, analyzer != null, queryBuilder ),
new StringFieldSortBuilderFactory( resolvedSortable, converter ),
new LuceneStringFieldSortBuilderFactory( resolvedSortable, converter ),
new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
);

Expand Down
6 changes: 3 additions & 3 deletions ...rt/impl/AbstractFieldSortBuilderImpl.java → .../impl/AbstractLuceneFieldSortBuilder.java
View file
Expand Up @@ -11,15 +11,15 @@
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;
import org.hibernate.search.engine.search.dsl.sort.SortOrder;
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<LuceneSearchSortBuilder> {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
Expand All @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions ...tandardLuceneFieldSortBuilderFactory.java → ...uceneStandardFieldSortBuilderFactory.java
View file
Expand Up @@ -16,15 +16,15 @@
import org.hibernate.search.engine.spatial.GeoPoint;
import org.hibernate.search.util.impl.common.LoggerFactory;

abstract class AbstractStandardLuceneFieldSortBuilderFactory<T> implements LuceneFieldSortBuilderFactory {
abstract class AbstractLuceneStandardFieldSortBuilderFactory<T> implements LuceneFieldSortBuilderFactory {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );

private final boolean sortable;

protected final LuceneFieldConverter<?, T> converter;

protected AbstractStandardLuceneFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, T> converter) {
protected AbstractLuceneStandardFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, T> converter) {
this.sortable = sortable;
this.converter = converter;
}
Expand All @@ -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 );
Expand Down
6 changes: 3 additions & 3 deletions ...ort/impl/GeoPointDistanceSortBuilder.java → ...pl/LuceneGeoPointDistanceSortBuilder.java
View file
Expand Up @@ -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;
Expand All @@ -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<LuceneSearchSortBuilder> {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
Expand All @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions ...impl/GeoPointFieldSortBuilderFactory.java → ...uceneGeoPointFieldSortBuilderFactory.java
View file
Expand Up @@ -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;
}

Expand All @@ -39,7 +39,7 @@ public DistanceSortBuilder<LuceneSearchSortBuilder> createDistanceSortBuilder(St
GeoPoint center) {
checkSortable( absoluteFieldPath );

return new GeoPointDistanceSortBuilder( absoluteFieldPath, center );
return new LuceneGeoPointDistanceSortBuilder( absoluteFieldPath, center );
}

@Override
Expand All @@ -48,7 +48,7 @@ public boolean isDslCompatibleWith(LuceneFieldSortBuilderFactory obj) {
return false;
}

GeoPointFieldSortBuilderFactory other = (GeoPointFieldSortBuilderFactory) obj;
LuceneGeoPointFieldSortBuilderFactory other = (LuceneGeoPointFieldSortBuilderFactory) obj;

return other.sortable == this.sortable;
}
Expand Down

0 comments on commit 6ef26d4

Please sign in to comment.