From 7fdfc9e16704ccf3fbed94b3d7cca94f0b28f6e7 Mon Sep 17 00:00:00 2001 From: Andreas Gudian Date: Thu, 14 Aug 2014 21:03:47 +0200 Subject: [PATCH] #279 fix missing imports in builtin mapping methods --- .../source/builtin/CalendarToXmlGregorianCalendar.java | 1 + .../ap/model/source/builtin/CalendarToZonedDateTime.java | 9 +++------ .../source/builtin/XmlGregorianCalendarToCalendar.java | 3 ++- .../model/source/builtin/XmlGregorianCalendarToDate.java | 3 ++- .../source/builtin/XmlGregorianCalendarToString.java | 2 +- .../ap/model/source/builtin/ZonedDateTimeToCalendar.java | 5 +---- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java index 7fe19d0a4..089e0d0d0 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java @@ -46,6 +46,7 @@ public class CalendarToXmlGregorianCalendar extends BuiltInMethod { this.importTypes = asSet( returnType, + parameter.getType(), typeFactory.getType( DatatypeFactory.class ), typeFactory.getType( GregorianCalendar.class ), typeFactory.getType( DatatypeConfigurationException.class ) diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java index af042844f..e2d9a6147 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java @@ -25,9 +25,10 @@ import java.util.TimeZone; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.util.Collections; import org.mapstruct.ap.util.JavaTimeConstants; +import static org.mapstruct.ap.util.Collections.asSet; + /** * {@link BuiltInMethod} for mapping between {@link java.util.Calendar} * and {@link java.time.ZonedDateTime}. @@ -43,11 +44,7 @@ public class CalendarToZonedDateTime extends BuiltInMethod { CalendarToZonedDateTime(TypeFactory typeFactory) { this.returnType = typeFactory.getType( JavaTimeConstants.ZONED_DATE_TIME_FQN ); this.parameter = new Parameter( "cal", typeFactory.getType( Calendar.class ) ); - this.importedTypes = Collections.asSet( - typeFactory.getType( Calendar.class ), - typeFactory.getType( TimeZone.class ), - typeFactory.getType( JavaTimeConstants.ZONED_DATE_TIME_FQN ) - ); + this.importedTypes = asSet( returnType, parameter.getType(), typeFactory.getType( TimeZone.class ) ); } @Override diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java index 4cd071687..4e00daac9 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model.source.builtin; import java.util.Calendar; import java.util.Set; + import javax.xml.datatype.XMLGregorianCalendar; import org.mapstruct.ap.model.common.Parameter; @@ -40,7 +41,7 @@ public class XmlGregorianCalendarToCalendar extends BuiltInMethod { public XmlGregorianCalendarToCalendar(TypeFactory typeFactory) { this.parameter = new Parameter( "xcal", typeFactory.getType( XMLGregorianCalendar.class ) ); this.returnType = typeFactory.getType( Calendar.class ); - this.importTypes = asSet( returnType, typeFactory.getType( XMLGregorianCalendar.class ) ); + this.importTypes = asSet( returnType, parameter.getType() ); } @Override diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java index bc419c3d8..087c786b2 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model.source.builtin; import java.util.Date; import java.util.Set; + import javax.xml.datatype.XMLGregorianCalendar; import org.mapstruct.ap.model.common.Parameter; @@ -40,7 +41,7 @@ public class XmlGregorianCalendarToDate extends BuiltInMethod { public XmlGregorianCalendarToDate(TypeFactory typeFactory) { this.parameter = new Parameter( "xcal", typeFactory.getType( XMLGregorianCalendar.class ) ); this.returnType = typeFactory.getType( Date.class ); - this.importTypes = asSet( returnType, typeFactory.getType( XMLGregorianCalendar.class ) ); + this.importTypes = asSet( returnType, parameter.getType() ); } @Override diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java index 2be225841..11e6d10b6 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java @@ -43,7 +43,7 @@ public class XmlGregorianCalendarToString extends BuiltInMethod { this.parameter = new Parameter( "xcal", typeFactory.getType( XMLGregorianCalendar.class ) ); this.returnType = typeFactory.getType( String.class ); this.importTypes = asSet( - typeFactory.getType( XMLGregorianCalendar.class ), + parameter.getType(), typeFactory.getType( Date.class ), typeFactory.getType( SimpleDateFormat.class ) ); diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java index 310c10b16..9101eda59 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java @@ -41,10 +41,7 @@ public class ZonedDateTimeToCalendar extends BuiltInMethod { ZonedDateTimeToCalendar(TypeFactory typeFactory) { this.returnType = typeFactory.getType( Calendar.class ); this.parameter = new Parameter( "dateTime", typeFactory.getType( JavaTimeConstants.ZONED_DATE_TIME_FQN ) ); - this.importedTypes = Collections.asSet( - typeFactory.getType( Calendar.class ), - typeFactory.getType( JavaTimeConstants.ZONED_DATE_TIME_FQN ) - ); + this.importedTypes = Collections.asSet( returnType, parameter.getType() ); } @Override