Prepared move of JdbcValue to mapping.

This is to avoid dependency cycles between mapping and conversion.

Closes #1128

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java

@@ -32,6 +32,7 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.jdbc.core.mapping.AggregateReference;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

@@ -32,6 +32,7 @@
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java

@@ -17,6 +17,7 @@
 
 import java.sql.ResultSet;
 
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcValue.java

@@ -27,45 +27,16 @@
  *
  * @author Jens Schauder
  * @since 1.1
+ * @deprecated use {@link org.springframework.data.jdbc.core.mapping.JdbcValue}
  */
-public final class JdbcValue {
-
-	private final Object value;
-	private final JDBCType jdbcType;
+@Deprecated
+public final class JdbcValue extends org.springframework.data.jdbc.core.mapping.JdbcValue {
 
 	private JdbcValue(@Nullable Object value, @Nullable JDBCType jdbcType) {
-
-		this.value = value;
-		this.jdbcType = jdbcType;
+		super(value, jdbcType);
 	}
 
 	public static JdbcValue of(@Nullable Object value, @Nullable JDBCType jdbcType) {
 		return new JdbcValue(value, jdbcType);
 	}
-
-	@Nullable
-	public Object getValue() {
-		return this.value;
-	}
-
-	@Nullable
-	public JDBCType getJdbcType() {
-		return this.jdbcType;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		JdbcValue jdbcValue = (JdbcValue) o;
-		return Objects.equals(value, jdbcValue.value) && jdbcType == jdbcValue.jdbcType;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(value, jdbcType);
-	}
 }

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcMySqlDialect.java

@@ -27,7 +27,7 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
-import org.springframework.data.jdbc.core.convert.JdbcValue;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.relational.core.dialect.Db2Dialect;
 import org.springframework.data.relational.core.dialect.MySqlDialect;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcSimpleTypes.java

@@ -31,7 +31,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.springframework.data.jdbc.core.convert.JdbcValue;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcValue.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.core.mapping;
+
+import java.sql.JDBCType;
+import java.util.Objects;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Wraps a value with the JDBCType that should be used to pass it as a bind parameter to a
+ * {@link java.sql.PreparedStatement}. Register a converter from any type to {@link JdbcValue} in order to control the
+ * value and the {@link JDBCType} as which a value should get passed to the JDBC driver.
+ *
+ * @author Jens Schauder
+ * @since 2.4
+ */
+public class JdbcValue {
+
+	private final Object value;
+	private final JDBCType jdbcType;
+
+	protected JdbcValue(@Nullable Object value, @Nullable JDBCType jdbcType) {
+
+		this.value = value;
+		this.jdbcType = jdbcType;
+	}
+
+	public static JdbcValue of(@Nullable Object value, @Nullable JDBCType jdbcType) {
+		return new JdbcValue(value, jdbcType);
+	}
+
+	@Nullable
+	public Object getValue() {
+		return this.value;
+	}
+
+	@Nullable
+	public JDBCType getJdbcType() {
+		return this.jdbcType;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		JdbcValue jdbcValue = (JdbcValue) o;
+		return Objects.equals(value, jdbcValue.value) && jdbcType == jdbcValue.jdbcType;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(value, jdbcType);
+	}
+}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/QueryMapper.java

@@ -26,7 +26,7 @@
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
-import org.springframework.data.jdbc.core.convert.JdbcValue;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PropertyPath;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQuery.java

@@ -25,7 +25,7 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.jdbc.core.convert.JdbcColumnTypes;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
-import org.springframework.data.jdbc.core.convert.JdbcValue;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.repository.query.RelationalParameterAccessor;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java

@@ -39,6 +39,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.jdbc.core.mapping.AggregateReference;
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcMySqlDialectUnitTests.java

@@ -23,7 +23,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
-import org.springframework.data.jdbc.core.convert.JdbcValue;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 
 /**
  * Tests for {@link JdbcMySqlDialect}.

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java

@@ -35,7 +35,7 @@
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
-import org.springframework.data.jdbc.core.convert.JdbcValue;
+import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
 import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
 import org.springframework.data.jdbc.testing.TestConfiguration;