Expose query method metadata

src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java

@@ -41,27 +41,31 @@ class PersistentEntityIsNewStrategy implements IsNewStrategy {
 	 * Creates a new {@link PersistentEntityIsNewStrategy} for the given entity.
 	 *
 	 * @param entity must not be {@literal null}.
+	 * @param idOnly {@code true} if should consider only the ID property of the {@link PersistentEntity}, {@code false}
+	 *               if other properties such as {@link PersistentEntity#getVersionProperty() version} shall be
+	 *               considered.
 	 */
 	private PersistentEntityIsNewStrategy(PersistentEntity<?, ?> entity, boolean idOnly) {
 
 		Assert.notNull(entity, "PersistentEntity must not be null");
 
-		this.valueLookup = entity.hasVersionProperty() && !idOnly //
-				? source -> entity.getPropertyAccessor(source).getProperty(entity.getRequiredVersionProperty())
-				: source -> entity.getIdentifierAccessor(source).getIdentifier();
-
-		this.valueType = entity.hasVersionProperty() && !idOnly //
-				? entity.getRequiredVersionProperty().getType() //
-				: entity.hasIdProperty() ? entity.getRequiredIdProperty().getType() : null;
+		if (entity.hasVersionProperty() && !idOnly) {
+			this.valueLookup = source -> entity.getPropertyAccessor(source).getProperty(entity.getRequiredVersionProperty());
+			this.valueType = entity.getRequiredVersionProperty().getType();
+		} else {
+			this.valueLookup = source -> entity.getIdentifierAccessor(source).getIdentifier();
+			this.valueType = entity.hasIdProperty() ? entity.getRequiredIdProperty().getType() : null;
+		}
 
 		Class<?> type = valueType;
 
 		if (type != null && type.isPrimitive()) {
 
 			if (!ClassUtils.isAssignable(Number.class, type)) {
 
-				throw new IllegalArgumentException(String
-						.format("Only numeric primitives are supported as identifier / version field types; Got: %s", valueType));
+				throw new IllegalArgumentException(
+						String.format("Only numeric primitives are supported as identifier / version field types; Got: %s",
+								valueType));
 			}
 		}
 	}

src/main/java/org/springframework/data/repository/query/Parameters.java

@@ -38,6 +38,8 @@
 /**
  * Abstracts method parameters that have to be bound to query parameters or applied to the query independently.
  *
+ * @param <T> The exact type of {@link Parameter} inside {@link Parameters}
+ * @param <S> The exact type of {@link Parameters} to be used. Generified to allow for recursive generics.
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Johannes Englmeier

src/main/java/org/springframework/data/repository/query/QueryMethod.java

@@ -86,7 +86,7 @@ public QueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory
 		this.method = method;
 		this.unwrappedReturnType = potentiallyUnwrapReturnTypeFor(metadata, method);
 		this.metadata = metadata;
-		this.parameters = createParameters(method, metadata.getDomainTypeInformation());
+		this.parameters = createParameters(ParametersSource.of(getMetadata(), method));
 
 		this.domainClass = Lazy.of(() -> {
 
@@ -316,11 +316,11 @@ public ResultProcessor getResultProcessor() {
 		return resultProcessor;
 	}
 
-	RepositoryMetadata getMetadata() {
+	public RepositoryMetadata getMetadata() {
 		return metadata;
 	}
 
-	Method getMethod() {
+	public Method getMethod() {
 		return method;
 	}
 
@@ -329,7 +329,7 @@ public String toString() {
 		return method.toString();
 	}
 
-	private static Class<? extends Object> potentiallyUnwrapReturnTypeFor(RepositoryMetadata metadata, Method method) {
+	private static Class<?> potentiallyUnwrapReturnTypeFor(RepositoryMetadata metadata, Method method) {
 
 		TypeInformation<?> returnType = metadata.getReturnType(method);
 		if (QueryExecutionConverters.supports(returnType.getType())