mapstruct#852 Expanding converters to cover java 8 LocalDate to java.util.Date

pjlarson · gunnarmorling · commit e13696172e69 · 2016-10-23T21:00:47.000+02:00
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java
@@ -230,6 +230,7 @@ private void registerJava8TimeConversions() {
         // Java 8 to Date
         register( JavaTimeConstants.ZONED_DATE_TIME_FQN, Date.class, new JavaZonedDateTimeToDateConversion() );
         register( JavaTimeConstants.LOCAL_DATE_TIME_FQN, Date.class, new JavaLocalDateTimeToDateConversion() );
+        register( JavaTimeConstants.LOCAL_DATE_FQN, Date.class, new JavaLocalDateToDateConversion() );
 
     }
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToDateConversion.java
@@ -0,0 +1,39 @@
+/**
+ *  Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.internal.conversion;
+
+import org.mapstruct.ap.internal.model.common.ConversionContext;
+
+/**
+ * SimpleConversion for mapping {@link java.time.LocalDate} to
+ * {@link java.util.Date} and vice versa.
+ */
+public class JavaLocalDateToDateConversion extends SimpleConversion {
+
+    @Override
+    protected String getToExpression(ConversionContext conversionContext) {
+        return "java.util.Date.from( <SOURCE>.atStartOfDay( java.time.ZoneOffset.UTC ).toInstant() )";
+
+    }
+
+    @Override
+    protected String getFromExpression(ConversionContext conversionContext) {
+        return "java.time.LocalDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneOffset.UTC ).toLocalDate()";
+    }
+}
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
@@ -267,4 +267,28 @@ public void testLocalDateTimeToDateMapping() {
 
         assertThat( source.getForDateConversionWithLocalDateTime() ).isEqualTo( dateTime );
     }
+
+    @Test
+    public void testLocalDateToDateMapping() {
+        TimeZone.setDefault( TimeZone.getTimeZone( "Australia/Melbourne" ) );
+
+        Source source = new Source();
+        LocalDate localDate = LocalDate.of( 2016, 3, 1 );
+        source.setForDateConversionWithLocalDate( localDate );
+
+        Target target = SourceTargetMapper.INSTANCE.sourceToTargetDefaultMapping( source );
+
+        assertThat( target.getForDateConversionWithLocalDate() ).isNotNull();
+
+        Calendar instance = Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) );
+        instance.setTimeInMillis( target.getForDateConversionWithLocalDate().getTime() );
+
+        assertThat( instance.get( Calendar.YEAR ) ).isEqualTo( localDate.getYear() );
+        assertThat( instance.get( Calendar.MONTH ) ).isEqualTo( localDate.getMonthValue() - 1 );
+        assertThat( instance.get( Calendar.DATE ) ).isEqualTo( localDate.getDayOfMonth() );
+
+        source = SourceTargetMapper.INSTANCE.targetToSource( target );
+
+        assertThat( source.getForDateConversionWithLocalDate() ).isEqualTo( localDate );
+    }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Source.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Source.java
@@ -42,6 +42,8 @@ public class Source {
 
     private LocalDateTime forDateConversionWithLocalDateTime;
 
+    private LocalDate forDateConversionWithLocalDate;
+
     public ZonedDateTime getZonedDateTime() {
         return zonedDateTime;
     }
@@ -97,4 +99,12 @@ public LocalDateTime getForDateConversionWithLocalDateTime() {
     public void setForDateConversionWithLocalDateTime(LocalDateTime forDateConversionWithLocalDateTime) {
         this.forDateConversionWithLocalDateTime = forDateConversionWithLocalDateTime;
     }
+
+    public LocalDate getForDateConversionWithLocalDate() {
+        return forDateConversionWithLocalDate;
+    }
+
+    public void setForDateConversionWithLocalDate(LocalDate forDateConversionWithLocalDate) {
+        this.forDateConversionWithLocalDate = forDateConversionWithLocalDate;
+    }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Target.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Target.java
@@ -39,6 +39,8 @@ public class Target {
 
     private Date forDateConversionWithLocalDateTime;
 
+    private Date forDateConversionWithLocalDate;
+
     public String getZonedDateTime() {
         return zonedDateTime;
     }
@@ -95,4 +97,11 @@ public void setForDateConversionWithLocalDateTime(Date forDateConversionWithLoca
         this.forDateConversionWithLocalDateTime = forDateConversionWithLocalDateTime;
     }
 
+    public Date getForDateConversionWithLocalDate() {
+        return forDateConversionWithLocalDate;
+    }
+
+    public void setForDateConversionWithLocalDate(Date forDateConversionWithLocalDate) {
+        this.forDateConversionWithLocalDate = forDateConversionWithLocalDate;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,7 @@ private void registerJava8TimeConversions() {`
`230`	`230`	`// Java 8 to Date`
`231`	`231`	`register( JavaTimeConstants.ZONED_DATE_TIME_FQN, Date.class, new JavaZonedDateTimeToDateConversion() );`
`232`	`232`	`register( JavaTimeConstants.LOCAL_DATE_TIME_FQN, Date.class, new JavaLocalDateTimeToDateConversion() );`
	`233`	`+ register( JavaTimeConstants.LOCAL_DATE_FQN, Date.class, new JavaLocalDateToDateConversion() );`
`233`	`234`
`234`	`235`	`}`
`235`	`236`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public class Source {`
`42`	`42`
`43`	`43`	`private LocalDateTime forDateConversionWithLocalDateTime;`
`44`	`44`
	`45`	`+ private LocalDate forDateConversionWithLocalDate;`
	`46`	`+`
`45`	`47`	`public ZonedDateTime getZonedDateTime() {`
`46`	`48`	`return zonedDateTime;`
`47`	`49`	`}`
`@@ -97,4 +99,12 @@ public LocalDateTime getForDateConversionWithLocalDateTime() {`
`97`	`99`	`public void setForDateConversionWithLocalDateTime(LocalDateTime forDateConversionWithLocalDateTime) {`
`98`	`100`	`this.forDateConversionWithLocalDateTime = forDateConversionWithLocalDateTime;`
`99`	`101`	`}`
	`102`	`+`
	`103`	`+ public LocalDate getForDateConversionWithLocalDate() {`
	`104`	`+ return forDateConversionWithLocalDate;`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ public void setForDateConversionWithLocalDate(LocalDate forDateConversionWithLocalDate) {`
	`108`	`+ this.forDateConversionWithLocalDate = forDateConversionWithLocalDate;`
	`109`	`+ }`
`100`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public class Target {`
`39`	`39`
`40`	`40`	`private Date forDateConversionWithLocalDateTime;`
`41`	`41`
	`42`	`+ private Date forDateConversionWithLocalDate;`
	`43`	`+`
`42`	`44`	`public String getZonedDateTime() {`
`43`	`45`	`return zonedDateTime;`
`44`	`46`	`}`
`@@ -95,4 +97,11 @@ public void setForDateConversionWithLocalDateTime(Date forDateConversionWithLoca`
`95`	`97`	`this.forDateConversionWithLocalDateTime = forDateConversionWithLocalDateTime;`
`96`	`98`	`}`
`97`	`99`
	`100`	`+ public Date getForDateConversionWithLocalDate() {`
	`101`	`+ return forDateConversionWithLocalDate;`
	`102`	`+ }`
	`103`	`+`
	`104`	`+ public void setForDateConversionWithLocalDate(Date forDateConversionWithLocalDate) {`
	`105`	`+ this.forDateConversionWithLocalDate = forDateConversionWithLocalDate;`
	`106`	`+ }`
`98`	`107`	`}`