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

DATACMNS-1639 - Re-instantiate API in legacy EntityInstantiators.

Browse Source 
To retain backwards compatibility for the legacy EntityInstantiators API, we now adapt the map values for custom instantiators that are handed into the constructors of EntityInstantiators.
This commit is contained in:
Oliver Drotbohm
2020-01-16 14:08:00 +01:00
parent 781ef48987
commit d05dd24a4b
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/springframework/data/convert/EntityInstantiators.java
View File

@@ -17,6 +17,8 @@ package org.springframework.data.convert;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.model.InternalEntityInstantiatorFactory;
@@ -46,7 +48,7 @@ public class EntityInstantiators extends org.springframework.data.mapping.model.
*
* @param fallback must not be {@literal null}.
*/
public EntityInstantiators(org.springframework.data.mapping.model.EntityInstantiator fallback) {
public EntityInstantiators(EntityInstantiator fallback) {
super(fallback, Collections.emptyMap());
}
@@ -55,9 +57,9 @@ public class EntityInstantiators extends org.springframework.data.mapping.model.
*
* @param customInstantiators must not be {@literal null}.
*/
public EntityInstantiators(
Map<Class<?>, org.springframework.data.mapping.model.EntityInstantiator> customInstantiators) {
super(InternalEntityInstantiatorFactory.getKotlinClassGeneratingEntityInstantiator(), customInstantiators);
public EntityInstantiators(Map<Class<?>, EntityInstantiator> customInstantiators) {
super(InternalEntityInstantiatorFactory.getKotlinClassGeneratingEntityInstantiator(),
adaptFromLegacy(customInstantiators));
}
/**
@@ -67,9 +69,9 @@ public class EntityInstantiators extends org.springframework.data.mapping.model.
* @param defaultInstantiator must not be {@literal null}.
* @param customInstantiators must not be {@literal null}.
*/
public EntityInstantiators(org.springframework.data.mapping.model.EntityInstantiator defaultInstantiator,
Map<Class<?>, org.springframework.data.mapping.model.EntityInstantiator> customInstantiators) {
super(defaultInstantiator, customInstantiators);
public EntityInstantiators(EntityInstantiator defaultInstantiator,
Map<Class<?>, EntityInstantiator> customInstantiators) {
super(defaultInstantiator, adaptFromLegacy(customInstantiators));
}
/*
@@ -80,4 +82,13 @@ public class EntityInstantiators extends org.springframework.data.mapping.model.
public EntityInstantiator getInstantiatorFor(PersistentEntity<?, ?> entity) {
return new EntityInstantiatorAdapter(super.getInstantiatorFor(entity));
}
private static Map<Class<?>, org.springframework.data.mapping.model.EntityInstantiator> adaptFromLegacy(
Map<Class<?>, EntityInstantiator> instantiators) {
return instantiators == null //
? null //
: instantiators.entrySet().stream() //
.collect(Collectors.toMap(Entry::getKey, e -> new EntityInstantiatorAdapter(e.getValue())));
}
}