Polishing.

Co-locate Hibernate-specific parameters accessor as the same package as JPA parameters accessor.
Remove Parameter Accessor reference from Persistence Provider since it's created in AbstractJpaQuery.

Closes #3137
Original Pull Request: #3173

Author: sxhinzvc

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java

@@ -106,12 +106,6 @@ public CloseableIterator<Object> executeQueryWithResultStream(Query jpaQuery) {
 			return new HibernateScrollableResultsIterator(jpaQuery);
 		}
 
-		@Override
-		public JpaParametersParameterAccessor getParameterAccessor(JpaParameters parameters, Object[] values,
-				EntityManager em) {
-			return new HibernateJpaParametersParameterAccessor(parameters, values, em);
-		}
-
 		@Override
 		public String getCommentHintKey() {
 			return "org.hibernate.comment";
@@ -292,11 +286,6 @@ public static PersistenceProvider fromMetamodel(Metamodel metamodel) {
 		return cacheAndReturn(metamodelType, GENERIC_JPA);
 	}
 
-	public JpaParametersParameterAccessor getParameterAccessor(JpaParameters parameters, Object[] values,
-			EntityManager em) {
-		return new JpaParametersParameterAccessor(parameters, values);
-	}
-
 	/**
 	 * Returns the placeholder to be used for simple count queries. Default implementation returns {@code x}.
 	 *

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java

@@ -32,7 +32,6 @@
 import java.util.stream.Collectors;
 
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.jpa.provider.HibernateJpaParametersParameterAccessor;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.query.JpaQueryExecution.CollectionExecution;
@@ -62,6 +61,7 @@
  * @author Jens Schauder
  * @author Сергей Цыпанов
  * @author Wonchul Heo
+ * @author Julia Lee
  */
 public abstract class AbstractJpaQuery implements RepositoryQuery {
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessor.java renamed to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HibernateJpaParametersParameterAccessor.java

@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.provider;
+package org.springframework.data.jpa.repository.query;
 
 import jakarta.persistence.EntityManager;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.TypedParameterValue;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
-import org.springframework.data.jpa.repository.query.JpaParametersParameterAccessor;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
@@ -38,9 +37,10 @@
  * @author Robert Wilson
  * @author Oliver Drotbohm
  * @author Greg Turnquist
+ * @author Julia Lee
  * @since 2.7
  */
-public class HibernateJpaParametersParameterAccessor extends JpaParametersParameterAccessor {
+class HibernateJpaParametersParameterAccessor extends JpaParametersParameterAccessor {
 
 	private final BasicTypeRegistry typeHelper;
 
@@ -51,7 +51,7 @@ public class HibernateJpaParametersParameterAccessor extends JpaParametersParame
 	 * @param values must not be {@literal null}.
 	 * @param em must not be {@literal null}.
 	 */
-	public HibernateJpaParametersParameterAccessor(Parameters<?, ?> parameters, Object[] values, EntityManager em) {
+	HibernateJpaParametersParameterAccessor(Parameters<?, ?> parameters, Object[] values, EntityManager em) {
 
 		super(parameters, values);
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java

@@ -233,10 +233,10 @@ public boolean isIsNullParameter() {
 		/**
 		 * Prepares the object before it's actually bound to the {@link jakarta.persistence.Query;}.
 		 *
-		 * @param value the value to be prepared.
+		 * @param value can be {@literal null}.
 		 */
 		@Nullable
-		public Object prepare(Object value) {
+		public Object prepare(@Nullable Object value) {
 
 			if (value == null || expression.getJavaType() == null) {
 				return value;

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java

@@ -40,7 +40,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.springframework.data.jpa.domain.sample.User;
-import org.springframework.data.jpa.provider.HibernateJpaParametersParameterAccessor;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType;
@@ -60,6 +59,7 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  * @author Krzysztof Krason
+ * @author Julia Lee
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:infrastructure.xml")

spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/HibernateJpaParametersParameterAccessorUnitTests.java renamed to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HibernateJpaParametersParameterAccessorUnitTests.java

@@ -1,4 +1,4 @@
-package org.springframework.data.jpa.provider;
+package org.springframework.data.jpa.repository.query;
 
 import jakarta.persistence.EntityManager;
 
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.query.HibernateJpaParametersParameterAccessor;
 import org.springframework.data.jpa.repository.query.JpaParameters;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessorTests.java

@@ -43,8 +43,7 @@ void createsJpaParametersParameterAccessor() throws Exception {
 		Method withNativeQuery = SampleRepository.class.getMethod("withNativeQuery", Integer.class);
 		Object[] values = { null };
 		JpaParameters parameters = new JpaParameters(withNativeQuery);
-		JpaParametersParameterAccessor accessor = PersistenceProvider.GENERIC_JPA.getParameterAccessor(parameters, values,
-				em);
+		JpaParametersParameterAccessor accessor = new JpaParametersParameterAccessor(parameters, values);
 
 		bind(parameters, accessor);
 
@@ -57,8 +56,7 @@ void createsHibernateParametersParameterAccessor() throws Exception {
 		Method withNativeQuery = SampleRepository.class.getMethod("withNativeQuery", Integer.class);
 		Object[] values = { null };
 		JpaParameters parameters = new JpaParameters(withNativeQuery);
-		JpaParametersParameterAccessor accessor = PersistenceProvider.HIBERNATE.getParameterAccessor(parameters, values,
-				em);
+		JpaParametersParameterAccessor accessor = new HibernateJpaParametersParameterAccessor(parameters, values, em);
 
 		bind(parameters, accessor);
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeIntegrationTests.java

@@ -54,6 +54,7 @@
  *
  * @author Greg Turnquist
  * @author Yuriy Tsarkov
+ * @author Julia Lee
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = QueryWithNullLikeIntegrationTests.Config.class)