Consider io.r2dbc.spi.Parameter as simple type.

We now consider R2DBC's Parameter as simple type to avoid entity handling.

Closes #1696

Author: mp911de

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcSimpleTypeHolder.java

@@ -17,6 +17,7 @@
 
 import io.r2dbc.spi.Blob;
 import io.r2dbc.spi.Clob;
+import io.r2dbc.spi.Parameter;
 import io.r2dbc.spi.Row;
 
 import java.math.BigDecimal;
@@ -42,7 +43,7 @@ public class R2dbcSimpleTypeHolder extends SimpleTypeHolder {
 	 */
 	public static final Set<Class<?>> R2DBC_SIMPLE_TYPES = Collections
 			.unmodifiableSet(new HashSet<>(Arrays.asList(OutboundRow.class, Row.class, BigInteger.class, BigDecimal.class,
-					UUID.class, Blob.class, Clob.class, ByteBuffer.class)));
+					UUID.class, Blob.class, Clob.class, ByteBuffer.class, Parameter.class)));
 
 	public static final SimpleTypeHolder HOLDER = new R2dbcSimpleTypeHolder();
 

spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java

@@ -19,6 +19,7 @@
 import static org.mockito.Mockito.*;
 import static org.springframework.data.relational.core.query.Criteria.*;
 
+import io.r2dbc.spi.Parameters;
 import io.r2dbc.spi.R2dbcType;
 import io.r2dbc.spi.test.MockColumnMetadata;
 import io.r2dbc.spi.test.MockResult;
@@ -35,6 +36,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -43,8 +45,11 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
 import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
+import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.data.r2dbc.dialect.PostgresDialect;
 import org.springframework.data.r2dbc.mapping.OutboundRow;
+import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.mapping.event.AfterConvertCallback;
 import org.springframework.data.r2dbc.mapping.event.AfterSaveCallback;
 import org.springframework.data.r2dbc.mapping.event.BeforeConvertCallback;
@@ -82,7 +87,11 @@ void before() {
 		recorder = StatementRecorder.newInstance();
 		client = DatabaseClient.builder().connectionFactory(recorder)
 				.bindMarkers(PostgresDialect.INSTANCE.getBindMarkersFactory()).build();
-		entityTemplate = new R2dbcEntityTemplate(client, PostgresDialect.INSTANCE);
+
+		R2dbcCustomConversions conversions = R2dbcCustomConversions.of(PostgresDialect.INSTANCE, new MoneyConverter());
+
+		entityTemplate = new R2dbcEntityTemplate(client, PostgresDialect.INSTANCE,
+				new MappingR2dbcConverter(new R2dbcMappingContext(), conversions));
 	}
 
 	@Test // gh-220
@@ -147,7 +156,6 @@ void shouldProjectEntityUsingInheritedInterface() {
 					assertThat(actual).isInstanceOf(Person.class);
 				}).verifyComplete();
 
-
 		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("SELECT"));
 		assertThat(statement.getSql()).isEqualTo("SELECT foo.* FROM foo WHERE foo.THE_NAME = $1");
 	}
@@ -584,10 +592,29 @@ void updateExcludesInsertOnlyColumns() {
 				Parameter.from(23L));
 	}
 
+	@Test // GH-1696
+	void shouldConsiderParameterConverter() {
+
+		MockRowMetadata metadata = MockRowMetadata.builder().build();
+		MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
+
+		recorder.addStubbing(s -> s.startsWith("INSERT"), result);
+
+		entityTemplate.insert(new WithMoney(null, new Money((byte) 1))).as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+
+		StatementRecorder.RecordedStatement statement = recorder.getCreatedStatement(s -> s.startsWith("INSERT"));
+
+		assertThat(statement.getSql()).isEqualTo("INSERT INTO with_money (money) VALUES ($1)");
+		assertThat(statement.getBindings()).hasSize(1).containsEntry(0,
+				Parameter.from(Parameters.in(R2dbcType.VARCHAR, "$$$")));
+	}
+
 	record WithoutId(String name) {
 	}
 
-	interface Named{
+	interface Named {
 		String getName();
 	}
 
@@ -784,4 +811,19 @@ public Mono<Person> onAfterConvert(Person entity, SqlIdentifier table) {
 			return Mono.just(person);
 		}
 	}
+
+	record WithMoney(@Id Integer id, Money money) {
+	}
+
+	record Money(byte amount) {
+	}
+
+	static class MoneyConverter implements Converter<Money, io.r2dbc.spi.Parameter> {
+
+		@Override
+		public io.r2dbc.spi.Parameter convert(Money source) {
+			return Parameters.in(R2dbcType.VARCHAR, "$$$");
+		}
+
+	}
 }