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

DATACMNS-1290 - Added support for timestamp values of type long.

Browse Source 
The type long or Long is actually required for custom revision entities by Envers.

See also: https://github.com/spring-projects/spring-data-envers/issues/122
Original pull request: #282.
This commit is contained in:
Jens Schauder
2018-04-06 16:07:53 +02:00
committed by Mark Paluch
parent 5e2e51b7a0
commit 5901a27130
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java
View File

@@ -19,7 +19,6 @@ import java.lang.annotation.Annotation;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.temporal.TemporalAccessor;
import java.util.Optional;
import org.springframework.data.util.AnnotationDetectionFieldCallback;
@@ -39,7 +38,7 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
private final Object entity;
private final Lazy<Optional<N>> revisionNumber;
private final Lazy<Optional<TemporalAccessor>> revisionDate;
private final Lazy<Optional<Object>> revisionDate;
/**
* Creates a new {@link AnnotationRevisionMetadata} inspecting the given entity for the given annotations. If no
@@ -106,29 +105,29 @@ public class AnnotationRevisionMetadata<N extends Number & Comparable<N>> implem
});
}
private static LocalDateTime convertToLocalDateTime(TemporalAccessor temporalAccessor) {
private static LocalDateTime convertToLocalDateTime(Object timestamp) {
if (temporalAccessor instanceof LocalDateTime) {
return (LocalDateTime) temporalAccessor;
if (timestamp instanceof LocalDateTime) {
return (LocalDateTime) timestamp;
}
if (temporalAccessor instanceof Instant) {
return LocalDateTime.ofInstant((Instant) temporalAccessor, ZoneOffset.systemDefault());
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
return LocalDateTime.ofInstant(convertToInstant(timestamp), ZoneOffset.systemDefault());
}
private static Instant convertToInstant(TemporalAccessor temporalAccessor) {
private static Instant convertToInstant(Object timestamp) {
if (temporalAccessor instanceof Instant) {
return (Instant) temporalAccessor;
if (timestamp instanceof Instant) {
return (Instant) timestamp;
}
if (temporalAccessor instanceof LocalDateTime) {
return ((LocalDateTime) temporalAccessor).atZone(ZoneOffset.systemDefault()).toInstant();
if (timestamp instanceof LocalDateTime) {
return ((LocalDateTime) timestamp).atZone(ZoneOffset.systemDefault()).toInstant();
}
throw new IllegalArgumentException(String.format("Can't convert %s to LocalDateTime!", temporalAccessor));
if (timestamp instanceof Long) {
return Instant.ofEpochMilli((Long) timestamp);
}
throw new IllegalArgumentException(String.format("Can't convert %s to Instant!", timestamp));
}
}

26
src/test/java/org/springframework/data/history/AnnotationRevisionMetadataUnitTests.java
View File

@@ -106,6 +106,26 @@ public class AnnotationRevisionMetadataUnitTests {
softly.assertAll();
}
@Test // DATACMNS-1290
public void exposesRevisionDateAndInstantForLong() {
SampleWithLong sample = new SampleWithLong();
sample.revisionLong = 4711L;
Instant expectedInstant = Instant.ofEpochMilli(sample.revisionLong);
LocalDateTime expectedLocalDateTime = LocalDateTime.ofInstant(expectedInstant, ZoneOffset.systemDefault());
RevisionMetadata<Long> metadata = getMetadata(sample);
softly.assertThat(metadata.getRevisionDate()).hasValue(expectedLocalDateTime);
softly.assertThat(metadata.getRequiredRevisionDate()).isEqualTo(expectedLocalDateTime);
softly.assertThat(metadata.getRevisionInstant()).hasValue(expectedInstant);
softly.assertThat(metadata.getRequiredRevisionInstant()).isEqualTo(expectedInstant);
softly.assertAll();
}
private static RevisionMetadata<Long> getMetadata(Object sample) {
return new AnnotationRevisionMetadata<>(sample, Autowired.class, Reference.class);
}
@@ -121,4 +141,10 @@ public class AnnotationRevisionMetadataUnitTests {
@Autowired Long revisionNumber;
@Reference Instant revisionInstant;
}
static class SampleWithLong {
@Autowired Long revisionNumber;
@Reference long revisionLong;
}
}