DATAJDBC-219: replaced VersionAccessor with simpler code

added integration tests for all version types

Author: thombergs

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java

@@ -26,6 +26,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -34,6 +35,7 @@
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PropertyHandler;
+import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
@@ -71,7 +73,7 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
 	 * Only suitable if this is the only access strategy in use.
 	 */
 	public DefaultDataAccessStrategy(SqlGeneratorSource sqlGeneratorSource, RelationalMappingContext context,
-			RelationalConverter converter, NamedParameterJdbcOperations operations) {
+									 RelationalConverter converter, NamedParameterJdbcOperations operations) {
 
 		this.sqlGeneratorSource = sqlGeneratorSource;
 		this.operations = operations;
@@ -117,9 +119,9 @@ public <T> Object insert(T instance, Class<T> domainType, Identifier identifier)
 		}
 
 		if (persistentEntity.hasVersionProperty()) {
-			VersionAccessor versionAccessor = new VersionAccessor<>(instance, persistentEntity);
-			Number newVersion = versionAccessor.nextVersion();
-			versionAccessor.setVersion(newVersion);
+
+			Number newVersion = getNextVersion(instance, persistentEntity, converter.getConversionService());
+			setVersion(instance, persistentEntity, newVersion);
 			parameters.put(persistentEntity.getVersionProperty().getColumnName(), converter.writeValue(newVersion,
 					ClassTypeInformation.from(persistentEntity.getVersionProperty().getColumnType())));
 		}
@@ -159,18 +161,17 @@ private <S> boolean updateWithoutVersion(S instance, Class<S> domainType) {
 	private <S> boolean updateWithVersion(S instance, Class<S> domainType) {
 
 		RelationalPersistentEntity<S> persistentEntity = getRequiredPersistentEntity(domainType);
-		VersionAccessor<S> versionAccessor = new VersionAccessor<>(instance, persistentEntity);
 
-		Number oldVersion = versionAccessor.currentVersion();
-		Number newVersion = versionAccessor.nextVersion();
-		versionAccessor.setVersion(newVersion);
+		Number oldVersion = getVersion(instance, persistentEntity, converter.getConversionService());
+		Number newVersion = getNextVersion(instance, persistentEntity, converter.getConversionService());
+		setVersion(instance, persistentEntity, newVersion);
 
 		int affectedRows = operations.update(sql(domainType).getUpdateWithVersion(oldVersion),
 				getPropertyMap(instance, persistentEntity, ""));
 
 		if (affectedRows == 0) {
 			// reverting version update on entity
-			versionAccessor.setVersion(oldVersion);
+			setVersion(instance, persistentEntity, oldVersion);
 			throw new OptimisticLockingFailureException(
 					String.format("Optimistic lock exception on saving entity of type %s.", persistentEntity.getName()));
 		}
@@ -333,7 +334,7 @@ public <T> boolean existsById(Object id, Class<T> domainType) {
 	}
 
 	private <S, T> MapSqlParameterSource getPropertyMap(S instance, RelationalPersistentEntity<S> persistentEntity,
-			String prefix) {
+														String prefix) {
 
 		MapSqlParameterSource parameters = new MapSqlParameterSource();
 
@@ -396,7 +397,7 @@ private <S, ID> ID getIdValueOrNull(S instance, RelationalPersistentEntity<S> pe
 	}
 
 	private static <S, ID> boolean isIdPropertyNullOrScalarZero(@Nullable ID idValue,
-			RelationalPersistentEntity<S> persistentEntity) {
+																RelationalPersistentEntity<S> persistentEntity) {
 
 		RelationalPersistentProperty idProperty = persistentEntity.getIdProperty();
 		return idValue == null //
@@ -452,4 +453,31 @@ private SqlGenerator sql(Class<?> domainType) {
 		return sqlGeneratorSource.getSqlGenerator(domainType);
 	}
 
+	@Nullable
+	private <T> Number getVersion(T instance, RelationalPersistentEntity<T> entity, ConversionService conversionService) {
+		RelationalPersistentProperty versionProperty = entity.getRequiredVersionProperty();
+		PersistentPropertyAccessor<T> propertyAccessor = entity.getPropertyAccessor(instance);
+		ConvertingPropertyAccessor<T> convertingPropertyAccessor = new ConvertingPropertyAccessor<>(propertyAccessor, conversionService);
+		return convertingPropertyAccessor.getProperty(versionProperty, Number.class);
+	}
+
+	private <T> Number getNextVersion(T instance, RelationalPersistentEntity<T> entity, ConversionService conversionService) {
+		Number version = getVersion(instance, entity, conversionService);
+		Class<?> versionType = entity.getRequiredVersionProperty().getType();
+		if (versionType == Integer.class || versionType == int.class) {
+			return version == null ? 1 : version.intValue() + 1;
+		} else if (versionType == Long.class || versionType == long.class) {
+			return version == null ? 1L : version.longValue() + 1;
+		} else if (versionType == Short.class || versionType == short.class) {
+			return version == null ? (short) 1 : (short) (version.shortValue() + 1);
+		}
+		throw new IllegalStateException(String.format("Entity '%s' has version property of invalid type '%s'.", entity.getType().getName(), entity.getVersionProperty().getType().getName()));
+	}
+
+	private <T> void setVersion(T instance, RelationalPersistentEntity<T> entity, Number newVersion) {
+		RelationalPersistentProperty versionProperty = entity.getRequiredVersionProperty();
+		PersistentPropertyAccessor<T> accessor = versionProperty.getOwner().getPropertyAccessor(instance);
+		accessor.setProperty(versionProperty, newVersion);
+	}
+
 }