HSEARCH-3082 Express SortBuilderFactory converter as internal type

fax4ever · yrodiere · commit ef45c653af64 · 2018-11-16T08:43:17.000+01:00
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
@@ -15,7 +15,7 @@
 import org.hibernate.search.backend.lucene.types.converter.impl.BooleanFieldConverter;
 import org.hibernate.search.backend.lucene.types.predicate.impl.IntegerFieldPredicateBuilderFactory;
 import org.hibernate.search.backend.lucene.types.projection.impl.StandardFieldProjectionBuilderFactory;
-import org.hibernate.search.backend.lucene.types.sort.impl.BooleanFieldSortBuilderFactory;
+import org.hibernate.search.backend.lucene.types.sort.impl.IntegerFieldSortBuilderFactory;
 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<Boolean> helper, Luce
 				converter,
 				codec,
 				new IntegerFieldPredicateBuilderFactory( converter ),
-				new BooleanFieldSortBuilderFactory( resolvedSortable, converter ),
+				new IntegerFieldSortBuilderFactory( resolvedSortable, converter ),
 				new StandardFieldProjectionBuilderFactory<>( resolvedProjectable, codec, converter )
 		);
 
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/AbstractStandardLuceneFieldSortBuilderFactory.java
@@ -16,15 +16,15 @@
 import org.hibernate.search.engine.spatial.GeoPoint;
 import org.hibernate.search.util.impl.common.LoggerFactory;
 
-abstract class AbstractStandardLuceneFieldSortBuilderFactory<F> implements LuceneFieldSortBuilderFactory {
+abstract class AbstractStandardLuceneFieldSortBuilderFactory<T> implements LuceneFieldSortBuilderFactory {
 
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
 	private final boolean sortable;
 
-	protected final LuceneFieldConverter<F, ?> converter;
+	protected final LuceneFieldConverter<?, T> converter;
 
-	protected AbstractStandardLuceneFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<F, ?> converter) {
+	protected AbstractStandardLuceneFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, T> converter) {
 		this.sortable = sortable;
 		this.converter = converter;
 	}
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/BooleanFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/BooleanFieldSortBuilderFactory.java
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/IntegerFieldSortBuilderFactory.java
@@ -13,7 +13,7 @@
 
 public class IntegerFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Integer> {
 
-	public IntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<Integer, ?> converter) {
+	public IntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, Integer> converter) {
 		super( sortable, converter );
 	}
 
@@ -22,6 +22,6 @@ public FieldSortBuilder<LuceneSearchSortBuilder> createFieldSortBuilder(
 			LuceneSearchContext searchContext, String absoluteFieldPath) {
 		checkSortable( absoluteFieldPath );
 
-		return new IntegerFieldSortBuilder( searchContext, absoluteFieldPath, (LuceneFieldConverter<?, Integer>) converter );
+		return new IntegerFieldSortBuilder( 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/LocalDateFieldSortBuilder.java
@@ -6,8 +6,6 @@
  */
 package org.hibernate.search.backend.lucene.types.sort.impl;
 
-import java.time.LocalDate;
-
 import org.apache.lucene.search.SortField;
 
 import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext;
@@ -18,7 +16,7 @@
 public class LocalDateFieldSortBuilder extends AbstractFieldSortBuilderImpl {
 
 	LocalDateFieldSortBuilder(LuceneSearchContext searchContext,
-			String absoluteFieldPath, LuceneFieldConverter<LocalDate, ?> converter) {
+			String absoluteFieldPath, LuceneFieldConverter<?, Long> 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/LocalDateFieldSortBuilderFactory.java
@@ -6,16 +6,14 @@
  */
 package org.hibernate.search.backend.lucene.types.sort.impl;
 
-import java.time.LocalDate;
-
 import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext;
 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.search.sort.spi.FieldSortBuilder;
 
-public class LocalDateFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<LocalDate> {
+public class LocalDateFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Long> {
 
-	public LocalDateFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<LocalDate, ?> converter) {
+	public LocalDateFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, Long> converter) {
 		super( sortable, 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/LongFieldSortBuilder.java
@@ -16,7 +16,7 @@
 public class LongFieldSortBuilder extends AbstractFieldSortBuilderImpl {
 
 	LongFieldSortBuilder(LuceneSearchContext searchContext,
-			String absoluteFieldPath, LuceneFieldConverter<Long, ?> converter) {
+			String absoluteFieldPath, LuceneFieldConverter<?, Long> 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/LongFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/LongFieldSortBuilderFactory.java
@@ -13,7 +13,7 @@
 
 public class LongFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Long> {
 
-	public LongFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<Long, ?> converter) {
+	public LongFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, Long> converter) {
 		super( sortable, 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/StringFieldSortBuilder.java
@@ -16,7 +16,7 @@
 public class StringFieldSortBuilder extends AbstractFieldSortBuilderImpl {
 
 	StringFieldSortBuilder(LuceneSearchContext searchContext,
-			String absoluteFieldPath, LuceneFieldConverter<String, ?> converter) {
+			String absoluteFieldPath, LuceneFieldConverter<?, String> 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/StringFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/StringFieldSortBuilderFactory.java
@@ -13,7 +13,7 @@
 
 public class StringFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<String> {
 
-	public StringFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<String, ?> converter) {
+	public StringFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, String> converter) {
 		super( sortable, converter );
 	}
 
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/UtilDateFieldSortBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/UtilDateFieldSortBuilder.java
@@ -6,8 +6,6 @@
  */
 package org.hibernate.search.backend.lucene.types.sort.impl;
 
-import java.util.Date;
-
 import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext;
 import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortCollector;
 import org.hibernate.search.backend.lucene.types.converter.impl.LuceneFieldConverter;
@@ -18,7 +16,7 @@
 public class UtilDateFieldSortBuilder extends AbstractFieldSortBuilderImpl {
 
 	UtilDateFieldSortBuilder(LuceneSearchContext searchContext,
-			String absoluteFieldPath, LuceneFieldConverter<Date, ?> converter) {
+			String absoluteFieldPath, LuceneFieldConverter<?, Long> 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/UtilDateFieldSortBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/sort/impl/UtilDateFieldSortBuilderFactory.java
@@ -6,14 +6,12 @@
  */
 package org.hibernate.search.backend.lucene.types.sort.impl;
 
-import java.util.Date;
-
 import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext;
 import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilder;
 import org.hibernate.search.backend.lucene.types.converter.impl.UtilDateFieldConverter;
 import org.hibernate.search.engine.search.sort.spi.FieldSortBuilder;
 
-public class UtilDateFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Date> {
+public class UtilDateFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Long> {
 
 	public UtilDateFieldSortBuilderFactory(boolean sortable, UtilDateFieldConverter converter) {
 		super( sortable, converter );

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`public class IntegerFieldSortBuilderFactory extends AbstractStandardLuceneFieldSortBuilderFactory<Integer> {`
`15`	`15`
`16`		`- public IntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<Integer, ?> converter) {`
	`16`	`+ public IntegerFieldSortBuilderFactory(boolean sortable, LuceneFieldConverter<?, Integer> converter) {`
`17`	`17`	`super( sortable, converter );`
`18`	`18`	`}`
`19`	`19`
`@@ -22,6 +22,6 @@ public FieldSortBuilder<LuceneSearchSortBuilder> createFieldSortBuilder(`
`22`	`22`	`LuceneSearchContext searchContext, String absoluteFieldPath) {`
`23`	`23`	`checkSortable( absoluteFieldPath );`
`24`	`24`
`25`		`- return new IntegerFieldSortBuilder( searchContext, absoluteFieldPath, (LuceneFieldConverter<?, Integer>) converter );`
	`25`	`+ return new IntegerFieldSortBuilder( searchContext, absoluteFieldPath, converter );`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`public class LongFieldSortBuilder extends AbstractFieldSortBuilderImpl {`
`17`	`17`
`18`	`18`	`LongFieldSortBuilder(LuceneSearchContext searchContext,`
`19`		`- String absoluteFieldPath, LuceneFieldConverter<Long, ?> converter) {`
	`19`	`+ String absoluteFieldPath, LuceneFieldConverter<?, Long> converter) {`
`20`	`20`	`super( searchContext, absoluteFieldPath, converter, Long.MIN_VALUE, Long.MAX_VALUE );`
`21`	`21`	`}`
`22`	`22`