This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 26333ae71fb573cae47e205838bc58f8e32ac938 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:19:59 2015 +0200 Fix generation name for AbstractDefaults + use fqn of names --- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 58 +++++++++++++++------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java index cf83f8d..c0af983 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java @@ -160,7 +160,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr generateBeanDefaults(input, abstractDefaultClassName, defaultClassName); } - if (notFoundInClassPath(input, defaultClassName)) { + if (canGenerateAbstractClass(aPackage, input, abstractDefaultClassName)) { generateAbstractBeanDefaults(aPackage, input, className, abstractDefaultClassName); } @@ -207,7 +207,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr for (ObjectModelClass superclass : superclasses) { superClassIsBean = beanClasses.contains(superclass); if (superClassIsBean) { - superClass = beanNameTranslation.get(superclass); + superClass = superclass.getPackageName() + "." + beanNameTranslation.get(superclass); break; } superClass = superclass.getQualifiedName(); @@ -507,13 +507,44 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr String simpleType = JavaGeneratorUtil.getSimpleName(attrType); simpleType = wrapPrimitiveType(simpleType); String capitalizeAttrName = JavaGeneratorUtil.capitalizeJavaBeanPropertyName(attrName); + String newFunctionMethodName = "new" + capitalizeAttrName + "Function"; - String newFunctionTypeName = "Function<BeanType, " + simpleType + ">"; + String getFunctionMethodName = "get" + capitalizeAttrName + "Function"; + String functionTypeName = "Function<BeanType, " + simpleType + ">"; + + String functionFieldName = JavaGeneratorUtil.convertVariableNameToConstantName(capitalizeAttrName + "Function"); + addAttribute( + output, + functionFieldName, + "Function<" + typeName + ", " + simpleType + ">", + newFunctionMethodName + "()", + ObjectModelJavaModifier.FINAL, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PROTECTED + ); + + ObjectModelOperation operation = addOperation( output, + getFunctionMethodName, + "<BeanType extends " + typeName + "> " + functionTypeName, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + + + setOperationBody(operation, "" + /*{ + return (<%=functionTypeName%>) <%=functionFieldName%>; + + }*/ + ); + + operation = addOperation( + output, newFunctionMethodName, - "<BeanType extends " + typeName + "> " + newFunctionTypeName, + "<BeanType extends " + typeName + "> " + functionTypeName, ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.PUBLIC ); @@ -521,7 +552,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr String getterName = getGetterName(attribute, attrName); setOperationBody(operation, "" /*{ - return new <%=newFunctionTypeName%>() { + return new <%=functionTypeName%>() { @Override public <%=simpleType%> apply(BeanType input) { @@ -532,17 +563,6 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr }*/ ); - String getFunctionFieldName = JavaGeneratorUtil.convertVariableNameToConstantName("get" + capitalizeAttrName); - addAttribute( - output, - getFunctionFieldName, - "Function<" + typeName + ", " + simpleType + ">", - newFunctionMethodName + "()", - ObjectModelJavaModifier.FINAL, - ObjectModelJavaModifier.STATIC, - ObjectModelJavaModifier.PROTECTED - ); - operation = addOperation( output, "uniqueIndexBy" + capitalizeAttrName, @@ -553,7 +573,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr addParameter(operation, "Iterable<BeanType>", "source"); setOperationBody(operation, "" /*{ - return Maps.uniqueIndex(source, <%=getFunctionFieldName%>); + return Maps.uniqueIndex(source, <%=functionFieldName%>); }*/ ); } @@ -578,7 +598,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr for (ObjectModelClass superclass : superclasses) { superClassIsBean = beanDefaultClasses.contains(superclass); if (superClassIsBean) { - superClassName = beanDefaultsNameTranslation.get(superclass); + superClassName = superclass.getPackageName() + "." + beanDefaultsNameTranslation.get(superclass); break; } superClassName = superclass.getQualifiedName(); @@ -603,7 +623,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr ObjectModelClass attributeClass = model.getClass(attrType); String attributeType = beanNameTranslation.get(attributeClass); if (attributeType != null) { - attrType = attributeType; + attrType = attributeClass.getPackageName() + "." + attributeType; } } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.