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

Remove package cycle between mapping and convert.

Browse Source 
Remove accessor methods to obtain annotated converters on PersistentProperty.

Closes #2576
This commit is contained in:
Mark Paluch
2022-04-05 10:32:53 +02:00
parent 0792b74549
commit e25fb0b16a
7 changed files with 77 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/java/org/springframework/data/convert/PropertyValueConverterFactoryUnitTests.java
View File

@@ -34,6 +34,7 @@ import org.springframework.lang.Nullable;
* Unit tests for {@link PropertyValueConverterFactory}.
*
* @author Christoph Strobl
* @author Mark Paluch
*/
public class PropertyValueConverterFactoryUnitTests {
@@ -48,8 +49,9 @@ public class PropertyValueConverterFactoryUnitTests {
void simpleConverterFactoryReadsConverterFromAnnotation() {
PersistentProperty property = mock(PersistentProperty.class);
when(property.hasValueConverter()).thenReturn(true);
when(property.getValueConverterType()).thenReturn(ConverterWithDefaultCtor.class);
ValueConverter annotation = mock(ValueConverter.class);
when(annotation.value()).thenReturn((Class) ConverterWithDefaultCtor.class);
when(property.findAnnotation(ValueConverter.class)).thenReturn(annotation);
assertThat(PropertyValueConverterFactory.simple().getConverter(property))
.isInstanceOf(ConverterWithDefaultCtor.class);
@@ -191,8 +193,9 @@ public class PropertyValueConverterFactoryUnitTests {
void cachingConverterFactoryServesCachedInstanceForProperty() {
PersistentProperty property = mock(PersistentProperty.class);
when(property.hasValueConverter()).thenReturn(true);
when(property.getValueConverterType()).thenReturn(ConverterWithDefaultCtor.class);
ValueConverter annotation = mock(ValueConverter.class);
when(annotation.value()).thenReturn((Class) ConverterWithDefaultCtor.class);
when(property.findAnnotation(ValueConverter.class)).thenReturn(annotation);
PropertyValueConverterFactory factory = PropertyValueConverterFactory
.caching(PropertyValueConverterFactory.simple());

35
src/test/java/org/springframework/data/mapping/model/AnnotationBasedPersistentPropertyUnitTests.java
View File

@@ -36,6 +36,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.springframework.core.annotation.AliasFor;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.data.annotation.AccessType;
@@ -44,9 +45,6 @@ import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.ReadOnlyProperty;
import org.springframework.data.annotation.Reference;
import org.springframework.data.annotation.Transient;
import org.springframework.data.convert.PropertyValueConverter;
import org.springframework.data.convert.ValueConversionContext;
import org.springframework.data.convert.ValueConverter;
import org.springframework.data.mapping.MappingException;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.context.SampleMappingContext;
@@ -341,15 +339,6 @@ public class AnnotationBasedPersistentPropertyUnitTests<P extends AnnotationBase
assertThat(property.isIdProperty()).isTrue();
}
@Test // GH-1484
void detectsValueConverter() {
SamplePersistentProperty property = getProperty(WithPropertyConverter.class, "value");
assertThat(property.hasValueConverter()).isTrue();
assertThat(property.getValueConverterType()).isEqualTo(MyPropertyConverter.class);
}
@SuppressWarnings("unchecked")
private Map<Class<? extends Annotation>, Annotation> getAnnotationCache(SamplePersistentProperty property) {
return (Map<Class<? extends Annotation>, Annotation>) ReflectionTestUtils.getField(property, "annotationCache");
@@ -472,7 +461,8 @@ public class AnnotationBasedPersistentPropertyUnitTests<P extends AnnotationBase
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { FIELD, METHOD, ANNOTATION_TYPE })
@Id
public @interface MyId {}
public @interface MyId {
}
static class FieldAccess {
String name;
@@ -542,23 +532,4 @@ public class AnnotationBasedPersistentPropertyUnitTests<P extends AnnotationBase
interface JMoleculesAggregate extends AggregateRoot<JMoleculesAggregate, Identifier> {}
static class WithPropertyConverter {
@ValueConverter(MyPropertyConverter.class)
String value;
}
static class MyPropertyConverter
implements PropertyValueConverter<Object, Object, ValueConversionContext<SamplePersistentProperty>> {
@Override
public Object read(Object value, ValueConversionContext context) {
return null;
}
@Override
public Object write(Object value, ValueConversionContext context) {
return null;
}
}
}