From 18c03a328d1c9e62d4f45db892106182bed18265 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Fri, 6 Nov 2015 19:19:34 +0100 Subject: [PATCH] #681 Using UTC for Date/JavaLocalDate conversion in both directions --- .../conversion/JavaLocalDateTimeToDateConversion.java | 2 +- .../test/conversion/java8time/Java8TimeConversionTest.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java index 40f0da5d5..70eee16f5 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java @@ -33,6 +33,6 @@ public class JavaLocalDateTimeToDateConversion extends SimpleConversion { @Override protected String getFromExpression(ConversionContext conversionContext) { - return "java.time.LocalDateTime.ofInstant( .toInstant(), java.time.ZoneId.systemDefault() )"; + return "java.time.LocalDateTime.ofInstant( .toInstant(), java.time.ZoneId.of( \"UTC\" ) )"; } } diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java index ab80eed6d..3dafe4395 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java @@ -240,12 +240,12 @@ public class Java8TimeConversionTest { source = SourceTargetMapper.INSTANCE.targetToSource( target ); assertThat( source.getForDateConversionWithZonedDateTime() ).isEqualTo( dateTime ); - } @Test public void testLocalDateTimeToDateMapping() { - TimeZone.setDefault( TimeZone.getTimeZone( "UTC" ) ); + TimeZone.setDefault( TimeZone.getTimeZone( "Australia/Melbourne" ) ); + Source source = new Source(); LocalDateTime dateTime = LocalDateTime.of( 2014, 1, 1, 0, 0 ); source.setForDateConversionWithLocalDateTime( dateTime ); @@ -266,7 +266,5 @@ public class Java8TimeConversionTest { source = SourceTargetMapper.INSTANCE.targetToSource( target ); assertThat( source.getForDateConversionWithLocalDateTime() ).isEqualTo( dateTime ); - } - }