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

DATACMNS-349 - Opened up SPI in DefaultTypeMapper to allow subclasses to resolve TypeAliases.

Browse Source 
Added getAliasFor(TypeInformation) method in DefaultTypeMapper to allow subclasses to resolve TypeAliases.
This commit is contained in:
Thomas Darimont
2013-07-23 12:29:40 +02:00
committed by Oliver Gierke
parent 2afb570729
commit cc576a7398
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/springframework/data/convert/DefaultTypeMapper.java
View File

@@ -35,6 +35,7 @@ import org.springframework.util.Assert;
* respectively.
*
* @author Oliver Gierke
* @author Thomas Darimont
*/
public class DefaultTypeMapper<S> implements TypeMapper<S> {
@@ -193,12 +194,30 @@ public class DefaultTypeMapper<S> implements TypeMapper<S> {
Assert.notNull(info);
Object alias = getAliasFor(info);
if (alias != null) {
accessor.writeTypeTo(sink, alias);
}
}
/**
* Returns the alias to be used for the given {@link TypeInformation}.
*
* @param info must not be {@literal null}
* @return the alias for the given {@link TypeInformation} or {@literal null} of none was found or all mappers
* returned {@literal null}.
*/
protected final Object getAliasFor(TypeInformation<?> info) {
Assert.notNull(info);
for (TypeInformationMapper mapper : mappers) {
Object alias = mapper.createAliasFor(info);
if (alias != null) {
accessor.writeTypeTo(sink, alias);
return;
return alias;
}
}
return null;
}
}

25
src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java
View File

@@ -39,15 +39,14 @@ import org.springframework.data.util.TypeInformation;
@RunWith(MockitoJUnitRunner.class)
public class DefaultTypeMapperUnitTests {
static final TypeInformation<String> STRING_TYPE_INFO = ClassTypeInformation.from(String.class);
static final String STRING = String.class.getName();
@Mock
TypeAliasAccessor<Map<String, String>> accessor;
@Mock TypeAliasAccessor<Map<String, String>> accessor;
@Mock
TypeInformationMapper mapper;
@Mock TypeInformationMapper mapper;
TypeMapper<Map<String, String>> typeMapper;
DefaultTypeMapper<Map<String, String>> typeMapper;
Map<String, String> source;
@Before
@@ -58,7 +57,7 @@ public class DefaultTypeMapperUnitTests {
this.source = Collections.singletonMap("key", STRING);
when(accessor.readAliasFrom(source)).thenReturn(STRING);
when(mapper.resolveTypeFrom(STRING)).thenReturn((TypeInformation) ClassTypeInformation.from(String.class));
when(mapper.resolveTypeFrom(STRING)).thenReturn((TypeInformation) STRING_TYPE_INFO);
}
@Test
@@ -66,10 +65,22 @@ public class DefaultTypeMapperUnitTests {
public void cachesResolvedTypeInformation() {
TypeInformation<?> information = typeMapper.readType(source);
assertThat(information, is((TypeInformation) ClassTypeInformation.from(String.class)));
assertThat(information, is((TypeInformation) STRING_TYPE_INFO));
verify(mapper, times(1)).resolveTypeFrom(STRING);
typeMapper.readType(source);
verify(mapper, times(1)).resolveTypeFrom(STRING);
}
/**
* @see DATACMNS-349
*/
@Test
public void returnsTypeAliasForInformation() {
Object alias = "alias";
when(mapper.createAliasFor(STRING_TYPE_INFO)).thenReturn(alias);
assertThat(this.typeMapper.getAliasFor(STRING_TYPE_INFO), is(alias));
}
}