From 52ccedb0e10dc9d29a1b2925bb29525331e98aa5 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Sat, 22 Feb 2014 21:24:35 +0100 Subject: [PATCH] #120 Moving built-in methods to o.m.a.model.source.builtin --- .../main/java/org/mapstruct/ap/model/MethodReference.java | 2 +- .../java/org/mapstruct/ap/model/VirtualMappingMethod.java | 6 ++++-- .../src/main/java/org/mapstruct/ap/model/source/Method.java | 1 + .../{ => model/source}/builtin/BuiltInMappingMethods.java | 3 +-- .../ap/model/source/{ => builtin}/BuiltInMethod.java | 3 ++- .../source}/builtin/CalendarToXmlGregorianCalendar.java | 6 ++++-- .../source}/builtin/DateToXmlGregorianCalendar.java | 6 ++++-- .../ap/{ => model/source}/builtin/JaxbElemToValue.java | 4 ++-- .../source}/builtin/ListOfJaxbElemToListOfValue.java | 5 +++-- .../source}/builtin/StringToXmlGregorianCalendar.java | 6 ++++-- .../source}/builtin/XmlGregorianCalendarToCalendar.java | 5 +++-- .../source}/builtin/XmlGregorianCalendarToDate.java | 5 +++-- .../source}/builtin/XmlGregorianCalendarToString.java | 4 ++-- .../org/mapstruct/ap/processor/MapperCreationProcessor.java | 4 ++-- ...uct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl} | 0 ...pstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl} | 0 ...l => org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl} | 0 ...struct.ap.model.builtin.ListOfJaxbElemToListOfValue.ftl} | 0 ...truct.ap.model.builtin.StringToXmlGregorianCalendar.ftl} | 0 ...uct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl} | 0 ...pstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl} | 0 ...truct.ap.model.builtin.XmlGregorianCalendarToString.ftl} | 0 22 files changed, 36 insertions(+), 24 deletions(-) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/BuiltInMappingMethods.java (95%) rename processor/src/main/java/org/mapstruct/ap/model/source/{ => builtin}/BuiltInMethod.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/CalendarToXmlGregorianCalendar.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/DateToXmlGregorianCalendar.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/JaxbElemToValue.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/ListOfJaxbElemToListOfValue.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/StringToXmlGregorianCalendar.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/XmlGregorianCalendarToCalendar.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/XmlGregorianCalendarToDate.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => model/source}/builtin/XmlGregorianCalendarToString.java (95%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.CalendarToXmlGregorianCalendar.ftl => org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.DateToXmlGregorianCalendar.ftl => org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.JaxbElemToValue.ftl => org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.ListOfJaxbElemToListOfValue.ftl => org.mapstruct.ap.model.builtin.ListOfJaxbElemToListOfValue.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.StringToXmlGregorianCalendar.ftl => org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.XmlGregorianCalendarToCalendar.ftl => org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.XmlGregorianCalendarToDate.ftl => org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.builtin.XmlGregorianCalendarToString.ftl => org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl} (100%) diff --git a/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java b/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java index 4b642376d..79cea4490 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java +++ b/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java @@ -23,8 +23,8 @@ import java.util.Set; import org.mapstruct.ap.model.common.ConversionContext; import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.BuiltInMethod; import org.mapstruct.ap.model.source.SourceMethod; +import org.mapstruct.ap.model.source.builtin.BuiltInMethod; /** * Represents a reference to {@link MappingMethod}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java index c2452fdee..8d8abcc48 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java @@ -21,7 +21,7 @@ package org.mapstruct.ap.model; import java.util.Set; import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.BuiltInMethod; +import org.mapstruct.ap.model.source.builtin.BuiltInMethod; /** * A mapping method which is not based on an actual method declared in the original mapper interface but is added as @@ -31,13 +31,15 @@ import org.mapstruct.ap.model.source.BuiltInMethod; */ public class VirtualMappingMethod extends MappingMethod { + private static final String BUILTIN_METHOD_TEMPLATE_PREFIX = "org.mapstruct.ap.model.builtin."; + private final String templateName; private final Set importTypes; public VirtualMappingMethod(BuiltInMethod method) { super( method ); this.importTypes = method.getImportTypes(); - this.templateName = method.getClass().getName() + ".ftl"; + this.templateName = BUILTIN_METHOD_TEMPLATE_PREFIX + method.getClass().getSimpleName() + ".ftl"; } @Override diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java index 7c5bc69b3..473133022 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java @@ -24,6 +24,7 @@ import java.util.List; import org.mapstruct.ap.model.common.Accessibility; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.model.source.builtin.BuiltInMethod; /** * This interface makes available common method properties and a matching method diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/BuiltInMappingMethods.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/builtin/BuiltInMappingMethods.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java index cec7c8335..de4a83a1f 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/BuiltInMappingMethods.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java @@ -16,13 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; import java.util.Arrays; import java.util.List; import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.model.source.BuiltInMethod; /** * Registry for all built-in methods. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/BuiltInMethod.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/model/source/BuiltInMethod.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java index e43feb52e..673fb8d10 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/BuiltInMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.model.source.builtin; import java.util.Arrays; import java.util.Collections; @@ -28,6 +28,7 @@ import org.mapstruct.ap.model.common.ConversionContext; import org.mapstruct.ap.model.common.ModelElement; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.model.source.Method; import org.mapstruct.ap.util.Strings; /** diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/CalendarToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/builtin/CalendarToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java index ed3557045..0e09217cb 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/CalendarToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java @@ -16,18 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Set; + import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; + import static org.mapstruct.ap.util.Collections.asSet; /** diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/DateToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/builtin/DateToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java index f845a82e5..1ed43e332 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/DateToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java @@ -16,18 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.Date; import java.util.GregorianCalendar; import java.util.Set; + import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; + import static org.mapstruct.ap.util.Collections.asSet; /** diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/JaxbElemToValue.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/builtin/JaxbElemToValue.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java index a59f98c49..128757743 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/JaxbElemToValue.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import javax.xml.bind.JAXBElement; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/ListOfJaxbElemToListOfValue.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ListOfJaxbElemToListOfValue.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/builtin/ListOfJaxbElemToListOfValue.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/ListOfJaxbElemToListOfValue.java index 20512125b..65fa7f6be 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/ListOfJaxbElemToListOfValue.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ListOfJaxbElemToListOfValue.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.List; + import javax.xml.bind.JAXBElement; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/StringToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/builtin/StringToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java index 31f97b24e..cd568b55a 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/StringToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java @@ -16,21 +16,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.GregorianCalendar; import java.util.Set; + import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.ConversionContext; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; + import static org.mapstruct.ap.util.Collections.asSet; /** diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToCalendar.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToCalendar.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java index 9125b94e7..c0088e902 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.Calendar; + import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToDate.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToDate.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java index 17c9de05f..0d39463fa 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToDate.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import java.util.Date; + import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; diff --git a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToString.java b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToString.java rename to processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java index 515d89f93..e31ebf58f 100644 --- a/processor/src/main/java/org/mapstruct/ap/builtin/XmlGregorianCalendarToString.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.builtin; +package org.mapstruct.ap.model.source.builtin; -import org.mapstruct.ap.model.source.BuiltInMethod; import javax.xml.datatype.XMLGregorianCalendar; + import org.mapstruct.ap.model.common.ConversionContext; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java index d041627d0..9d26b0021 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java @@ -37,7 +37,6 @@ import javax.lang.model.util.Elements; import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import org.mapstruct.ap.builtin.BuiltInMappingMethods; import org.mapstruct.ap.conversion.ConversionProvider; import org.mapstruct.ap.conversion.Conversions; import org.mapstruct.ap.model.BeanMappingMethod; @@ -56,10 +55,11 @@ import org.mapstruct.ap.model.common.DefaultConversionContext; 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.model.source.BuiltInMethod; import org.mapstruct.ap.model.source.Mapping; import org.mapstruct.ap.model.source.Method; import org.mapstruct.ap.model.source.SourceMethod; +import org.mapstruct.ap.model.source.builtin.BuiltInMappingMethods; +import org.mapstruct.ap.model.source.builtin.BuiltInMethod; import org.mapstruct.ap.option.Options; import org.mapstruct.ap.option.ReportingPolicy; import org.mapstruct.ap.prism.MapperPrism; diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.CalendarToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.CalendarToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.DateToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.DateToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.JaxbElemToValue.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.JaxbElemToValue.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.ListOfJaxbElemToListOfValue.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.ListOfJaxbElemToListOfValue.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.ListOfJaxbElemToListOfValue.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.ListOfJaxbElemToListOfValue.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.StringToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.StringToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToDate.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToDate.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToString.ftl b/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToString.ftl rename to processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl