Skip to content

Commit c808730

Browse files
mp911demp911de
committed
Consider registered converters using Row and RowDocument as source.
We now consider converters for RowDocument. Additionally, we reinstated conversion from R2DBC's Row type into entities as that converter functionality got lost during the converter revision. Closes #1710
1 parent 134556f commit c808730

File tree

3 files changed

+87
-7
lines changed

3 files changed

+87
-7
lines changed

‎spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.springframework.data.r2dbc.mapping.event.AfterSaveCallback;
5858
import org.springframework.data.r2dbc.mapping.event.BeforeConvertCallback;
5959
import org.springframework.data.r2dbc.mapping.event.BeforeSaveCallback;
60+
import org.springframework.data.relational.core.conversion.AbstractRelationalConverter;
6061
import org.springframework.data.relational.core.mapping.PersistentPropertyTranslator;
6162
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
6263
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
@@ -818,7 +819,13 @@ public <T> RowsFetchSpec<T> getRowsFetchSpec(DatabaseClient.GenericExecuteSpec e
818819

819820
BiFunction<Row, RowMetadata, T> rowMapper;
820821

821-
if (simpleType) {
822+
// Bridge-code: Consider Converter<Row, T> until we have fully migrated to RowDocument
823+
if (converter instanceof AbstractRelationalConverter relationalConverter
824+
&& relationalConverter.getConversions().hasCustomReadTarget(Row.class, entityType)) {
825+
826+
ConversionService conversionService = relationalConverter.getConversionService();
827+
rowMapper = (row, rowMetadata) -> (T) conversionService.convert(row, entityType);
828+
} else if (simpleType) {
822829
rowMapper = dataAccessStrategy.getRowMapper(resultType);
823830
} else {
824831

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

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import io.r2dbc.spi.Parameters;
2323
import io.r2dbc.spi.R2dbcType;
24+
import io.r2dbc.spi.Row;
2425
import io.r2dbc.spi.test.MockColumnMetadata;
2526
import io.r2dbc.spi.test.MockResult;
2627
import io.r2dbc.spi.test.MockRow;
@@ -62,6 +63,7 @@
6263
import org.springframework.data.relational.core.query.Query;
6364
import org.springframework.data.relational.core.query.Update;
6465
import org.springframework.data.relational.core.sql.SqlIdentifier;
66+
import org.springframework.data.relational.domain.RowDocument;
6567
import org.springframework.lang.Nullable;
6668
import org.springframework.r2dbc.core.DatabaseClient;
6769
import org.springframework.r2dbc.core.Parameter;
@@ -88,7 +90,8 @@ void before() {
8890
client = DatabaseClient.builder().connectionFactory(recorder)
8991
.bindMarkers(PostgresDialect.INSTANCE.getBindMarkersFactory()).build();
9092

91-
R2dbcCustomConversions conversions = R2dbcCustomConversions.of(PostgresDialect.INSTANCE, new MoneyConverter());
93+
R2dbcCustomConversions conversions = R2dbcCustomConversions.of(PostgresDialect.INSTANCE, new MoneyConverter(),
94+
new RowConverter(), new RowDocumentConverter());
9295

9396
entityTemplate = new R2dbcEntityTemplate(client, PostgresDialect.INSTANCE,
9497
new MappingR2dbcConverter(new R2dbcMappingContext(), conversions));
@@ -610,6 +613,42 @@ void shouldConsiderParameterConverter() {
610613
Parameter.from(Parameters.in(R2dbcType.VARCHAR, "$$$")));
611614
}
612615

616+
@Test // GH-1696
617+
void shouldConsiderRowConverter() {
618+
619+
MockRowMetadata metadata = MockRowMetadata.builder()
620+
.columnMetadata(MockColumnMetadata.builder().name("foo").type(R2dbcType.INTEGER).build())
621+
.columnMetadata(MockColumnMetadata.builder().name("bar").type(R2dbcType.VARCHAR).build()).build();
622+
MockResult result = MockResult.builder().row(MockRow.builder().identified("foo", Object.class, 42)
623+
.identified("bar", String.class, "the-bar").metadata(metadata).build()).build();
624+
625+
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
626+
627+
entityTemplate.select(MyRowToEntityType.class).all().as(StepVerifier::create) //
628+
.assertNext(actual -> {
629+
assertThat(actual.foo).isEqualTo(1); // converter-fixed value
630+
assertThat(actual.bar).isEqualTo("the-bar"); // converted value
631+
}).verifyComplete();
632+
}
633+
634+
@Test // GH-1696
635+
void shouldConsiderRowDocumentConverter() {
636+
637+
MockRowMetadata metadata = MockRowMetadata.builder()
638+
.columnMetadata(MockColumnMetadata.builder().name("foo").type(R2dbcType.INTEGER).build())
639+
.columnMetadata(MockColumnMetadata.builder().name("bar").type(R2dbcType.VARCHAR).build()).build();
640+
MockResult result = MockResult.builder().row(MockRow.builder().identified("foo", Object.class, 42)
641+
.identified("bar", Object.class, "the-bar").metadata(metadata).build()).build();
642+
643+
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
644+
645+
entityTemplate.select(MyRowDocumentToEntityType.class).all().as(StepVerifier::create) //
646+
.assertNext(actual -> {
647+
assertThat(actual.foo).isEqualTo(1); // converter-fixed value
648+
assertThat(actual.bar).isEqualTo("the-bar"); // converted value
649+
}).verifyComplete();
650+
}
651+
613652
record WithoutId(String name) {
614653
}
615654

@@ -825,4 +864,30 @@ public io.r2dbc.spi.Parameter convert(Money source) {
825864
}
826865

827866
}
867+
868+
record MyRowToEntityType(int foo, String bar) {
869+
870+
}
871+
872+
static class RowConverter implements Converter<Row, MyRowToEntityType> {
873+
874+
@Override
875+
public MyRowToEntityType convert(Row source) {
876+
return new MyRowToEntityType(1, source.get("bar", String.class));
877+
}
878+
879+
}
880+
881+
record MyRowDocumentToEntityType(int foo, String bar) {
882+
883+
}
884+
885+
static class RowDocumentConverter implements Converter<RowDocument, MyRowDocumentToEntityType> {
886+
887+
@Override
888+
public MyRowDocumentToEntityType convert(RowDocument source) {
889+
return new MyRowDocumentToEntityType(1, (String) source.get("bar"));
890+
}
891+
892+
}
828893
}

‎spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,16 @@
4141
import org.springframework.data.mapping.PersistentPropertyAccessor;
4242
import org.springframework.data.mapping.PersistentPropertyPathAccessor;
4343
import org.springframework.data.mapping.context.MappingContext;
44-
import org.springframework.data.mapping.model.*;
44+
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
45+
import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
46+
import org.springframework.data.mapping.model.EntityInstantiator;
47+
import org.springframework.data.mapping.model.ParameterValueProvider;
48+
import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
49+
import org.springframework.data.mapping.model.PropertyValueProvider;
50+
import org.springframework.data.mapping.model.SimpleTypeHolder;
51+
import org.springframework.data.mapping.model.SpELContext;
52+
import org.springframework.data.mapping.model.SpELExpressionEvaluator;
53+
import org.springframework.data.mapping.model.SpELExpressionParameterValueProvider;
4554
import org.springframework.data.projection.EntityProjection;
4655
import org.springframework.data.projection.EntityProjectionIntrospector;
4756
import org.springframework.data.projection.EntityProjectionIntrospector.ProjectionPredicate;
@@ -316,8 +325,8 @@ protected <S> S readAggregate(ConversionContext context, RowDocumentAccessor doc
316325

317326
Class<? extends S> rawType = typeHint.getType();
318327

319-
if (getConversions().hasCustomReadTarget(documentAccessor.getClass(), rawType)) {
320-
return doConvert(documentAccessor, rawType, typeHint.getType());
328+
if (getConversions().hasCustomReadTarget(RowDocument.class, rawType)) {
329+
return doConvert(documentAccessor.getDocument(), rawType, typeHint.getType());
321330
}
322331

323332
if (RowDocument.class.isAssignableFrom(rawType)) {
@@ -1199,8 +1208,7 @@ protected <T> T potentiallyConvertSpelValue(Object object, Parameter<T, Relation
11991208
}
12001209
}
12011210

1202-
private record PropertyTranslatingPropertyAccessor<T>(
1203-
PersistentPropertyAccessor<T> delegate,
1211+
private record PropertyTranslatingPropertyAccessor<T>(PersistentPropertyAccessor<T> delegate,
12041212
PersistentPropertyTranslator propertyTranslator) implements PersistentPropertyAccessor<T> {
12051213

12061214
static <T> PersistentPropertyAccessor<T> create(PersistentPropertyAccessor<T> delegate,

0 commit comments

Comments
 (0)