diff --git a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java index 0246e16f1..3e2944ff2 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java @@ -39,13 +39,11 @@ public class BeanMappingMethod extends MappingMethod { private final List propertyMappings; private final FactoryMethod factoryMethod; - private final boolean hasFactoryMethod; public BeanMappingMethod(Method method, List propertyMappings, FactoryMethod factoryMethod) { super( method ); this.propertyMappings = propertyMappings; this.factoryMethod = factoryMethod; - this.hasFactoryMethod = factoryMethod != null; } public List getPropertyMappings() { @@ -64,7 +62,6 @@ public class BeanMappingMethod extends MappingMethod { } } } - return mappingsByParameter; } @@ -79,10 +76,6 @@ public class BeanMappingMethod extends MappingMethod { return types; } - public boolean isHasFactoryMethod() { - return this.hasFactoryMethod; - } - public FactoryMethod getFactoryMethod() { return this.factoryMethod; } diff --git a/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl index 00155f5d6..72b86bbf8 100644 --- a/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl +++ b/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl @@ -25,7 +25,7 @@ public <@includeModel object=returnType/> ${name}(<#list parameters as param><@i } <#if !existingInstanceMapping> - ${resultType.name} ${resultName} = <#if hasFactoryMethod><@includeModel object=factoryMethod/><#else>new ${resultType.name}(); + ${resultType.name} ${resultName} = <#if factoryMethod??><@includeModel object=factoryMethod/><#else>new ${resultType.name}(); <#if (sourceParameters?size > 1)> <#list sourceParameters as sourceParam>