Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecations in PersistentPropertyAccessor.

Browse Source 
Related issue: #2813.
This commit is contained in:
Oliver Drotbohm
2023-03-01 22:21:07 +01:00
parent 35a2f45736
commit 55e14952c8
4 changed files with 1 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/test/java/org/springframework/data/mapping/PersistentPropertyAccessorUnitTests.java
View File

@@ -19,24 +19,13 @@ import static org.assertj.core.api.Assertions.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.Value;
import lombok.With;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.data.mapping.context.SampleMappingContext;
import org.springframework.data.mapping.context.SamplePersistentProperty;
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
/**
@@ -58,68 +47,6 @@ public class PersistentPropertyAccessorUnitTests {
this.path = context.getPersistentPropertyPath(path, Order.class);
}
@Test // DATACMNS-1275
public void looksUpValueForPropertyPath() {
var order = new Order(new Customer("Dave"));
setUp(order, "customer.firstname");
assertThat(accessor.getProperty(path)).isEqualTo("Dave");
}
@Test // DATACMNS-1275
public void setsPropertyOnNestedPath() {
var customer = new Customer("Dave");
var order = new Order(customer);
setUp(order, "customer.firstname");
accessor.setProperty(path, "Oliver August");
assertThat(customer.firstname).isEqualTo("Oliver August");
}
@Test // DATACMNS-1275
public void rejectsIntermediateNullValuesForRead() {
setUp(new Order(null), "customer.firstname");
assertThatExceptionOfType(MappingException.class)//
.isThrownBy(() -> accessor.getProperty(path));
}
@Test // DATACMNS-1275
public void rejectsIntermediateNullValuesForWrite() {
setUp(new Order(null), "customer.firstname");
assertThatExceptionOfType(MappingException.class)//
.isThrownBy(() -> accessor.setProperty(path, "Oliver August"));
}
@Test // DATACMNS-1322
public void correctlyReplacesObjectInstancesWhenSettingPropertyPathOnImmutableObjects() {
PersistentEntity<Object, SamplePersistentProperty> entity = context.getPersistentEntity(Outer.class);
var path = context.getPersistentPropertyPath("immutable.value",
entity.getType());
var immutable = new NestedImmutable("foo");
var outer = new Outer(immutable);
PersistentPropertyAccessor accessor = entity.getPropertyAccessor(outer);
accessor.setProperty(path, "bar");
var result = accessor.getBean();
assertThat(result).isInstanceOfSatisfying(Outer.class, it -> {
assertThat(it.immutable).isNotSameAs(immutable);
assertThat(it).isNotSameAs(outer);
});
}
@Test // DATACMNS-1377
public void shouldConvertToPropertyPathLeafType() {
@@ -137,53 +64,6 @@ public class PersistentPropertyAccessorUnitTests {
assertThat(convertingAccessor.getBean().getCustomer().getFirstname()).isEqualTo("2");
}
@Test // DATACMNS-1555
public void usesTraversalContextToTraverseCollections() {
var withContext = WithContext.builder() //
.collection(Collections.singleton("value")) //
.list(Collections.singletonList("value")) //
.set(Collections.singleton("value")) //
.map(Collections.singletonMap("key", "value")) //
.string(" value ") //
.build();
var collectionHelper = Spec.of("collection",
(context, property) -> context.registerCollectionHandler(property, it -> it.iterator().next()));
var listHelper = Spec.of("list", (context, property) -> context.registerListHandler(property, it -> it.get(0)));
var setHelper = Spec.of("set",
(context, property) -> context.registerSetHandler(property, it -> it.iterator().next()));
var mapHelper = Spec.of("map", (context, property) -> context.registerMapHandler(property, it -> it.get("key")));
var stringHelper = Spec.of("string",
(context, property) -> context.registerHandler(property, String.class, it -> it.trim()));
Stream.of(collectionHelper, listHelper, setHelper, mapHelper, stringHelper).forEach(it -> {
PersistentEntity<Object, SamplePersistentProperty> entity = context.getPersistentEntity(WithContext.class);
PersistentProperty<?> property = entity.getRequiredPersistentProperty(it.name);
var accessor = entity.getPropertyAccessor(withContext);
var traversalContext = it.registrar.apply(new TraversalContext(), property);
var propertyPath = context.getPersistentPropertyPath(it.name,
WithContext.class);
assertThat(accessor.getProperty(propertyPath, traversalContext)).isEqualTo("value");
});
}
@Test // DATACMNS-1555
public void traversalContextRejectsInvalidPropertyHandler() {
PersistentEntity<Object, SamplePersistentProperty> entity = context.getPersistentEntity(WithContext.class);
PersistentProperty<?> property = entity.getRequiredPersistentProperty("collection");
var traversal = new TraversalContext();
assertThatIllegalArgumentException() //
.isThrownBy(() -> traversal.registerHandler(property, Map.class, Function.identity()));
}
@Value
static class Order {
Customer customer;
@@ -208,23 +88,4 @@ public class PersistentPropertyAccessorUnitTests {
static class Outer {
NestedImmutable immutable;
}
// DATACMNS-1555
@Builder
static class WithContext {
Collection<String> collection;
List<String> list;
Set<String> set;
Map<String, String> map;
String string;
}
@Value(staticConstructor = "of")
static class Spec {
String name;
BiFunction<TraversalContext, PersistentProperty<?>, TraversalContext> registrar;
}
}