#26 Template clean-up

This commit is contained in:
Gunnar Morling 2013-07-07 16:32:57 +02:00
parent 9dd8c179e3
commit 97e1848887
2 changed files with 18 additions and 25 deletions

View File

@ -32,12 +32,13 @@ import ${importedType.fullyQualifiedName};
<@includeModel object=annotation/>
</#list>
public class ${implementationName} implements ${interfaceName} {
<#list referencedMappers as mapper>
<@includeModel object=mapper/>
</#list>
<#list mappingMethods as mappingMethod>
<@includeModel object=mappingMethod/>
</#list>
}

View File

@ -25,32 +25,10 @@
<#elseif conversion??>
<#if sourceType.primitive == false>
if ( ${sourceBeanName}.${sourceAccessorName}() != null ) {
<#if (conversion.exceptionTypes?size == 0) >
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
<#else>
try {
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
}
<#list conversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<@applyConversion targetBeanName=targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
}
<#else>
<#if (conversion.exceptionTypes?size == 0) >
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
<#else>
try {
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
}
<#list conversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
<@applyConversion targetBeanName=targetBeanName targetAccessorName=targetAccessorName conversion=conversion/>
</#if>
<#-- c) simply set -->
<#else>
@ -62,3 +40,17 @@
${targetBeanName}.${targetAccessorName}( ${sourceBeanName}.${sourceAccessorName}() );
</#if>
</#if>
<#macro applyConversion targetBeanName targetAccessorName conversion>
<#if (conversion.exceptionTypes?size == 0) >
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
<#else>
try {
${targetBeanName}.${targetAccessorName}( <@includeModel object=conversion/> );
}
<#list conversion.exceptionTypes as exceptionType>
catch( ${exceptionType.name} e ) {
throw new RuntimeException( e );
}
</#list>
</#if>
</#macro>