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

DATACMNS-1828 - Fix Map component type lookup for custom Map implementations.

Browse Source 
Instead of using the first generic type parameter of a parameterized type as Map component type, we now explicitly lookup the super type's Map-specific generics configuration and use its first generic type parameter. The same for collection like types falling back to the parameter type bound to Iterable.
This commit is contained in:
Oliver Drotbohm
2020-11-05 15:14:57 +01:00
parent 98d61d6f25
commit 9fddd402f7
3 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
View File

@@ -264,8 +264,8 @@ class QueryExecutionConvertersUnitTests {
Method method = Sample.class.getMethod("pages");
TypeInformation<Object> returnType = ClassTypeInformation.fromReturnTypeOf(method);
assertThat(QueryExecutionConverters.unwrapWrapperTypes(returnType))
.isEqualTo(ClassTypeInformation.from(String.class));
assertThat(QueryExecutionConverters.unwrapWrapperTypes(returnType).getType())
.isEqualTo(String.class);
}
@Test // DATACMNS-983

37
src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
View File

@@ -443,6 +443,32 @@ public class ClassTypeInformationUnitTests {
assertThat(specialized.getProperty("root").getType()).isEqualTo(Aggregate.class);
}
@Test // DATACMNS-1828
void discoversMapKeyAndValueTypeFromTypedMap() {
TypeInformation<TypeWithTypedMap> information = from(TypeWithTypedMap.class);
TypeInformation<?> typedMap = information.getProperty("typedMap");
assertThat(typedMap.getType()).isEqualTo(StringKeyMap.class);
assertThat(typedMap.isMap()).isTrue();
assertThat(typedMap.getRequiredComponentType().getType()).isEqualTo(String.class);
assertThat(typedMap.getMapValueType().getType()).isEqualTo(Long.class);
TypeInformation<?> longMultiValueMap = information.getProperty("longMultiValueMap");
assertThat(longMultiValueMap.getType()).isEqualTo(MultiValueMap.class);
assertThat(longMultiValueMap.getRequiredComponentType().getType()).isEqualTo(String.class);
assertThat(longMultiValueMap.getMapValueType().getType()).isEqualTo(List.class);
assertThat(longMultiValueMap.getMapValueType().getRequiredActualType().getType()).isEqualTo(Long.class);
TypeInformation<?> justMap = information.getProperty("justMap");
assertThat(justMap.getType()).isEqualTo(Map.class);
assertThat(justMap.getRequiredComponentType().getType()).isEqualTo(String.class);
assertThat(justMap.getMapValueType().getType()).isEqualTo(Long.class);
}
static class StringMapContainer extends MapContainer<String> {
}
@@ -681,4 +707,15 @@ public class ClassTypeInformationUnitTests {
// A domain type partially binding generics
static class GenericEvent<T extends Aggregate> extends DomainEvent<T, Long> {}
// DATACMNS-1828
interface StringKeyMap<T> extends Map<String, T> {}
interface MultiValueMap<T> extends Map<String, List<T>> {}
static class TypeWithTypedMap {
StringKeyMap<Long> typedMap;
MultiValueMap<Long> longMultiValueMap;
Map<String, Long> justMap;
}
}