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

#548 Move all packages except of "spi" under "org.mapstruct.ap.internal"

Browse Source
This commit is contained in:
Andreas Gudian 2015-05-29 19:10:11 +02:00
parent ccedca8890
commit 1baf8edc0a
216 changed files with 741 additions and 718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-config/src/main/resources/build-config/import-control.xml
View File

@ -10,8 +10,8 @@
<!-- the annotation processor may not use the annotations or enums specified in org.mapstruct directly... -->
<disallow pkg="org.mapstruct" exact-match="true" />
<subpackage name="prism">
<!-- ... with exception to the package org.mapstruct.ap.prism -->
<subpackage name="internal.prism">
<!-- ... with exception to the package org.mapstruct.ap.internal.prism -->
<allow pkg=".*" regex="true" />
</subpackage>
<subpackage name="test">

2
parent/pom.xml
View File

@ -315,7 +315,7 @@
<version>2.10.3</version>
<configuration>
<quiet>true</quiet>
<excludePackageNames>org.mapstruct.ap.prism;org.mapstruct.itest.jaxb.xsd.*</excludePackageNames>
<excludePackageNames>org.mapstruct.ap.internal.prism;org.mapstruct.itest.jaxb.xsd.*</excludePackageNames>
</configuration>
</plugin>
<plugin>

16
processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJavaTimeToStringConversion.java
View File

@ -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;
/**
* <p>

10
processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToBigIntegerConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java
View File

@ -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}.

8
processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToPrimitiveConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java
View File

@ -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}.

10
processor/src/main/java/org/mapstruct/ap/conversion/BigDecimalToWrapperConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToPrimitiveConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java
View File

@ -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}.

10
processor/src/main/java/org/mapstruct/ap/conversion/BigIntegerToWrapperConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java
View File

@ -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.

4
processor/src/main/java/org/mapstruct/ap/conversion/CharToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/CharToStringConversion.java
View File

@ -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}.

4
processor/src/main/java/org/mapstruct/ap/conversion/CharWrapperToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/CharWrapperToStringConversion.java
View File

@ -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}.

8
processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/ConversionProvider.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java
View File

@ -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}.

12
processor/src/main/java/org/mapstruct/ap/conversion/DateToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java
View File

@ -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}.

8
processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java
View File

@ -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.

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

@ -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

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

@ -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}

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

@ -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}

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

@ -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}

4
processor/src/main/java/org/mapstruct/ap/conversion/JavaZonedDateTimeToDateConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToDateConversion.java
View File

@ -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

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

@ -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}

8
processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToCalendarConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java
View File

@ -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}.

4
processor/src/main/java/org/mapstruct/ap/conversion/JodaDateTimeToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToStringConversion.java
View File

@ -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}.

4
processor/src/main/java/org/mapstruct/ap/conversion/JodaLocalDateTimeToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaLocalDateTimeToStringConversion.java
View File

@ -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}.

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

@ -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}.

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

@ -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}.

8
processor/src/main/java/org/mapstruct/ap/conversion/JodaTimeToDateConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java
View File

@ -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}:

4
processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToPrimitiveConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToPrimitiveConversion.java
View File

@ -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}.

8
processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToStringConversion.java
View File

@ -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

6
processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToWrapperConversion.java
View File

@ -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

6
processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/conversion/SimpleConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToStringConversion.java
View File

@ -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}.

6
processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToWrapperConversion.java
View File

@ -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}.

2
processor/src/main/java/org/mapstruct/ap/conversion/package-info.java → processor/src/main/java/org/mapstruct/ap/internal/conversion/package-info.java
View File

@ -23,4 +23,4 @@
* code.
* </p>
*/
package org.mapstruct.ap.conversion;
package org.mapstruct.ap.internal.conversion;

6
processor/src/main/java/org/mapstruct/ap/model/Annotation.java → processor/src/main/java/org/mapstruct/ap/internal/model/Annotation.java
View File

@ -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.

6
processor/src/main/java/org/mapstruct/ap/model/AnnotationMapperReference.java → processor/src/main/java/org/mapstruct/ap/internal/model/AnnotationMapperReference.java
View File

@ -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.

13
processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java → processor/src/main/java/org/mapstruct/ap/internal/model/AssignmentFactory.java
View File

@ -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

38
processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
View File

@ -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

2
processor/src/main/java/org/mapstruct/ap/model/Constructor.java → processor/src/main/java/org/mapstruct/ap/internal/model/Constructor.java
View File

@ -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

14
processor/src/main/java/org/mapstruct/ap/model/Decorator.java → processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java
View File

@ -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.

6
processor/src/main/java/org/mapstruct/ap/model/DecoratorConstructor.java → processor/src/main/java/org/mapstruct/ap/internal/model/DecoratorConstructor.java
View File

@ -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.

10
processor/src/main/java/org/mapstruct/ap/model/DefaultMapperReference.java → processor/src/main/java/org/mapstruct/ap/internal/model/DefaultMapperReference.java
View File

@ -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

4
processor/src/main/java/org/mapstruct/ap/model/DelegatingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/DelegatingMethod.java
View File

@ -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.

9
processor/src/main/java/org/mapstruct/ap/model/Direct.java → processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java
View File

@ -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

20
processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java
View File

@ -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

6
processor/src/main/java/org/mapstruct/ap/model/Field.java → processor/src/main/java/org/mapstruct/ap/internal/model/Field.java
View File

@ -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.

14
processor/src/main/java/org/mapstruct/ap/model/GeneratedType.java → processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java
View File

@ -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.

24
processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/IterableMappingMethod.java
View File

@ -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

14
processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackFactory.java → processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackFactory.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/model/LifecycleCallbackMethodReference.java → processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleCallbackMethodReference.java
View File

@ -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}.

22
processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/model/Mapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/Mapper.java
View File

@ -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

4
processor/src/main/java/org/mapstruct/ap/model/MapperReference.java → processor/src/main/java/org/mapstruct/ap/internal/model/MapperReference.java
View File

@ -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.

16
processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java → processor/src/main/java/org/mapstruct/ap/internal/model/MappingBuilderContext.java
View File

@ -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.

16
processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java
View File

@ -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.

14
processor/src/main/java/org/mapstruct/ap/model/MethodReference.java → processor/src/main/java/org/mapstruct/ap/internal/model/MethodReference.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/model/NestedPropertyMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java
View File

@ -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

46
processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
View File

@ -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

10
processor/src/main/java/org/mapstruct/ap/model/TypeConversion.java → processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java
View File

@ -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.
*

8
processor/src/main/java/org/mapstruct/ap/model/VirtualMappingMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/VirtualMappingMethod.java
View File

@ -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<Type> importTypes;

4
processor/src/main/java/org/mapstruct/ap/model/assignment/AdderWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AdderWrapper.java
View File

@ -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.

11
processor/src/main/java/org/mapstruct/ap/model/assignment/ArrayCopyWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java
View File

@ -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

4
processor/src/main/java/org/mapstruct/ap/model/assignment/Assignment.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/Assignment.java
View File

@ -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.

7
processor/src/main/java/org/mapstruct/ap/model/assignment/AssignmentWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/AssignmentWrapper.java
View File

@ -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.

6
processor/src/main/java/org/mapstruct/ap/model/assignment/GetterWrapperForCollectionsAndMaps.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/GetterWrapperForCollectionsAndMaps.java
View File

@ -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

5
processor/src/main/java/org/mapstruct/ap/model/assignment/LocalVarWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.java
View File

@ -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.

4
processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NewCollectionOrMapWrapper.java
View File

@ -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

2
processor/src/main/java/org/mapstruct/ap/model/assignment/NullCheckWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/NullCheckWrapper.java
View File

@ -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.

5
processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapper.java
View File

@ -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.

7
processor/src/main/java/org/mapstruct/ap/model/assignment/SetterWrapperForCollectionsAndMaps.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/SetterWrapperForCollectionsAndMaps.java
View File

@ -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.

5
processor/src/main/java/org/mapstruct/ap/model/assignment/UpdateWrapper.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.java
View File

@ -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.

2
processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java → processor/src/main/java/org/mapstruct/ap/internal/model/assignment/package-info.java
View File

@ -25,4 +25,4 @@
* </ul>
* 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;

2
processor/src/main/java/org/mapstruct/ap/model/common/Accessibility.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java
View File

@ -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;

2
processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java
View File

@ -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;

6
processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidationResult.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidationResult.java
View File

@ -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

2
processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidator.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidator.java
View File

@ -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

8
processor/src/main/java/org/mapstruct/ap/model/common/DateFormatValidatorFactory.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java
View File

@ -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}. <p> Based on the types of source / target type a specific {@link

7
processor/src/main/java/org/mapstruct/ap/model/common/DefaultConversionContext.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java
View File

@ -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.

8
processor/src/main/java/org/mapstruct/ap/model/common/ModelElement.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/ModelElement.java
View File

@ -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

4
processor/src/main/java/org/mapstruct/ap/model/common/Parameter.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/Parameter.java
View File

@ -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.

12
processor/src/main/java/org/mapstruct/ap/model/common/Type.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -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.

14
processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
View File

@ -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.

2
processor/src/main/java/org/mapstruct/ap/model/common/package-info.java → processor/src/main/java/org/mapstruct/ap/internal/model/common/package-info.java
View File

@ -21,4 +21,4 @@
* Contains types which are shared between the intermediary mapping method model ("source model") and the mapper model.
* </p>
*/
package org.mapstruct.ap.model.common;
package org.mapstruct.ap.internal.model.common;

2
processor/src/main/java/org/mapstruct/ap/model/dependency/GraphAnalyzer.java → processor/src/main/java/org/mapstruct/ap/internal/model/dependency/GraphAnalyzer.java
View File

@ -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;

2
processor/src/main/java/org/mapstruct/ap/model/dependency/Node.java → processor/src/main/java/org/mapstruct/ap/internal/model/dependency/Node.java
View File

@ -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;

2
processor/src/main/java/org/mapstruct/ap/model/package-info.java → processor/src/main/java/org/mapstruct/ap/internal/model/package-info.java
View File

@ -22,4 +22,4 @@
* using FreeMarker templates.
* </p>
*/
package org.mapstruct.ap.model;
package org.mapstruct.ap.internal.model;

12
processor/src/main/java/org/mapstruct/ap/model/source/BeanMapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMapping.java
View File

@ -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;
/**

2
processor/src/main/java/org/mapstruct/ap/model/source/EnumMapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/EnumMapping.java
View File

@ -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.

14
processor/src/main/java/org/mapstruct/ap/model/source/ForgedMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java
View File

@ -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.

11
processor/src/main/java/org/mapstruct/ap/model/source/IterableMapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java
View File

@ -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}.

11
processor/src/main/java/org/mapstruct/ap/model/source/MapMapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java
View File

@ -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}.

14
processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/Mapping.java
View File

@ -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}.

6
processor/src/main/java/org/mapstruct/ap/model/source/MappingOptions.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java
View File

@ -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

12
processor/src/main/java/org/mapstruct/ap/model/source/Method.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java
View File

@ -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:

12
processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java
View File

@ -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:

22
processor/src/main/java/org/mapstruct/ap/model/source/SourceMethod.java → processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More