Skip to content

Commit b2d5a1f

Browse files
committed
Adapt to changes in entity creation metadata APIs in Spring Data Commons.
1 parent 3134555 commit b2d5a1f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,8 @@ enum NoOpParameterValueProvider implements ParameterValueProvider<RelationalPers
696696
INSTANCE;
697697

698698
@Override
699-
public <T> T getParameterValue(PreferredConstructor.Parameter<T, RelationalPersistentProperty> parameter) {
699+
public <T> T getParameterValue(
700+
org.springframework.data.mapping.Parameter<T, RelationalPersistentProperty> parameter) {
700701
return null;
701702
}
702703
}
@@ -724,7 +725,8 @@ public RowParameterValueProvider(Row resultSet, RowMetadata metadata, Relational
724725
*/
725726
@Override
726727
@Nullable
727-
public <T> T getParameterValue(PreferredConstructor.Parameter<T, RelationalPersistentProperty> parameter) {
728+
public <T> T getParameterValue(
729+
org.springframework.data.mapping.Parameter<T, RelationalPersistentProperty> parameter) {
728730

729731
RelationalPersistentProperty property = this.entity.getRequiredPersistentProperty(parameter.getName());
730732
Object value = readFrom(this.resultSet, this.metadata, property, this.prefix);

src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
import reactor.core.publisher.Mono;
2020

2121
import org.reactivestreams.Publisher;
22-
2322
import org.springframework.core.convert.converter.Converter;
23+
import org.springframework.data.convert.DtoInstantiatingConverter;
2424
import org.springframework.data.mapping.context.MappingContext;
2525
import org.springframework.data.mapping.model.EntityInstantiators;
2626
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
2727
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
28-
import org.springframework.data.relational.repository.query.DtoInstantiatingConverter;
2928
import org.springframework.data.repository.query.ResultProcessor;
3029
import org.springframework.data.repository.query.ReturnedType;
3130
import org.springframework.data.util.Lazy;

0 commit comments

Comments
 (0)