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

Polishing.

Browse Source 
Related ticket: GH-2252.
This commit is contained in:
Oliver Drotbohm
2024-03-14 10:34:56 +01:00
parent 487c2ac75f
commit 2b14ee3e4f
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/ValidationErrors.java
View File

@@ -28,11 +28,10 @@ import org.springframework.beans.PropertyAccessorFactory;
import org.springframework.beans.PropertyAccessorUtils;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.PersistentPropertyAccessor;
import org.springframework.data.mapping.context.PersistentEntities;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.validation.AbstractPropertyBindingResult;
import org.springframework.validation.Errors;
/**
* An {@link Errors} implementation for use in the events mechanism of Spring Data REST. Customizes actual field lookup
@@ -92,22 +91,29 @@ public class ValidationErrors extends AbstractPropertyBindingResult {
* @param segment the property segment to look up, must not be {@literal null} or empty.
* @return
*/
@Nullable
private Object lookupValueOn(Object value, String segment) {
Optional<PersistentEntity<?, ? extends PersistentProperty<?>>> entity = entities.getPersistentEntity(value.getClass());
Optional<PersistentEntity<?, ? extends PersistentProperty<?>>> entity = entities
.getPersistentEntity(value.getClass());
return getAccessor(entity, value, segment).getPropertyValue(segment);
}
private static ConfigurablePropertyAccessor getAccessor(
Optional<PersistentEntity<?, ? extends PersistentProperty<?>>> entity, Object value, String segment) {
if (!entity.isPresent()) {
return new DirectFieldAccessor(value).getPropertyValue(segment);
return PropertyAccessorFactory.forDirectFieldAccess(value);
}
PersistentProperty<?> property = entity //
.map(it -> it.getPersistentProperty(PropertyAccessorUtils.getPropertyName(segment))) //
.orElseThrow(() -> new NotReadablePropertyException(value.getClass(), segment));
ConfigurablePropertyAccessor accessor = property.usePropertyAccess() //
return property.usePropertyAccess() //
? PropertyAccessorFactory.forBeanPropertyAccess(value) //
: PropertyAccessorFactory.forDirectFieldAccess(value);
return accessor.getPropertyValue(segment);
}
};
}

5
spring-data-rest-core/src/test/java/org/springframework/data/rest/core/ValidationErrorsUnitTests.java
View File

@@ -94,7 +94,7 @@ class ValidationErrorsUnitTests {
fail("Expected NotReadablePropertyException");
} catch (NotReadablePropertyException e) {}
assertThat(errors.getFieldValue("field")).isEqualTo((Object) "Hello");
assertThat(errors.getFieldValue("field")).isEqualTo("Hello");
}
static class Foo {
@@ -111,7 +111,8 @@ class ValidationErrorsUnitTests {
String field = "World";
}
static class TestKeyValueMappingContext<E extends KeyValuePersistentEntity<?, P>, P extends KeyValuePersistentProperty<P>> extends KeyValueMappingContext<E, P> {
static class TestKeyValueMappingContext<E extends KeyValuePersistentEntity<?, P>, P extends KeyValuePersistentProperty<P>>
extends KeyValueMappingContext<E, P> {
@Override
protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {