From b2d5a1f35cf30ded053c984aee8e3dd10969844f Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 15 Feb 2022 16:08:38 +0100 Subject: [PATCH] Adapt to changes in entity creation metadata APIs in Spring Data Commons. --- .../data/r2dbc/convert/MappingR2dbcConverter.java | 6 ++++-- .../data/r2dbc/repository/query/R2dbcQueryExecution.java | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java index 5e05c78..079076d 100644 --- a/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java @@ -696,7 +696,8 @@ public class MappingR2dbcConverter extends BasicRelationalConverter implements R INSTANCE; @Override - public T getParameterValue(PreferredConstructor.Parameter parameter) { + public T getParameterValue( + org.springframework.data.mapping.Parameter parameter) { return null; } } @@ -724,7 +725,8 @@ public class MappingR2dbcConverter extends BasicRelationalConverter implements R */ @Override @Nullable - public T getParameterValue(PreferredConstructor.Parameter parameter) { + public T getParameterValue( + org.springframework.data.mapping.Parameter parameter) { RelationalPersistentProperty property = this.entity.getRequiredPersistentProperty(parameter.getName()); Object value = readFrom(this.resultSet, this.metadata, property, this.prefix); diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java b/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java index d6731fd..5093052 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java @@ -19,13 +19,12 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.reactivestreams.Publisher; - import org.springframework.core.convert.converter.Converter; +import org.springframework.data.convert.DtoInstantiatingConverter; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mapping.model.EntityInstantiators; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; -import org.springframework.data.relational.repository.query.DtoInstantiatingConverter; import org.springframework.data.repository.query.ResultProcessor; import org.springframework.data.repository.query.ReturnedType; import org.springframework.data.util.Lazy;