From 1baf8edc0a1c19490d331343c3f1c45c38894ae4 Mon Sep 17 00:00:00 2001 From: Andreas Gudian Date: Fri, 29 May 2015 19:10:11 +0200 Subject: [PATCH] #548 Move all packages except of "spi" under "org.mapstruct.ap.internal" --- .../resources/build-config/import-control.xml | 4 +- parent/pom.xml | 2 +- .../org/mapstruct/ap/MappingProcessor.java | 16 ++--- .../AbstractJavaTimeToStringConversion.java | 12 ++-- .../AbstractJodaTypeToStringConversion.java | 10 +-- .../BigDecimalToBigIntegerConversion.java | 8 +-- .../BigDecimalToPrimitiveConversion.java | 8 +-- .../BigDecimalToStringConversion.java | 8 +-- .../BigDecimalToWrapperConversion.java | 10 +-- .../BigIntegerToPrimitiveConversion.java | 8 +-- .../BigIntegerToStringConversion.java | 8 +-- .../BigIntegerToWrapperConversion.java | 10 +-- .../conversion/CharToStringConversion.java | 4 +- .../CharWrapperToStringConversion.java | 4 +- .../conversion/ConversionProvider.java | 8 +-- .../conversion/Conversions.java | 12 ++-- .../conversion/DateToStringConversion.java | 12 ++-- .../conversion/EnumStringConversion.java | 8 +-- .../JavaLocalDateTimeToDateConversion.java | 4 +- .../JavaLocalDateTimeToStringConversion.java | 2 +- .../JavaLocalDateToStringConversion.java | 2 +- .../JavaLocalTimeToStringConversion.java | 2 +- .../JavaZonedDateTimeToDateConversion.java | 4 +- .../JavaZonedDateTimeToStringConversion.java | 2 +- .../JodaDateTimeToCalendarConversion.java | 8 +-- .../JodaDateTimeToStringConversion.java | 4 +- .../JodaLocalDateTimeToStringConversion.java | 4 +- .../JodaLocalDateToStringConversion.java | 2 +- .../JodaLocalTimeToStringConversion.java | 2 +- .../conversion/JodaTimeToDateConversion.java | 8 +-- .../PrimitiveToPrimitiveConversion.java | 4 +- .../PrimitiveToStringConversion.java | 8 +-- .../PrimitiveToWrapperConversion.java | 6 +- .../conversion/ReverseConversion.java | 6 +- .../conversion/SimpleConversion.java | 12 ++-- .../conversion/WrapperToStringConversion.java | 8 +-- .../WrapperToWrapperConversion.java | 6 +- .../conversion/package-info.java | 2 +- .../ap/{ => internal}/model/Annotation.java | 6 +- .../model/AnnotationMapperReference.java | 6 +- .../model/AssignmentFactory.java | 13 ++-- .../model/BeanMappingMethod.java | 38 +++++------ .../ap/{ => internal}/model/Constructor.java | 2 +- .../ap/{ => internal}/model/Decorator.java | 14 ++-- .../model/DecoratorConstructor.java | 6 +- .../model/DefaultMapperReference.java | 10 +-- .../model/DelegatingMethod.java | 4 +- .../ap/{ => internal}/model/Direct.java | 9 +-- .../model/EnumMappingMethod.java | 20 +++--- .../ap/{ => internal}/model/Field.java | 6 +- .../{ => internal}/model/GeneratedType.java | 14 ++-- .../model/IterableMappingMethod.java | 24 +++---- .../model/LifecycleCallbackFactory.java | 14 ++-- .../LifecycleCallbackMethodReference.java | 12 ++-- .../model/MapMappingMethod.java | 22 +++---- .../ap/{ => internal}/model/Mapper.java | 12 ++-- .../{ => internal}/model/MapperReference.java | 4 +- .../model/MappingBuilderContext.java | 16 ++--- .../{ => internal}/model/MappingMethod.java | 16 ++--- .../{ => internal}/model/MethodReference.java | 14 ++-- .../model/NestedPropertyMappingMethod.java | 12 ++-- .../{ => internal}/model/PropertyMapping.java | 46 ++++++------- .../{ => internal}/model/TypeConversion.java | 10 +-- .../model/VirtualMappingMethod.java | 8 +-- .../model/assignment/AdderWrapper.java | 4 +- .../model/assignment/ArrayCopyWrapper.java | 11 ++-- .../model/assignment/Assignment.java | 4 +- .../model/assignment/AssignmentWrapper.java | 7 +- .../GetterWrapperForCollectionsAndMaps.java | 6 +- .../model/assignment/LocalVarWrapper.java | 5 +- .../assignment/NewCollectionOrMapWrapper.java | 4 +- .../model/assignment/NullCheckWrapper.java | 2 +- .../model/assignment/SetterWrapper.java | 5 +- .../SetterWrapperForCollectionsAndMaps.java | 7 +- .../model/assignment/UpdateWrapper.java | 5 +- .../model/assignment/package-info.java | 2 +- .../model/common/Accessibility.java | 2 +- .../model/common/ConversionContext.java | 2 +- .../common/DateFormatValidationResult.java | 6 +- .../model/common/DateFormatValidator.java | 2 +- .../common/DateFormatValidatorFactory.java | 8 +-- .../common/DefaultConversionContext.java | 7 +- .../model/common/ModelElement.java | 8 +-- .../model/common/Parameter.java | 4 +- .../ap/{ => internal}/model/common/Type.java | 12 ++-- .../model/common/TypeFactory.java | 14 ++-- .../model/common/package-info.java | 2 +- .../model/dependency/GraphAnalyzer.java | 2 +- .../{ => internal}/model/dependency/Node.java | 2 +- .../ap/{ => internal}/model/package-info.java | 2 +- .../model/source/BeanMapping.java | 12 ++-- .../model/source/EnumMapping.java | 2 +- .../model/source/ForgedMethod.java | 14 ++-- .../model/source/IterableMapping.java | 11 ++-- .../model/source/MapMapping.java | 11 ++-- .../{ => internal}/model/source/Mapping.java | 14 ++-- .../model/source/MappingOptions.java | 6 +- .../{ => internal}/model/source/Method.java | 12 ++-- .../model/source/MethodMatcher.java | 12 ++-- .../model/source/SourceMethod.java | 22 +++---- .../model/source/SourceReference.java | 16 ++--- .../source/builtin/BuiltInMappingMethods.java | 10 +-- .../model/source/builtin/BuiltInMethod.java | 20 +++--- .../CalendarToXmlGregorianCalendar.java | 11 ++-- .../builtin/CalendarToZonedDateTime.java | 12 ++-- .../builtin/DateToXmlGregorianCalendar.java | 10 +-- .../model/source/builtin/JaxbElemToValue.java | 11 ++-- .../builtin/StringToXmlGregorianCalendar.java | 13 ++-- .../XmlGregorianCalendarToCalendar.java | 10 +-- .../builtin/XmlGregorianCalendarToDate.java | 10 +-- .../builtin/XmlGregorianCalendarToString.java | 13 ++-- .../builtin/ZonedDateTimeToCalendar.java | 12 ++-- .../model/source/builtin/package-info.java | 2 +- .../model/source/package-info.java | 2 +- .../selector/CreateOrUpdateSelector.java | 6 +- .../source/selector/InheritanceSelector.java | 10 +-- .../model/source/selector/MethodSelector.java | 6 +- .../source/selector/MethodSelectors.java | 9 +-- .../source/selector/QualifierSelector.java | 10 +-- .../source/selector/SelectionCriteria.java | 2 +- .../source/selector/TargetTypeSelector.java | 6 +- .../model/source/selector/TypeSelector.java | 8 +-- .../selector/XmlElementDeclSelector.java | 10 +-- .../model/source/selector/package-info.java | 2 +- .../naming/DefaultAccessorNamingStrategy.java | 2 +- .../ap/{ => internal}/option/Options.java | 2 +- .../{ => internal}/option/OptionsHelper.java | 2 +- .../option/ReportingPolicy.java | 2 +- .../{ => internal}/option/package-info.java | 2 +- .../prism/CollectionMappingStrategyPrism.java | 2 +- .../MappingInheritanceStrategyPrism.java | 2 +- .../prism/NullValueMappingStrategyPrism.java | 2 +- .../{ => internal}/prism/PrismGenerator.java | 2 +- .../ap/{ => internal}/prism/package-info.java | 2 +- ...nnotationBasedComponentModelProcessor.java | 17 ++--- .../processor/CdiComponentProcessor.java | 6 +- .../DefaultModelElementProcessorContext.java | 14 ++-- .../processor/DefaultVersionInformation.java | 4 +- .../processor/Jsr330ComponentProcessor.java | 6 +- .../processor/MapperCreationProcessor.java | 64 +++++++++---------- .../processor/MapperRenderingProcessor.java | 9 +-- .../processor/MethodRetrievalProcessor.java | 40 ++++++------ .../processor/ModelElementProcessor.java | 10 +-- .../processor/SpringComponentProcessor.java | 6 +- .../creation/MappingResolverImpl.java | 46 ++++++------- .../processor/creation/package-info.java | 4 +- .../processor/package-info.java | 2 +- .../ap/{ => internal}/services/Services.java | 2 +- .../util/AnnotationProcessingException.java | 2 +- .../ap/{ => internal}/util/Collections.java | 2 +- .../ap/{ => internal}/util/Executables.java | 13 ++-- .../ap/{ => internal}/util/Filters.java | 2 +- .../util/FormattingMessager.java | 2 +- .../util/JavaTimeConstants.java | 2 +- .../ap/{ => internal}/util/JaxbConstants.java | 2 +- .../util/JodaTimeConstants.java | 2 +- .../util/MapperConfiguration.java | 14 ++-- .../ap/{ => internal}/util/Message.java | 2 +- .../ap/{ => internal}/util/NativeTypes.java | 2 +- .../ap/{ => internal}/util/Nouns.java | 2 +- .../util/SpecificCompilerWorkarounds.java | 2 +- .../ap/{ => internal}/util/Strings.java | 4 +- .../ap/{ => internal}/util/package-info.java | 2 +- .../version/VersionInformation.java | 2 +- .../{ => internal}/version/package-info.java | 2 +- .../writer/FreeMarkerModelElementWriter.java | 5 +- .../writer/FreeMarkerWritable.java | 2 +- .../writer/IndentationCorrectingWriter.java | 2 +- .../writer/ModelIncludeDirective.java | 5 +- .../ap/{ => internal}/writer/ModelWriter.java | 4 +- .../ap/{ => internal}/writer/Writable.java | 2 +- .../{ => internal}/writer/package-info.java | 2 +- ....internal.processor.ModelElementProcessor} | 12 ++-- ...apstruct.ap.internal.model.Annotation.ftl} | 0 ...ernal.model.AnnotationMapperReference.ftl} | 0 ...t.ap.internal.model.BeanMappingMethod.ftl} | 0 ...ct.ap.internal.model.ConversionMethod.ftl} | 0 ...p.internal.model.DecoratorConstructor.ftl} | 0 ...internal.model.DefaultMapperReference.ftl} | 0 ...ct.ap.internal.model.DelegatingMethod.ftl} | 0 ...rg.mapstruct.ap.internal.model.Direct.ftl} | 0 ...t.ap.internal.model.EnumMappingMethod.ftl} | 0 ...org.mapstruct.ap.internal.model.Field.ftl} | 0 ...truct.ap.internal.model.GeneratedType.ftl} | 0 ....internal.model.IterableMappingMethod.ftl} | 0 ...odel.LifecycleCallbackMethodReference.ftl} | 0 ...ct.ap.internal.model.MapMappingMethod.ftl} | 0 ...uct.ap.internal.model.MethodReference.ftl} | 0 ...nal.model.NestedPropertyMappingMethod.ftl} | 0 ...uct.ap.internal.model.PropertyMapping.ftl} | 0 ...ruct.ap.internal.model.TypeConversion.ftl} | 0 ...nternal.model.assignment.AdderWrapper.ftl} | 0 ...nal.model.assignment.ArrayCopyWrapper.ftl} | 0 ...nt.GetterWrapperForCollectionsAndMaps.ftl} | 0 ...rnal.model.assignment.LocalVarWrapper.ftl} | 0 ....assignment.NewCollectionOrMapWrapper.ftl} | 0 ...nal.model.assignment.NullCheckWrapper.ftl} | 0 ...ternal.model.assignment.SetterWrapper.ftl} | 0 ...nt.SetterWrapperForCollectionsAndMaps.ftl} | 0 ...ternal.model.assignment.UpdateWrapper.ftl} | 0 ...uiltin.CalendarToXmlGregorianCalendar.ftl} | 0 ...model.builtin.CalendarToZonedDateTime.ftl} | 0 ...el.builtin.DateToXmlGregorianCalendar.ftl} | 0 ...nternal.model.builtin.JaxbElemToValue.ftl} | 0 ....builtin.StringToXmlGregorianCalendar.ftl} | 0 ...uiltin.XmlGregorianCalendarToCalendar.ftl} | 0 ...el.builtin.XmlGregorianCalendarToDate.ftl} | 0 ....builtin.XmlGregorianCalendarToString.ftl} | 0 ...model.builtin.ZonedDateTimeToCalendar.ftl} | 0 ...ct.ap.internal.model.common.Parameter.ftl} | 0 ...pstruct.ap.internal.model.common.Type.ftl} | 0 .../DateFormatValidatorFactoryTest.java | 9 +-- .../common/DefaultConversionContextTest.java | 9 +-- .../forged/CollectionMappingTest.java | 10 ++- .../ap/test/dependency/GraphAnalyzerTest.java | 4 +- .../ap/test/prism/EnumPrismsTest.java | 6 +- 216 files changed, 741 insertions(+), 718 deletions(-) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/AbstractJavaTimeToStringConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/AbstractJodaTypeToStringConversion.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigDecimalToBigIntegerConversion.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigDecimalToPrimitiveConversion.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigDecimalToStringConversion.java (86%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigDecimalToWrapperConversion.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigIntegerToPrimitiveConversion.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigIntegerToStringConversion.java (86%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/BigIntegerToWrapperConversion.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/CharToStringConversion.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/CharWrapperToStringConversion.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/ConversionProvider.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/Conversions.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/DateToStringConversion.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/EnumStringConversion.java (86%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaLocalDateTimeToDateConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaLocalDateTimeToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaLocalDateToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaLocalTimeToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaZonedDateTimeToDateConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JavaZonedDateTimeToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaDateTimeToCalendarConversion.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaDateTimeToStringConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaLocalDateTimeToStringConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaLocalDateToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaLocalTimeToStringConversion.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/JodaTimeToDateConversion.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/PrimitiveToPrimitiveConversion.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/PrimitiveToStringConversion.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/PrimitiveToWrapperConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/ReverseConversion.java (90%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/SimpleConversion.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/WrapperToStringConversion.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/WrapperToWrapperConversion.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/conversion/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Annotation.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/AnnotationMapperReference.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/AssignmentFactory.java (83%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/BeanMappingMethod.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Constructor.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Decorator.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/DecoratorConstructor.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/DefaultMapperReference.java (90%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/DelegatingMethod.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Direct.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/EnumMappingMethod.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Field.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/GeneratedType.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/IterableMappingMethod.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/LifecycleCallbackFactory.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/LifecycleCallbackMethodReference.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/MapMappingMethod.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/Mapper.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/MapperReference.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/MappingBuilderContext.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/MappingMethod.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/MethodReference.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/NestedPropertyMappingMethod.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/PropertyMapping.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/TypeConversion.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/VirtualMappingMethod.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/AdderWrapper.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/ArrayCopyWrapper.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/Assignment.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/AssignmentWrapper.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/GetterWrapperForCollectionsAndMaps.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/LocalVarWrapper.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/NewCollectionOrMapWrapper.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/NullCheckWrapper.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/SetterWrapper.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/SetterWrapperForCollectionsAndMaps.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/UpdateWrapper.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/assignment/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/Accessibility.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/ConversionContext.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/DateFormatValidationResult.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/DateFormatValidator.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/DateFormatValidatorFactory.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/DefaultConversionContext.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/ModelElement.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/Parameter.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/Type.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/TypeFactory.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/common/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/dependency/GraphAnalyzer.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/dependency/Node.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/BeanMapping.java (90%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/EnumMapping.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/ForgedMethod.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/IterableMapping.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/MapMapping.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/Mapping.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/MappingOptions.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/Method.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/MethodMatcher.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/SourceMethod.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/SourceReference.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/BuiltInMappingMethods.java (89%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/BuiltInMethod.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/CalendarToXmlGregorianCalendar.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/CalendarToZonedDateTime.java (84%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/DateToXmlGregorianCalendar.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/JaxbElemToValue.java (86%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/StringToXmlGregorianCalendar.java (87%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/XmlGregorianCalendarToCalendar.java (85%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/XmlGregorianCalendarToDate.java (85%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/XmlGregorianCalendarToString.java (85%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/ZonedDateTimeToCalendar.java (84%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/builtin/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/CreateOrUpdateSelector.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/InheritanceSelector.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/MethodSelector.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/MethodSelectors.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/QualifierSelector.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/SelectionCriteria.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/TargetTypeSelector.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/TypeSelector.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/XmlElementDeclSelector.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/model/source/selector/package-info.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/naming/DefaultAccessorNamingStrategy.java (99%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/option/Options.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/option/OptionsHelper.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/option/ReportingPolicy.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/option/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/prism/CollectionMappingStrategyPrism.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/prism/MappingInheritanceStrategyPrism.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/prism/NullValueMappingStrategyPrism.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/prism/PrismGenerator.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/prism/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/AnnotationBasedComponentModelProcessor.java (88%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/CdiComponentProcessor.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/DefaultModelElementProcessorContext.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/DefaultVersionInformation.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/Jsr330ComponentProcessor.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/MapperCreationProcessor.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/MapperRenderingProcessor.java (92%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/MethodRetrievalProcessor.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/ModelElementProcessor.java (93%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/SpringComponentProcessor.java (91%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/creation/MappingResolverImpl.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/creation/package-info.java (83%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/processor/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/services/Services.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/AnnotationProcessingException.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Collections.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Executables.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Filters.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/FormattingMessager.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/JavaTimeConstants.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/JaxbConstants.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/JodaTimeConstants.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/MapperConfiguration.java (94%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Message.java (99%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/NativeTypes.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Nouns.java (99%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/SpecificCompilerWorkarounds.java (99%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/Strings.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/util/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/version/VersionInformation.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/version/package-info.java (95%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/FreeMarkerModelElementWriter.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/FreeMarkerWritable.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/IndentationCorrectingWriter.java (99%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/ModelIncludeDirective.java (96%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/ModelWriter.java (98%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/Writable.java (97%) rename processor/src/main/java/org/mapstruct/ap/{ => internal}/writer/package-info.java (95%) rename processor/src/main/resources/META-INF/services/{org.mapstruct.ap.processor.ModelElementProcessor => org.mapstruct.ap.internal.processor.ModelElementProcessor} (67%) rename processor/src/main/resources/{org.mapstruct.ap.model.Annotation.ftl => org.mapstruct.ap.internal.model.Annotation.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.AnnotationMapperReference.ftl => org.mapstruct.ap.internal.model.AnnotationMapperReference.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.BeanMappingMethod.ftl => org.mapstruct.ap.internal.model.BeanMappingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.ConversionMethod.ftl => org.mapstruct.ap.internal.model.ConversionMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.DecoratorConstructor.ftl => org.mapstruct.ap.internal.model.DecoratorConstructor.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.DefaultMapperReference.ftl => org.mapstruct.ap.internal.model.DefaultMapperReference.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.DelegatingMethod.ftl => org.mapstruct.ap.internal.model.DelegatingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.Direct.ftl => org.mapstruct.ap.internal.model.Direct.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.EnumMappingMethod.ftl => org.mapstruct.ap.internal.model.EnumMappingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.Field.ftl => org.mapstruct.ap.internal.model.Field.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.GeneratedType.ftl => org.mapstruct.ap.internal.model.GeneratedType.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.IterableMappingMethod.ftl => org.mapstruct.ap.internal.model.IterableMappingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.LifecycleCallbackMethodReference.ftl => org.mapstruct.ap.internal.model.LifecycleCallbackMethodReference.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.MapMappingMethod.ftl => org.mapstruct.ap.internal.model.MapMappingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.MethodReference.ftl => org.mapstruct.ap.internal.model.MethodReference.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.NestedPropertyMappingMethod.ftl => org.mapstruct.ap.internal.model.NestedPropertyMappingMethod.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.PropertyMapping.ftl => org.mapstruct.ap.internal.model.PropertyMapping.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.TypeConversion.ftl => org.mapstruct.ap.internal.model.TypeConversion.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.AdderWrapper.ftl => org.mapstruct.ap.internal.model.assignment.AdderWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.ArrayCopyWrapper.ftl => org.mapstruct.ap.internal.model.assignment.ArrayCopyWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.GetterWrapperForCollectionsAndMaps.ftl => org.mapstruct.ap.internal.model.assignment.GetterWrapperForCollectionsAndMaps.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.LocalVarWrapper.ftl => org.mapstruct.ap.internal.model.assignment.LocalVarWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper.ftl => org.mapstruct.ap.internal.model.assignment.NewCollectionOrMapWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.NullCheckWrapper.ftl => org.mapstruct.ap.internal.model.assignment.NullCheckWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.SetterWrapper.ftl => org.mapstruct.ap.internal.model.assignment.SetterWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.SetterWrapperForCollectionsAndMaps.ftl => org.mapstruct.ap.internal.model.assignment.SetterWrapperForCollectionsAndMaps.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.assignment.UpdateWrapper.ftl => org.mapstruct.ap.internal.model.assignment.UpdateWrapper.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl => org.mapstruct.ap.internal.model.builtin.CalendarToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.CalendarToZonedDateTime.ftl => org.mapstruct.ap.internal.model.builtin.CalendarToZonedDateTime.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl => org.mapstruct.ap.internal.model.builtin.DateToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl => org.mapstruct.ap.internal.model.builtin.JaxbElemToValue.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl => org.mapstruct.ap.internal.model.builtin.StringToXmlGregorianCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl => org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl => org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToDate.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl => org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToString.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.builtin.ZonedDateTimeToCalendar.ftl => org.mapstruct.ap.internal.model.builtin.ZonedDateTimeToCalendar.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.common.Parameter.ftl => org.mapstruct.ap.internal.model.common.Parameter.ftl} (100%) rename processor/src/main/resources/{org.mapstruct.ap.model.common.Type.ftl => org.mapstruct.ap.internal.model.common.Type.ftl} (100%) rename processor/src/test/java/org/mapstruct/ap/{ => internal}/model/common/DateFormatValidatorFactoryTest.java (96%) rename processor/src/test/java/org/mapstruct/ap/{ => internal}/model/common/DefaultConversionContextTest.java (95%) diff --git a/build-config/src/main/resources/build-config/import-control.xml b/build-config/src/main/resources/build-config/import-control.xml index fd3614e47..7e04d49ce 100644 --- a/build-config/src/main/resources/build-config/import-control.xml +++ b/build-config/src/main/resources/build-config/import-control.xml @@ -10,8 +10,8 @@ - - + + diff --git a/parent/pom.xml b/parent/pom.xml index d2a74269d..16eda2e16 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -315,7 +315,7 @@ 2.10.3 true - org.mapstruct.ap.prism;org.mapstruct.itest.jaxb.xsd.* + org.mapstruct.ap.internal.prism;org.mapstruct.itest.jaxb.xsd.* diff --git a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java index 096727e83..2aac44df2 100644 --- a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java @@ -41,14 +41,14 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.util.ElementKindVisitor6; import javax.tools.Diagnostic.Kind; -import org.mapstruct.ap.model.Mapper; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.option.ReportingPolicy; -import org.mapstruct.ap.prism.MapperPrism; -import org.mapstruct.ap.processor.DefaultModelElementProcessorContext; -import org.mapstruct.ap.processor.ModelElementProcessor; -import org.mapstruct.ap.processor.ModelElementProcessor.ProcessorContext; -import org.mapstruct.ap.util.AnnotationProcessingException; +import org.mapstruct.ap.internal.model.Mapper; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.option.ReportingPolicy; +import org.mapstruct.ap.internal.prism.MapperPrism; +import org.mapstruct.ap.internal.processor.DefaultModelElementProcessorContext; +import org.mapstruct.ap.internal.processor.ModelElementProcessor; +import org.mapstruct.ap.internal.processor.ModelElementProcessor.ProcessorContext; +import org.mapstruct.ap.internal.util.AnnotationProcessingException; /** * A JSR 269 annotation {@link Processor} which generates the implementations for mapper interfaces (interfaces diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJavaTimeToStringConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJavaTimeToStringConversion.java index 79726c90b..5ffec4336 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJavaTimeToStringConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.Collections; -import org.mapstruct.ap.util.JavaTimeConstants; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.Collections; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.Strings; /** *

diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java index f2347a5d0..70942463e 100755 --- a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Collections; import java.util.Locale; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.JodaTimeConstants; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.JodaTimeConstants; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Base class for conversions between Joda-Time types and String. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToBigIntegerConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToBigIntegerConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java index 386255224..d6f8ed660 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToBigIntegerConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigDecimal} and {@link BigInteger}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToPrimitiveConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToPrimitiveConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java index 62ea902d5..67db380da 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToPrimitiveConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigDecimal; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigDecimal} and native number types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java similarity index 86% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java index 7738201e3..9828eb4b0 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigDecimal; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigDecimal} and {@link String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToWrapperConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java index 914a4ca15..6982ac65a 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToWrapperConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigDecimal; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.NativeTypes; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.NativeTypes; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigDecimal} and wrappers of native number types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToPrimitiveConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToPrimitiveConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java index 3e231e6a7..69e80e8f3 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToPrimitiveConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigInteger; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigInteger} and native number types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java similarity index 86% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java index 0437a16f5..156354603 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigInteger; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigInteger} and {@link String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToWrapperConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java index 3393c38d7..9ba2e39b9 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToWrapperConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigInteger; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.NativeTypes; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.NativeTypes; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link BigInteger} and wrappers of native number types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/CharToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CharToStringConversion.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/conversion/CharToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/CharToStringConversion.java index 3349b44cf..8ec6ca11c 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/CharToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CharToStringConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * Conversion between {@code char} and {@link String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/CharWrapperToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CharWrapperToStringConversion.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/conversion/CharWrapperToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/CharWrapperToStringConversion.java index af66c11d8..d5b625863 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/CharWrapperToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CharWrapperToStringConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * Conversion between {@link Character} and {@link String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ConversionProvider.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/ConversionProvider.java index 4d5fe83da..e1a79ea0e 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ConversionProvider.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.TypeConversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.TypeConversion; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * Implementations create inline {@link TypeConversion}s such as diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java index 39de726ba..662c4bab3 100755 --- a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.math.BigDecimal; import java.math.BigInteger; @@ -27,12 +27,12 @@ import java.util.Map; import javax.lang.model.util.Elements; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.util.JavaTimeConstants; -import org.mapstruct.ap.util.JodaTimeConstants; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.JodaTimeConstants; -import static org.mapstruct.ap.conversion.ReverseConversion.reverse; +import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse; /** * Holds built-in {@link ConversionProvider}s such as from {@code int} to {@code String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/DateToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/conversion/DateToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java index fbdc6d05f..8cba76baa 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/DateToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java @@ -16,20 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.AssignmentFactory; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.AssignmentFactory; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; import static java.util.Arrays.asList; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link String} and {@link Date}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java similarity index 86% rename from processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java index f0915cb05..215e7c466 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@link String} and {@link Enum} types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToDateConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java index e7911a091..40f0da5d5 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToDateConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * SimpleConversion for mapping {@link java.time.LocalDateTime} to diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToStringConversion.java index 5355193f6..36965d3ef 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Specialization of {@link AbstractJavaTimeToStringConversion} for converting {@link java.time.LocalDateTime} diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToStringConversion.java index a94baf03b..65735f400 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalDateToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Specialization of {@link AbstractJavaTimeToStringConversion} for converting {@link java.time.LocalDate} diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalTimeToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalTimeToStringConversion.java index 59cc680e6..278b89474 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaLocalTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalTimeToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Specialization of {@link AbstractJavaTimeToStringConversion} for converting {@link java.time.LocalTime} diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToDateConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToDateConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToDateConversion.java index e895c814a..23290e40a 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToDateConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToDateConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * SimpleConversion for mapping {@link java.time.ZonedDateTime} to diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToStringConversion.java index 407c4f1d2..56ffe2272 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Specialization of {@link AbstractJavaTimeToStringConversion} for converting {@link java.time.ZonedDateTime} diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToCalendarConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToCalendarConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java index d26afdd77..ff37151ba 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToCalendarConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Calendar; import java.util.Locale; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between {@code DateTime} and {@link Calendar}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToStringConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToStringConversion.java index e2860c0b7..c0e3aa88a 100755 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToStringConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.util.JodaTimeConstants; +import org.mapstruct.ap.internal.util.JodaTimeConstants; /** * Conversion between {@code DateTime} and {@code String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateTimeToStringConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateTimeToStringConversion.java index c03b3b852..3eef1a246 100755 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateTimeToStringConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.util.JodaTimeConstants; +import org.mapstruct.ap.internal.util.JodaTimeConstants; /** * Conversion between {@code LocalDateTime} and {@code String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateToStringConversion.java index de30c027e..d5b1b21d0 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Conversion between {@code LocalDate} and {@code String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalTimeToStringConversion.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalTimeToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalTimeToStringConversion.java index 78b22ebf4..1f1fcb0fa 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalTimeToStringConversion.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; /** * Conversion between {@code LocalTime} and {@code String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/JodaTimeToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/conversion/JodaTimeToDateConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java index 3386d7eb9..8164ce71a 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/JodaTimeToDateConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Date; import java.util.Set; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Conversion between the following Joda types and {@link Date}: diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToPrimitiveConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToPrimitiveConversion.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToPrimitiveConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToPrimitiveConversion.java index 16f0f7902..4549bf846 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToPrimitiveConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToPrimitiveConversion.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * Conversion between primitive types such as {@code byte} or {@code long}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToStringConversion.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToStringConversion.java index d454e43a7..954fc3230 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToStringConversion.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.util.NativeTypes; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.util.NativeTypes; +import org.mapstruct.ap.internal.util.Strings; /** * Conversion between primitive types such as {@code byte} or {@code long} and diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToWrapperConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToWrapperConversion.java index 629ed2161..66f1b495b 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToWrapperConversion.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.util.NativeTypes; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.util.NativeTypes; /** * Conversion between primitive types such as {@code byte} and wrapper types diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java similarity index 90% rename from processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java index eaba4cd5e..1b36b6083 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; /** * A {@link ConversionProvider} which creates the reversed conversions for a diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/SimpleConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/conversion/SimpleConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java index c6ed5a4d6..6826b7f38 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/SimpleConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; import java.util.Collections; import java.util.Set; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.AssignmentFactory; -import org.mapstruct.ap.model.TypeConversion; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.AssignmentFactory; +import org.mapstruct.ap.internal.model.TypeConversion; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; /** * Base class for {@link ConversionProvider}s creating {@link TypeConversion}s which don't declare any exception types. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToStringConversion.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToStringConversion.java index d07ec4cae..f6e1a34c0 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToStringConversion.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.util.NativeTypes; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.util.NativeTypes; +import org.mapstruct.ap.internal.util.Strings; /** * Conversion between wrapper types such as {@link Integer} and {@link String}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToWrapperConversion.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToWrapperConversion.java index e305cfbeb..e15488d5a 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToWrapperConversion.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.util.NativeTypes; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.util.NativeTypes; /** * Conversion between wrapper types such as {@link Integer} or {@link Long}. diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/conversion/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/conversion/package-info.java index c5f92b067..bd164ad3a 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/package-info.java @@ -23,4 +23,4 @@ * code. *

*/ -package org.mapstruct.ap.conversion; +package org.mapstruct.ap.internal.conversion; diff --git a/processor/src/main/java/org/mapstruct/ap/model/Annotation.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Annotation.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/model/Annotation.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Annotation.java index 0e02f8536..02a2f5718 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Annotation.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Annotation.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Collections; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; /** * Represents a Java 5 annotation. diff --git a/processor/src/main/java/org/mapstruct/ap/model/AnnotationMapperReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/AnnotationMapperReference.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/AnnotationMapperReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/AnnotationMapperReference.java index 8cfd21d53..37536633f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/AnnotationMapperReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/AnnotationMapperReference.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Set; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.Collections; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.Collections; /** * Mapper reference which is retrieved via Annotation-based dependency injection. diff --git a/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/AssignmentFactory.java similarity index 83% rename from processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/AssignmentFactory.java index 1c346a8f5..01dbe7838 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/AssignmentFactory.java @@ -16,17 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.List; import java.util.Set; - -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.model.source.builtin.BuiltInMethod; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.builtin.BuiltInMethod; /** * Factory class for creating all types of assignments diff --git a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java index 78da09954..832e78539 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.text.MessageFormat; import java.util.ArrayList; @@ -36,24 +36,24 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; -import org.mapstruct.ap.model.PropertyMapping.ConstantMappingBuilder; -import org.mapstruct.ap.model.PropertyMapping.JavaExpressionMappingBuilder; -import org.mapstruct.ap.model.PropertyMapping.PropertyMappingBuilder; -import org.mapstruct.ap.model.common.Parameter; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.dependency.GraphAnalyzer; -import org.mapstruct.ap.model.dependency.GraphAnalyzer.GraphAnalyzerBuilder; -import org.mapstruct.ap.model.source.Mapping; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.model.source.SourceReference; -import org.mapstruct.ap.option.ReportingPolicy; -import org.mapstruct.ap.prism.BeanMappingPrism; -import org.mapstruct.ap.prism.CollectionMappingStrategyPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Executables; -import org.mapstruct.ap.util.MapperConfiguration; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.PropertyMapping.ConstantMappingBuilder; +import org.mapstruct.ap.internal.model.PropertyMapping.JavaExpressionMappingBuilder; +import org.mapstruct.ap.internal.model.PropertyMapping.PropertyMappingBuilder; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.dependency.GraphAnalyzer; +import org.mapstruct.ap.internal.model.dependency.GraphAnalyzer.GraphAnalyzerBuilder; +import org.mapstruct.ap.internal.model.source.Mapping; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.model.source.SourceReference; +import org.mapstruct.ap.internal.option.ReportingPolicy; +import org.mapstruct.ap.internal.prism.BeanMappingPrism; +import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.Executables; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; /** * A {@link MappingMethod} implemented by a {@link Mapper} class which maps one bean type to another, optionally diff --git a/processor/src/main/java/org/mapstruct/ap/model/Constructor.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Constructor.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/Constructor.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Constructor.java index cf6456659..b57cb9e3b 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Constructor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Constructor.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; /** * Basic interface class that facilitates an empty constructor diff --git a/processor/src/main/java/org/mapstruct/ap/model/Decorator.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/Decorator.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java index 52c84759a..45cd914bc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Decorator.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Arrays; import java.util.List; @@ -27,12 +27,12 @@ import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; import javax.lang.model.util.Elements; -import org.mapstruct.ap.model.common.Accessibility; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.prism.DecoratedWithPrism; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.prism.DecoratedWithPrism; +import org.mapstruct.ap.internal.version.VersionInformation; /** * Represents a decorator applied to a generated mapper type. diff --git a/processor/src/main/java/org/mapstruct/ap/model/DecoratorConstructor.java b/processor/src/main/java/org/mapstruct/ap/internal/model/DecoratorConstructor.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/DecoratorConstructor.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/DecoratorConstructor.java index 8c2b3d075..949f5a720 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/DecoratorConstructor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/DecoratorConstructor.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Collections; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; /** * Represents the constructor of a decorator. diff --git a/processor/src/main/java/org/mapstruct/ap/model/DefaultMapperReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/DefaultMapperReference.java similarity index 90% rename from processor/src/main/java/org/mapstruct/ap/model/DefaultMapperReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/DefaultMapperReference.java index 9e76ad4a7..ff4b1e0aa 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/DefaultMapperReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/DefaultMapperReference.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.List; import java.util.Set; -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.Strings; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.Collections; +import org.mapstruct.ap.internal.util.Strings; /** * Mapper reference which is retrieved via the {@code Mappers#getMapper()} method. Used by default if no other component diff --git a/processor/src/main/java/org/mapstruct/ap/model/DelegatingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/DelegatingMethod.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/DelegatingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/DelegatingMethod.java index c0e83d288..613df08dc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/DelegatingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/DelegatingMethod.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; -import org.mapstruct.ap.model.source.Method; +import org.mapstruct.ap.internal.model.source.Method; /** * A method of a decorator which delegates to the corresponding method of the generated mapper implementation. diff --git a/processor/src/main/java/org/mapstruct/ap/model/Direct.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/model/Direct.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java index c7e2b8d95..a312adf9a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Direct.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java @@ -16,14 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; + +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; -import org.mapstruct.ap.model.assignment.Assignment; import java.util.Collections; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; /** * Direct Assignment. Just a source reference diff --git a/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java index 68e48d430..57eca3966 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java @@ -16,23 +16,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.List; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.model.common.Parameter; -import org.mapstruct.ap.model.source.EnumMapping; -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.prism.BeanMappingPrism; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.source.EnumMapping; +import org.mapstruct.ap.internal.model.source.Mapping; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.prism.BeanMappingPrism; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * A {@link MappingMethod} which maps one enum type to another, optionally configured by one or more diff --git a/processor/src/main/java/org/mapstruct/ap/model/Field.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Field.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/Field.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Field.java index 4e2f2b566..e57a10147 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Field.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Field.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Collections; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; /** * A field of a mapper type, e.g. a reference to another mapper. diff --git a/processor/src/main/java/org/mapstruct/ap/model/GeneratedType.java b/processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/GeneratedType.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java index 03ceeef46..4d9e0c88d 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/GeneratedType.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.Collection; @@ -26,12 +26,12 @@ import java.util.TreeSet; import javax.annotation.Generated; -import org.mapstruct.ap.model.common.Accessibility; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.version.VersionInformation; /** * A type generated by MapStruct, e.g. representing a mapper type. diff --git a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/IterableMappingMethod.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/IterableMappingMethod.java index 8cdf5a028..6485cd281 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/IterableMappingMethod.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.List; import java.util.Set; @@ -24,18 +24,18 @@ import java.util.Set; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.assignment.LocalVarWrapper; -import org.mapstruct.ap.model.assignment.SetterWrapper; -import org.mapstruct.ap.model.common.Parameter; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.ForgedMethod; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.assignment.LocalVarWrapper; +import org.mapstruct.ap.internal.model.assignment.SetterWrapper; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.ForgedMethod; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * A {@link MappingMethod} implemented by a {@link Mapper} class which maps one iterable type to another. The collection diff --git a/processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackFactory.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackFactory.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackFactory.java index 18c13b38a..44b7dc61f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackFactory.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.HashMap; @@ -26,12 +26,12 @@ import java.util.Map; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -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.model.source.SourceMethod; -import org.mapstruct.ap.model.source.selector.QualifierSelector; -import org.mapstruct.ap.model.source.selector.SelectionCriteria; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.model.source.selector.QualifierSelector; +import org.mapstruct.ap.internal.model.source.selector.SelectionCriteria; /** * Factory for creating lists of appropriate {@link LifecycleCallbackMethodReference}s diff --git a/processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackMethodReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackMethodReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java index e511ad85c..60f43c5d9 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackMethodReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.beans.Introspector; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.Parameter; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.util.Collections; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.util.Collections; +import org.mapstruct.ap.internal.util.Strings; /** * Represents a reference to a method that is annotated with {@code @BeforeMapping} or {@code @AfterMapping}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java index 8af6f9da4..f5f6de845 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java @@ -16,24 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.List; import java.util.Set; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.assignment.LocalVarWrapper; -import org.mapstruct.ap.model.common.Parameter; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.ForgedMethod; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.assignment.LocalVarWrapper; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.ForgedMethod; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * A {@link MappingMethod} implemented by a {@link Mapper} class which maps one {@code Map} type to another. Keys and diff --git a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Mapper.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/Mapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/Mapper.java index 660fb72f9..65647901c 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Mapper.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.List; import java.util.SortedSet; @@ -25,11 +25,11 @@ import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; import javax.lang.model.util.Elements; -import org.mapstruct.ap.model.common.Accessibility; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.version.VersionInformation; /** * Represents a type implementing a mapper interface (annotated with {@code @Mapper}). This is the root object of the diff --git a/processor/src/main/java/org/mapstruct/ap/model/MapperReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MapperReference.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/MapperReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/MapperReference.java index 83f070feb..3ef1fc415 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MapperReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MapperReference.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.Type; /** * A reference to another mapper class, which itself may be generated or hand-written. diff --git a/processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingBuilderContext.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/MappingBuilderContext.java index 61f424bc2..a63a06767 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingBuilderContext.java @@ -16,24 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.mapstruct.ap.util.FormattingMessager; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.option.Options; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.util.FormattingMessager; /** * This class provides the context for the builders. diff --git a/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java index b31bb337e..4f9705b46 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.Collection; @@ -24,14 +24,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.Accessibility; -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.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; -import static org.mapstruct.ap.util.Strings.getSaveVariableName; -import static org.mapstruct.ap.util.Strings.join; +import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName; +import static org.mapstruct.ap.internal.util.Strings.join; /** * A method implemented or referenced by a {@link Mapper} class. diff --git a/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MethodReference.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/MethodReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/MethodReference.java index 6412969b4..1c3ba11e3 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MethodReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MethodReference.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.Collections; @@ -24,12 +24,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.assignment.Assignment; -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.source.Method; -import org.mapstruct.ap.model.source.builtin.BuiltInMethod; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.builtin.BuiltInMethod; /** * Represents a reference to another method, e.g. used to map a bean property from source to target type or to diff --git a/processor/src/main/java/org/mapstruct/ap/model/NestedPropertyMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/NestedPropertyMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java index 1763593a6..16cbcee18 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/NestedPropertyMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.ArrayList; import java.util.List; import java.util.Set; -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.model.source.SourceReference.PropertyEntry; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceReference.PropertyEntry; +import org.mapstruct.ap.internal.util.Strings; /** * This method is used to convert the nested properties as listed in propertyEntries into a method diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java index f02aa5e0e..9edbcdf5d 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Arrays; import java.util.Collections; @@ -26,29 +26,29 @@ import java.util.Set; import javax.lang.model.element.ExecutableElement; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.model.assignment.AdderWrapper; -import org.mapstruct.ap.model.assignment.ArrayCopyWrapper; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.assignment.GetterWrapperForCollectionsAndMaps; -import org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper; -import org.mapstruct.ap.model.assignment.NullCheckWrapper; -import org.mapstruct.ap.model.assignment.SetterWrapper; -import org.mapstruct.ap.model.assignment.SetterWrapperForCollectionsAndMaps; -import org.mapstruct.ap.model.assignment.UpdateWrapper; -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.ForgedMethod; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.model.source.SourceReference; -import org.mapstruct.ap.model.source.SourceReference.PropertyEntry; -import org.mapstruct.ap.util.Executables; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.assignment.AdderWrapper; +import org.mapstruct.ap.internal.model.assignment.ArrayCopyWrapper; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.assignment.GetterWrapperForCollectionsAndMaps; +import org.mapstruct.ap.internal.model.assignment.NewCollectionOrMapWrapper; +import org.mapstruct.ap.internal.model.assignment.NullCheckWrapper; +import org.mapstruct.ap.internal.model.assignment.SetterWrapper; +import org.mapstruct.ap.internal.model.assignment.SetterWrapperForCollectionsAndMaps; +import org.mapstruct.ap.internal.model.assignment.UpdateWrapper; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.ForgedMethod; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.model.source.SourceReference; +import org.mapstruct.ap.internal.model.source.SourceReference.PropertyEntry; +import org.mapstruct.ap.internal.util.Executables; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.model.assignment.Assignment.AssignmentType.DIRECT; -import static org.mapstruct.ap.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED; -import static org.mapstruct.ap.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED; +import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.DIRECT; +import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED; +import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED; /** * Represents the mapping between a source and target property, e.g. from {@code String Source#foo} to diff --git a/processor/src/main/java/org/mapstruct/ap/model/TypeConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/TypeConversion.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java index d9f4e4eba..f90241e74 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/TypeConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; + +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; -import org.mapstruct.ap.model.assignment.Assignment; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; - /** * An inline conversion between source and target type of a mapping. * diff --git a/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/VirtualMappingMethod.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/VirtualMappingMethod.java index 693121129..46fd2cd6f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/VirtualMappingMethod.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; import java.util.Set; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.builtin.BuiltInMethod; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.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,7 +31,7 @@ import org.mapstruct.ap.model.source.builtin.BuiltInMethod; */ public class VirtualMappingMethod extends MappingMethod { - private static final String BUILTIN_METHOD_TEMPLATE_PREFIX = "org.mapstruct.ap.model.builtin."; + private static final String BUILTIN_METHOD_TEMPLATE_PREFIX = "org.mapstruct.ap.internal.model.builtin."; private final String templateName; private final Set importTypes; diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/AdderWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/AdderWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java index 30b288522..410b94f83 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/AdderWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.Type; /** * Wraps the assignment in a target setter. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/ArrayCopyWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/ArrayCopyWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java index 7f6f790f1..41618a8e5 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/ArrayCopyWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java @@ -16,17 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.Strings; -import static org.mapstruct.ap.util.Strings.decapitalize; -import static org.mapstruct.ap.util.Strings.getSaveVariableName; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.Strings; + +import static org.mapstruct.ap.internal.util.Strings.decapitalize; +import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName; /** * Decorates the assignment as a Map or Collection constructor diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/Assignment.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/Assignment.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/Assignment.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/Assignment.java index e69a22a92..64c11d250 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/Assignment.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/Assignment.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.Type; /** * Assignment represents all kind of manners a source can be assigned to a target. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/AssignmentWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AssignmentWrapper.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/AssignmentWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AssignmentWrapper.java index 5002162d3..39d525262 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/AssignmentWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AssignmentWrapper.java @@ -16,12 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.ModelElement; -import org.mapstruct.ap.model.common.Type; + +import org.mapstruct.ap.internal.model.common.ModelElement; +import org.mapstruct.ap.internal.model.common.Type; /** * Base class for decorators (wrappers). Decorator pattern is used to decorate assignments. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterWrapperForCollectionsAndMaps.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/GetterWrapperForCollectionsAndMaps.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/GetterWrapperForCollectionsAndMaps.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/GetterWrapperForCollectionsAndMaps.java index 127b7a63d..14873b637 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterWrapperForCollectionsAndMaps.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/GetterWrapperForCollectionsAndMaps.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.ArrayList; import java.util.Collection; @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.Strings; /** * This wrapper handles the situation were an assignment must be done via a target getter method because there diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/LocalVarWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/LocalVarWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.java index a09f63fb3..d89b120ad 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/LocalVarWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.ArrayList; import java.util.List; -import org.mapstruct.ap.model.common.Type; + +import org.mapstruct.ap.internal.model.common.Type; /** * Decorates an assignment as local variable. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NewCollectionOrMapWrapper.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NewCollectionOrMapWrapper.java index fac615a39..a715d1052 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NewCollectionOrMapWrapper.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.HashSet; import java.util.Set; -import org.mapstruct.ap.model.common.Type; +import org.mapstruct.ap.internal.model.common.Type; /** * Decorates the assignment as a Map or Collection constructor diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/NullCheckWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NullCheckWrapper.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/NullCheckWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NullCheckWrapper.java index c3779e333..043ec86a1 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/NullCheckWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NullCheckWrapper.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; /** * Wraps the assignment in a null check. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapper.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapper.java index 6175ad121..612d74ebb 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapper.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.ArrayList; import java.util.List; -import org.mapstruct.ap.model.common.Type; + +import org.mapstruct.ap.internal.model.common.Type; /** * Wraps the assignment in a target setter. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapperForCollectionsAndMaps.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapperForCollectionsAndMaps.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapperForCollectionsAndMaps.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapperForCollectionsAndMaps.java index d11e664ea..2b6dafa16 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapperForCollectionsAndMaps.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapperForCollectionsAndMaps.java @@ -16,14 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.HashSet; import java.util.Set; + import javax.lang.model.element.ExecutableElement; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.util.Executables; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.Executables; /** * This wrapper handles the situation were an assignment is done via the setter. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/UpdateWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/UpdateWrapper.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java index 538776196..ff025035a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/UpdateWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; import java.util.ArrayList; import java.util.List; -import org.mapstruct.ap.model.common.Type; + +import org.mapstruct.ap.internal.model.common.Type; /** * Wraps the assignment in a target setter. diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/assignment/package-info.java index 3ae12358b..4f7b466b8 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/package-info.java @@ -25,4 +25,4 @@ * * The assignments can be wrapped. E.g. in a collection or map constructor, a null check, a try-catch, etc. */ -package org.mapstruct.ap.model.assignment; +package org.mapstruct.ap.internal.model.assignment; diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java index 10d593398..dead371bc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.util.Set; import javax.lang.model.element.Modifier; diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java index 08336eae3..b01bfad2f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.util.Date; diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidationResult.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidationResult.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidationResult.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidationResult.java index beedffca5..c0181be1f 100755 --- a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidationResult.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidationResult.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.FormattingMessager; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; /** * Reflects the result of a date format validation diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidator.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidator.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidator.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidator.java index e69252678..503548f16 100755 --- a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidator.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidator.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; /** * An abstraction for validating {@link ConversionContext#getDateFormat()}. There are implementers for different date diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidatorFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidatorFactory.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java index c9f9e9f2b..037494593 100755 --- a/processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidatorFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; -import org.mapstruct.ap.util.JavaTimeConstants; -import org.mapstruct.ap.util.JodaTimeConstants; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.JodaTimeConstants; +import org.mapstruct.ap.internal.util.Message; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.text.SimpleDateFormat; -import org.mapstruct.ap.util.Message; /** * Factory for {@link DateFormatValidator}.

Based on the types of source / target type a specific {@link diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/DefaultConversionContext.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/common/DefaultConversionContext.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java index f00370c8d..416063a51 100755 --- a/processor/src/main/java/org/mapstruct/ap/model/common/DefaultConversionContext.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java @@ -16,11 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; -import org.mapstruct.ap.util.Strings; - -import org.mapstruct.ap.util.FormattingMessager; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Strings; /** * Default implementation of the {@link ConversionContext} passed to conversion providers. diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/ModelElement.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/ModelElement.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/common/ModelElement.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/ModelElement.java index b8ec5e3e3..20e52584f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/ModelElement.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/ModelElement.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.io.Writer; import java.util.Set; -import org.mapstruct.ap.writer.FreeMarkerModelElementWriter; -import org.mapstruct.ap.writer.FreeMarkerWritable; -import org.mapstruct.ap.writer.Writable; +import org.mapstruct.ap.internal.writer.FreeMarkerModelElementWriter; +import org.mapstruct.ap.internal.writer.FreeMarkerWritable; +import org.mapstruct.ap.internal.writer.Writable; /** * Base class of all model elements. Implements the {@link Writable} contract to write model elements into source code diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/Parameter.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Parameter.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/common/Parameter.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/Parameter.java index 48e1acee7..f2444d5fc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/Parameter.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Parameter.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.util.Set; -import org.mapstruct.ap.util.Collections; +import org.mapstruct.ap.internal.util.Collections; /** * A parameter of a mapping method. diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/Type.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/model/common/Type.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java index 1b1b397c0..bad94d5e2 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/Type.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.util.ArrayList; import java.util.Collection; @@ -42,11 +42,11 @@ import javax.lang.model.type.WildcardType; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.prism.CollectionMappingStrategyPrism; -import org.mapstruct.ap.util.Executables; -import org.mapstruct.ap.util.Filters; -import org.mapstruct.ap.util.Nouns; -import org.mapstruct.ap.util.SpecificCompilerWorkarounds; +import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism; +import org.mapstruct.ap.internal.util.Executables; +import org.mapstruct.ap.internal.util.Filters; +import org.mapstruct.ap.internal.util.Nouns; +import org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds; /** * Represents (a reference to) the type of a bean property, parameter etc. Types are managed per generated source file. diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java index 7b137c75e..2adb58e6d 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import java.util.ArrayList; import java.util.Collection; @@ -52,13 +52,13 @@ import javax.lang.model.util.SimpleElementVisitor6; import javax.lang.model.util.SimpleTypeVisitor6; import javax.lang.model.util.Types; -import org.mapstruct.ap.prism.MappingTargetPrism; -import org.mapstruct.ap.prism.TargetTypePrism; -import org.mapstruct.ap.util.AnnotationProcessingException; -import org.mapstruct.ap.util.SpecificCompilerWorkarounds; +import org.mapstruct.ap.internal.prism.MappingTargetPrism; +import org.mapstruct.ap.internal.prism.TargetTypePrism; +import org.mapstruct.ap.internal.util.AnnotationProcessingException; +import org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds; -import static org.mapstruct.ap.util.SpecificCompilerWorkarounds.erasure; -import static org.mapstruct.ap.util.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary; +import static org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds.erasure; +import static org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary; /** * Factory creating {@link Type} instances. diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/common/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/common/package-info.java index 726e867b8..d83b789a1 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/package-info.java @@ -21,4 +21,4 @@ * Contains types which are shared between the intermediary mapping method model ("source model") and the mapper model. *

*/ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; diff --git a/processor/src/main/java/org/mapstruct/ap/model/dependency/GraphAnalyzer.java b/processor/src/main/java/org/mapstruct/ap/internal/model/dependency/GraphAnalyzer.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/model/dependency/GraphAnalyzer.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/dependency/GraphAnalyzer.java index 24f7bdd5b..8303ef179 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/dependency/GraphAnalyzer.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/dependency/GraphAnalyzer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.dependency; +package org.mapstruct.ap.internal.model.dependency; import java.util.ArrayList; import java.util.Arrays; diff --git a/processor/src/main/java/org/mapstruct/ap/model/dependency/Node.java b/processor/src/main/java/org/mapstruct/ap/internal/model/dependency/Node.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/model/dependency/Node.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/dependency/Node.java index fc7ec0f15..c317bf7d1 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/dependency/Node.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/dependency/Node.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.dependency; +package org.mapstruct.ap.internal.model.dependency; import java.util.ArrayList; import java.util.HashSet; diff --git a/processor/src/main/java/org/mapstruct/ap/model/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/package-info.java index de67407fb..6486be567 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/package-info.java @@ -22,4 +22,4 @@ * using FreeMarker templates. *

*/ -package org.mapstruct.ap.model; +package org.mapstruct.ap.internal.model; diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/BeanMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMapping.java similarity index 90% rename from processor/src/main/java/org/mapstruct/ap/model/source/BeanMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMapping.java index d52972003..957b08784 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/BeanMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMapping.java @@ -16,16 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; import java.util.List; -import org.mapstruct.ap.util.FormattingMessager; + import javax.lang.model.element.ExecutableElement; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.prism.BeanMappingPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Message; + +import org.mapstruct.ap.internal.prism.BeanMappingPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; /** diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/EnumMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/EnumMapping.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/source/EnumMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/EnumMapping.java index 31c8ee5b5..2e63337c9 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/EnumMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/EnumMapping.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.internal.model.source; /** * Represents the mapping between one enum constant and another. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/ForgedMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/source/ForgedMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java index 6d6aa03fd..2d2c54562 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/ForgedMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.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.internal.model.source; import java.util.ArrayList; import java.util.Arrays; @@ -24,13 +24,13 @@ import java.util.List; import javax.lang.model.element.ExecutableElement; -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.util.MapperConfiguration; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * This method will be generated in absence of a suitable abstract method to implement. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/IterableMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/source/IterableMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java index 1464ec9e0..b913288e7 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/IterableMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java @@ -16,19 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; import java.util.List; -import org.mapstruct.ap.util.FormattingMessager; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.ExecutableElement; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.prism.IterableMappingPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Message; +import org.mapstruct.ap.internal.prism.IterableMappingPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; /** * Represents an iterable mapping as configured via {@code @IterableMapping}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MapMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/source/MapMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java index ba39335ef..da2a0901a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/MapMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java @@ -16,18 +16,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; import java.util.List; -import org.mapstruct.ap.util.FormattingMessager; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ExecutableElement; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.prism.MapMappingPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.util.Message; +import org.mapstruct.ap.internal.prism.MapMappingPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; /** * Represents a map mapping as configured via {@code @MapMapping}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Mapping.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/Mapping.java index b6cfbe2af..a3b8fbfcc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Mapping.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.internal.model.source; import java.util.ArrayList; import java.util.Collections; @@ -34,12 +34,12 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.prism.CollectionMappingStrategyPrism; -import org.mapstruct.ap.prism.MappingPrism; -import org.mapstruct.ap.prism.MappingsPrism; -import org.mapstruct.ap.util.FormattingMessager; -import org.mapstruct.ap.util.Message; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism; +import org.mapstruct.ap.internal.prism.MappingPrism; +import org.mapstruct.ap.internal.prism.MappingsPrism; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; /** * Represents a property mapping as configured via {@code @Mapping}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MappingOptions.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/source/MappingOptions.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java index 7b125dcb0..8a1d6e5fc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/MappingOptions.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.util.FormattingMessager; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.FormattingMessager; /** * Encapsulates all options specifiable on a mapping method diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/source/Method.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java index 499e2deb5..ef60ae705 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; import java.util.List; import javax.lang.model.element.ExecutableElement; -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; -import org.mapstruct.ap.util.MapperConfiguration; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.builtin.BuiltInMethod; +import org.mapstruct.ap.internal.util.MapperConfiguration; /** * This interface makes available common method properties and a matching method There are 2 known implementors: diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java index b90b9af9b..63a2a7265 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.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.internal.model.source; import java.util.HashMap; import java.util.List; @@ -34,12 +34,12 @@ import javax.lang.model.type.WildcardType; import javax.lang.model.util.SimpleTypeVisitor6; import javax.lang.model.util.Types; -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.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.hasNonNullElements; -import static org.mapstruct.ap.util.SpecificCompilerWorkarounds.isSubType; +import static org.mapstruct.ap.internal.util.Collections.hasNonNullElements; +import static org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds.isSubType; /** * SourceMethodMatcher $8.4 of the JavaLanguage specification describes a method body as such: diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/SourceMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/source/SourceMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java index effa3a248..ca4caf167 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/SourceMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.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.internal.model.source; import java.util.ArrayList; import java.util.Collections; @@ -29,17 +29,17 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.util.Types; -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.common.TypeFactory; -import org.mapstruct.ap.model.source.SourceReference.PropertyEntry; -import org.mapstruct.ap.util.Executables; -import org.mapstruct.ap.util.FormattingMessager; -import org.mapstruct.ap.util.MapperConfiguration; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.SourceReference.PropertyEntry; +import org.mapstruct.ap.internal.util.Executables; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * Represents a mapping method with source and target type and the mappings between the properties of source and target diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/SourceReference.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/model/source/SourceReference.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.java index c65bb3e1d..088123d5d 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/SourceReference.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceReference.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.internal.model.source; import java.util.ArrayList; import java.util.Arrays; @@ -25,14 +25,14 @@ import java.util.Map; import javax.lang.model.element.ExecutableElement; -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.FormattingMessager; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * This class describes the source side of a property mapping. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMappingMethods.java similarity index 89% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMappingMethods.java index 08c2c02a9..9eb578e7a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMappingMethods.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMappingMethods.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.List; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.util.Collections; -import org.mapstruct.ap.util.JavaTimeConstants; -import org.mapstruct.ap.util.JaxbConstants; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.Collections; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.JaxbConstants; /** * Registry for all built-in methods. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java index 0643fe17b..5e1d605c8 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/BuiltInMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/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.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.ArrayList; import java.util.Arrays; @@ -26,16 +26,16 @@ import java.util.Set; import javax.lang.model.element.ExecutableElement; -import org.mapstruct.ap.conversion.SimpleConversion; -import org.mapstruct.ap.model.common.Accessibility; -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.source.Method; -import org.mapstruct.ap.util.MapperConfiguration; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.conversion.SimpleConversion; +import org.mapstruct.ap.internal.model.common.Accessibility; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Strings; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * Represents a "built-in" mapping method which will be added as private method to the generated mapper. Built-in diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java index b5be9b287..78093c323 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java @@ -16,20 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; 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 org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToZonedDateTime.java similarity index 84% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToZonedDateTime.java index 4346764cf..7371465cb 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/CalendarToZonedDateTime.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToZonedDateTime.java @@ -16,19 +16,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Set; 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.JavaTimeConstants; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.JavaTimeConstants; /** * {@link BuiltInMethod} for mapping between {@link Calendar} and {@link ZonedDateTime}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java index 41d4d4dbb..d027e89ad 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/DateToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.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.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.Date; import java.util.GregorianCalendar; @@ -26,11 +26,11 @@ 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 org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java similarity index 86% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java index 6f0202c58..0f71e8479 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/JaxbElemToValue.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java @@ -16,16 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.Set; + 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; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java similarity index 87% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java index 1b2f1368a..acc71e85b 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/StringToXmlGregorianCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java @@ -16,23 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; 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 org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java similarity index 85% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java index 7bd3a9ae6..f9fd517b2 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.Calendar; import java.util.Set; 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 org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java similarity index 85% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java index d60bb961e..1a3281f66 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToDate.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.util.Date; import java.util.Set; 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 org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java similarity index 85% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java index 8c21640fe..6cf6f7a80 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/XmlGregorianCalendarToString.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java @@ -16,19 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Set; + 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 org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * @author Sjaak Derksen diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/ZonedDateTimeToCalendar.java similarity index 84% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/ZonedDateTimeToCalendar.java index 50d8a23df..01e64e104 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/ZonedDateTimeToCalendar.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/ZonedDateTimeToCalendar.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Set; -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 org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.util.Collections; +import org.mapstruct.ap.internal.util.JavaTimeConstants; /** * {@link BuiltInMethod} for mapping between {@link Calendar} and {@link ZonedDateTime}. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/source/builtin/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/package-info.java index 39f6f97f7..fb9008006 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/builtin/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/package-info.java @@ -24,4 +24,4 @@ * contains the source code of the method. *

*/ -package org.mapstruct.ap.model.source.builtin; +package org.mapstruct.ap.internal.model.source.builtin; diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/source/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/package-info.java index 472004b3b..19a1430bf 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/package-info.java @@ -22,4 +22,4 @@ * representation is then processed into the mapper model representation. *

*/ -package org.mapstruct.ap.model.source; +package org.mapstruct.ap.internal.model.source; diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/CreateOrUpdateSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/CreateOrUpdateSelector.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/CreateOrUpdateSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/CreateOrUpdateSelector.java index 7d394be84..cf835dc57 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/CreateOrUpdateSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/CreateOrUpdateSelector.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.List; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; /** * Selection based on type of method (create - or update method). diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/InheritanceSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/InheritanceSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java index 704ecddf5..0356d4330 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/InheritanceSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.List; -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.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; -import static org.mapstruct.ap.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.first; /** * Selects on inheritance distance, e.g. the amount of inheritance steps from the parameter type. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelector.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelector.java index 186f44e42..c74ef5ba5 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelector.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.List; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; /** * Implementations select those methods from a given input set which match the given source and target type of a mapping diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelectors.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelectors.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelectors.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelectors.java index 98c1c4ecf..50c9c8385 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/MethodSelectors.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/MethodSelectors.java @@ -16,17 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.model.source.Method; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.Method; /** * Applies all known {@link MethodSelector}s in order. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/QualifierSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/QualifierSelector.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/QualifierSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/QualifierSelector.java index a64a683d1..be099443e 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/QualifierSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/QualifierSelector.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.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.HashSet; @@ -28,10 +28,10 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.prism.QualifierPrism; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.prism.QualifierPrism; /** * This selector selects a best match based on qualifier annotations. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/SelectionCriteria.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/SelectionCriteria.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java index 588368f4c..9520d4ad0 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/SelectionCriteria.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.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.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.List; import javax.lang.model.type.TypeMirror; diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/TargetTypeSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TargetTypeSelector.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/TargetTypeSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TargetTypeSelector.java index 2b52abf1a..642da7b13 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/TargetTypeSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TargetTypeSelector.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.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.List; @@ -25,8 +25,8 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; /** * This selector selects a best match based on the result type. diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/TypeSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TypeSelector.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/TypeSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TypeSelector.java index 40b5ca17b..ff1273209 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/TypeSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/TypeSelector.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.model.source.MethodMatcher; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.MethodMatcher; /** * Selects those methods from the given input set which match the given source and target types (via diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/XmlElementDeclSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/XmlElementDeclSelector.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/XmlElementDeclSelector.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/XmlElementDeclSelector.java index e84faa8b9..04e6bbd0e 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/XmlElementDeclSelector.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/XmlElementDeclSelector.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.selector; +package org.mapstruct.ap.internal.model.source.selector; import java.util.ArrayList; import java.util.List; @@ -25,10 +25,10 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Types; import javax.xml.bind.annotation.XmlElementDecl; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.source.Method; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.prism.XmlElementDeclPrism; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.prism.XmlElementDeclPrism; /** * Selects those methods with matching {@code name} and {@code scope} attributes of the {@link XmlElementDecl} diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/selector/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/package-info.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/model/source/selector/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/package-info.java index e1063047c..6e5737138 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/selector/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/package-info.java @@ -22,4 +22,4 @@ * or instantiating the target type of a mapping method, respectively. *

*/ -package org.mapstruct.ap.model.source.selector; +package org.mapstruct.ap.internal.model.source.selector; diff --git a/processor/src/main/java/org/mapstruct/ap/naming/DefaultAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java similarity index 99% rename from processor/src/main/java/org/mapstruct/ap/naming/DefaultAccessorNamingStrategy.java rename to processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java index 167a3a814..b93c06464 100644 --- a/processor/src/main/java/org/mapstruct/ap/naming/DefaultAccessorNamingStrategy.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.naming; +package org.mapstruct.ap.internal.naming; import java.beans.Introspector; import javax.lang.model.element.ExecutableElement; diff --git a/processor/src/main/java/org/mapstruct/ap/option/Options.java b/processor/src/main/java/org/mapstruct/ap/internal/option/Options.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/option/Options.java rename to processor/src/main/java/org/mapstruct/ap/internal/option/Options.java index 10087b54a..2575864ff 100644 --- a/processor/src/main/java/org/mapstruct/ap/option/Options.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/option/Options.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.option; +package org.mapstruct.ap.internal.option; /** diff --git a/processor/src/main/java/org/mapstruct/ap/option/OptionsHelper.java b/processor/src/main/java/org/mapstruct/ap/internal/option/OptionsHelper.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/option/OptionsHelper.java rename to processor/src/main/java/org/mapstruct/ap/internal/option/OptionsHelper.java index 2399a01ba..3b87c8652 100644 --- a/processor/src/main/java/org/mapstruct/ap/option/OptionsHelper.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/option/OptionsHelper.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.option; +package org.mapstruct.ap.internal.option; /** diff --git a/processor/src/main/java/org/mapstruct/ap/option/ReportingPolicy.java b/processor/src/main/java/org/mapstruct/ap/internal/option/ReportingPolicy.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/option/ReportingPolicy.java rename to processor/src/main/java/org/mapstruct/ap/internal/option/ReportingPolicy.java index 32d38616a..569ab1222 100644 --- a/processor/src/main/java/org/mapstruct/ap/option/ReportingPolicy.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/option/ReportingPolicy.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.option; +package org.mapstruct.ap.internal.option; import javax.tools.Diagnostic; import javax.tools.Diagnostic.Kind; diff --git a/processor/src/main/java/org/mapstruct/ap/option/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/option/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/option/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/option/package-info.java index 4f80b5662..3929f457d 100644 --- a/processor/src/main/java/org/mapstruct/ap/option/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/option/package-info.java @@ -21,4 +21,4 @@ * Provides access to the options passed to the annotation processor. *

*/ -package org.mapstruct.ap.option; +package org.mapstruct.ap.internal.option; diff --git a/processor/src/main/java/org/mapstruct/ap/prism/CollectionMappingStrategyPrism.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/CollectionMappingStrategyPrism.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/prism/CollectionMappingStrategyPrism.java rename to processor/src/main/java/org/mapstruct/ap/internal/prism/CollectionMappingStrategyPrism.java index 5b859bd94..73145e04b 100644 --- a/processor/src/main/java/org/mapstruct/ap/prism/CollectionMappingStrategyPrism.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/CollectionMappingStrategyPrism.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.prism; +package org.mapstruct.ap.internal.prism; /** * Prism for the enum {@link org.mapstruct.CollectionMappingStrategy} diff --git a/processor/src/main/java/org/mapstruct/ap/prism/MappingInheritanceStrategyPrism.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/MappingInheritanceStrategyPrism.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/prism/MappingInheritanceStrategyPrism.java rename to processor/src/main/java/org/mapstruct/ap/internal/prism/MappingInheritanceStrategyPrism.java index 9ce415662..117683480 100644 --- a/processor/src/main/java/org/mapstruct/ap/prism/MappingInheritanceStrategyPrism.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/MappingInheritanceStrategyPrism.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.prism; +package org.mapstruct.ap.internal.prism; /** diff --git a/processor/src/main/java/org/mapstruct/ap/prism/NullValueMappingStrategyPrism.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/NullValueMappingStrategyPrism.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/prism/NullValueMappingStrategyPrism.java rename to processor/src/main/java/org/mapstruct/ap/internal/prism/NullValueMappingStrategyPrism.java index 897075cac..92d858346 100644 --- a/processor/src/main/java/org/mapstruct/ap/prism/NullValueMappingStrategyPrism.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/NullValueMappingStrategyPrism.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.prism; +package org.mapstruct.ap.internal.prism; /** * Prism for the enum {@link org.mapstruct.NullValueMappingStrategy} diff --git a/processor/src/main/java/org/mapstruct/ap/prism/PrismGenerator.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/prism/PrismGenerator.java rename to processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java index 03ae9a094..2c5937aae 100644 --- a/processor/src/main/java/org/mapstruct/ap/prism/PrismGenerator.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.prism; +package org.mapstruct.ap.internal.prism; import javax.xml.bind.annotation.XmlElementDecl; diff --git a/processor/src/main/java/org/mapstruct/ap/prism/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/prism/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/prism/package-info.java index 18af4a263..ed3cda1c9 100644 --- a/processor/src/main/java/org/mapstruct/ap/prism/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/package-info.java @@ -21,4 +21,4 @@ * This package contains the generated prism types for accessing the MapStruct annotations in a comfortable way. *

*/ -package org.mapstruct.ap.prism; +package org.mapstruct.ap.internal.prism; diff --git a/processor/src/main/java/org/mapstruct/ap/processor/AnnotationBasedComponentModelProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/processor/AnnotationBasedComponentModelProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java index 145ebb2c0..f502a30e1 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/AnnotationBasedComponentModelProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java @@ -16,18 +16,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; import java.util.ListIterator; + import javax.lang.model.element.TypeElement; -import org.mapstruct.ap.model.Annotation; -import org.mapstruct.ap.model.AnnotationMapperReference; -import org.mapstruct.ap.model.Mapper; -import org.mapstruct.ap.model.MapperReference; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.OptionsHelper; -import org.mapstruct.ap.util.MapperConfiguration; +import org.mapstruct.ap.internal.model.Annotation; +import org.mapstruct.ap.internal.model.AnnotationMapperReference; +import org.mapstruct.ap.internal.model.Mapper; +import org.mapstruct.ap.internal.model.MapperReference; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.OptionsHelper; +import org.mapstruct.ap.internal.util.MapperConfiguration; /** * An {@link ModelElementProcessor} which converts the given {@link Mapper} diff --git a/processor/src/main/java/org/mapstruct/ap/processor/CdiComponentProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/CdiComponentProcessor.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/processor/CdiComponentProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/CdiComponentProcessor.java index d095ddb8b..0486fcbe1 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/CdiComponentProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/CdiComponentProcessor.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; -import org.mapstruct.ap.model.Annotation; -import org.mapstruct.ap.model.Mapper; +import org.mapstruct.ap.internal.model.Annotation; +import org.mapstruct.ap.internal.model.Mapper; /** * A {@link ModelElementProcessor} which converts the given {@link Mapper} diff --git a/processor/src/main/java/org/mapstruct/ap/processor/DefaultModelElementProcessorContext.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultModelElementProcessorContext.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/processor/DefaultModelElementProcessorContext.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultModelElementProcessorContext.java index 82ee43b47..26ff46e38 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/DefaultModelElementProcessorContext.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultModelElementProcessorContext.java @@ -16,9 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; -import org.mapstruct.ap.util.FormattingMessager; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; @@ -29,11 +28,12 @@ import javax.lang.model.util.Elements; import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.processor.ModelElementProcessor.ProcessorContext; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.processor.ModelElementProcessor.ProcessorContext; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.version.VersionInformation; /** * Default implementation of the processor context. diff --git a/processor/src/main/java/org/mapstruct/ap/processor/DefaultVersionInformation.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultVersionInformation.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/processor/DefaultVersionInformation.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultVersionInformation.java index 8ef26e8cf..bbbb7f2d0 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/DefaultVersionInformation.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultVersionInformation.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; import java.io.IOException; import java.net.MalformedURLException; @@ -25,7 +25,7 @@ import java.util.jar.Manifest; import javax.annotation.processing.ProcessingEnvironment; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.version.VersionInformation; /** * Provides information about the processor version and the processor context implementation version. diff --git a/processor/src/main/java/org/mapstruct/ap/processor/Jsr330ComponentProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/Jsr330ComponentProcessor.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/processor/Jsr330ComponentProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/Jsr330ComponentProcessor.java index 304fd504c..2c11cbc8f 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/Jsr330ComponentProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/Jsr330ComponentProcessor.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; -import org.mapstruct.ap.model.Annotation; -import org.mapstruct.ap.model.Mapper; +import org.mapstruct.ap.internal.model.Annotation; +import org.mapstruct.ap.internal.model.Mapper; /** * A {@link ModelElementProcessor} which converts the given {@link Mapper} diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java index 6b51d1ed8..838f68ca9 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java @@ -16,11 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; - -import static org.mapstruct.ap.prism.MappingInheritanceStrategyPrism.AUTO_INHERIT_FROM_CONFIG; -import static org.mapstruct.ap.util.Collections.first; -import static org.mapstruct.ap.util.Collections.join; +package org.mapstruct.ap.internal.processor; import java.util.ArrayList; import java.util.LinkedList; @@ -36,33 +32,37 @@ import javax.lang.model.util.ElementFilter; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.model.BeanMappingMethod; -import org.mapstruct.ap.model.Decorator; -import org.mapstruct.ap.model.DefaultMapperReference; -import org.mapstruct.ap.model.DelegatingMethod; -import org.mapstruct.ap.model.EnumMappingMethod; -import org.mapstruct.ap.model.IterableMappingMethod; -import org.mapstruct.ap.model.MapMappingMethod; -import org.mapstruct.ap.model.Mapper; -import org.mapstruct.ap.model.MapperReference; -import org.mapstruct.ap.model.MappingBuilderContext; -import org.mapstruct.ap.model.MappingMethod; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.model.source.MappingOptions; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.prism.DecoratedWithPrism; -import org.mapstruct.ap.prism.InheritConfigurationPrism; -import org.mapstruct.ap.prism.InheritInverseConfigurationPrism; -import org.mapstruct.ap.prism.MapperPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; -import org.mapstruct.ap.processor.creation.MappingResolverImpl; -import org.mapstruct.ap.util.FormattingMessager; -import org.mapstruct.ap.util.MapperConfiguration; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.Strings; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.BeanMappingMethod; +import org.mapstruct.ap.internal.model.Decorator; +import org.mapstruct.ap.internal.model.DefaultMapperReference; +import org.mapstruct.ap.internal.model.DelegatingMethod; +import org.mapstruct.ap.internal.model.EnumMappingMethod; +import org.mapstruct.ap.internal.model.IterableMappingMethod; +import org.mapstruct.ap.internal.model.MapMappingMethod; +import org.mapstruct.ap.internal.model.Mapper; +import org.mapstruct.ap.internal.model.MapperReference; +import org.mapstruct.ap.internal.model.MappingBuilderContext; +import org.mapstruct.ap.internal.model.MappingMethod; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.MappingOptions; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.prism.DecoratedWithPrism; +import org.mapstruct.ap.internal.prism.InheritConfigurationPrism; +import org.mapstruct.ap.internal.prism.InheritInverseConfigurationPrism; +import org.mapstruct.ap.internal.prism.MapperPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.processor.creation.MappingResolverImpl; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.Strings; +import org.mapstruct.ap.internal.version.VersionInformation; + +import static org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism.AUTO_INHERIT_FROM_CONFIG; +import static org.mapstruct.ap.internal.util.Collections.first; +import static org.mapstruct.ap.internal.util.Collections.join; /** * A {@link ModelElementProcessor} which creates a {@link Mapper} from the given diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperRenderingProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperRenderingProcessor.java similarity index 92% rename from processor/src/main/java/org/mapstruct/ap/processor/MapperRenderingProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/MapperRenderingProcessor.java index aee19395c..a5a0c7edb 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MapperRenderingProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperRenderingProcessor.java @@ -16,16 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; import java.io.IOException; + import javax.annotation.processing.Filer; import javax.lang.model.element.TypeElement; import javax.tools.JavaFileObject; -import org.mapstruct.ap.model.GeneratedType; -import org.mapstruct.ap.model.Mapper; -import org.mapstruct.ap.writer.ModelWriter; +import org.mapstruct.ap.internal.model.GeneratedType; +import org.mapstruct.ap.internal.model.Mapper; +import org.mapstruct.ap.internal.writer.ModelWriter; /** * A {@link ModelElementProcessor} which creates a Java source file representing diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java index f8825a650..d4153cba5 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; import java.util.ArrayList; import java.util.Collections; @@ -34,26 +34,26 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -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.BeanMapping; -import org.mapstruct.ap.model.source.IterableMapping; -import org.mapstruct.ap.model.source.MapMapping; -import org.mapstruct.ap.model.source.Mapping; -import org.mapstruct.ap.model.source.SourceMethod; -import org.mapstruct.ap.prism.BeanMappingPrism; -import org.mapstruct.ap.prism.IterableMappingPrism; -import org.mapstruct.ap.prism.MapMappingPrism; -import org.mapstruct.ap.prism.MappingPrism; -import org.mapstruct.ap.prism.MappingsPrism; -import org.mapstruct.ap.util.AnnotationProcessingException; -import org.mapstruct.ap.util.Executables; -import org.mapstruct.ap.util.FormattingMessager; -import org.mapstruct.ap.util.MapperConfiguration; -import org.mapstruct.ap.util.Message; +import org.mapstruct.ap.internal.model.common.Parameter; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.BeanMapping; +import org.mapstruct.ap.internal.model.source.IterableMapping; +import org.mapstruct.ap.internal.model.source.MapMapping; +import org.mapstruct.ap.internal.model.source.Mapping; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.prism.BeanMappingPrism; +import org.mapstruct.ap.internal.prism.IterableMappingPrism; +import org.mapstruct.ap.internal.prism.MapMappingPrism; +import org.mapstruct.ap.internal.prism.MappingPrism; +import org.mapstruct.ap.internal.prism.MappingsPrism; +import org.mapstruct.ap.internal.util.AnnotationProcessingException; +import org.mapstruct.ap.internal.util.Executables; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.Message; -import static org.mapstruct.ap.util.Executables.getAllEnclosedExecutableElements; +import static org.mapstruct.ap.internal.util.Executables.getAllEnclosedExecutableElements; /** * A {@link ModelElementProcessor} which retrieves a list of {@link SourceMethod}s diff --git a/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/ModelElementProcessor.java similarity index 93% rename from processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/ModelElementProcessor.java index 3097379df..bfe869195 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/ModelElementProcessor.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; import javax.annotation.processing.Filer; -import org.mapstruct.ap.util.FormattingMessager; import javax.lang.model.element.TypeElement; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import org.mapstruct.ap.model.common.TypeFactory; -import org.mapstruct.ap.option.Options; -import org.mapstruct.ap.version.VersionInformation; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.option.Options; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.version.VersionInformation; /** * A processor which performs one task of the mapper generation, e.g. retrieving diff --git a/processor/src/main/java/org/mapstruct/ap/processor/SpringComponentProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/SpringComponentProcessor.java similarity index 91% rename from processor/src/main/java/org/mapstruct/ap/processor/SpringComponentProcessor.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/SpringComponentProcessor.java index 2c9eb2807..5f98acd52 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/SpringComponentProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/SpringComponentProcessor.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; -import org.mapstruct.ap.model.Annotation; -import org.mapstruct.ap.model.Mapper; +import org.mapstruct.ap.internal.model.Annotation; +import org.mapstruct.ap.internal.model.Mapper; /** * A {@link ModelElementProcessor} which converts the given {@link Mapper} diff --git a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java index e92652c26..41db41690 100755 --- a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.processor.creation; +package org.mapstruct.ap.internal.processor.creation; import java.util.ArrayList; import java.util.HashSet; @@ -27,28 +27,28 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.mapstruct.ap.conversion.ConversionProvider; -import org.mapstruct.ap.conversion.Conversions; -import org.mapstruct.ap.model.AssignmentFactory; -import org.mapstruct.ap.model.MapperReference; -import org.mapstruct.ap.model.MappingBuilderContext.MappingResolver; -import org.mapstruct.ap.model.MethodReference; -import org.mapstruct.ap.model.VirtualMappingMethod; -import org.mapstruct.ap.model.assignment.Assignment; -import org.mapstruct.ap.model.common.ConversionContext; -import org.mapstruct.ap.model.common.DefaultConversionContext; -import org.mapstruct.ap.model.common.Type; -import org.mapstruct.ap.model.common.TypeFactory; -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.model.source.selector.MethodSelectors; -import org.mapstruct.ap.model.source.selector.SelectionCriteria; -import org.mapstruct.ap.util.FormattingMessager; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.SpecificCompilerWorkarounds; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.conversion.ConversionProvider; +import org.mapstruct.ap.internal.conversion.Conversions; +import org.mapstruct.ap.internal.model.AssignmentFactory; +import org.mapstruct.ap.internal.model.MapperReference; +import org.mapstruct.ap.internal.model.MethodReference; +import org.mapstruct.ap.internal.model.VirtualMappingMethod; +import org.mapstruct.ap.internal.model.MappingBuilderContext.MappingResolver; +import org.mapstruct.ap.internal.model.assignment.Assignment; +import org.mapstruct.ap.internal.model.common.ConversionContext; +import org.mapstruct.ap.internal.model.common.DefaultConversionContext; +import org.mapstruct.ap.internal.model.common.Type; +import org.mapstruct.ap.internal.model.common.TypeFactory; +import org.mapstruct.ap.internal.model.source.Method; +import org.mapstruct.ap.internal.model.source.SourceMethod; +import org.mapstruct.ap.internal.model.source.builtin.BuiltInMappingMethods; +import org.mapstruct.ap.internal.model.source.builtin.BuiltInMethod; +import org.mapstruct.ap.internal.model.source.selector.MethodSelectors; +import org.mapstruct.ap.internal.model.source.selector.SelectionCriteria; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.Message; +import org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds; +import org.mapstruct.ap.internal.util.Strings; /** * The one and only implementation of {@link MappingResolver}. The class has been split into an interface an diff --git a/processor/src/main/java/org/mapstruct/ap/processor/creation/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/package-info.java similarity index 83% rename from processor/src/main/java/org/mapstruct/ap/processor/creation/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/creation/package-info.java index 690b87107..9f2a116d8 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/creation/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/package-info.java @@ -18,7 +18,7 @@ */ /** *

- * Contains all helper classes for the {@link org.mapstruct.ap.processor.MapperCreationProcessor} + * Contains all helper classes for the {@link org.mapstruct.ap.internal.processor.MapperCreationProcessor} *

*/ -package org.mapstruct.ap.processor.creation; +package org.mapstruct.ap.internal.processor.creation; diff --git a/processor/src/main/java/org/mapstruct/ap/processor/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/processor/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/processor/package-info.java index 254231155..1933647df 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/package-info.java @@ -22,4 +22,4 @@ * and writing the model into Java source files. Processors are invoked in order as per their priority value. *

*/ -package org.mapstruct.ap.processor; +package org.mapstruct.ap.internal.processor; diff --git a/processor/src/main/java/org/mapstruct/ap/services/Services.java b/processor/src/main/java/org/mapstruct/ap/internal/services/Services.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/services/Services.java rename to processor/src/main/java/org/mapstruct/ap/internal/services/Services.java index cf1733066..dcbdb5023 100644 --- a/processor/src/main/java/org/mapstruct/ap/services/Services.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/services/Services.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.services; +package org.mapstruct.ap.internal.services; import java.util.ServiceLoader; import java.util.concurrent.ConcurrentHashMap; diff --git a/processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java b/processor/src/main/java/org/mapstruct/ap/internal/util/AnnotationProcessingException.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/AnnotationProcessingException.java index 255953344..25d73eaba 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/AnnotationProcessingException.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; diff --git a/processor/src/main/java/org/mapstruct/ap/util/Collections.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Collections.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/util/Collections.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Collections.java index 642608bfd..0d1215201 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Collections.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Collections.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/processor/src/main/java/org/mapstruct/ap/util/Executables.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Executables.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/util/Executables.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Executables.java index a60b3b170..b542ce91f 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Executables.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Executables.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.ArrayList; import java.util.List; @@ -29,16 +29,15 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; -import org.mapstruct.ap.naming.DefaultAccessorNamingStrategy; -import org.mapstruct.ap.services.Services; +import org.mapstruct.ap.internal.naming.DefaultAccessorNamingStrategy; +import org.mapstruct.ap.internal.prism.AfterMappingPrism; +import org.mapstruct.ap.internal.prism.BeforeMappingPrism; +import org.mapstruct.ap.internal.services.Services; import org.mapstruct.ap.spi.AccessorNamingStrategy; import org.mapstruct.ap.spi.MethodType; -import org.mapstruct.ap.prism.AfterMappingPrism; -import org.mapstruct.ap.prism.BeforeMappingPrism; - import static javax.lang.model.util.ElementFilter.methodsIn; -import static org.mapstruct.ap.util.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary; +import static org.mapstruct.ap.internal.util.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary; /** * Provides functionality around {@link ExecutableElement}s. diff --git a/processor/src/main/java/org/mapstruct/ap/util/Filters.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Filters.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/util/Filters.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Filters.java index 41054ac3f..b0110141e 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Filters.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Filters.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.LinkedList; import java.util.List; diff --git a/processor/src/main/java/org/mapstruct/ap/util/FormattingMessager.java b/processor/src/main/java/org/mapstruct/ap/internal/util/FormattingMessager.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/util/FormattingMessager.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/FormattingMessager.java index ba79b26ca..fc2d4f05c 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/FormattingMessager.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/FormattingMessager.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; diff --git a/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java b/processor/src/main/java/org/mapstruct/ap/internal/util/JavaTimeConstants.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/JavaTimeConstants.java index b00edd606..f198ac7ac 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/JavaTimeConstants.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; /** * Helper holding Java time full qualified class names for conversion registration diff --git a/processor/src/main/java/org/mapstruct/ap/util/JaxbConstants.java b/processor/src/main/java/org/mapstruct/ap/internal/util/JaxbConstants.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/util/JaxbConstants.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/JaxbConstants.java index 54128db99..f693f0157 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/JaxbConstants.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/JaxbConstants.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; /** * Helper holding JAXB time full qualified class names for conversion registration diff --git a/processor/src/main/java/org/mapstruct/ap/util/JodaTimeConstants.java b/processor/src/main/java/org/mapstruct/ap/internal/util/JodaTimeConstants.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/util/JodaTimeConstants.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/JodaTimeConstants.java index f70f2c518..d3e9c4da8 100755 --- a/processor/src/main/java/org/mapstruct/ap/util/JodaTimeConstants.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/JodaTimeConstants.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; /** * Helper holding constants for working with Joda-Time. diff --git a/processor/src/main/java/org/mapstruct/ap/util/MapperConfiguration.java b/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java similarity index 94% rename from processor/src/main/java/org/mapstruct/ap/util/MapperConfiguration.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java index 362163f11..f7daecf17 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/MapperConfiguration.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -29,12 +29,12 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.mapstruct.ap.option.ReportingPolicy; -import org.mapstruct.ap.prism.CollectionMappingStrategyPrism; -import org.mapstruct.ap.prism.MapperConfigPrism; -import org.mapstruct.ap.prism.MapperPrism; -import org.mapstruct.ap.prism.MappingInheritanceStrategyPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.option.ReportingPolicy; +import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism; +import org.mapstruct.ap.internal.prism.MapperConfigPrism; +import org.mapstruct.ap.internal.prism.MapperPrism; +import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; /** * Provides an aggregated view to the settings given via {@link org.mapstruct.Mapper} and diff --git a/processor/src/main/java/org/mapstruct/ap/util/Message.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java similarity index 99% rename from processor/src/main/java/org/mapstruct/ap/util/Message.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Message.java index fd4f1876c..30e157511 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Message.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import javax.tools.Diagnostic; diff --git a/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java b/processor/src/main/java/org/mapstruct/ap/internal/util/NativeTypes.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/NativeTypes.java index 20eeca9b7..fcbc3651e 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/NativeTypes.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.Collections; import java.util.HashMap; diff --git a/processor/src/main/java/org/mapstruct/ap/util/Nouns.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Nouns.java similarity index 99% rename from processor/src/main/java/org/mapstruct/ap/util/Nouns.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Nouns.java index 7fb737246..4da86b731 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Nouns.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Nouns.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.Arrays; import java.util.List; diff --git a/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java b/processor/src/main/java/org/mapstruct/ap/internal/util/SpecificCompilerWorkarounds.java similarity index 99% rename from processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/SpecificCompilerWorkarounds.java index 49940039f..e8b86dd20 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/SpecificCompilerWorkarounds.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeKind; diff --git a/processor/src/main/java/org/mapstruct/ap/util/Strings.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/util/Strings.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java index e47033ba9..6288bbc9f 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Strings.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import static org.mapstruct.ap.util.Collections.asSet; +import static org.mapstruct.ap.internal.util.Collections.asSet; /** * Helper class for dealing with strings. diff --git a/processor/src/main/java/org/mapstruct/ap/util/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/util/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/util/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/util/package-info.java index 11618247a..8838e9aa1 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/package-info.java @@ -21,4 +21,4 @@ * Several helper types dealing with collection types, option management etc. *

*/ -package org.mapstruct.ap.util; +package org.mapstruct.ap.internal.util; diff --git a/processor/src/main/java/org/mapstruct/ap/version/VersionInformation.java b/processor/src/main/java/org/mapstruct/ap/internal/version/VersionInformation.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/version/VersionInformation.java rename to processor/src/main/java/org/mapstruct/ap/internal/version/VersionInformation.java index edc77c781..4d6ff6858 100644 --- a/processor/src/main/java/org/mapstruct/ap/version/VersionInformation.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/version/VersionInformation.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.version; +package org.mapstruct.ap.internal.version; /** * Provides information about the processor version and the processor context implementation version diff --git a/processor/src/main/java/org/mapstruct/ap/version/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/version/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/version/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/version/package-info.java index 3c9dc94c8..7d0d25f00 100644 --- a/processor/src/main/java/org/mapstruct/ap/version/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/version/package-info.java @@ -21,4 +21,4 @@ * Provides various version information *

*/ -package org.mapstruct.ap.version; +package org.mapstruct.ap.internal.version; diff --git a/processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerModelElementWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerModelElementWriter.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java index 8434b68f1..d0705b36b 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerModelElementWriter.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.Writer; import java.util.Map; @@ -29,7 +29,8 @@ import freemarker.template.Template; import freemarker.template.TemplateHashModel; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.mapstruct.ap.writer.Writable.Context; + +import org.mapstruct.ap.internal.writer.Writable.Context; /** * Delegate for writing given {@link Writable}s into a {@link Writer} using diff --git a/processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerWritable.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerWritable.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerWritable.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerWritable.java index e567ed4eb..e61bb1c77 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/FreeMarkerWritable.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerWritable.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.Writer; diff --git a/processor/src/main/java/org/mapstruct/ap/writer/IndentationCorrectingWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java similarity index 99% rename from processor/src/main/java/org/mapstruct/ap/writer/IndentationCorrectingWriter.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java index 789c6d52a..8cf53797e 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/IndentationCorrectingWriter.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.IOException; import java.io.Writer; diff --git a/processor/src/main/java/org/mapstruct/ap/writer/ModelIncludeDirective.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java similarity index 96% rename from processor/src/main/java/org/mapstruct/ap/writer/ModelIncludeDirective.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java index 38c8bfd5a..6e5f07f9b 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/ModelIncludeDirective.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.IOException; import java.util.HashMap; @@ -29,7 +29,8 @@ import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; -import org.mapstruct.ap.writer.ModelWriter.DefaultModelElementWriterContext; + +import org.mapstruct.ap.internal.writer.ModelWriter.DefaultModelElementWriterContext; /** * A {@link TemplateDirectiveModel} which allows to recursively write a graph of diff --git a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java similarity index 98% rename from processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java index 93c938e5b..cbb75710a 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.BufferedWriter; import java.io.IOException; @@ -31,7 +31,7 @@ import java.util.Map; import javax.tools.JavaFileObject; -import org.mapstruct.ap.writer.Writable.Context; +import org.mapstruct.ap.internal.writer.Writable.Context; import freemarker.cache.StrongCacheStorage; import freemarker.cache.TemplateLoader; diff --git a/processor/src/main/java/org/mapstruct/ap/writer/Writable.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/Writable.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/writer/Writable.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/Writable.java index 3c47c2a01..4b771ae2a 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/Writable.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/Writable.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; import java.io.Writer; diff --git a/processor/src/main/java/org/mapstruct/ap/writer/package-info.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/package-info.java similarity index 95% rename from processor/src/main/java/org/mapstruct/ap/writer/package-info.java rename to processor/src/main/java/org/mapstruct/ap/internal/writer/package-info.java index ba0acfbfb..bd017a842 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/package-info.java @@ -21,4 +21,4 @@ * Infrastructure for dealing with the FreeMarker template engine. *

*/ -package org.mapstruct.ap.writer; +package org.mapstruct.ap.internal.writer; diff --git a/processor/src/main/resources/META-INF/services/org.mapstruct.ap.processor.ModelElementProcessor b/processor/src/main/resources/META-INF/services/org.mapstruct.ap.internal.processor.ModelElementProcessor similarity index 67% rename from processor/src/main/resources/META-INF/services/org.mapstruct.ap.processor.ModelElementProcessor rename to processor/src/main/resources/META-INF/services/org.mapstruct.ap.internal.processor.ModelElementProcessor index 45faea7eb..20b315ca9 100644 --- a/processor/src/main/resources/META-INF/services/org.mapstruct.ap.processor.ModelElementProcessor +++ b/processor/src/main/resources/META-INF/services/org.mapstruct.ap.internal.processor.ModelElementProcessor @@ -15,9 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.mapstruct.ap.processor.CdiComponentProcessor -org.mapstruct.ap.processor.Jsr330ComponentProcessor -org.mapstruct.ap.processor.MapperCreationProcessor -org.mapstruct.ap.processor.MapperRenderingProcessor -org.mapstruct.ap.processor.MethodRetrievalProcessor -org.mapstruct.ap.processor.SpringComponentProcessor +org.mapstruct.ap.internal.processor.CdiComponentProcessor +org.mapstruct.ap.internal.processor.Jsr330ComponentProcessor +org.mapstruct.ap.internal.processor.MapperCreationProcessor +org.mapstruct.ap.internal.processor.MapperRenderingProcessor +org.mapstruct.ap.internal.processor.MethodRetrievalProcessor +org.mapstruct.ap.internal.processor.SpringComponentProcessor diff --git a/processor/src/main/resources/org.mapstruct.ap.model.Annotation.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.Annotation.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.Annotation.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.Annotation.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.AnnotationMapperReference.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.AnnotationMapperReference.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.AnnotationMapperReference.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.AnnotationMapperReference.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.BeanMappingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.BeanMappingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.ConversionMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.ConversionMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.ConversionMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.ConversionMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.DecoratorConstructor.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.DecoratorConstructor.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.DecoratorConstructor.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.DecoratorConstructor.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.DefaultMapperReference.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.DefaultMapperReference.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.DefaultMapperReference.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.DefaultMapperReference.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.DelegatingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.DelegatingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.DelegatingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.DelegatingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.Direct.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.Direct.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.Direct.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.Direct.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.EnumMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.EnumMappingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.EnumMappingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.EnumMappingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.Field.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.Field.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.Field.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.Field.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.GeneratedType.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.GeneratedType.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.IterableMappingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.IterableMappingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.LifecycleCallbackMethodReference.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.LifecycleCallbackMethodReference.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.LifecycleCallbackMethodReference.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.LifecycleCallbackMethodReference.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.MapMappingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.MapMappingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.MethodReference.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.MethodReference.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.MethodReference.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.MethodReference.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.NestedPropertyMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.NestedPropertyMappingMethod.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.NestedPropertyMappingMethod.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.NestedPropertyMappingMethod.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.PropertyMapping.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.PropertyMapping.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.PropertyMapping.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.PropertyMapping.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.TypeConversion.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.TypeConversion.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.TypeConversion.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.TypeConversion.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.AdderWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.AdderWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.AdderWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.AdderWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.ArrayCopyWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.ArrayCopyWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.ArrayCopyWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.ArrayCopyWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.GetterWrapperForCollectionsAndMaps.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.GetterWrapperForCollectionsAndMaps.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.GetterWrapperForCollectionsAndMaps.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.GetterWrapperForCollectionsAndMaps.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.LocalVarWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.LocalVarWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.LocalVarWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.LocalVarWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.NewCollectionOrMapWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.NewCollectionOrMapWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.NullCheckWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.NullCheckWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.NullCheckWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.NullCheckWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.SetterWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.SetterWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.SetterWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.SetterWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.SetterWrapperForCollectionsAndMaps.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.SetterWrapperForCollectionsAndMaps.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.SetterWrapperForCollectionsAndMaps.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.SetterWrapperForCollectionsAndMaps.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.assignment.UpdateWrapper.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.UpdateWrapper.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.assignment.UpdateWrapper.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.assignment.UpdateWrapper.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.CalendarToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.CalendarToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToZonedDateTime.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.CalendarToZonedDateTime.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.CalendarToZonedDateTime.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.CalendarToZonedDateTime.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.DateToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.DateToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.DateToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.JaxbElemToValue.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.JaxbElemToValue.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.JaxbElemToValue.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.StringToXmlGregorianCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.StringToXmlGregorianCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.StringToXmlGregorianCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToDate.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToDate.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToDate.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToString.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.XmlGregorianCalendarToString.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.XmlGregorianCalendarToString.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.builtin.ZonedDateTimeToCalendar.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.ZonedDateTimeToCalendar.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.builtin.ZonedDateTimeToCalendar.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.builtin.ZonedDateTimeToCalendar.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.common.Parameter.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.common.Parameter.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.common.Parameter.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.common.Parameter.ftl diff --git a/processor/src/main/resources/org.mapstruct.ap.model.common.Type.ftl b/processor/src/main/resources/org.mapstruct.ap.internal.model.common.Type.ftl similarity index 100% rename from processor/src/main/resources/org.mapstruct.ap.model.common.Type.ftl rename to processor/src/main/resources/org.mapstruct.ap.internal.model.common.Type.ftl diff --git a/processor/src/test/java/org/mapstruct/ap/model/common/DateFormatValidatorFactoryTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java similarity index 96% rename from processor/src/test/java/org/mapstruct/ap/model/common/DateFormatValidatorFactoryTest.java rename to processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java index d31b21236..8403afe57 100755 --- a/processor/src/test/java/org/mapstruct/ap/model/common/DateFormatValidatorFactoryTest.java +++ b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java @@ -16,24 +16,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import org.junit.Test; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.JodaTimeConstants; import org.mapstruct.ap.testutil.IssueKey; -import org.mapstruct.ap.util.JavaTimeConstants; -import org.mapstruct.ap.util.JodaTimeConstants; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVisitor; + import java.lang.annotation.Annotation; import java.util.List; import static org.fest.assertions.Assertions.assertThat; /** - * Tests for {@link org.mapstruct.ap.model.common.DateFormatValidatorFactory}. + * Tests for {@link org.mapstruct.ap.internal.model.common.DateFormatValidatorFactory}. * * @author Timo Eckhardt */ diff --git a/processor/src/test/java/org/mapstruct/ap/model/common/DefaultConversionContextTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java similarity index 95% rename from processor/src/test/java/org/mapstruct/ap/model/common/DefaultConversionContextTest.java rename to processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java index b33b0336b..af81303c2 100755 --- a/processor/src/test/java/org/mapstruct/ap/model/common/DefaultConversionContextTest.java +++ b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java @@ -16,11 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mapstruct.ap.model.common; +package org.mapstruct.ap.internal.model.common; import org.junit.Test; +import org.mapstruct.ap.internal.util.FormattingMessager; +import org.mapstruct.ap.internal.util.JavaTimeConstants; +import org.mapstruct.ap.internal.util.Message; import org.mapstruct.ap.testutil.IssueKey; -import org.mapstruct.ap.util.JavaTimeConstants; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; @@ -29,12 +31,11 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVisitor; import javax.tools.Diagnostic; + import java.lang.annotation.Annotation; import java.util.List; import static org.fest.assertions.Assertions.assertThat; -import org.mapstruct.ap.util.Message; -import org.mapstruct.ap.util.FormattingMessager; /** * Testing DefaultConversionContext for dateFormat diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java index fa3a53f5b..434778ebe 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java @@ -19,19 +19,23 @@ package org.mapstruct.ap.test.collection.forged; -import com.google.common.collect.ImmutableMap; import java.util.Map; + import javax.tools.Diagnostic.Kind; -import static org.fest.assertions.Assertions.assertThat; + import org.junit.Test; import org.junit.runner.RunWith; +import org.mapstruct.ap.internal.util.Collections; import org.mapstruct.ap.testutil.IssueKey; import org.mapstruct.ap.testutil.WithClasses; import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult; import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic; import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome; import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner; -import org.mapstruct.ap.util.Collections; + +import com.google.common.collect.ImmutableMap; + +import static org.fest.assertions.Assertions.assertThat; /** * Test for mappings between collection types, diff --git a/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java b/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java index 44c653cf5..51bade116 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.mapstruct.ap.model.dependency.GraphAnalyzer; -import org.mapstruct.ap.util.Strings; +import org.mapstruct.ap.internal.model.dependency.GraphAnalyzer; +import org.mapstruct.ap.internal.util.Strings; /** * Unit test for {@link GraphAnalyzer}. diff --git a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java index 23824c1a5..48dae1b5e 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.MappingInheritanceStrategy; import org.mapstruct.NullValueMappingStrategy; -import org.mapstruct.ap.prism.CollectionMappingStrategyPrism; -import org.mapstruct.ap.prism.MappingInheritanceStrategyPrism; -import org.mapstruct.ap.prism.NullValueMappingStrategyPrism; +import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism; +import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism; +import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; import static org.fest.assertions.Assertions.assertThat;