DATAJDBC-102 - Determine the EntityInstantiator to be used dynamically.

Replaced the direct use of EntityInstantiator with EntityInstantiators.
Moved it into the MappingContext because instantiation is part of the mapping process.

Author: schauder

src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java

@@ -24,8 +24,7 @@
 
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.ClassGeneratingEntityInstantiator;
-import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
@@ -49,7 +48,7 @@ public class EntityRowMapper<T> implements RowMapper<T> {
 	private static final Converter<Iterable<?>, Map<?, ?>> ITERABLE_OF_ENTRY_TO_MAP_CONVERTER = new IterableOfEntryToMapConverter();
 
 	private final JdbcPersistentEntity<T> entity;
-	private final EntityInstantiator instantiator = new ClassGeneratingEntityInstantiator();
+
 	private final ConversionService conversions;
 	private final JdbcMappingContext context;
 	private final DataAccessStrategy accessStrategy;
@@ -97,7 +96,9 @@ public T mapRow(ResultSet resultSet, int rowNumber) throws SQLException {
 	}
 
 	private T createInstance(ResultSet rs) {
-		return instantiator.createInstance(entity, new ResultSetParameterValueProvider(rs, entity, conversions, ""));
+
+		return context.getInstantiatorFor(entity) //
+				.createInstance(entity, new ResultSetParameterValueProvider(rs, entity, conversions, ""));
 	}
 
 	/**
@@ -135,8 +136,8 @@ private <S> S readEntityFrom(ResultSet rs, PersistentProperty<?> property) {
 			return null;
 		}
 
-		S instance = instantiator.createInstance(entity,
-				new ResultSetParameterValueProvider(rs, entity, conversions, prefix));
+		S instance = context.getInstantiatorFor(entity) //
+				.createInstance(entity, new ResultSetParameterValueProvider(rs, entity, conversions, prefix));
 
 		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(instance);
 		ConvertingPropertyAccessor propertyAccessor = new ConvertingPropertyAccessor(accessor, conversions);

src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java

@@ -27,10 +27,14 @@
 import java.util.HashSet;
 import java.util.List;
 
+import lombok.Setter;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.convert.Jsr310Converters;
+import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.context.MappingContext;
@@ -59,6 +63,8 @@ public class JdbcMappingContext extends AbstractMappingContext<JdbcPersistentEnt
 	@Getter private final NamingStrategy namingStrategy;
 	@Getter private SimpleTypeHolder simpleTypeHolder;
 	private GenericConversionService conversions = getDefaultConversionService();
+	@Setter
+	private EntityInstantiators instantiators = new EntityInstantiators();
 
 	/**
 	 * Creates a new {@link JdbcMappingContext}.
@@ -143,6 +149,10 @@ public ConversionService getConversions() {
 		return conversions;
 	}
 
+	public EntityInstantiator getInstantiatorFor(PersistentEntity<?, ?> entity) {
+		return instantiators.getInstantiatorFor(entity);
+	}
+
 	private static GenericConversionService getDefaultConversionService() {
 
 		DefaultConversionService conversionService = new DefaultConversionService();