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

DATACMNS-1243 - Add converters from LocalDateTime to Instant and back.

Browse Source 
This allows usage of Instant for AuditAware.

Original pull request: #268.
This commit is contained in:
Jens Schauder
2018-01-11 09:08:34 +01:00
committed by Oliver Gierke
parent 8d732bca19
commit 0e9f150fa8
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Period;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -70,6 +71,8 @@ public abstract class Jsr310Converters {
converters.add(LocalTimeToDateConverter.INSTANCE);
converters.add(DateToInstantConverter.INSTANCE);
converters.add(InstantToDateConverter.INSTANCE);
converters.add(LocalDateTimeToInstantConverter.INSTANCE);
converters.add(InstantToLocalDateTimeConverter.INSTANCE);
converters.add(ZoneIdToStringConverter.INSTANCE);
converters.add(StringToZoneIdConverter.INSTANCE);
converters.add(DurationToStringConverter.INSTANCE);
@@ -178,6 +181,28 @@ public abstract class Jsr310Converters {
}
}
public static enum LocalDateTimeToInstantConverter implements Converter<LocalDateTime, Instant> {
INSTANCE;
@Nonnull
@Override
public Instant convert(LocalDateTime source) {
return source.atZone(systemDefault()).toInstant();
}
}
public static enum InstantToLocalDateTimeConverter implements Converter<Instant, LocalDateTime> {
INSTANCE;
@Nonnull
@Override
public LocalDateTime convert(Instant source) {
return LocalDateTime.ofInstant(source, systemDefault());
}
}
@WritingConverter
public static enum ZoneIdToStringConverter implements Converter<ZoneId, String> {

11
src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java
View File

@@ -145,6 +145,17 @@ public class Jsr310ConvertersUnitTests {
}
}
@Test // DATACMNS-1243
public void convertsLocalDateTimeToInstantAndBack() {
LocalDateTime dateTime = LocalDateTime.now();
Instant instant = CONVERSION_SERVICE.convert(dateTime, Instant.class);
LocalDateTime convertedDateTime = CONVERSION_SERVICE.convert(dateTime, LocalDateTime.class);
assertThat(convertedDateTime).isEqualTo(dateTime);
}
private static Predicate<Date> formatted(Temporal expected, String format) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);