HSEARCH-1987 Deal with flexible prefixes in nested IndexedEmbedded Numeric fields

Author: Sanne

engine/src/main/java/org/hibernate/search/engine/metadata/impl/AnnotationMetadataProvider.java

@@ -172,8 +172,8 @@ private void checkDocumentId(XProperty member,
 			return;
 		}
 
-		String attributeName = getIdAttributeName( member, idAnnotation );
-		String path = prefix + attributeName;
+		final String unprefixedAttributeName = getIdAttributeName( member, idAnnotation );
+		final String path = prefix + unprefixedAttributeName;
 		if ( isRoot ) {
 			createIdPropertyMetadata(
 					member,
@@ -182,7 +182,8 @@ private void checkDocumentId(XProperty member,
 					configContext,
 					parseContext,
 					idAnnotation,
-					path
+					path,
+					unprefixedAttributeName
 			);
 		}
 		else {
@@ -237,7 +238,8 @@ private void createIdPropertyMetadata(XProperty member,
 			ConfigContext configContext,
 			ParseContext parseContext,
 			Annotation idAnnotation,
-			String path) {
+			String path,
+			String unprefixedAttributeName) {
 		if ( parseContext.isExplicitDocumentId() ) {
 			if ( idAnnotation instanceof DocumentId ) {
 				throw log.duplicateDocumentIdFound( typeMetadataBuilder.getIndexedType().getName() );
@@ -251,7 +253,7 @@ private void createIdPropertyMetadata(XProperty member,
 			parseContext.setExplicitDocumentId( true );
 		}
 
-		NumericField numericFieldAnnotation = numericFields.getNumericFieldAnnotation( path );
+		NumericField numericFieldAnnotation = numericFields.getNumericFieldAnnotation( unprefixedAttributeName );
 
 		// Don't apply @NumericField if it is given with the default name and there is another custom @Field
 		if ( numericFieldAnnotation != null && numericFieldAnnotation.forField().isEmpty()
@@ -1013,7 +1015,8 @@ private void bindFieldAnnotation(
 			typeMetadataBuilder.disableStateInspectionOptimization();
 		}
 
-		String fieldName = prefix + ReflectionHelper.getAttributeName( member, fieldAnnotation.name() );
+		final String unPrefixedFieldName = ReflectionHelper.getAttributeName( member, fieldAnnotation.name() );
+		final String fieldName = prefix + unPrefixedFieldName;
 		Store store = fieldAnnotation.store();
 		Field.Index index = AnnotationProcessingHelper.getIndex(
 				fieldAnnotation.index(),
@@ -1022,7 +1025,7 @@ private void bindFieldAnnotation(
 		);
 		Field.TermVector termVector = AnnotationProcessingHelper.getTermVector( fieldAnnotation.termVector() );
 
-		NumericField numericFieldAnnotation = numericFields.getNumericFieldAnnotation( fieldName );
+		NumericField numericFieldAnnotation = numericFields.getNumericFieldAnnotation( unPrefixedFieldName );
 
 		FieldBridge fieldBridge = bridgeFactory.buildFieldBridge(
 				fieldAnnotation,

engine/src/main/java/org/hibernate/search/engine/metadata/impl/NumericFieldsConfiguration.java

@@ -56,12 +56,10 @@ class NumericFieldsConfiguration {
 	 * Gets the {@code @NumericField} annotation matching the given field, if any. As a side-effect, the given field
 	 * is collected for later validation of configured numeric fields against actually present fields.
 	 */
-	NumericField getNumericFieldAnnotation(String fieldName) {
-		fieldName = unqualify( fieldName );
+	NumericField getNumericFieldAnnotation(final String unprefixedFieldName) {
+		fieldsOfProperty.add( unprefixedFieldName );
 
-		fieldsOfProperty.add( fieldName );
-
-		NumericField numericFieldAnnotation = fieldsMarkedAsNumeric.get( fieldName );
+		NumericField numericFieldAnnotation = fieldsMarkedAsNumeric.get( unprefixedFieldName );
 
 		if ( numericFieldAnnotation == null ) {
 			numericFieldAnnotation = fieldsMarkedAsNumeric.get( "" );
@@ -89,12 +87,4 @@ void validate() {
 		}
 	}
 
-	private String unqualify(String fieldName) {
-		int separatorIdx = fieldName.lastIndexOf( '.' );
-		if ( separatorIdx != -1 ) {
-			fieldName = fieldName.substring( separatorIdx + 1 );
-		}
-
-		return fieldName;
-	}
 }