Resolve typed property paths to mapped field names outside FTS

emilienbev · claude · emilienbev · commit e35d597bdebf · 2026-07-03T17:00:36.000+01:00
The TypedPropertyPath overloads for QueryCriteria where/and/or, Query.distinct, fluent project/distinct and mutate-in paths converted paths with toDotPath(), baking raw Java property names into N1QL statements, KV sub-document projections and mutate-in paths. Fields renamed with @field (e.g. Person.middlename stored as "nickname") silently matched nothing, while the FTS overloads already resolved aliases via the converter. - QueryCriteria keeps the property path and resolves the mapped field name at export time, when a converter is available; string-based criteria are emitted verbatim as before. - Query.distinct(TypedPropertyPath...) keeps the typed paths and resolves them in toN1qlSelectString. - The operation Support classes override the typed project/distinct/ withXxxPaths defaults and map through template.getConverter(), mirroring the FTS withSort/withFields/withHighlight implementations. - SearchPropertyPathSupport renamed to PropertyPathSupport now that it serves all typed overloads, with an array-based mapping variant. - Added @SuppressWarnings("unchecked") on the reactive mutate-in typed defaults to match the blocking variant; unit tests cover alias resolution for where/and/or, distinct and the no-converter fallback. Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
@@ -98,6 +99,13 @@ public FindByIdInScope<T> project(String... fields) {
 			return new ExecutableFindByIdSupport<>(template, domainType, scope, collection, options, Arrays.asList(fields), expiry, lockDuration);
 		}
 
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByIdInScope<T> project(TypedPropertyPath<T, ?>... fields) {
+			return project(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), fields));
+		}
+
 		@Override
 		public FindByIdWithProjection<T> withExpiry(final Duration expiry) {
 			return new ExecutableFindByIdSupport<>(template, domainType, scope, collection, options, fields,
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.couchbase.core;
 
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -147,6 +148,20 @@ public FindByQueryWithProjection<T> distinct(final String[] distinctFields) {
 					collection, options, dFields, fields);
 		}
 
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByQueryWithProjection<T> project(TypedPropertyPath<T, ?>... fields) {
+			return project(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), fields));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByQueryWithProjection<T> distinct(TypedPropertyPath<T, ?>... distinctFields) {
+			return distinct(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), distinctFields));
+		}
+
 		@Override
 		public Stream<T> stream() {
 			return reactiveSupport.all().toStream();
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindBySearchOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindBySearchOperationSupport.java
@@ -219,7 +219,7 @@ public FindBySearchWithSkip<T> withSort(SearchSort... sort) {
 		@Override
 		public <P> FindBySearchWithSkip<T> withSort(TypedPropertyPath<P, ?> property,
 				TypedPropertyPath<P, ?>... additionalProperties) {
-			return withSort(SearchPropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));
+			return withSort(PropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));
 		}
 
 		@Override
@@ -232,7 +232,7 @@ public FindBySearchWithSort<T> withHighlight(HighlightStyle style, String... fie
 		public <P> FindBySearchWithSort<T> withHighlight(HighlightStyle style, TypedPropertyPath<P, ?> field,
 				TypedPropertyPath<P, ?>... additionalFields) {
 			return withHighlight(style,
-					SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
+					PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
 		}
 
 		@Override
@@ -252,7 +252,7 @@ public FindBySearchWithFacets<T> withFields(String... fields) {
 		@Override
 		public <P> FindBySearchWithFacets<T> withFields(TypedPropertyPath<P, ?> field,
 				TypedPropertyPath<P, ?>... additionalFields) {
-			return withFields(SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
+			return withFields(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
 		}
 	}
 }
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -178,6 +179,35 @@ public MutateInByIdWithDurability<T> withReplacePaths(final String... replacePat
 					durabilityLevel, expiry, removePaths, upsertPaths, insertPaths, Arrays.asList(replacePaths), provideCas);
 		}
 
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withRemovePaths(TypedPropertyPath<T, ?>... removePaths) {
+			return withRemovePaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), removePaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withUpsertPaths(TypedPropertyPath<T, ?>... upsertPaths) {
+			return withUpsertPaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), upsertPaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withInsertPaths(TypedPropertyPath<T, ?>... insertPaths) {
+			return withInsertPaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), insertPaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withReplacePaths(TypedPropertyPath<T, ?>... replacePaths) {
+			return withReplacePaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), replacePaths));
+		}
+
 		@Override
 		public MutateInByIdWithPaths<T> withCasProvided() {
 			return new ExecutableMutateInByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,
diff --git a/src/main/java/org/springframework/data/couchbase/core/PropertyPathSupport.java b/src/main/java/org/springframework/data/couchbase/core/PropertyPathSupport.java
@@ -25,9 +25,25 @@
 
 import com.couchbase.client.java.search.sort.SearchSort;
 
-final class SearchPropertyPathSupport {
+/**
+ * Maps {@link TypedPropertyPath} property references to the stored field names, honoring {@code @Field} aliases on
+ * every segment of the path.
+ *
+ * @author Emilien Bevierre
+ * @since 6.2
+ */
+final class PropertyPathSupport {
+
+	private PropertyPathSupport() {
+	}
+
+	static <P> String[] getMappedFieldPaths(CouchbaseConverter converter, TypedPropertyPath<P, ?>[] properties) {
 
-	private SearchPropertyPathSupport() {
+		String[] fields = new String[properties.length];
+		for (int i = 0; i < properties.length; i++) {
+			fields[i] = getMappedFieldPath(converter, properties[i]);
+		}
+		return fields;
 	}
 
 	static <P> String getMappedFieldPath(CouchbaseConverter converter, TypedPropertyPath<P, ?> property) {
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import static com.couchbase.client.java.kv.GetAndLockOptions.getAndLockOptions;
 import static com.couchbase.client.java.kv.GetAndTouchOptions.getAndTouchOptions;
 import static com.couchbase.client.java.transactions.internal.ConverterUtil.makeCollectionIdentifier;
@@ -210,6 +211,13 @@ public FindByIdInCollection<T> project(String... fields) {
 					expiry, lockDuration, support);
 		}
 
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByIdInCollection<T> project(TypedPropertyPath<T, ?>... fields) {
+			return project(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), fields));
+		}
+
 		@Override
 		public FindByIdWithProjection<T> withExpiry(final Duration expiry) {
 			return new ReactiveFindByIdSupport<>(template, domainType, scope, collection, options, fields, expiry, 
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -164,6 +165,20 @@ public FindByQueryWithDistinct<T> distinct(final String[] distinctFields) {
 					collection, options, dFields, fields, support);
 		}
 
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByQueryWithProjection<T> project(TypedPropertyPath<T, ?>... fields) {
+			return project(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), fields));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final FindByQueryWithProjection<T> distinct(TypedPropertyPath<T, ?>... distinctFields) {
+			return distinct(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), distinctFields));
+		}
+
 		@Override
 		public Mono<T> one() {
 			return all().singleOrEmpty();
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindBySearchOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindBySearchOperationSupport.java
@@ -183,7 +183,7 @@ public FindBySearchWithSkip<T> withSort(SearchSort... sort) {
 		@Override
 		public <P> FindBySearchWithSkip<T> withSort(TypedPropertyPath<P, ?> property,
 				TypedPropertyPath<P, ?>... additionalProperties) {
-			return withSort(SearchPropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));
+			return withSort(PropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));
 		}
 
 		@Override
@@ -197,7 +197,7 @@ public FindBySearchWithSort<T> withHighlight(HighlightStyle style, String... fie
 		public <P> FindBySearchWithSort<T> withHighlight(HighlightStyle style, TypedPropertyPath<P, ?> field,
 				TypedPropertyPath<P, ?>... additionalFields) {
 			return withHighlight(style,
-					SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
+					PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
 		}
 
 		@Override
@@ -217,7 +217,7 @@ public FindBySearchWithFacets<T> withFields(String... fields) {
 		@Override
 		public <P> FindBySearchWithFacets<T> withFields(TypedPropertyPath<P, ?> field,
 				TypedPropertyPath<P, ?>... additionalFields) {
-			return withFields(SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
+			return withFields(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));
 		}
 
 		@Override
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java
@@ -106,6 +106,7 @@ interface MutateInByIdWithPaths<T> extends TerminatingMutateInById<T>, WithMutat
 		 * Type-safe variant of {@link #withRemovePaths(String...)} using property paths.
 		 * @since 6.1
 		 */
+		@SuppressWarnings("unchecked")
 		default MutateInByIdWithPaths<T> withRemovePaths(TypedPropertyPath<T, ?>... removePaths) {
 			return withRemovePaths(Arrays.stream(removePaths).map(TypedPropertyPath::toDotPath).toArray(String[]::new));
 		}
@@ -114,6 +115,7 @@ default MutateInByIdWithPaths<T> withRemovePaths(TypedPropertyPath<T, ?>... remo
 		 * Type-safe variant of {@link #withInsertPaths(String...)} using property paths.
 		 * @since 6.1
 		 */
+		@SuppressWarnings("unchecked")
 		default MutateInByIdWithPaths<T> withInsertPaths(TypedPropertyPath<T, ?>... insertPaths) {
 			return withInsertPaths(Arrays.stream(insertPaths).map(TypedPropertyPath::toDotPath).toArray(String[]::new));
 		}
@@ -122,6 +124,7 @@ default MutateInByIdWithPaths<T> withInsertPaths(TypedPropertyPath<T, ?>... inse
 		 * Type-safe variant of {@link #withUpsertPaths(String...)} using property paths.
 		 * @since 6.1
 		 */
+		@SuppressWarnings("unchecked")
 		default MutateInByIdWithPaths<T> withUpsertPaths(TypedPropertyPath<T, ?>... upsertPaths) {
 			return withUpsertPaths(Arrays.stream(upsertPaths).map(TypedPropertyPath::toDotPath).toArray(String[]::new));
 		}
@@ -130,6 +133,7 @@ default MutateInByIdWithPaths<T> withUpsertPaths(TypedPropertyPath<T, ?>... upse
 		 * Type-safe variant of {@link #withReplacePaths(String...)} using property paths.
 		 * @since 6.1
 		 */
+		@SuppressWarnings("unchecked")
 		default MutateInByIdWithPaths<T> withReplacePaths(TypedPropertyPath<T, ?>... replacePaths) {
 			return withReplacePaths(Arrays.stream(replacePaths).map(TypedPropertyPath::toDotPath).toArray(String[]::new));
 		}
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import org.springframework.data.core.TypedPropertyPath;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -206,6 +207,35 @@ public MutateInByIdWithDurability<T> withReplacePaths(final String... replacePat
 					durabilityLevel, expiry, support, removePaths, upsertPaths, insertPaths, Arrays.asList(replacePaths), provideCas);
 		}
 
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withRemovePaths(TypedPropertyPath<T, ?>... removePaths) {
+			return withRemovePaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), removePaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withUpsertPaths(TypedPropertyPath<T, ?>... upsertPaths) {
+			return withUpsertPaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), upsertPaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withInsertPaths(TypedPropertyPath<T, ?>... insertPaths) {
+			return withInsertPaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), insertPaths));
+		}
+
+		@Override
+		@SafeVarargs
+		// maps property references to stored field names (honoring @Field aliases) via the converter
+		public final MutateInByIdWithPaths<T> withReplacePaths(TypedPropertyPath<T, ?>... replacePaths) {
+			return withReplacePaths(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), replacePaths));
+		}
+
 		@Override
 		public MutateInByIdWithPaths<T> withCasProvided() {
 			return new ReactiveMutateInByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Query.java b/src/main/java/org/springframework/data/couchbase/core/query/Query.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.couchbase.core.query;
 
+import org.springframework.data.mapping.PersistentPropertyPath;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
 import static org.springframework.util.Assert.*;
 
 import java.util.ArrayList;
@@ -58,6 +60,11 @@ public class Query {
 	private int limit;
 	private boolean distinct;
 	private String[] distinctFields;
+	/**
+	 * When distinct fields were given as {@link TypedPropertyPath}s, the paths are kept so they can be resolved to the
+	 * mapped field names (honoring {@code @Field} aliases) once a converter is available.
+	 */
+	private TypedPropertyPath<?, ?>[] typedDistinctFields;
 	protected Sort sort = Sort.unsorted();
 	private QueryScanConsistency queryScanConsistency;
 	private Meta meta;
@@ -79,6 +86,7 @@ public Query(Query that) {
 		this.limit = that.limit;
 		this.distinct = that.distinct;
 		this.distinctFields = that.distinctFields;
+		this.typedDistinctFields = that.typedDistinctFields;
 		this.sort = that.sort;
 		this.queryScanConsistency = that.queryScanConsistency;
 		this.meta = that.meta;
@@ -175,6 +183,7 @@ public boolean isDistinct() {
 	 */
 	public Query distinct(String[] distinctFields) {
 		this.distinctFields = distinctFields;
+		this.typedDistinctFields = null;
 		return this;
 	}
 
@@ -187,6 +196,7 @@ public Query distinct(String[] distinctFields) {
 	@SafeVarargs
 	public final <T> Query distinct(TypedPropertyPath<T, ?>... distinctFields) {
 		this.distinctFields = Arrays.stream(distinctFields).map(TypedPropertyPath::toDotPath).toArray(String[]::new);
+		this.typedDistinctFields = distinctFields;
 		return this;
 	}
 
@@ -199,6 +209,20 @@ public String[] getDistinctFields() {
 		return distinctFields;
 	}
 
+	/**
+	 * Resolves distinct fields given as {@link TypedPropertyPath}s to the stored field names (honoring {@code @Field}
+	 * aliases) using the given converter.
+	 */
+	private String[] mappedDistinctFields(CouchbaseConverter converter) {
+		String[] mapped = new String[typedDistinctFields.length];
+		for (int i = 0; i < typedDistinctFields.length; i++) {
+			PersistentPropertyPath<CouchbasePersistentProperty> path = converter.getMappingContext()
+					.getPersistentPropertyPath(typedDistinctFields[i]);
+			mapped[i] = path.toDotPath(CouchbasePersistentProperty::getFieldName);
+		}
+		return mapped;
+	}
+
 	/**
 	 * Sets the given pagination information on the {@link Query} instance. Will transparently set {@code skip} and
 	 * {@code limit} as well as applying the {@link Sort} instance defined with the {@link Pageable}.
@@ -364,6 +388,10 @@ public String toN1qlSelectString(ReactiveCouchbaseTemplate template, Class domai
 	public String toN1qlSelectString(CouchbaseConverter converter, String bucketName, String scopeName,
 			String collectionName, Class domainClass, Class returnClass, boolean isCount, String[] distinctFields,
 			String[] fields) {
+		if (typedDistinctFields != null && Arrays.equals(distinctFields, this.distinctFields)) {
+			// distinct fields were given as property references; resolve them to the mapped field names
+			distinctFields = mappedDistinctFields(converter);
+		}
 		StringBasedN1qlQueryParser.N1qlSpelValues n1ql = getN1qlSpelValues(converter, bucketName, scopeName, collectionName,
 				domainClass, returnClass, isCount, distinctFields, fields);
 		final StringBuilder statement = new StringBuilder();
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java b/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java
diff --git a/src/test/java/org/springframework/data/couchbase/core/PropertyPathSupportTests.java b/src/test/java/org/springframework/data/couchbase/core/PropertyPathSupportTests.java
diff --git a/src/test/java/org/springframework/data/couchbase/core/query/TypeSafePropertyReferenceTests.java b/src/test/java/org/springframework/data/couchbase/core/query/TypeSafePropertyReferenceTests.java

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public FindBySearchWithSkip<T> withSort(SearchSort... sort) {`
`219`	`219`	`@Override`
`220`	`220`	`public <P> FindBySearchWithSkip<T> withSort(TypedPropertyPath<P, ?> property,`
`221`	`221`	`TypedPropertyPath<P, ?>... additionalProperties) {`
`222`		`- return withSort(SearchPropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));`
	`222`	`+ return withSort(PropertyPathSupport.toSearchSorts(template.getConverter(), property, additionalProperties));`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`@Override`
`@@ -232,7 +232,7 @@ public FindBySearchWithSort<T> withHighlight(HighlightStyle style, String... fie`
`232`	`232`	`public <P> FindBySearchWithSort<T> withHighlight(HighlightStyle style, TypedPropertyPath<P, ?> field,`
`233`	`233`	`TypedPropertyPath<P, ?>... additionalFields) {`
`234`	`234`	`return withHighlight(style,`
`235`		`- SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));`
	`235`	`+ PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`@Override`
`@@ -252,7 +252,7 @@ public FindBySearchWithFacets<T> withFields(String... fields) {`
`252`	`252`	`@Override`
`253`	`253`	`public <P> FindBySearchWithFacets<T> withFields(TypedPropertyPath<P, ?> field,`
`254`	`254`	`TypedPropertyPath<P, ?>... additionalFields) {`
`255`		`- return withFields(SearchPropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));`
	`255`	`+ return withFields(PropertyPathSupport.getMappedFieldPaths(template.getConverter(), field, additionalFields));`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`}`