From 2b36c220a3ec1adbe855fd03abdc899c2c589fd7 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Sat, 25 Jan 2020 08:06:06 +0100 Subject: [PATCH] #1998 preparation move classes to new names 1 --- .../conversion/CreateDecimalFormat.java | 6 ++-- .../internal/model/AbstractBaseBuilder.java | 4 +-- .../model/AbstractMappingMethodBuilder.java | 4 +-- .../ap/internal/model/BeanMappingMethod.java | 14 ++++---- .../model/BuilderFinisherMethodResolver.java | 4 +-- .../ap/internal/model/ForgedMethod.java | 8 ++--- .../ap/internal/model/HelperMethod.java | 4 +-- .../ap/internal/model/PropertyMapping.java | 10 +++--- .../model/beanmapping/TargetReference.java | 6 ++-- ...anMapping.java => BeanMappingOptions.java} | 20 +++++------ ...pping.java => IterableMappingOptions.java} | 12 +++---- ...MapMapping.java => MapMappingOptions.java} | 14 ++++---- .../source/MapperOptions.java} | 10 +++--- ...Options.java => MappingMethodOptions.java} | 34 +++++++++---------- .../ap/internal/model/source/Method.java | 6 ++-- .../internal/model/source/SourceMethod.java | 34 +++++++++---------- .../model/source/builtin/BuiltInMethod.java | 10 +++--- ...nnotationBasedComponentModelProcessor.java | 4 +-- .../processor/MapperCreationProcessor.java | 32 ++++++++--------- .../processor/MapperServiceProcessor.java | 4 +-- .../processor/MethodRetrievalProcessor.java | 26 +++++++------- 21 files changed, 133 insertions(+), 133 deletions(-) rename processor/src/main/java/org/mapstruct/ap/internal/model/source/{BeanMapping.java => BeanMappingOptions.java} (91%) rename processor/src/main/java/org/mapstruct/ap/internal/model/source/{IterableMapping.java => IterableMappingOptions.java} (85%) rename processor/src/main/java/org/mapstruct/ap/internal/model/source/{MapMapping.java => MapMappingOptions.java} (88%) rename processor/src/main/java/org/mapstruct/ap/internal/{util/MapperConfiguration.java => model/source/MapperOptions.java} (97%) rename processor/src/main/java/org/mapstruct/ap/internal/model/source/{MappingOptions.java => MappingMethodOptions.java} (85%) diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/CreateDecimalFormat.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CreateDecimalFormat.java index 9fe0c5b33..59f85d6b2 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/CreateDecimalFormat.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/CreateDecimalFormat.java @@ -14,7 +14,7 @@ import org.mapstruct.ap.internal.model.HelperMethod; 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.MappingOptions; +import org.mapstruct.ap.internal.model.source.MappingMethodOptions; /** * HelperMethod that creates a {@link java.text.DecimalFormat} @@ -52,7 +52,7 @@ public class CreateDecimalFormat extends HelperMethod { } @Override - public MappingOptions getMappingOptions() { - return MappingOptions.empty(); + public MappingMethodOptions getMappingOptions() { + return MappingMethodOptions.empty(); } } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractBaseBuilder.java b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractBaseBuilder.java index b030f41c3..b2d13dede 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractBaseBuilder.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractBaseBuilder.java @@ -13,7 +13,7 @@ import org.mapstruct.ap.internal.model.common.SourceRHS; import org.mapstruct.ap.internal.model.common.Type; import org.mapstruct.ap.internal.model.source.MappingMethodUtils; import org.mapstruct.ap.internal.model.source.Method; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; import org.mapstruct.ap.internal.util.Message; /** @@ -60,7 +60,7 @@ class AbstractBaseBuilder> { } private boolean isDisableSubMappingMethodsGeneration() { - MapperConfiguration configuration = MapperConfiguration.getInstanceOn( ctx.getMapperTypeElement() ); + MapperOptions configuration = MapperOptions.getInstanceOn( ctx.getMapperTypeElement() ); return configuration.isDisableSubMappingMethodsGeneration(); } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java index 69dad8e0c..f9c53891c 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java @@ -8,7 +8,7 @@ package org.mapstruct.ap.internal.model; import org.mapstruct.ap.internal.model.common.Assignment; import org.mapstruct.ap.internal.model.common.SourceRHS; import org.mapstruct.ap.internal.model.common.Type; -import org.mapstruct.ap.internal.model.source.BeanMapping; +import org.mapstruct.ap.internal.model.source.BeanMappingOptions; import org.mapstruct.ap.internal.util.Strings; import static org.mapstruct.ap.internal.model.ForgedMethod.forElementMapping; @@ -58,7 +58,7 @@ public abstract class AbstractMappingMethodBuilder ignoreUnmappedSourceProperties, BuilderPrism builder, - AnnotationMirror mirror) { + private BeanMappingOptions(SelectionParameters selectionParameters, NullValueMappingStrategyPrism nvms, + NullValuePropertyMappingStrategyPrism nvpms, NullValueCheckStrategyPrism nvcs, + ReportingPolicyPrism reportingPolicy, boolean ignoreByDefault, + List ignoreUnmappedSourceProperties, BuilderPrism builder, + AnnotationMirror mirror) { this.selectionParameters = selectionParameters; this.nullValueMappingStrategy = nvms; this.nullValuePropertyMappingStrategy = nvpms; diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMappingOptions.java similarity index 85% rename from processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMappingOptions.java index 0f000ec74..75fcf84e8 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMappingOptions.java @@ -21,15 +21,15 @@ import org.mapstruct.ap.internal.util.Message; * * @author Gunnar Morling */ -public class IterableMapping { +public class IterableMappingOptions { private final SelectionParameters selectionParameters; private final FormattingParameters formattingParameters; private final AnnotationMirror mirror; private final NullValueMappingStrategyPrism nullValueMappingStrategy; - public static IterableMapping fromPrism(IterableMappingPrism iterableMapping, ExecutableElement method, - FormattingMessager messager, Types typeUtils) { + public static IterableMappingOptions fromPrism(IterableMappingPrism iterableMapping, ExecutableElement method, + FormattingMessager messager, Types typeUtils) { if ( iterableMapping == null ) { return null; } @@ -66,15 +66,15 @@ public class IterableMapping { method ); - return new IterableMapping( formatting, + return new IterableMappingOptions( formatting, selection, iterableMapping.mirror, nullValueMappingStrategy ); } - private IterableMapping(FormattingParameters formattingParameters, SelectionParameters selectionParameters, - AnnotationMirror mirror, NullValueMappingStrategyPrism nvms) { + private IterableMappingOptions(FormattingParameters formattingParameters, SelectionParameters selectionParameters, + AnnotationMirror mirror, NullValueMappingStrategyPrism nvms) { this.formattingParameters = formattingParameters; this.selectionParameters = selectionParameters; diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMappingOptions.java similarity index 88% rename from processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMappingOptions.java index 5bbc704d3..62c827b5a 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMappingOptions.java @@ -21,7 +21,7 @@ import org.mapstruct.ap.internal.util.Message; * * @author Gunnar Morling */ -public class MapMapping { +public class MapMappingOptions { private final SelectionParameters keySelectionParameters; private final SelectionParameters valueSelectionParameters; @@ -30,8 +30,8 @@ public class MapMapping { private final AnnotationMirror mirror; private final NullValueMappingStrategyPrism nullValueMappingStrategy; - public static MapMapping fromPrism(MapMappingPrism mapMapping, ExecutableElement method, - FormattingMessager messager, Types typeUtils) { + public static MapMappingOptions fromPrism(MapMappingPrism mapMapping, ExecutableElement method, + FormattingMessager messager, Types typeUtils) { if ( mapMapping == null ) { return null; } @@ -89,7 +89,7 @@ public class MapMapping { method ); - return new MapMapping( + return new MapMappingOptions( keyFormatting, keySelection, valueFormatting, @@ -99,9 +99,9 @@ public class MapMapping { ); } - private MapMapping(FormattingParameters keyFormatting, SelectionParameters keySelectionParameters, - FormattingParameters valueFormatting, SelectionParameters valueSelectionParameters, AnnotationMirror mirror, - NullValueMappingStrategyPrism nvms ) { + private MapMappingOptions(FormattingParameters keyFormatting, SelectionParameters keySelectionParameters, + FormattingParameters valueFormatting, SelectionParameters valueSelectionParameters, AnnotationMirror mirror, + NullValueMappingStrategyPrism nvms ) { this.keyFormattingParameters = keyFormatting; this.keySelectionParameters = keySelectionParameters; this.valueFormattingParameters = valueFormatting; diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapperOptions.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MapperOptions.java index 5eb542758..1039e412f 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MapperOptions.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package org.mapstruct.ap.internal.util; +package org.mapstruct.ap.internal.model.source; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -36,17 +36,17 @@ import org.mapstruct.ap.internal.prism.ReportingPolicyPrism; * * @author Sjaak Derksen */ -public class MapperConfiguration { +public class MapperOptions { private final MapperPrism mapperPrism; private final MapperConfigPrism mapperConfigPrism; private final DeclaredType config; - public static MapperConfiguration getInstanceOn(Element e) { - return new MapperConfiguration( MapperPrism.getInstanceOn( e ) ); + public static MapperOptions getInstanceOn(Element e) { + return new MapperOptions( MapperPrism.getInstanceOn( e ) ); } - private MapperConfiguration(MapperPrism mapperPrism) { + private MapperOptions(MapperPrism mapperPrism) { this.mapperPrism = mapperPrism; if ( mapperPrism.values.config() != null ) { diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java similarity index 85% rename from processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java rename to processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java index 30f406082..2786e221b 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingOptions.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java @@ -24,8 +24,8 @@ import static org.mapstruct.ap.internal.model.source.Mapping.getMappingTargetNam * * @author Andreas Gudian */ -public class MappingOptions { - private static final MappingOptions EMPTY = new MappingOptions( Collections.emptySet(), +public class MappingMethodOptions { + private static final MappingMethodOptions EMPTY = new MappingMethodOptions( Collections.emptySet(), null, null, null, @@ -33,14 +33,14 @@ public class MappingOptions { ); private Set mappings; - private IterableMapping iterableMapping; - private MapMapping mapMapping; - private BeanMapping beanMapping; + private IterableMappingOptions iterableMapping; + private MapMappingOptions mapMapping; + private BeanMappingOptions beanMapping; private List valueMappings; private boolean fullyInitialized; - public MappingOptions(Set mappings, IterableMapping iterableMapping, MapMapping mapMapping, - BeanMapping beanMapping, List valueMappings ) { + public MappingMethodOptions(Set mappings, IterableMappingOptions iterableMapping, MapMappingOptions mapMapping, + BeanMappingOptions beanMapping, List valueMappings ) { this.mappings = mappings; this.iterableMapping = iterableMapping; this.mapMapping = mapMapping; @@ -53,7 +53,7 @@ public class MappingOptions { * * @return empty mapping options */ - public static MappingOptions empty() { + public static MappingMethodOptions empty() { return EMPTY; } @@ -65,15 +65,15 @@ public class MappingOptions { return mappings; } - public IterableMapping getIterableMapping() { + public IterableMappingOptions getIterableMapping() { return iterableMapping; } - public MapMapping getMapMapping() { + public MapMappingOptions getMapMapping() { return mapMapping; } - public BeanMapping getBeanMapping() { + public BeanMappingOptions getBeanMapping() { return beanMapping; } @@ -81,15 +81,15 @@ public class MappingOptions { return valueMappings; } - public void setIterableMapping(IterableMapping iterableMapping) { + public void setIterableMapping(IterableMappingOptions iterableMapping) { this.iterableMapping = iterableMapping; } - public void setMapMapping(MapMapping mapMapping) { + public void setMapMapping(MapMappingOptions mapMapping) { this.mapMapping = mapMapping; } - public void setBeanMapping(BeanMapping beanMapping) { + public void setBeanMapping(BeanMappingOptions beanMapping) { this.beanMapping = beanMapping; } @@ -117,7 +117,7 @@ public class MappingOptions { * @param method the source method */ public void applyInheritedOptions(SourceMethod templateMethod, boolean isInverse, SourceMethod method ) { - MappingOptions inherited = templateMethod.getMappingOptions(); + MappingMethodOptions inherited = templateMethod.getMappingOptions(); if ( null != inherited ) { if ( getIterableMapping() == null && inherited.getIterableMapping() != null) { setIterableMapping( inherited.getIterableMapping() ); @@ -128,7 +128,7 @@ public class MappingOptions { } if ( getBeanMapping() == null && inherited.getBeanMapping() != null ) { - setBeanMapping( BeanMapping.forInheritance( inherited.getBeanMapping() ) ); + setBeanMapping( BeanMappingOptions.forInheritance( inherited.getBeanMapping() ) ); } if ( getValueMappings() == null ) { @@ -179,7 +179,7 @@ public class MappingOptions { if ( !method.isUpdateMethod() ) { writeType = typeFactory.effectiveResultTypeFor( writeType, - BeanMapping.builderPrismFor( method ) + BeanMappingOptions.builderPrismFor( method ) ); } Map writeAccessors = writeType.getPropertyWriteAccessors( cms ); diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java index 5ed6f485d..cf122fe2d 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/Method.java @@ -13,7 +13,7 @@ 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; +import org.mapstruct.ap.internal.util.MapperOptions; /** * This interface makes available common method properties and a matching method There are 2 known implementors: @@ -168,7 +168,7 @@ public interface Method { * * @return the mapper config when this method needs to be implemented */ - MapperConfiguration getMapperConfiguration(); + MapperOptions getMapperConfiguration(); /** * @return {@code true}, if the method represents a mapping lifecycle callback (Before/After mapping method) @@ -185,7 +185,7 @@ public interface Method { * * @return the mapping options for this method */ - MappingOptions getMappingOptions(); + MappingMethodOptions getMappingOptions(); /** * diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java index ae6760ae2..0de68bd51 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/SourceMethod.java @@ -20,7 +20,7 @@ import org.mapstruct.ap.internal.model.common.Type; import org.mapstruct.ap.internal.model.common.TypeFactory; import org.mapstruct.ap.internal.prism.ObjectFactoryPrism; import org.mapstruct.ap.internal.util.Executables; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; import org.mapstruct.ap.internal.util.Strings; import static org.mapstruct.ap.internal.model.source.MappingMethodUtils.isEnumMapping; @@ -31,7 +31,7 @@ import static org.mapstruct.ap.internal.util.Collections.first; * type. *

* A method can either be configured by itself or by another method for the inverse mapping direction (the appropriate - * setter on {@link MappingOptions} will be called in this case). + * setter on {@link MappingMethodOptions} will be called in this case). * * @author Gunnar Morling */ @@ -49,8 +49,8 @@ public class SourceMethod implements Method { private final Type returnType; private final Accessibility accessibility; private final List exceptionTypes; - private final MapperConfiguration config; - private final MappingOptions mappingOptions; + private final MapperOptions config; + private final MappingMethodOptions mappingOptions; private final List prototypeMethods; private final Type mapperToImplement; @@ -78,12 +78,12 @@ public class SourceMethod implements Method { private Type returnType = null; private List exceptionTypes; private Set mappings; - private IterableMapping iterableMapping = null; - private MapMapping mapMapping = null; - private BeanMapping beanMapping = null; + private IterableMappingOptions iterableMapping = null; + private MapMappingOptions mapMapping = null; + private BeanMappingOptions beanMapping = null; private Types typeUtils; private TypeFactory typeFactory = null; - private MapperConfiguration mapperConfig = null; + private MapperOptions mapperConfig = null; private List prototypeMethods = Collections.emptyList(); private List valueMappings; private ParameterProvidedMethods contextProvidedMethods; @@ -118,17 +118,17 @@ public class SourceMethod implements Method { return this; } - public Builder setIterableMapping(IterableMapping iterableMapping) { + public Builder setIterableMapping(IterableMappingOptions iterableMapping) { this.iterableMapping = iterableMapping; return this; } - public Builder setMapMapping(MapMapping mapMapping) { + public Builder setMapMapping(MapMappingOptions mapMapping) { this.mapMapping = mapMapping; return this; } - public Builder setBeanMapping(BeanMapping beanMapping) { + public Builder setBeanMapping(BeanMappingOptions beanMapping) { this.beanMapping = beanMapping; return this; } @@ -148,7 +148,7 @@ public class SourceMethod implements Method { return this; } - public Builder setMapperConfiguration(MapperConfiguration mapperConfig) { + public Builder setMapperConfiguration(MapperOptions mapperConfig) { this.mapperConfig = mapperConfig; return this; } @@ -174,14 +174,14 @@ public class SourceMethod implements Method { mappings = Collections.emptySet(); } - MappingOptions mappingOptions = - new MappingOptions( mappings, iterableMapping, mapMapping, beanMapping, valueMappings ); + MappingMethodOptions mappingOptions = + new MappingMethodOptions( mappings, iterableMapping, mapMapping, beanMapping, valueMappings ); return new SourceMethod( this, mappingOptions ); } } - private SourceMethod(Builder builder, MappingOptions mappingOptions) { + private SourceMethod(Builder builder, MappingMethodOptions mappingOptions) { this.declaringMapper = builder.declaringMapper; this.executable = builder.executable; this.parameters = builder.parameters; @@ -463,7 +463,7 @@ public class SourceMethod implements Method { } @Override - public MappingOptions getMappingOptions() { + public MappingMethodOptions getMappingOptions() { return mappingOptions; } @@ -483,7 +483,7 @@ public class SourceMethod implements Method { } @Override - public MapperConfiguration getMapperConfiguration() { + public MapperOptions getMapperConfiguration() { return config; } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java index bbfafcbfb..3fdfd0eea 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/BuiltInMethod.java @@ -16,10 +16,10 @@ 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.MappingOptions; +import org.mapstruct.ap.internal.model.source.MappingMethodOptions; import org.mapstruct.ap.internal.model.source.Method; import org.mapstruct.ap.internal.model.source.ParameterProvidedMethods; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; import org.mapstruct.ap.internal.util.Strings; import static org.mapstruct.ap.internal.util.Collections.first; @@ -255,7 +255,7 @@ public abstract class BuiltInMethod implements Method { } @Override - public MapperConfiguration getMapperConfiguration() { + public MapperOptions getMapperConfiguration() { return null; } @@ -270,8 +270,8 @@ public abstract class BuiltInMethod implements Method { } @Override - public MappingOptions getMappingOptions() { - return MappingOptions.empty(); + public MappingMethodOptions getMappingOptions() { + return MappingMethodOptions.empty(); } public BuiltInFieldReference getFieldReference() { diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java index 8cd9a21c0..17707d446 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java @@ -24,7 +24,7 @@ import org.mapstruct.ap.internal.model.MapperReference; import org.mapstruct.ap.internal.model.common.Type; import org.mapstruct.ap.internal.model.common.TypeFactory; import org.mapstruct.ap.internal.prism.InjectionStrategyPrism; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; /** * An {@link ModelElementProcessor} which converts the given {@link Mapper} object into an annotation based component @@ -42,7 +42,7 @@ public abstract class AnnotationBasedComponentModelProcessor implements ModelEle public Mapper process(ProcessorContext context, TypeElement mapperTypeElement, Mapper mapper) { this.typeFactory = context.getTypeFactory(); - MapperConfiguration mapperConfiguration = MapperConfiguration.getInstanceOn( mapperTypeElement ); + MapperOptions mapperConfiguration = MapperOptions.getInstanceOn( mapperTypeElement ); String componentModel = mapperConfiguration.componentModel( context.getOptions() ); InjectionStrategyPrism injectionStrategy = mapperConfiguration.getInjectionStrategy( context.getOptions() ); diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java index f5d924002..c67780de4 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java @@ -40,8 +40,8 @@ import org.mapstruct.ap.internal.model.ValueMappingMethod; import org.mapstruct.ap.internal.model.common.FormattingParameters; 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.MappingOptions; +import org.mapstruct.ap.internal.model.source.BeanMappingOptions; +import org.mapstruct.ap.internal.model.source.MappingMethodOptions; import org.mapstruct.ap.internal.model.source.Method; import org.mapstruct.ap.internal.model.source.SelectionParameters; import org.mapstruct.ap.internal.model.source.SourceMethod; @@ -56,7 +56,7 @@ import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism; import org.mapstruct.ap.internal.processor.creation.MappingResolverImpl; import org.mapstruct.ap.internal.util.AccessorNamingUtils; import org.mapstruct.ap.internal.util.FormattingMessager; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; import org.mapstruct.ap.internal.util.Message; import org.mapstruct.ap.internal.util.Strings; import org.mapstruct.ap.internal.version.VersionInformation; @@ -93,7 +93,7 @@ public class MapperCreationProcessor implements ModelElementProcessor mapperReferences = initReferencedMappers( mapperTypeElement, mapperConfig ); MappingBuilderContext ctx = new MappingBuilderContext( @@ -126,7 +126,7 @@ public class MapperCreationProcessor implements ModelElementProcessor initReferencedMappers(TypeElement element, MapperConfiguration mapperConfig) { + private List initReferencedMappers(TypeElement element, MapperOptions mapperConfig) { List result = new LinkedList<>(); List variableNames = new LinkedList<>(); @@ -145,7 +145,7 @@ public class MapperCreationProcessor implements ModelElementProcessor methods) { + private Mapper getMapper(TypeElement element, MapperOptions mapperConfig, List methods) { List mappingMethods = getMappingMethods( mapperConfig, methods ); mappingMethods.addAll( mappingContext.getUsedSupportedMappings() ); @@ -257,7 +257,7 @@ public class MapperCreationProcessor implements ModelElementProcessor getExtraImports(TypeElement element) { SortedSet extraImports = new TreeSet<>(); - MapperConfiguration mapperConfiguration = MapperConfiguration.getInstanceOn( element ); + MapperOptions mapperConfiguration = MapperOptions.getInstanceOn( element ); for ( TypeMirror extraImport : mapperConfiguration.imports() ) { Type type = typeFactory.getType( extraImport ); @@ -272,7 +272,7 @@ public class MapperCreationProcessor implements ModelElementProcessor getMappingMethods(MapperConfiguration mapperConfig, List methods) { + private List getMappingMethods(MapperOptions mapperConfig, List methods) { List mappingMethods = new ArrayList<>(); for ( SourceMethod method : methods ) { @@ -282,7 +282,7 @@ public class MapperCreationProcessor implements ModelElementProcessor() ); - MappingOptions mappingOptions = method.getMappingOptions(); + MappingMethodOptions mappingOptions = method.getMappingOptions(); boolean hasFactoryMethod = false; @@ -360,7 +360,7 @@ public class MapperCreationProcessor implements ModelElementProcessor M createWithElementMappingMethod(SourceMethod method, - MappingOptions mappingOptions, ContainerMappingMethodBuilder builder) { + MappingMethodOptions mappingOptions, ContainerMappingMethodBuilder builder) { FormattingParameters formattingParameters = null; SelectionParameters selectionParameters = null; @@ -408,7 +408,7 @@ public class MapperCreationProcessor implements ModelElementProcessor availableMethods, List initializingMethods) { if ( initializingMethods.contains( method ) ) { // cycle detected @@ -424,7 +424,7 @@ public class MapperCreationProcessor implements ModelElementProcessor applicableReversePrototypeMethods = method.getApplicableReversePrototypeMethods(); SourceMethod inverseTemplateMethod = @@ -512,7 +512,7 @@ public class MapperCreationProcessor implements ModelElementProcessor rawMethods, SourceMethod method, List initializingMethods, - MapperConfiguration mapperConfig) { + MapperOptions mapperConfig) { SourceMethod resultMethod = null; InheritInverseConfigurationPrism inversePrism = InheritInverseConfigurationPrism.getInstanceOn( method.getExecutable() @@ -568,7 +568,7 @@ public class MapperCreationProcessor implements ModelElementProcessor rawMethods, - MapperConfiguration mapperConfig, + MapperOptions mapperConfig, List initializingMethods) { if ( resultMethod != null ) { if ( !resultMethod.getMappingOptions().isFullyInitialized() ) { @@ -589,7 +589,7 @@ public class MapperCreationProcessor implements ModelElementProcessor rawMethods, SourceMethod method, List initializingMethods, - MapperConfiguration mapperConfig) { + MapperOptions mapperConfig) { SourceMethod resultMethod = null; InheritConfigurationPrism forwardPrism = InheritConfigurationPrism.getInstanceOn( method.getExecutable() diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperServiceProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperServiceProcessor.java index a2b7cf747..967d13f5f 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperServiceProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperServiceProcessor.java @@ -15,7 +15,7 @@ import javax.tools.StandardLocation; import org.mapstruct.ap.internal.model.GeneratedType; import org.mapstruct.ap.internal.model.Mapper; import org.mapstruct.ap.internal.model.ServicesEntry; -import org.mapstruct.ap.internal.util.MapperConfiguration; +import org.mapstruct.ap.internal.util.MapperOptions; import org.mapstruct.ap.internal.writer.ModelWriter; /** @@ -37,7 +37,7 @@ public class MapperServiceProcessor implements ModelElementProcessor retrievePrototypeMethods(TypeElement mapperTypeElement, - MapperConfiguration mapperConfig) { + MapperOptions mapperConfig) { if ( mapperConfig.config() == null ) { return Collections.emptyList(); } @@ -149,7 +149,7 @@ public class MethodRetrievalProcessor implements ModelElementProcessor retrieveMethods(TypeElement usedMapper, TypeElement mapperToImplement, - MapperConfiguration mapperConfig, List prototypeMethods) { + MapperOptions mapperConfig, List prototypeMethods) { List methods = new ArrayList<>(); for ( ExecutableElement executable : getAllEnclosedExecutableElements( elementUtils, usedMapper ) ) { @@ -186,7 +186,7 @@ public class MethodRetrievalProcessor implements ModelElementProcessor prototypeMethods) { ExecutableType methodType = typeFactory.getMethodType( (DeclaredType) usedMapper.asType(), method ); @@ -219,7 +219,7 @@ public class MethodRetrievalProcessor implements ModelElementProcessor parameters, boolean containsTargetTypeParameter, - MapperConfiguration mapperConfig, + MapperOptions mapperConfig, List prototypeMethods, TypeElement mapperToImplement) { Type returnType = typeFactory.getReturnType( methodType ); @@ -253,16 +253,16 @@ public class MethodRetrievalProcessor implements ModelElementProcessor(), new HashSet<>() ) ) .setIterableMapping( - IterableMapping.fromPrism( + IterableMappingOptions.fromPrism( IterableMappingPrism.getInstanceOn( method ), method, messager, typeUtils ) ) .setMapMapping( - MapMapping.fromPrism( MapMappingPrism.getInstanceOn( method ), method, messager, typeUtils ) ) + MapMappingOptions.fromPrism( MapMappingPrism.getInstanceOn( method ), method, messager, typeUtils ) ) .setBeanMapping( - new BeanMapping.Builder() + new BeanMappingOptions.Builder() .beanMappingPrism( BeanMappingPrism.getInstanceOn( method ) ) .messager( messager ) .method( method ) @@ -280,7 +280,7 @@ public class MethodRetrievalProcessor implements ModelElementProcessor contextParameters, TypeElement mapperToImplement, MapperConfiguration mapperConfig) { + List contextParameters, TypeElement mapperToImplement, MapperOptions mapperConfig) { ParameterProvidedMethods.Builder builder = ParameterProvidedMethods.builder(); for ( Parameter contextParam : contextParameters ) {