third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#681 Using UTC for Date/JavaLocalDate conversion in both directions

Browse Source
This commit is contained in:
Gunnar Morling 2015-11-06 19:19:34 +01:00
parent 1f091c35e2
commit 18c03a328d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java
View File

@ -33,6 +33,6 @@ public class JavaLocalDateTimeToDateConversion extends SimpleConversion {
@Override @Override
protected String getFromExpression(ConversionContext conversionContext) { protected String getFromExpression(ConversionContext conversionContext) {
return "java.time.LocalDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneId.systemDefault() )"; return "java.time.LocalDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneId.of( \"UTC\" ) )";
} }
} }

6
processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
View File

@ -240,12 +240,12 @@ public class Java8TimeConversionTest {
source = SourceTargetMapper.INSTANCE.targetToSource( target ); source = SourceTargetMapper.INSTANCE.targetToSource( target );
assertThat( source.getForDateConversionWithZonedDateTime() ).isEqualTo( dateTime ); assertThat( source.getForDateConversionWithZonedDateTime() ).isEqualTo( dateTime );
} }
@Test @Test
public void testLocalDateTimeToDateMapping() { public void testLocalDateTimeToDateMapping() {
TimeZone.setDefault( TimeZone.getTimeZone( "UTC" ) ); TimeZone.setDefault( TimeZone.getTimeZone( "Australia/Melbourne" ) );
Source source = new Source(); Source source = new Source();
LocalDateTime dateTime = LocalDateTime.of( 2014, 1, 1, 0, 0 ); LocalDateTime dateTime = LocalDateTime.of( 2014, 1, 1, 0, 0 );
source.setForDateConversionWithLocalDateTime( dateTime ); source.setForDateConversionWithLocalDateTime( dateTime );
@ -266,7 +266,5 @@ public class Java8TimeConversionTest {
source = SourceTargetMapper.INSTANCE.targetToSource( target ); source = SourceTargetMapper.INSTANCE.targetToSource( target );
assertThat( source.getForDateConversionWithLocalDateTime() ).isEqualTo( dateTime ); assertThat( source.getForDateConversionWithLocalDateTime() ).isEqualTo( dateTime );
} }
} }