From 3e8165145586afe5238b97ab3a65da75d50f6eca Mon Sep 17 00:00:00 2001
From: Andreas Gudian <agudian@apache.org>
Date: Sun, 28 Dec 2014 21:13:09 +0100
Subject: [PATCH] Minor formatting fixes of generated code

---
 .../org.mapstruct.ap.model.BeanMappingMethod.ftl          | 6 +++---
 .../resources/org.mapstruct.ap.model.GeneratedType.ftl    | 1 -
 .../org.mapstruct.ap.model.IterableMappingMethod.ftl      | 8 ++++----
 .../resources/org.mapstruct.ap.model.MapMappingMethod.ftl | 4 ++--
 4 files changed, 9 insertions(+), 10 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 a02209ed4..d40dfb390 100644
--- a/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl
+++ b/processor/src/main/resources/org.mapstruct.ap.model.BeanMappingMethod.ftl
@@ -19,7 +19,7 @@
 
 -->
 @Override
-<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) <@throws/> {
+<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>)<@throws/> {
     <#if !mapNullToDefault>
     if ( <#list sourceParametersExcludingPrimitives as sourceParam>${sourceParam.name} == null<#if sourceParam_has_next> && </#if></#list> ) {
         return<#if returnType.name != "void"> null</#if>;
@@ -61,10 +61,10 @@
 }
 <#macro throws>
     <@compress single_line=true>
-        <#if (thrownTypes?size > 0)>throws </#if>
+        <#if (thrownTypes?size > 0)> throws </#if>
         <#list thrownTypes as exceptionType>
             <@includeModel object=exceptionType/>
             <#if exceptionType_has_next>, </#if>
         </#list>
     </@compress>
-</#macro>
+</#macro>
\ No newline at end of file
diff --git a/processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl b/processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl
index 1c23da94b..21a0edb03 100644
--- a/processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl
+++ b/processor/src/main/resources/org.mapstruct.ap.model.GeneratedType.ftl
@@ -37,7 +37,6 @@ import ${importedType.importName};
 <#nt>    <@includeModel object=field/>
 </#list>
 <#list methods as method>
-
 <#nt>    <@includeModel object=method/>
 </#list>
 }
diff --git a/processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl
index 071f58783..ced6f2d23 100644
--- a/processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl
+++ b/processor/src/main/resources/org.mapstruct.ap.model.IterableMappingMethod.ftl
@@ -19,7 +19,7 @@
 
 -->
 <#if overridden>@Override</#if>
-<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) <@throws/> {
+<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>)<@throws/> {
     if ( ${sourceParameter.name} == null ) {
         <#if !mapNullToDefault>
             <#-- returned target type starts to miss-align here with target handed via param, TODO is this right? -->
@@ -48,7 +48,7 @@
 
     <#if resultType.arrayType>
         <#if !existingInstanceMapping>
-            <@includeModel object=resultElementType/>[] ${resultName} = new <@includeModel object=resultElementType/>[ <@iterableSize/> ];
+            <@includeModel object=resultElementType/>[] ${resultName} = new <@includeModel object=resultElementType/>[<@iterableSize/>];
         </#if>
         int ${index1Name} = 0;
         for ( <@includeModel object=sourceElementType/> ${loopVariableName} : ${sourceParameter.name} ) {
@@ -79,7 +79,7 @@
 }
 <#macro throws>
     <@compress single_line=true>
-        <#if (thrownTypes?size > 0)>throws </#if>
+        <#if (thrownTypes?size > 0)> throws </#if>
         <#list thrownTypes as exceptionType>
             <@includeModel object=exceptionType/>
             <#if exceptionType_has_next>, </#if>
@@ -117,4 +117,4 @@
             </#if>()
         </#if>
     </@compress>
-</#macro>
+</#macro>
\ No newline at end of file
diff --git a/processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl b/processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl
index 4ad30bfee..e55fd234a 100644
--- a/processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl
+++ b/processor/src/main/resources/org.mapstruct.ap.model.MapMappingMethod.ftl
@@ -19,7 +19,7 @@
 
 -->
 <#if overridden>@Override</#if>
-<#lt>${accessibility.keyword} <@includeModel object=returnType /> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) <@throws/> {
+<#lt>${accessibility.keyword} <@includeModel object=returnType /> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>)<@throws/> {
     if ( ${sourceParameter.name} == null ) {
         <#if !mapNullToDefault>
             return<#if returnType.name != "void"> null</#if>;
@@ -58,7 +58,7 @@
 }
 <#macro throws>
     <@compress single_line=true>
-        <#if (thrownTypes?size > 0)>throws </#if>
+        <#if (thrownTypes?size > 0)> throws </#if>
         <#list thrownTypes as exceptionType>
             <@includeModel object=exceptionType/>
             <#if exceptionType_has_next>, </#if>