HSEARCH-2547 Consider nested @IndexedEmbeddeds as included even when …

…upper-level @IndexedEmbedded with empty includePaths exist

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

@@ -237,7 +237,7 @@ private void checkDocumentId(XProperty member,
 			);
 		}
 		else {
-			if ( parseContext.includeEmbeddedObjectId() || pathsContext.isIncluded( fieldPath ) ) {
+			if ( parseContext.includeEmbeddedObjectId() || pathsContext != null && pathsContext.isIncluded( fieldPath ) ) {
 				createPropertyMetadataForEmbeddedId( member, typeMetadataBuilder, propertyMetadataBuilder,
 						numericFields, configContext, parseContext, fieldPath );
 			}
@@ -1917,8 +1917,14 @@ private boolean isInPath(String localPrefix, PathsContext pathsContext, IndexedE
 
 	private PathsContext updatePaths(String localPrefix, PathsContext pathsContext, IndexedEmbedded indexedEmbeddedAnnotation) {
 		if ( pathsContext != null ) {
+			// There is an upper-level path restriction: let it override any nested restriction
 			return pathsContext;
 		}
+		else if ( indexedEmbeddedAnnotation.includePaths().length == 0 ) {
+			// No upper-level restriction and no restriction on this level, either
+			return null;
+		}
+
 		PathsContext newPathsContext = new PathsContext();
 		for ( String path : indexedEmbeddedAnnotation.includePaths() ) {
 			newPathsContext.addIncludedPath( localPrefix + path );