#64 Removing superfluous indentations from templates; Each template can start with an indentation of 0 as it will be correctly indented automatically later on

This commit is contained in:
Gunnar Morling 2013-08-18 00:30:46 +02:00
parent 4a0141fb4b
commit 3e8ba36774
6 changed files with 139 additions and 140 deletions

View File

@ -18,31 +18,31 @@
limitations under the License.
-->
@Override
public ${returnType.name} ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( <#list sourceParameters as sourceParam>${sourceParam.name} == null<#if sourceParam_has_next> && </#if></#list> ) {
return<#if returnType.name != "void"> null</#if>;
}
@Override
public ${returnType.name} ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( <#list sourceParameters as sourceParam>${sourceParam.name} == null<#if sourceParam_has_next> && </#if></#list> ) {
return<#if returnType.name != "void"> null</#if>;
}
<#if !existingInstanceMapping>
${resultType.name} ${resultName} = new ${resultType.name}();
<#if !existingInstanceMapping>
${resultType.name} ${resultName} = new ${resultType.name}();
</#if>
<#if (sourceParameters?size > 1)>
<#list sourceParameters as sourceParam>
if ( ${sourceParam.name} != null ) {
<#list propertyMappingsByParameter[sourceParam.name] as propertyMapping>
<@includeModel object=propertyMapping targetBeanName=resultName/>
</#list>
}
</#list>
<#else>
<#list propertyMappingsByParameter[sourceParameters[0].name] as propertyMapping>
</#if>
<#if (sourceParameters?size > 1)>
<#list sourceParameters as sourceParam>
if ( ${sourceParam.name} != null ) {
<#list propertyMappingsByParameter[sourceParam.name] as propertyMapping>
<@includeModel object=propertyMapping targetBeanName=resultName/>
</#list>
</#if>
<#if returnType.name != "void">
return ${resultName};
</#if>
}
</#list>
<#else>
<#list propertyMappingsByParameter[sourceParameters[0].name] as propertyMapping>
<@includeModel object=propertyMapping targetBeanName=resultName/>
</#list>
</#if>
<#if returnType.name != "void">
return ${resultName};
</#if>
}

View File

@ -18,4 +18,4 @@
limitations under the License.
-->
private final ${mapperType.name} ${variableName} = new ${mapperType.name}();
private final ${mapperType.name} ${variableName} = new ${mapperType.name}();

View File

@ -18,39 +18,39 @@
limitations under the License.
-->
@Override
public <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( ${sourceParameter.name} == null ) {
return<#if returnType.name != "void"> null</#if>;
}
@Override
public <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( ${sourceParameter.name} == null ) {
return<#if returnType.name != "void"> null</#if>;
}
<#if existingInstanceMapping>
${resultName}.clear();
<#if existingInstanceMapping>
${resultName}.clear();
<#else>
<#-- Use the interface type on the left side, except it is java.lang.Iterable; use the implementation type - if present - on the right side -->
<#if resultType.fullyQualifiedName == "java.lang.Iterable"><@includeModel object=resultType.implementationType/><#else><@includeModel object=resultType/></#if> ${resultName} = new <#if resultType.implementationType??><@includeModel object=resultType.implementationType/><#else><@includeModel object=resultType/></#if>();
</#if>
for ( <@includeModel object=sourceParameter.type.typeParameters[0]/> ${loopVariableName} : ${sourceParameter.name} ) {
<#if elementMappingMethod??>
${resultName}.add( <@includeModel object=elementMappingMethod input="${loopVariableName}"/> );
<#else>
<#-- Use the interface type on the left side, except it is java.lang.Iterable; use the implementation type - if present - on the right side -->
<#if resultType.fullyQualifiedName == "java.lang.Iterable"><@includeModel object=resultType.implementationType/><#else><@includeModel object=resultType/></#if> ${resultName} = new <#if resultType.implementationType??><@includeModel object=resultType.implementationType/><#else><@includeModel object=resultType/></#if>();
</#if>
for ( <@includeModel object=sourceParameter.type.typeParameters[0]/> ${loopVariableName} : ${sourceParameter.name} ) {
<#if elementMappingMethod??>
${resultName}.add( <@includeModel object=elementMappingMethod input="${loopVariableName}"/> );
<#if (conversion.exceptionTypes?size == 0) >
${resultName}.add( <@includeModel object=conversion/> );
<#else>
<#if (conversion.exceptionTypes?size == 0) >
try {
${resultName}.add( <@includeModel object=conversion/> );
<#else>
try {
${resultName}.add( <@includeModel object=conversion/> );
}
<#list conversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
</#if>
}
<#if returnType.name != "void">
return ${resultName};
<#list conversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
</#if>
}
<#if returnType.name != "void">
return ${resultName};
</#if>
}

View File

@ -18,65 +18,65 @@
limitations under the License.
-->
@Override
public <@includeModel object=returnType /> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( ${sourceParameter.name} == null ) {
return<#if returnType.name != "void"> null</#if>;
}
<#if existingInstanceMapping>
${resultName}.clear();
<#else>
<@includeModel object=resultType /> ${resultName} = new <#if resultType.implementationType??><@includeModel object=resultType.implementationType /><#else><@includeModel object=resultType /></#if>();
</#if>
for ( Map.Entry<<#list sourceParameter.type.typeParameters as typeParameter><@includeModel object=typeParameter /><#if typeParameter_has_next>, </#if></#list>> ${entryVariableName} : ${sourceParameter.name}.entrySet() ) {
<#-- key -->
<#if keyMappingMethod??>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = <@includeModel object=keyMappingMethod input="entry.getKey()"/>;
<#elseif keyConversion??>
<#if (keyConversion.exceptionTypes?size == 0) >
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = <@includeModel object=keyConversion/>;
<#else>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName};
try {
${keyVariableName} = <@includeModel object=keyConversion/>;
}
<#list keyConversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<#else>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = entry.getKey();
</#if>
<#-- value -->
<#if valueMappingMethod??>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = <@includeModel object=valueMappingMethod input="entry.getValue()"/>;
<#elseif valueConversion??>
<#if (valueConversion.exceptionTypes?size == 0) >
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = <@includeModel object=valueConversion/>;
<#else>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName};
try {
${valueVariableName} = <@includeModel object=valueConversion/>;
}
<#list valueConversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<#else>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = entry.getValue();
</#if>
${resultName}.put( ${keyVariableName}, ${valueVariableName} );
}
<#if returnType.name != "void">
return ${resultName};
</#if>
@Override
public <@includeModel object=returnType /> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
if ( ${sourceParameter.name} == null ) {
return<#if returnType.name != "void"> null</#if>;
}
<#if existingInstanceMapping>
${resultName}.clear();
<#else>
<@includeModel object=resultType /> ${resultName} = new <#if resultType.implementationType??><@includeModel object=resultType.implementationType /><#else><@includeModel object=resultType /></#if>();
</#if>
for ( Map.Entry<<#list sourceParameter.type.typeParameters as typeParameter><@includeModel object=typeParameter /><#if typeParameter_has_next>, </#if></#list>> ${entryVariableName} : ${sourceParameter.name}.entrySet() ) {
<#-- key -->
<#if keyMappingMethod??>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = <@includeModel object=keyMappingMethod input="entry.getKey()"/>;
<#elseif keyConversion??>
<#if (keyConversion.exceptionTypes?size == 0) >
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = <@includeModel object=keyConversion/>;
<#else>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName};
try {
${keyVariableName} = <@includeModel object=keyConversion/>;
}
<#list keyConversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<#else>
<@includeModel object=resultType.typeParameters[0]/> ${keyVariableName} = entry.getKey();
</#if>
<#-- value -->
<#if valueMappingMethod??>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = <@includeModel object=valueMappingMethod input="entry.getValue()"/>;
<#elseif valueConversion??>
<#if (valueConversion.exceptionTypes?size == 0) >
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = <@includeModel object=valueConversion/>;
<#else>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName};
try {
${valueVariableName} = <@includeModel object=valueConversion/>;
}
<#list valueConversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<#else>
<@includeModel object=resultType.typeParameters[1]/> ${valueVariableName} = entry.getValue();
</#if>
${resultName}.put( ${keyVariableName}, ${valueVariableName} );
}
<#if returnType.name != "void">
return ${resultName};
</#if>
}

View File

@ -36,11 +36,10 @@ public class ${implementationName} implements ${interfaceName} {
<@includeModel object=mapper/>
</#list>
<#list mappingMethods as mappingMethod>
<@includeModel object=mappingMethod/>
<#if mappingMethod_has_next>
</#if>
<@includeModel object=mappingMethod/>
</#list>
}

View File

@ -18,28 +18,28 @@
limitations under the License.
-->
<#-- a) invoke mapping method -->
<#if mappingMethod??>
${ext.targetBeanName}.${targetAccessorName}( <@includeModel object=mappingMethod input="${sourceBeanName}.${sourceAccessorName}()"/> );
<#-- b) simple conversion -->
<#elseif conversion??>
<#if sourceType.primitive == false>
if ( ${sourceBeanName}.${sourceAccessorName}() != null ) {
<@applyConversion targetBeanName=ext.targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
}
<#else>
<@applyConversion targetBeanName=ext.targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
</#if>
<#-- c) simply set -->
<#else>
<#if targetType.collectionType || targetType.mapType>
if ( ${sourceBeanName}.${sourceAccessorName}() != null ) {
${ext.targetBeanName}.${targetAccessorName}( new <#if targetType.implementationType??><@includeModel object=targetType.implementationType/><#else><@includeModel object=targetType/></#if>( ${sourceBeanName}.${sourceAccessorName}() ) );
}
<#else>
${ext.targetBeanName}.${targetAccessorName}( ${sourceBeanName}.${sourceAccessorName}() );
</#if>
</#if>
<#-- a) invoke mapping method -->
<#if mappingMethod??>
${ext.targetBeanName}.${targetAccessorName}( <@includeModel object=mappingMethod input="${sourceBeanName}.${sourceAccessorName}()"/> );
<#-- b) simple conversion -->
<#elseif conversion??>
<#if sourceType.primitive == false>
if ( ${sourceBeanName}.${sourceAccessorName}() != null ) {
<@applyConversion targetBeanName=ext.targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
}
<#else>
<@applyConversion targetBeanName=ext.targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
</#if>
<#-- c) simply set -->
<#else>
<#if targetType.collectionType || targetType.mapType>
if ( ${sourceBeanName}.${sourceAccessorName}() != null ) {
${ext.targetBeanName}.${targetAccessorName}( new <#if targetType.implementationType??><@includeModel object=targetType.implementationType/><#else><@includeModel object=targetType/></#if>( ${sourceBeanName}.${sourceAccessorName}() ) );
}
<#else>
${ext.targetBeanName}.${targetAccessorName}( ${sourceBeanName}.${sourceAccessorName}() );
</#if>
</#if>
<#macro applyConversion targetBeanName targetAccessorName conversion>
<#if (conversion.exceptionTypes?size == 0) >
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );