From 792d773cbd3fd7d0e374c413c3ad3dc755f9d2a8 Mon Sep 17 00:00:00 2001
From: Jens Schauder <jens.schauder@broadcom.com>
Date: Tue, 23 Apr 2024 17:13:37 +0200
Subject: [PATCH] Fix broken merge.

See #1721
Original pull request #1722
---
 .../jdbc/repository/query/JdbcQueryMethod.java    |  8 +++++---
 .../repository/query/RelationalParameters.java    | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java
index bc555566..9bfc5683 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java
@@ -28,10 +28,11 @@ import org.springframework.data.relational.core.mapping.RelationalPersistentEnti
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.repository.Lock;
 import org.springframework.data.relational.repository.query.RelationalEntityMetadata;
-import org.springframework.data.relational.repository.query.RelationalParameters;
 import org.springframework.data.relational.repository.query.SimpleRelationalEntityMetadata;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.query.Parameters;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.RowMapper;
@@ -67,6 +68,7 @@ public class JdbcQueryMethod extends QueryMethod {
 			MappingContext<? extends RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> mappingContext) {
 
 		super(method, metadata, factory);
+
 		this.namedQueries = namedQueries;
 		this.method = method;
 		this.mappingContext = mappingContext;
@@ -75,8 +77,8 @@ public class JdbcQueryMethod extends QueryMethod {
 	}
 
 	@Override
-	protected RelationalParameters createParameters(Method method) {
-		return new JdbcParameters(method);
+	protected Parameters<?, ?> createParameters(ParametersSource parametersSource) {
+		return new JdbcParameters(parametersSource);
 	}
 
 	@Override
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/RelationalParameters.java b/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/RelationalParameters.java
index c1a789d8..469c505f 100755
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/RelationalParameters.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/RelationalParameters.java
@@ -24,6 +24,7 @@ import org.springframework.core.ResolvableType;
 import org.springframework.data.relational.repository.query.RelationalParameters.RelationalParameter;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.util.TypeInformation;
 
 /**
@@ -43,7 +44,7 @@ public class RelationalParameters extends Parameters<RelationalParameters, Relat
 	}
 
 	protected RelationalParameters(ParametersSource parametersSource,
-			Function<MethodParameter, RelationalParameter> parameterFactory) {
+								   Function<MethodParameter, RelationalParameter> parameterFactory) {
 		super(parametersSource, parameterFactory);
 	}
 
@@ -81,6 +82,18 @@ public class RelationalParameters extends Parameters<RelationalParameters, Relat
 			this.typeInformation = TypeInformation.fromMethodParameter(parameter);
 		}
 
+		/**
+		 * Creates a new {@link RelationalParameter}.
+		 *
+		 * @param parameter must not be {@literal null}.
+		 */
+		protected RelationalParameter(MethodParameter parameter, TypeInformation<?> domainType) {
+
+			super(parameter, domainType);
+
+			this.typeInformation = TypeInformation.fromMethodParameter(parameter);
+		}
+
 		public ResolvableType getResolvableType() {
 			return getTypeInformation().toTypeDescriptor().getResolvableType();
 		}