HSEARCH-2457 Made SortableFieldMetadata.Builder consistent with other…

… builders ... by passing all the required data through constructor parameters. It makes it obvious that a builder wasn't really necessary, but it was probably added for consistency with other metadata.
hibernate · Nov 23, 2016 · 415a2c3 · 415a2c3
1 parent 73ca2ca
commit 415a2c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/...e/src/main/java/org/hibernate/search/engine/metadata/impl/AnnotationMetadataProvider.java b/...e/src/main/java/org/hibernate/search/engine/metadata/impl/AnnotationMetadataProvider.java
@@ -975,9 +975,7 @@ private void bindSortableFieldAnnotation(SortableField sortableFieldAnnotation,
 			throw log.sortableFieldRefersToUndefinedField( typeMetadataBuilder.getIndexedType(), propertyMetadataBuilder.getPropertyAccessor().getName(), sortedFieldAbsoluteName );
 		}
 
-		SortableFieldMetadata fieldMetadata = new SortableFieldMetadata.Builder()
-			.fieldName( sortedFieldAbsoluteName )
-			.build();
+		SortableFieldMetadata fieldMetadata = new SortableFieldMetadata.Builder( sortedFieldAbsoluteName ).build();
 
 		propertyMetadataBuilder.addSortableField( fieldMetadata );
 	}
@@ -1344,9 +1342,7 @@ private void bindFieldAnnotation(
 					fieldMetadataBuilder, metadataProvidingFieldBridge );
 
 			for ( String sortableFieldAbsoluteName : bridgeContributedMetadata.getSortableFieldsAbsoluteNames() ) {
-				SortableFieldMetadata sortableFieldMetadata = new SortableFieldMetadata.Builder()
-					.fieldName( sortableFieldAbsoluteName )
-					.build();
+				SortableFieldMetadata sortableFieldMetadata = new SortableFieldMetadata.Builder( sortableFieldAbsoluteName ).build();
 				propertyMetadataBuilder.addSortableField( sortableFieldMetadata );
 			}
 

diff --git a/engine/src/main/java/org/hibernate/search/engine/metadata/impl/SortableFieldMetadata.java b/engine/src/main/java/org/hibernate/search/engine/metadata/impl/SortableFieldMetadata.java
@@ -36,9 +36,8 @@ public static class Builder {
 
 		private String absoluteName;
 
-		public Builder fieldName(String absoluteName) {
+		public Builder(String absoluteName) {
 			this.absoluteName = absoluteName;
-			return this;
 		}
 
 		public SortableFieldMetadata build() {

diff --git a/engine/src/main/java/org/hibernate/search/engine/metadata/impl/TypeMetadata.java b/engine/src/main/java/org/hibernate/search/engine/metadata/impl/TypeMetadata.java
@@ -629,7 +629,7 @@ public String toString() {
 
 		public void addClassBridgeSortableFields(Iterable<String> sortableFieldsAbsoluteNames) {
 			for ( String sortableFieldAbsoluteName : sortableFieldsAbsoluteNames ) {
-				classBridgeSortableFieldMetadata.add( new SortableFieldMetadata.Builder().fieldName( sortableFieldAbsoluteName ).build() );
+				classBridgeSortableFieldMetadata.add( new SortableFieldMetadata.Builder( sortableFieldAbsoluteName ).build() );
 			}
 		}
 

diff --git a/engine/src/test/java/org/hibernate/search/test/sorting/ManagedMultiReaderTest.java b/engine/src/test/java/org/hibernate/search/test/sorting/ManagedMultiReaderTest.java
@@ -57,8 +57,8 @@ public void testStandardReaderIsUsedIfAllSortsAreCovered() throws Exception {
 			.setEntityType( Person.class )
 			.addSortableFields(
 					Arrays.asList(
-							new SortableFieldMetadata.Builder().fieldName( "ageForIntSorting" ).build(),
-							new SortableFieldMetadata.Builder().fieldName( "ageForStringSorting" ).build()
+							new SortableFieldMetadata.Builder( "ageForIntSorting" ).build(),
+							new SortableFieldMetadata.Builder( "ageForStringSorting" ).build()
 					)
 			)
 			.build();
@@ -88,7 +88,7 @@ public void testUninvertingReaderIsUsedIfNotAllSortsAreCovered() throws Exceptio
 			.setEntityType( Person.class )
 			.addSortableFields(
 					Arrays.asList(
-							new SortableFieldMetadata.Builder().fieldName( "ageForStringSorting" ).build()
+							new SortableFieldMetadata.Builder( "ageForStringSorting" ).build()
 					)
 			)
 			.build();
@@ -119,14 +119,14 @@ public void testCombinationOfStandardAndUninvertingReaderAsRequiredToSortOnInvol
 			.setIndex( "person" )
 				.setEntityType( Person.class )
 					.addSortableFields(
-							Arrays.asList( new SortableFieldMetadata.Builder().fieldName( "ageForStringSorting" ).build() )
+							Arrays.asList( new SortableFieldMetadata.Builder( "ageForStringSorting" ).build() )
 					)
 			.setIndex( "customer" )
 				.setEntityType( Customer.class )
 					.addSortableFields(
 							Arrays.asList(
-									new SortableFieldMetadata.Builder().fieldName( "ageForStringSorting" ).build(),
-									new SortableFieldMetadata.Builder().fieldName( "ageForIntSorting" ).build()
+									new SortableFieldMetadata.Builder( "ageForStringSorting" ).build(),
+									new SortableFieldMetadata.Builder( "ageForIntSorting" ).build()
 							)
 					)
 			.build();