Vastly refactored property --> jdbc value mapping api

spring-projects · Oct 20, 2024 · aae3db2 · aae3db2
1 parent a8463e0
commit aae3db2
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 96 deletions.
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java
@@ -125,6 +125,15 @@ default <R> R readAndResolve(Class<R> type, RowDocument source, Identifier ident
 	 */
 	SQLType getTargetSqlType(RelationalPersistentProperty property);
 
+	/**
+	 * The SQL type constant used when using this property as a parameter for a SQL statement.
+	 *
+	 * @return Must not be {@code null}.
+	 * @see java.sql.Types
+	 * @since 2.0
+	 */
+	SQLType getTargetSqlType(Class<?> property);
+
 	@Override
 	RelationalMappingContext getMappingContext();
 

diff --git a/...a-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/MappingJdbcConverter.java b/...a-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/MappingJdbcConverter.java
@@ -21,7 +21,6 @@
 import java.sql.SQLType;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Function;
 
 import org.apache.commons.logging.Log;
@@ -152,6 +151,11 @@ public SQLType getTargetSqlType(RelationalPersistentProperty property) {
 		return JdbcUtil.targetSqlTypeFor(getColumnType(property));
 	}
 
+	@Override
+	public SQLType getTargetSqlType(Class<?> property) {
+		return JdbcUtil.targetSqlTypeFor(property);
+	}
+
 	@Override
 	public Class<?> getColumnType(RelationalPersistentProperty property) {
 		return doGetColumnType(property);
@@ -205,13 +209,13 @@ public Object readValue(@Nullable Object value, TypeInformation<?> type) {
 
 	@Override
 	@Nullable
-	public Object writeValue(@Nullable Object value, TypeInformation<?> type) {
+	public Object writeValue(@Nullable Object value, TypeInformation<?> targetType) {
 
 		if (value == null) {
 			return null;
 		}
 
-		return super.writeValue(value, type);
+		return super.writeValue(value, targetType);
 	}
 
 	private boolean canWriteAsJdbcValue(@Nullable Object value) {
@@ -236,8 +240,9 @@ private boolean canWriteAsJdbcValue(@Nullable Object value) {
 			return true;
 		}
 
-		Optional<Class<?>> customWriteTarget = getConversions().getCustomWriteTarget(value.getClass());
-		return customWriteTarget.isPresent() && customWriteTarget.get().isAssignableFrom(JdbcValue.class);
+		return getCustomConversions().getCustomWriteTarget(value.getClass())
+			.filter(it -> it.isAssignableFrom(JdbcValue.class))
+			.isPresent();
 	}
 
 	@Override
@@ -353,7 +358,7 @@ public <T> T getPropertyValue(RelationalPersistentProperty property) {
 
 			AggregatePath aggregatePath = this.context.aggregatePath();
 
-			if (getConversions().isSimpleType(property.getActualType())) {
+			if (getCustomConversions().isSimpleType(property.getActualType())) {
 				return (T) delegate.getValue(aggregatePath);
 			}
 

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
@@ -381,10 +381,12 @@ private JdbcValue convertToJdbcValue(RelationalPersistentProperty property, @Nul
 	 */
 	private JdbcValue getWriteValue(RelationalPersistentProperty property, Object value) {
 
+		Class<?> columnType = converter.getColumnType(property);
+
 		return converter.writeJdbcValue( //
 				value, //
-				converter.getColumnType(property), //
-				converter.getTargetSqlType(property) //
+		        columnType, //
+				converter.getTargetSqlType(columnType) //
 		);
 	}
 

diff --git a/...ata-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java b/...ata-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.jdbc.core.mapping;
 
-import java.util.Objects;
-
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -27,6 +25,7 @@
  * @param <ID> the type of the id of the referenced aggregate root.
  * @author Jens Schauder
  * @author Myeonghyeon Lee
+ * @author Mikhail Polivakha
  * @since 1.0
  */
 public interface AggregateReference<T, ID> {
@@ -48,42 +47,15 @@ static <T, ID> AggregateReference<T, ID> to(ID id) {
 	 * @param <T>
 	 * @param <ID>
 	 */
-	class IdOnlyAggregateReference<T, ID> implements AggregateReference<T, ID> {
-
-		private final ID id;
-
-		public IdOnlyAggregateReference(ID id) {
+	record IdOnlyAggregateReference<T, ID>(ID id) implements AggregateReference<T, ID> {
 
+		public IdOnlyAggregateReference {
 			Assert.notNull(id, "Id must not be null");
-
-			this.id = id;
 		}
 
 		@Override
 		public ID getId() {
-			return id;
-		}
-
-		@Override
-		public boolean equals(@Nullable Object o) {
-
-			if (this == o)
-				return true;
-			if (o == null || getClass() != o.getClass())
-				return false;
-			IdOnlyAggregateReference<?, ?> that = (IdOnlyAggregateReference<?, ?>) o;
-			return id.equals(that.id);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(id);
-		}
-
-		@Override
-		public String toString() {
-
-			return "IdOnlyAggregateReference{" + "id=" + id + '}';
+			return id();
 		}
 	}
 }
diff --git a/...ata-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java b/...ata-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
@@ -101,7 +101,7 @@ public <R> R read(Class<R> type, Row row, @Nullable RowMetadata metadata) {
 			return type.cast(row);
 		}
 
-		if (getConversions().hasCustomReadTarget(Row.class, rawType)
+		if (getCustomConversions().hasCustomReadTarget(Row.class, rawType)
 				&& getConversionService().canConvert(Row.class, rawType)) {
 			return getConversionService().convert(row, rawType);
 		}
@@ -170,7 +170,7 @@ public void write(Object source, OutboundRow sink) {
 
 		Class<?> userClass = ClassUtils.getUserClass(source);
 
-		Optional<Class<?>> customTarget = getConversions().getCustomWriteTarget(userClass, OutboundRow.class);
+		Optional<Class<?>> customTarget = getCustomConversions().getCustomWriteTarget(userClass, OutboundRow.class);
 		if (customTarget.isPresent()) {
 
 			OutboundRow result = getConversionService().convert(source, OutboundRow.class);
@@ -212,7 +212,7 @@ private void writeProperties(OutboundRow sink, RelationalPersistentEntity<?> ent
 				continue;
 			}
 
-			if (getConversions().isSimpleType(value.getClass())) {
+			if (getCustomConversions().isSimpleType(value.getClass())) {
 				writeSimpleInternal(sink, value, isNew, property);
 			} else {
 				writePropertyInternal(sink, value, isNew, property);
@@ -286,7 +286,7 @@ private List<Object> writeCollectionInternal(Collection<?> source, @Nullable Typ
 
 			Class<?> elementType = element == null ? null : element.getClass();
 
-			if (elementType == null || getConversions().isSimpleType(elementType)) {
+			if (elementType == null || getCustomConversions().isSimpleType(elementType)) {
 				collection.add(getPotentiallyConvertedSimpleWrite(element,
 						componentType != null ? componentType.getType() : Object.class));
 			} else if (element instanceof Collection || elementType.isArray()) {
@@ -306,7 +306,7 @@ private void writeNullInternal(OutboundRow sink, RelationalPersistentProperty pr
 
 	private Class<?> getPotentiallyConvertedSimpleNullType(Class<?> type) {
 
-		Optional<Class<?>> customTarget = getConversions().getCustomWriteTarget(type);
+		Optional<Class<?>> customTarget = getCustomConversions().getCustomWriteTarget(type);
 
 		if (customTarget.isPresent()) {
 			return customTarget.get();
@@ -353,7 +353,7 @@ private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, Class<
 			}
 		}
 
-		Optional<Class<?>> customTarget = getConversions().getCustomWriteTarget(value.getClass());
+		Optional<Class<?>> customTarget = getCustomConversions().getCustomWriteTarget(value.getClass());
 
 		if (customTarget.isPresent()) {
 			return getConversionService().convert(value, customTarget.get());
@@ -393,7 +393,7 @@ public Object getArrayValue(ArrayColumns arrayColumns, RelationalPersistentPrope
 	@Override
 	public Class<?> getTargetType(Class<?> valueType) {
 
-		Optional<Class<?>> writeTarget = getConversions().getCustomWriteTarget(valueType);
+		Optional<Class<?>> writeTarget = getCustomConversions().getCustomWriteTarget(valueType);
 
 		return writeTarget.orElseGet(() -> {
 			return Enum.class.isAssignableFrom(valueType) ? String.class : valueType;
@@ -402,7 +402,7 @@ public Class<?> getTargetType(Class<?> valueType) {
 
 	@Override
 	public boolean isSimpleType(Class<?> type) {
-		return getConversions().isSimpleType(type);
+		return getCustomConversions().isSimpleType(type);
 	}
 
 	// ----------------------------------

diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -852,7 +852,7 @@ public <T> RowsFetchSpec<T> getRowsFetchSpec(DatabaseClient.GenericExecuteSpec e
 
 		// Bridge-code: Consider Converter<Row, T> until we have fully migrated to RowDocument
 		if (converter instanceof AbstractRelationalConverter relationalConverter
-				&& relationalConverter.getConversions().hasCustomReadTarget(Row.class, resultType)) {
+				&& relationalConverter.getCustomConversions().hasCustomReadTarget(Row.class, resultType)) {
 
 			ConversionService conversionService = relationalConverter.getConversionService();
 			rowMapper = (row, rowMetadata) -> (T) conversionService.convert(row, resultType);

diff --git a/...rg/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBeanUnitTests.java b/...rg/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBeanUnitTests.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.ListableBeanFactory;
@@ -26,6 +27,8 @@
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.spel.ReactiveExtensionAwareEvaluationContextProvider;
+import org.springframework.data.repository.query.ReactiveExtensionAwareQueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ReactiveQueryMethodEvaluationContextProvider;
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -56,7 +59,5 @@ void shouldConfigureReactiveExtensionAwareQueryMethodEvaluationContextProvider()
 
 	static class Person {}
 
-	interface PersonRepository extends R2dbcRepository<Person, String>
-
-	{}
+	interface PersonRepository extends R2dbcRepository<Person, String> {}
 }
diff --git a/...java/org/springframework/data/relational/core/conversion/AbstractRelationalConverter.java b/...java/org/springframework/data/relational/core/conversion/AbstractRelationalConverter.java
@@ -89,7 +89,7 @@ public ConversionService getConversionService() {
 		return conversionService;
 	}
 
-	public CustomConversions getConversions() {
+	public CustomConversions getCustomConversions() {
 		return conversions;
 	}