From b5e18b54fcae4beeb84d065441e03dc6cf4ab73e Mon Sep 17 00:00:00 2001 From: sjaakd Date: Wed, 2 Jul 2014 21:17:34 +0200 Subject: [PATCH] #255 avoid empty if check due to the introduction of constants in bean mapping --- .../org.mapstruct.ap.model.BeanMappingMethod.ftl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 54301f3ff..eb98b7ba6 100644 --- a/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl +++ b/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl @@ -27,11 +27,13 @@ <#if !existingInstanceMapping><@includeModel object=resultType/> ${resultName} = <#if factoryMethod??><@includeModel object=factoryMethod targetType=resultType raw=true/><#else>new <@includeModel object=resultType/>(); <#if (sourceParameters?size > 1)> <#list sourceParameters as sourceParam> - if ( ${sourceParam.name} != null ) { - <#list propertyMappingsByParameter[sourceParam.name] as propertyMapping> - <@includeModel object=propertyMapping targetBeanName=resultName existingInstanceMapping=existingInstanceMapping/> - - } + <#if (propertyMappingsByParameter[sourceParam.name]?size > 0)> + if ( ${sourceParam.name} != null ) { + <#list propertyMappingsByParameter[sourceParam.name] as propertyMapping> + <@includeModel object=propertyMapping targetBeanName=resultName existingInstanceMapping=existingInstanceMapping/> + + } + <#else> <#list propertyMappingsByParameter[sourceParameters[0].name] as propertyMapping>