DATACMNS-1259 - Fixed support for Long values in Auditables.

Using Instant as internal data type since it's a point in time without time zone which LocalDateTime isn't. Added necessary converters. Fixed one JodaTime converter that used UTC to use SystemDefault like other similar converters.

In case of a conversion failure the error message now contains the source type.

Original pull request: #273.
This commit is contained in:
Jens Schauder
2018-02-13 14:34:58 +01:00
committed by Oliver Gierke
parent 4947ca01dc
commit 5251f72e69
5 changed files with 175 additions and 8 deletions

View File

@@ -19,6 +19,7 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import java.lang.reflect.Field;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAccessor;
import java.util.Calendar;
@@ -42,6 +43,7 @@ import org.springframework.util.Assert;
*
* @author Oliver Gierke
* @author Christoph Strobl
* @author Jens Schauder
* @since 1.5
*/
class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory {
@@ -207,8 +209,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
return conversionService.convert(date, targetType);
}
throw new IllegalArgumentException(String.format("Invalid date type for member %s! Supported types are %s.",
source, AnnotationAuditingMetadata.SUPPORTED_DATE_TYPES));
throw new IllegalArgumentException(createUnsupportedTypeErrorMessage(source));
}
/**
@@ -228,19 +229,24 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
return (T) it;
}
Class<?> typeToConvertTo = Stream.of(target, LocalDateTime.class)//
Class<?> typeToConvertTo = Stream.of(target, Instant.class)//
.filter(type -> target.isAssignableFrom(type))//
.filter(type -> conversionService.canConvert(it.getClass(), type))//
.findFirst()
.orElseThrow(() -> new IllegalArgumentException(
String.format("Invalid date type for member %s! Supported types are %s.", source,
AnnotationAuditingMetadata.SUPPORTED_DATE_TYPES)));
createUnsupportedTypeErrorMessage(((Optional<Object>)source).orElseGet(() -> source))));
return (T) conversionService.convert(it, typeToConvertTo);
});
}
}
private static String createUnsupportedTypeErrorMessage(Object source) {
return String.format("Invalid date type %s for member %s! Supported types are %s.", source.getClass(), source,
AnnotationAuditingMetadata.SUPPORTED_DATE_TYPES);
}
/**
* An {@link AuditableBeanWrapper} implementation that sets values on the target object using reflection.
*