Polish

filiphr · filiphr · commit e34abec139ff · 2024-09-02T10:15:24.000+02:00
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ContainerMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ContainerMappingMethod.java
@@ -47,6 +47,7 @@ public abstract class ContainerMappingMethod extends NormalTypeMappingMethod {
         this.elementAssignment = parameterAssignment;
         this.loopVariableName = loopVariableName;
         this.selectionParameters = selectionParameters != null ? selectionParameters : SelectionParameters.empty();
+
         this.index1Name = Strings.getSafeVariableName( "i", existingVariables );
         this.index2Name = Strings.getSafeVariableName( "j", existingVariables );
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
@@ -317,10 +317,6 @@ public Type getImplementationType() {
         return implementationType != null ? implementationType.getType() : null;
     }
 
-    public String getFactoryMethodName() {
-        return implementationType != null ? implementationType.getFactoryMethodName() : null;
-    }
-
     public ImplementationType getImplementation() {
         return implementationType;
     }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
@@ -91,7 +91,6 @@ public class TypeFactory {
     private final TypeUtils typeUtils;
     private final FormattingMessager messager;
     private final RoundContext roundContext;
-    private final VersionInformation versionInformation;
 
     private final TypeMirror iterableType;
     private final TypeMirror collectionType;
@@ -111,7 +110,6 @@ public TypeFactory(ElementUtils elementUtils, TypeUtils typeUtils, FormattingMes
         this.typeUtils = typeUtils;
         this.messager = messager;
         this.roundContext = roundContext;
-        this.versionInformation = versionInformation;
         this.notToBeImportedTypes = notToBeImportedTypes;
 
         iterableType = typeUtils.erasure( elementUtils.getTypeElement( Iterable.class.getCanonicalName() ).asType() );
@@ -125,9 +123,10 @@ public TypeFactory(ElementUtils elementUtils, TypeUtils typeUtils, FormattingMes
         implementationTypes.put( Collection.class.getName(), withInitialCapacity( getType( ArrayList.class ) ) );
         implementationTypes.put( List.class.getName(), withInitialCapacity( getType( ArrayList.class ) ) );
 
+        boolean sourceVersionAtLeast19 = versionInformation.isSourceVersionAtLeast19();
         implementationTypes.put(
             Set.class.getName(),
-            isSourceVersionAtLeast19() ?
+            sourceVersionAtLeast19 ?
                 withFactoryMethod( getType( LinkedHashSet.class ), LINKED_HASH_SET_FACTORY_METHOD_NAME ) :
                 withLoadFactorAdjustment( getType( LinkedHashSet.class ) )
         );
@@ -136,7 +135,7 @@ public TypeFactory(ElementUtils elementUtils, TypeUtils typeUtils, FormattingMes
 
         implementationTypes.put(
             Map.class.getName(),
-            isSourceVersionAtLeast19() ?
+            sourceVersionAtLeast19 ?
                 withFactoryMethod( getType( LinkedHashMap.class ), LINKED_HASH_MAP_FACTORY_METHOD_NAME ) :
                 withLoadFactorAdjustment( getType( LinkedHashMap.class ) )
         );
@@ -480,10 +479,6 @@ private boolean isExecutableType(TypeMirror accessorType) {
         return accessorType.getKind() == TypeKind.EXECUTABLE;
     }
 
-    private boolean isSourceVersionAtLeast19() {
-        return versionInformation != null && versionInformation.isSourceVersionAtLeast19();
-    }
-
     public Type getReturnType(ExecutableType method) {
         return getType( method.getReturnType() );
     }
diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/IterableCreation.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/IterableCreation.ftl
@@ -11,15 +11,15 @@
         <@includeModel object=factoryMethod targetType=resultType/>
     <#elseif enumSet>
         EnumSet.noneOf( <@includeModel object=enumSetElementType raw=true/>.class )
-    <#elseif resultType.implementationType?? && resultType.factoryMethodName?? && ext.useSizeIfPossible?? && ext.useSizeIfPossible && canUseSize>
-        <@includeModel object=resultType.implementationType raw=true />.${resultType.factoryMethodName}( <@iterableSize /> )
-    <#else>
-    new
-        <#if resultType.implementationType??>
-            <@includeModel object=resultType.implementationType/><#if ext.useSizeIfPossible?? && ext.useSizeIfPossible && canUseSize>( <@sizeForCreation /> )<#else>()</#if>
+    <#elseif resultType.implementation??>
+        <#if resultType.implementation.factoryMethodName?? && ext.useSizeIfPossible?? && ext.useSizeIfPossible && canUseSize>
+            <@includeModel object=resultType.implementationType raw=true />.${resultType.implementation.factoryMethodName}( <@sizeForCreation /> )
         <#else>
-            <@includeModel object=resultType/>()</#if>
+            new <@includeModel object=resultType.implementationType/><#if ext.useSizeIfPossible?? && ext.useSizeIfPossible && canUseSize>( <@sizeForCreation /> )<#else>()</#if>
         </#if>
+    <#else>
+    new <@includeModel object=resultType/>()
+    </#if>
 </@compress>
 <#macro sizeForCreation>
     <@compress single_line=true>

Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,6 @@ public Type getImplementationType() {`
`317`	`317`	`return implementationType != null ? implementationType.getType() : null;`
`318`	`318`	`}`
`319`	`319`
`320`		`- public String getFactoryMethodName() {`
`321`		`- return implementationType != null ? implementationType.getFactoryMethodName() : null;`
`322`		`- }`
`323`		`-`
`324`	`320`	`public ImplementationType getImplementation() {`
`325`	`321`	`return implementationType;`
`326`	`322`	`}`