- Topia-commits - mailman.cloud.codelutin.com

r2031 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 25 Jun '10

25 Jun '10

Author: fdesbois Date: 2010-06-25 14:40:15 +0200 (Fri, 25 Jun 2010) New Revision: 2031 Url: http://nuiton.org/repositories/revision/topia/2031 Log: Remove useless call to uncapitalize Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-25 12:39:46 UTC (rev 2030) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-25 12:40:15 UTC (rev 2031) @@ -550,8 +550,7 @@ protected String getReferenceAttributeName(ObjectModelAttribute attrReference) { String attrName = attrReference.getName(); if(attrReference.hasAssociationClass()) { - String assocAttrName = GeneratorUtil.getAssocAttrName(attrReference); - attrName = StringUtils.uncapitalize(assocAttrName); + attrName = GeneratorUtil.getAssocAttrName(attrReference); } return attrName; }

1 0

r2030 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 25 Jun '10

25 Jun '10

Author: fdesbois Date: 2010-06-25 14:39:46 +0200 (Fri, 25 Jun 2010) New Revision: 2030 Url: http://nuiton.org/repositories/revision/topia/2030 Log: Remove deprecated method, no change anywhere because of inheritance Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-06-25 10:28:33 UTC (rev 2029) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-06-25 12:39:46 UTC (rev 2030) @@ -580,29 +580,6 @@ (!GeneratorUtil.isFirstAttribute(attr)); } - /** - * Renvoie le nom de l'attribut de classe d'association en fonction des cas: - * Si l'attribut porte le même nom que le type (extrémité inverse de - * l'association), on lui ajoute le nom de la classe d'association - * - * @param attr l'attribut a traiter - * @return le nom de l'attribut de classe d'association - * @deprecated since 2.3.4, prefer use the - * {@link GeneratorUtil#getAssocAttrName(ObjectModelAttribute)} - */ - @Deprecated - public static String getAssocAttrName(ObjectModelAttribute attr) { - String result = GeneratorUtil.getAssocAttrName(attr); -// String typeName = attr.getType().substring( -// attr.getType().lastIndexOf(".") + 1); -// String result = attr.getName(); -// if (attr.getName().equalsIgnoreCase(typeName)) { -// result += StringUtils.capitalize( -// attr.getAssociationClass().getName()); -// } - return result; - } - public static String getDOType(ObjectModelElement elem, ObjectModel model) { String type = elem.getName(); if (elem instanceof ObjectModelAttribute) {

1 0

r2029 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 25 Jun '10

25 Jun '10

Author: fdesbois Date: 2010-06-25 12:28:33 +0200 (Fri, 25 Jun 2010) New Revision: 2029 Url: http://nuiton.org/repositories/revision/topia/2029 Log: Evo #609 : Refactor generation for properties operations (association class are not considered in refactor yet). Generation is still working as before. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-24 22:43:33 UTC (rev 2028) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-25 10:28:33 UTC (rev 2029) @@ -43,6 +43,7 @@ import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; import java.beans.Introspector; import java.net.URL; @@ -51,13 +52,10 @@ import java.util.List; import java.util.Set; -import static org.nuiton.eugene.GeneratorUtil.getSimpleName; import static org.nuiton.topia.generator.TopiaGeneratorUtil.STEREOTYPE_ENTITY; import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_DB_NAME; import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.isDateType; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.isPrimitiveType; import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldBeAbstract; @@ -142,26 +140,11 @@ outputInterface = createInterface(clazzName, packageName); outputAbstract = createAbstractClass(clazzName + "Abstract", packageName); + // generateOperationsFromAttributes(input.getAttributes()); is executed in generateInterface + generateInterface(input, outputInterface, attributes, operations); generateAbstract(input, outputAbstract, attributes, operations); -// ObjectModelClassifier output; -// -// // generate interface -// -// { -// outputInterface = createInterface(clazzName, packageName); -// generateInterface(input, outputInterface, attributes, operations); -// } -// -// // generate abstract -// -// { -// outputAbstract = createAbstractClass( clazzName + "Abstract", packageName); -// generateAbstract(input, outputAbstract, attributes, operations); -// -// } - boolean generateImpl = isGenerateImpl(input, operations); if (generateImpl) { @@ -225,6 +208,539 @@ return true; } + protected void generateOperationsFromAttributes(Collection<ObjectModelAttribute> attributes) { + + for (ObjectModelAttribute attribute : attributes) { + + if (!attribute.isNavigable() && + !TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType( + attribute.getReverseAttribute(), model)) { + continue; + } + + // Don't manage association class for instance + if (attribute.hasAssociationClass()) { + continue; + } + + if (attribute.getMaxMultiplicity() == 1) { + + // setXXX + addSimpleSetOperation(attribute); + + // getXXX + addSimpleGetOperation(attribute, null); + + } else { + + // List, Set or Collection ? + String collectionInterface = + TopiaGeneratorUtil.getNMultiplicityInterfaceType(attribute); + String collectionImpl = + TopiaGeneratorUtil.getNMultiplicityObjectType(attribute); + + addImport(outputInterface, collectionInterface); + addImport(outputAbstract, collectionInterface); + addImport(outputAbstract, collectionImpl); + + collectionInterface = + TopiaGeneratorUtil.getSimpleName(collectionInterface); + collectionImpl = + TopiaGeneratorUtil.getSimpleName(collectionImpl); + + // addXXX + addMultipleAddOperation(attribute, collectionImpl); + + // addAllXXX + addMultipleAddAllOperation(attribute, collectionInterface); + + // setXXX + addMultipleSetOperation(attribute, collectionInterface); + + // removeXXX + addMultipleRemoveOperation(attribute); + + // clearXXX + addMultipleClearOperation(attribute, collectionInterface, collectionImpl); + + // getXXX + addMultipleGetOperation(attribute, collectionInterface); + + if (!TopiaGeneratorUtil.isPrimitiveType(attribute) && + !TopiaGeneratorUtil.isDateType(attribute)) { + + // getXXXByTopiaId + addMultipleGetTopiaIdOperation(attribute); + } + + // sizeXXX + addMultipleSizeOperation(attribute); + + // isXXXEmpty + addMultipleIsEmptyOperation(attribute); + } + + } + } + + // TODO-fdesbois-2010-06-25 : This method can be put in JavaBuilder or ObjectModelTransformerToJava + protected ObjectModelOperation createPropertySetterSignature(ObjectModelClassifier classifier, + String propertyType, + String propertyName, + String operationDocumentation) { + // Operation + ObjectModelOperation operation = + addOperation(classifier, "set" + StringUtils.capitalize(propertyName), + void.class, ObjectModelModifier.PACKAGE); + + ObjectModelParameter param = + addParameter(operation, propertyType, propertyName); + + // Documentation + if (StringUtils.isNotEmpty(operationDocumentation)) { + setDocumentation(operation, operationDocumentation); + } + setDocumentation(param, "La valeur de l'attribut à positionner."); + + return operation; + } + + protected void addSimpleSetOperation(ObjectModelAttribute attribute) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + + // Interface operation + ObjectModelOperation interfaceOperation = + createPropertySetterSignature(outputInterface, attrType, attrName, + attribute.getDocumentation()); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + <%=attrType%> oldValue = this.<%=attrName%>; + fireOnPreWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); + this.<%=attrName%> = <%=attrName%>; + fireOnPostWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); +}*/ + ); + } + + /** + * Add getter for simple property (neither association nor multiple). + * Will add two different operations for boolean case ('is' method and + * 'get' method). This method add the operation in both {@code + * outputAbstract} and {@code outputInterface}. + * + * @param attribute ObjectModelAttribute for getter operation + * @param operationPrefix Operation prefix : 'get' by default, if prefix + * is null + */ + protected void addSimpleGetOperation(ObjectModelAttribute attribute, + String operationPrefix) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + + if (operationPrefix == null) { + operationPrefix = TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; + } + + if (log.isDebugEnabled()) { + log.debug("Add getter operation for " + attrName + + " prefix = " + operationPrefix); + } + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, operationPrefix + StringUtils.capitalize(attrName), + attrType, ObjectModelModifier.PACKAGE); + + // Documentation + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(interfaceOperation, attribute.getDocumentation()); + } + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + fireOnPreRead(<%=getConstantName(attrName)%>, <%=attrName%>); + <%=attrType%> result = this.<%=attrName%>; + fireOnPostRead(<%=getConstantName(attrName)%>, <%=attrName%>); + return result; +}*/ + ); + + // Generate 'is' getter for boolean attributes + if (attrType.toLowerCase().contains("boolean") && + !operationPrefix.equals(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { + addSimpleGetOperation(attribute, + TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); + } + } + + protected void addMultipleAddOperation(ObjectModelAttribute attribute, String collectionImpl) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + ObjectModelAttribute reverse = attribute.getReverseAttribute(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "add" + StringUtils.capitalize(attrName), + void.class, ObjectModelModifier.PACKAGE); + ObjectModelParameter param = + addParameter(interfaceOperation, attrType, attrName); + + // Documentation + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(interfaceOperation, attribute.getDocumentation()); + } + setDocumentation(param, "L'instance de " + attrType + " à ajouter"); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + StringBuilder body = new StringBuilder(); + + body.append("" +/*{ + fireOnPreWrite(<%=getConstantName(attrName)%>, null, <%=attrName%>); + if (this.<%=attrName%> == null) { + this.<%=attrName%> = new <%=collectionImpl%><<%=attrType%>>(); + } +}*/ + ); + + if (reverse != null && (reverse.isNavigable() || + hasUnidirectionalRelationOnAbstractType(attribute, model))) { + String reverseAttrName = StringUtils.capitalize(reverse.getName()); + String reverseAttrType = TopiaGeneratorUtil.getSimpleName(reverse.getType()); + if (!GeneratorUtil.isNMultiplicity(reverse)) { + body.append("" +/*{ + <%=attrName%>.set<%=reverseAttrName%>(this); +}*/ + ); + } else { + body.append("" +/*{ + if (<%=attrName%>.get<%=reverseAttrName%>() == null) { + <%=attrName%>.set<%=reverseAttrName%>(new <%=collectionImpl%><<%=reverseAttrType%>>()); + } + <%=attrName%>.get<%=reverseAttrName%>().add(this); +}*/ + ); + } + } + body.append("" +/*{ + this.<%=attrName%>.add(<%=attrName%>); + fireOnPostWrite(<%=getConstantName(attrName)%>, this.<%=attrName%>.size(), null, <%=attrName%>); +}*/ + ); + setOperationBody(implOperation, body.toString()); + } + + protected void addMultipleAddAllOperation(ObjectModelAttribute attribute, String collectionInterface) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "addAll" + StringUtils.capitalize(attrName), + void.class, ObjectModelModifier.PACKAGE); + ObjectModelParameter param = + addParameter(interfaceOperation, collectionInterface + "<" + attrType + ">", attrName); + + // Documentation + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(interfaceOperation, attribute.getDocumentation()); + } + setDocumentation(param, "Les instances de " + attrType + " à ajouter"); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + if (<%=attrName%> == null) { + return; + } + for (<%=attrType%> item : <%=attrName%>) { + add<%=StringUtils.capitalize(attrName)%>(item); + } +}*/ + ); + } + + protected void addMultipleSetOperation(ObjectModelAttribute attribute, String collectionInterface) { + + String attrName = attribute.getName(); + String attrType = collectionInterface + "<" + attribute.getType() + ">"; + + // Interface operation + ObjectModelOperation interfaceOperation = + createPropertySetterSignature(outputInterface, attrType, attrName, + attribute.getDocumentation()); + + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + // Force fire for collection + setOperationBody(implOperation, "" +/*{ + fireOnPreWrite(<%=getConstantName(attrName)%>, null, <%=attrName%>); + this.<%=attrName%> = <%=attrName%>; + fireOnPostWrite(<%=getConstantName(attrName)%>, null, <%=attrName%>); +}*/ + ); + } + + protected void addMultipleRemoveOperation(ObjectModelAttribute attribute) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + ObjectModelAttribute reverse = attribute.getReverseAttribute(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "remove" + StringUtils.capitalize(attrName), + void.class, ObjectModelModifier.PACKAGE); + ObjectModelParameter param = + addParameter(interfaceOperation, attrType, attrName); + + // Documentation + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(interfaceOperation, attribute.getDocumentation()); + } + setDocumentation(param, "L'instance de " + attrType + " à retirer"); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + StringBuilder body = new StringBuilder(); + + body.append("" +/*{ + fireOnPreWrite(<%=getConstantName(attrName)%>, <%=attrName%>, null); + if ((this.<%=attrName%> == null) || (!this.<%=attrName%>.remove(<%=attrName%>))) { + throw new IllegalArgumentException("List does not contain given element"); + } +}*/ + ); + + if (reverse != null && (reverse.isNavigable() || + hasUnidirectionalRelationOnAbstractType(attribute, model))) { + String reverseAttrName = StringUtils.capitalize(reverse.getName()); + if (!GeneratorUtil.isNMultiplicity(reverse)) { + body.append("" +/*{ + <%=attrName%>.set<%=reverseAttrName%>(null); +}*/ + ); + } else { + body.append("" +/*{ + <%=attrName%>.get<%=reverseAttrName%>().remove(this); +}*/ + ); + } + } + body.append("" +/*{ + fireOnPostWrite(<%=getConstantName(attrName)%>, this.<%=attrName%>.size() + 1, <%=attrName%>, null); +}*/ + ); + setOperationBody(implOperation, body.toString()); + } + + protected void addMultipleClearOperation(ObjectModelAttribute attribute, + String collectionInterface, + String collectionImpl) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + ObjectModelAttribute reverse = attribute.getReverseAttribute(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "clear" + StringUtils.capitalize(attrName), + void.class, ObjectModelModifier.PACKAGE); + + // Documentation + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(interfaceOperation, attribute.getDocumentation()); + } + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + StringBuilder body = new StringBuilder("" +/*{ + if (this.<%=attrName%> == null) { + return; + } +}*/ + ); + + if (reverse != null && (reverse.isNavigable() || + hasUnidirectionalRelationOnAbstractType(attribute, model))) { + String reverseAttrName = StringUtils.capitalize(reverse.getName()); + body.append("" +/*{ for (<%=attrType%> item : this.<%=attrName%>) { +}*/ + ); + if (!GeneratorUtil.isNMultiplicity(reverse)) { + body.append("" +/*{ item.set<%=reverseAttrName%>(null); +}*/ + ); + } else { + body.append("" +/*{ item.get<%=reverseAttrName%>().remove(this); +}*/ + ); + } + body.append("" +/*{ } +}*/ + ); + } + // FIXME-fdesbois-2010-06-25 : Very strange behavior, why the oldValue is a new instance ? + body.append("" +/*{ <%=collectionInterface%><<%=attrType%>> _oldValue = new <%=collectionImpl%><<%=attrType%>>(this.<%=attrName%>); + fireOnPreWrite(<%=getConstantName(attrName)%>, _oldValue, this.<%=attrName%>); + this.<%=attrName%>.clear(); + fireOnPostWrite(<%=getConstantName(attrName)%>, _oldValue, this.<%=attrName%>); +}*/ + ); + setOperationBody(implOperation, body.toString()); + } + + protected void addMultipleGetOperation(ObjectModelAttribute attribute, + String collectionInterface) { + + String attrName = attribute.getName(); + String attrType = collectionInterface + "<" + attribute.getType() + ">"; + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "get" + StringUtils.capitalize(attrName), + attrType, ObjectModelModifier.PACKAGE); + + // Documentation +// if (TopiaGeneratorUtil.hasDocumentation(attribute)) { +// // ?? +// setDocumentation(interfaceOperation, "Retourne la collection."); +// } + setDocumentation(interfaceOperation, "Retourne la collection."); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + return <%=attrName%>; +}*/ + ); + } + + protected void addMultipleGetTopiaIdOperation(ObjectModelAttribute attribute) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "get" + StringUtils.capitalize(attrName) + "ByTopiaId", + attrType, ObjectModelModifier.PACKAGE); + ObjectModelParameter param = + addParameter(interfaceOperation, String.class, "topiaId"); + + // Documentation + setDocumentation(interfaceOperation, "Recupère l'attribut " + attrName + + " à partir de son topiaId"); + setDocumentation(param, "le topia id de l'entité recherchée"); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + addImport(outputAbstract, TopiaEntityHelper.class); + + setOperationBody(implOperation, "" +/*{ + return TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); + }*/ + ); + } + + protected void addMultipleSizeOperation(ObjectModelAttribute attribute) { + + String attrName = attribute.getName(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "size" + StringUtils.capitalize(attrName), + int.class, ObjectModelModifier.PACKAGE); + + // Documentation + setDocumentation(interfaceOperation, "Retourne le nombre d'éléments de la collection " + attrName); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + if (<%=attrName%> == null) { + return 0; + } + return <%=attrName%>.size(); +}*/ + ); + } + + protected void addMultipleIsEmptyOperation(ObjectModelAttribute attribute) { + + String attrName = attribute.getName(); + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, "is" + StringUtils.capitalize(attrName) + "Empty", + boolean.class, ObjectModelModifier.PACKAGE); + + // Documentation + setDocumentation(interfaceOperation, "Retourne {@code true} si la collection " + attrName + " est vide."); + + // Implementation + ObjectModelOperation implOperation = + cloneOperationSignature(interfaceOperation, outputAbstract); + + setOperationBody(implOperation, "" +/*{ + int size = size<%=StringUtils.capitalize(attrName)%>(); + return size == 0; +}*/ + ); + } + + + ///////////////////////////////// OLD + protected void generateInterface(ObjectModelClass input, ObjectModelInterface output, Collection<ObjectModelAttribute> attributes, @@ -265,6 +781,8 @@ // attributes + generateOperationsFromAttributes(attributes); + for (ObjectModelAttribute attr : attributes) { ObjectModelAttribute reverse = attr.getReverseAttribute(); if (!attr.isNavigable() && @@ -278,11 +796,11 @@ addInterfaceAssociationAttribute(output, attr); } else { - - addInterfaceNoneAssociationAttribute(output, attr); + //addInterfaceNoneAssociationAttribute(output, attr); } } + //Méthodes d'accès aux attributs d'une classe d'associations if (input instanceof ObjectModelAssociationClass) { @@ -590,6 +1108,7 @@ } } + @Deprecated protected void addInterfaceNoneAssociationAttribute(ObjectModelInterface output, ObjectModelAttribute attr) { String attrName = attr.getName(); @@ -598,6 +1117,7 @@ ObjectModelParameter attr2; if (!GeneratorUtil.isNMultiplicity(attr)) { + // DONE // setXXX @@ -618,13 +1138,13 @@ // Add getter for simple property. // Only one call for this method, no need for abstract generation // TODO-fdesbois-2010-05-27 : manage all attribute cases in this method - addSimpleGetterOperation(attr, null); + addSimpleGetOperation(attr, null); } else { String collectionInterface = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); - // addXXX + // addXXX : DONE op = addOperation(output, "add" + StringUtils.capitalize(attrName), @@ -638,7 +1158,7 @@ setDocumentation(attr2, "L'instance de " + attrName + " à ajouter"); - // addAllXXX + // addAllXXX : DONE op = addOperation(output, "addAll" + StringUtils.capitalize(attrName), @@ -653,7 +1173,7 @@ setDocumentation(attr2, "Les instances de " + attrName + " à ajouter"); - // setXXX + // setXXX : DONE op = addOperation(output, "set" + StringUtils.capitalize(attrName), @@ -668,7 +1188,7 @@ setDocumentation(attr2, "La Collection de " + attrName + " à ajouter"); - // removeXXX + // removeXXX : DONE op = addOperation(output, "remove" + StringUtils.capitalize(attrName), @@ -683,7 +1203,7 @@ setDocumentation(attr2, "L'instance de " + attrName + " à retirer"); - // clearXXX + // clearXXX : DONE op = addOperation(output, "clear" + StringUtils.capitalize(attrName), @@ -694,7 +1214,7 @@ } setDocumentation(attr2, "Vide la Collection de " + attrName); - // getXXX + // getXXX : DONE op = addOperation(output, "get" + StringUtils.capitalize(attrName), @@ -707,7 +1227,7 @@ if (!TopiaGeneratorUtil.isPrimitiveType(attr) && !TopiaGeneratorUtil.isDateType(attr)) { - // getXXXByTopiaId + // getXXXByTopiaId : DONE op = addOperation(output, "get" + StringUtils.capitalize(attrName) + "ByTopiaId", @@ -718,7 +1238,7 @@ setDocumentation(attr2, "le topia id de l'entité recherchée"); } - // sizeXXX + // sizeXXX : DONE op = addOperation(output, "size" + StringUtils.capitalize(attrName), @@ -726,7 +1246,7 @@ ObjectModelModifier.PACKAGE); setDocumentation(op, "Retourne le nombre d'éléments de la collection " + attrName); - // isXXXEmpty + // isXXXEmpty : DONE op = addOperation(output, "is" + StringUtils.capitalize(attrName) + "Empty", @@ -961,7 +1481,9 @@ return <%=name%>; }*/ ); - } else { + // Code is refactored and generated with correct methods, see generateOperationsFromAttributes + } else if (false) { + // DONE // setXXX @@ -992,12 +1514,13 @@ addImport(result, collectionInterface); addImport(result, collectionObject); collectionInterface = TopiaGeneratorUtil.getSimpleName(collectionInterface); - collectionObject = getSimpleName(collectionObject); + collectionObject = TopiaGeneratorUtil.getSimpleName(collectionObject); - if (!attr.hasAssociationClass()) { + // Code is refactored and generated with correct methods, see generateOperationsFromAttributes + if (!attr.hasAssociationClass() && false) { //Méthodes remplacées par des accesseurs sur les classes d'assoc - // addXXX + // addXXX : DONE op = addOperation(result, "add" + StringUtils.capitalize(attrName), @@ -1041,7 +1564,7 @@ ); setOperationBody(op, body.toString()); - // addAllXXX + // addAllXXX : DONE op = addOperation(result, "addAll" + StringUtils.capitalize(attrName), @@ -1060,8 +1583,11 @@ }*/ ); - if (!isPrimitiveType(attr) && !isDateType(attr)) { + // getXXXByTopiaId : DONE + if (!TopiaGeneratorUtil.isPrimitiveType(attr) && + !TopiaGeneratorUtil.isDateType(attr)) { + op = addOperation(result, "get" + StringUtils.capitalize(attrName) + "ByTopiaId", attrType, @@ -1075,7 +1601,7 @@ } - // setXXX + // setXXX : DONE op = addOperation(result, "set" + StringUtils.capitalize(attrName), @@ -1093,7 +1619,7 @@ ); - // removeXXX + // removeXXX : DONE op = addOperation(result, @@ -1134,7 +1660,7 @@ setOperationBody(op, body.toString()); - // clearXXX + // clearXXX : DONE op = addOperation(result, "clear" + StringUtils.capitalize(attrName), @@ -1184,7 +1710,7 @@ setOperationBody(op, body.toString()); - } else { + } else if (attr.hasAssociationClass()) { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); @@ -1225,7 +1751,8 @@ setOperationBody(op, body.toString()); - if (!isPrimitiveType(attr) && !isDateType(attr)) { + if (!TopiaGeneratorUtil.isPrimitiveType(attr) && + !TopiaGeneratorUtil.isDateType(attr)) { // getXXXByTopiaId @@ -1349,9 +1876,10 @@ setOperationBody(op, body.toString()); } - if (!attr.hasAssociationClass()) { + // Code is refactored and generated with correct methods, see generateOperationsFromAttributes + if (!attr.hasAssociationClass() && false) { - // getXXX : getter for collection entity attribute (N multiplicity) + // getXXX : getter for collection entity attribute (N multiplicity) : DONE op = addOperation(result, "get" + StringUtils.capitalize(attrName), @@ -1363,7 +1891,7 @@ }*/ ); - // sizeXXX + // sizeXXX : DONE op = addOperation(result, "size" + StringUtils.capitalize(attrName), @@ -1378,7 +1906,7 @@ }*/ ); - // isXXXEmpty + // isXXXEmpty : DONE op = addOperation(result, "is" + StringUtils.capitalize(attrName) + "Empty", @@ -1391,7 +1919,7 @@ }*/ ); - } else { + } else if (attr.hasAssociationClass()) { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); // String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); @@ -1464,63 +1992,6 @@ } } - /** - * Add getter for simple property (neither association nor multiple). - * Will add two different operations for boolean case ('is' method and - * 'get' method). This method add the operation in both {@code - * outputAbstract} and {@code outputInterface}. - * - * @param attribute ObjectModelAttribute for getter operation - * @param operationPrefix Operation prefix : 'get' by default, if prefix - * is null - */ - protected void addSimpleGetterOperation(ObjectModelAttribute attribute, - String operationPrefix) { - - String attrName = attribute.getName(); - String attrType = attribute.getType(); - - if (operationPrefix == null) { - operationPrefix = TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; - } - - if (log.isDebugEnabled()) { - log.debug("Add getter operation for " + attrName + - " prefix = " + operationPrefix); - } - - // CONTRACT in Interface - ObjectModelOperation contract = addOperation(outputInterface, - operationPrefix + StringUtils.capitalize(attrName), - attrType, - ObjectModelModifier.PACKAGE); - - if (TopiaGeneratorUtil.hasDocumentation(attribute)) { - setDocumentation(contract, attribute.getDocumentation()); - } - - // IMPLEMENTATION in Abstract - ObjectModelOperation impl = addOperation(outputAbstract, - contract.getName(), - contract.getReturnType(), - ObjectModelModifier.PUBLIC); - setOperationBody(impl, "" -/*{ - fireOnPreRead(<%=getConstantName(attrName)%>, <%=attrName%>); - <%=attrType%> result = this.<%=attrName%>; - fireOnPostRead(<%=getConstantName(attrName)%>, <%=attrName%>); - return result; -}*/ - ); - - // Generate 'is' getter for boolean attributes - if (attrType.toLowerCase().contains("boolean") && - !operationPrefix.equals(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { - addSimpleGetterOperation(attribute, - TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); - } - } - protected void generateToStringMethod(ObjectModelClass output, ObjectModelClass clazz) { if (log.isDebugEnabled()) {

1 0

r2028 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-25 00:43:33 +0200 (Fri, 25 Jun 2010) New Revision: 2028 Url: http://nuiton.org/repositories/revision/topia/2028 Log: Manage case for association attributes Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-24 18:53:49 UTC (rev 2027) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-24 22:43:33 UTC (rev 2028) @@ -5,6 +5,7 @@ import org.apache.commons.lang.math.RandomUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaBuilder; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModel; @@ -37,6 +38,8 @@ protected static final String ENTITY_PROPERTY_CLASS_NAME = "EntityProperty"; + protected static final String ENTITY_PROPERTY_SUFFIX = "Property"; + protected static final String ENTITY_PROPERTY_GENERIC_TYPE = "<E>"; protected String mainException; @@ -289,10 +292,6 @@ addExtraForSubEntity(clazz); } - protected String getPropertyClassName(ObjectModelClassifier entityClass) { - return entityClass.getName() + "Property"; - } - protected String createAliasConstant(String entityName) { String constantName = @@ -397,26 +396,28 @@ // Generate for all attributes for (ObjectModelAttribute attr : input.getAttributes()) { + // Case we don't want generation for + if (!attr.isNavigable()) { + continue; + } + + String attrName = getReferenceAttributeName(attr); + if (log.isDebugEnabled()) { - log.debug("Entity property : name=" + attr.getName() + + log.debug("Entity property : name=" + attrName + " _ navigable=" + attr.isNavigable() + " _ maxMultiplicity=" + attr.getMaxMultiplicity() + " _ associationClass=" + attr.hasAssociationClass() + " _ referenceClassifier=" + attr.referenceClassifier()); } - // Case we don't want generation for - if (!attr.isNavigable() || attr.hasAssociationClass()) { - continue; - } - ObjectModelOperation propertyNameOperation = - createGetPropertyNameOperation(propertyClass, attr.getName(), input.getName()); + createGetPropertyNameOperation(propertyClass, attrName, input.getName()); createGetPropertyObjectOperation(propertyClass, attr, propertyNameOperation); } - // Case of Association class + // Case of Association class : generate also for participant properties if (input instanceof ObjectModelAssociationClass) { ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)input; @@ -455,26 +456,32 @@ protected ObjectModelOperation createGetPropertyObjectOperation(ObjectModelClass output, ObjectModelAttribute attrReference, ObjectModelOperation propertyNameOperation) { - ObjectModelOperation result = null; - if (attrReference.referenceClassifier() && attrReference.getMaxMultiplicity() == 1) { - String opName = attrReference.getName() + "Property"; + ObjectModelClassifier referenceClass = getReferenceAttributeClassifier(attrReference); - String referencePropertyClassName = getPropertyClassName(attrReference.getClassifier()); + // No reference, can add method to getPropertyObject + if (referenceClass == null) { + return null; + } - result = addOperation(output, opName, referencePropertyClassName, ObjectModelModifier.PUBLIC); + String operationName = getReferenceAttributeName(attrReference) + + ENTITY_PROPERTY_SUFFIX; - if (log.isDebugEnabled()) { - log.debug("Extra operation : " + opName + - " _ className = " + referencePropertyClassName); - } + String referencePropertyClassName = getPropertyClassName(referenceClass); - setOperationBody(result, "" + ObjectModelOperation result = + addOperation(output, operationName, referencePropertyClassName); + + if (log.isDebugEnabled()) { + log.debug("Extra operation : " + operationName + + " _ className = " + referencePropertyClassName); + } + + setOperationBody(result, "" /*{ return new<%=referencePropertyClassName%>(<%=propertyNameOperation.getName()%>()); }*/ - ); - } + ); return result; } @@ -535,6 +542,32 @@ } } + // Helpers + protected String getPropertyClassName(ObjectModelClassifier entityClass) { + return entityClass.getName() + ENTITY_PROPERTY_SUFFIX; + } + + protected String getReferenceAttributeName(ObjectModelAttribute attrReference) { + String attrName = attrReference.getName(); + if(attrReference.hasAssociationClass()) { + String assocAttrName = GeneratorUtil.getAssocAttrName(attrReference); + attrName = StringUtils.uncapitalize(assocAttrName); + } + return attrName; + } + + protected ObjectModelClassifier getReferenceAttributeClassifier(ObjectModelAttribute attrReference) { + ObjectModelClassifier referenceClass = null; + // case for attribute classifier, only for maxMultiplicity = 1 + if (attrReference.referenceClassifier() && attrReference.getMaxMultiplicity() == 1) { + referenceClass = attrReference.getClassifier(); + // case for association attribute + } else if (attrReference.hasAssociationClass()) { + referenceClass = attrReference.getAssociationClass(); + } + return referenceClass; + } + // For tests protected void setBuilder(JavaBuilder builder) { this.builder = builder;

1 0

r2027 - in trunk: src/site topia-service-replication/src/site/resources
by athimel＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: athimel Date: 2010-06-24 20:53:49 +0200 (Thu, 24 Jun 2010) New Revision: 2027 Url: http://nuiton.org/repositories/revision/topia/2027 Log: Fix JRST url Modified: trunk/src/site/site_fr.xml trunk/topia-service-replication/src/site/resources/dependencies.html trunk/topia-service-replication/src/site/resources/dependency-management.html Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-06-24 16:33:55 UTC (rev 2026) +++ trunk/src/site/site_fr.xml 2010-06-24 18:53:49 UTC (rev 2027) @@ -33,7 +33,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> </poweredBy> Modified: trunk/topia-service-replication/src/site/resources/dependencies.html =================================================================== --- trunk/topia-service-replication/src/site/resources/dependencies.html 2010-06-24 16:33:55 UTC (rev 2026) +++ trunk/topia-service-replication/src/site/resources/dependencies.html 2010-06-24 18:53:49 UTC (rev 2027) @@ -1357,7 +1357,7 @@ <a href="http://maven.apache.org" title="Maven" class="poweredBy"> <img class="poweredBy" alt="Maven" - src="http://jrst.labs.libre-entreprise.org/jrst/images/logos/maven-feather.png" + src="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png" width="90" height="30" /> @@ -1365,10 +1365,10 @@ - <a href="http://jrst.labs.libre-entreprise.org" title="JRst" class="poweredBy"> + <a href="http://maven-site.nuiton.org/jrst/" title="JRst" class="poweredBy"> <img class="poweredBy" alt="JRst" - src="http://jrst.labs.libre-entreprise.org/jrst/images/jrst-logo.png" + src="http://maven-site.nuiton.org/jrst/images/jrst-logo.png" width="90" height="30" /> @@ -1379,7 +1379,7 @@ <a href="http://docutils.sourceforge.net/rst.html" title="ReStructuredText" class="poweredBy"> <img class="poweredBy" alt="ReStructuredText" - src="http://jrst.labs.libre-entreprise.org/jrst/images/restructuredtext-logo.png" + src="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png" width="90" height="30" /> Modified: trunk/topia-service-replication/src/site/resources/dependency-management.html =================================================================== --- trunk/topia-service-replication/src/site/resources/dependency-management.html 2010-06-24 16:33:55 UTC (rev 2026) +++ trunk/topia-service-replication/src/site/resources/dependency-management.html 2010-06-24 18:53:49 UTC (rev 2027) @@ -434,7 +434,7 @@ <a href="http://maven.apache.org" title="Maven" class="poweredBy"> <img class="poweredBy" alt="Maven" - src="http://jrst.labs.libre-entreprise.org/jrst/images/logos/maven-feather.png" + src="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png" width="90" height="30" /> @@ -442,10 +442,10 @@ - <a href="http://jrst.labs.libre-entreprise.org" title="JRst" class="poweredBy"> + <a href="http://maven-site.nuiton.org/jrst/" title="JRst" class="poweredBy"> <img class="poweredBy" alt="JRst" - src="http://jrst.labs.libre-entreprise.org/jrst/images/jrst-logo.png" + src="http://maven-site.nuiton.org/jrst/images/jrst-logo.png" width="90" height="30" /> @@ -456,7 +456,7 @@ <a href="http://docutils.sourceforge.net/rst.html" title="ReStructuredText" class="poweredBy"> <img class="poweredBy" alt="ReStructuredText" - src="http://jrst.labs.libre-entreprise.org/jrst/images/restructuredtext-logo.png" + src="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png" width="90" height="30" />

1 0

r2026 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-24 18:33:55 +0200 (Thu, 24 Jun 2010) New Revision: 2026 Url: http://nuiton.org/repositories/revision/topia/2026 Log: Add managment for sub entity Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-24 14:13:08 UTC (rev 2025) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-24 16:33:55 UTC (rev 2026) @@ -285,6 +285,8 @@ // Create methods to instantiate the inner class createNewOperations(entityPropertyClass); + + addExtraForSubEntity(clazz); } protected String getPropertyClassName(ObjectModelClassifier entityClass) { @@ -505,6 +507,34 @@ ); } + protected void addExtraForSubEntity(ObjectModelClass entityClass) { + for (ObjectModelAttribute attr : entityClass.getAttributes()) { + + if (attr.isNavigable() && attr.referenceClassifier() && + attr.getClassifier().getName().equals(entityClass.getName())) { + // Same entity + + String propertyClassName = getPropertyClassName(entityClass); + + String subEntityName = entityClass.getName() + StringUtils.capitalize(attr.getName()); + String aliasConstant = createAliasConstant(subEntityName); + + ObjectModelOperation newEntityProperty = + addOperation(helperClass, "new" + subEntityName + "Property", propertyClassName, + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + + String callMethodName = "new" + propertyClassName; + + setOperationBody(newEntityProperty, "" + /*{ + return <%=callMethodName%>(<%=aliasConstant%>); + }*/ + ); + + } + } + } + // For tests protected void setBuilder(JavaBuilder builder) { this.builder = builder;

1 0

r2025 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator src/test/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-24 16:13:08 +0200 (Thu, 24 Jun 2010) New Revision: 2025 Url: http://nuiton.org/repositories/revision/topia/2025 Log: Evo #707 : QueryHelperTransformer (todo javadoc) Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java Modified: trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-06-24 14:10:48 UTC (rev 2024) +++ trunk/topia-persistence/pom.xml 2010-06-24 14:13:08 UTC (rev 2025) @@ -192,7 +192,8 @@ org.nuiton.topia.generator.EntityTransformer, org.nuiton.topia.generator.InterfaceTransformer, org.nuiton.topia.generator.BeanTransformer, - org.nuiton.topia.generator.EntityDTOTransformer + org.nuiton.topia.generator.EntityDTOTransformer, + org.nuiton.topia.generator.QueryHelperTransformer </templates> <excludeTemplates> <excludeTemplate>org.nuiton.topia.generator.EntityAbstractTransformer</excludeTemplate> Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-24 14:13:08 UTC (rev 2025) @@ -0,0 +1,512 @@ +package org.nuiton.topia.generator; + +import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.JavaBuilder; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.HashMap; +import java.util.Map; + +/** + * Created: 23 juin 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class QueryHelperTransformer extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(QueryHelperTransformer.class); + + protected ObjectModelClass helperClass; + + protected ObjectModelClass abstractEntityPropertyClass; + + protected static final String ENTITY_PROPERTY_CLASS_NAME = "EntityProperty"; + + protected static final String ENTITY_PROPERTY_GENERIC_TYPE = "<E>"; + + protected String mainException; + + protected Map<String, String> aliases; + + public static final String CONSTANT_PREFIX = "ALIAS_"; + + /*************************** MAIN PART OF THE HELPER **********************/ + + @Override + public void transformFromModel(ObjectModel model) { + + aliases = new HashMap<String, String>(); + + String modelName = StringUtils.capitalize(model.getName()); + String packageName = getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + helperClass = createClass(modelName + "QueryHelper", packageName); + + addImport(helperClass, TopiaQuery.class); + addImport(helperClass, TopiaEntity.class); + + String exception = model.getTagValue(TopiaGeneratorUtil.TAG_EXCEPTION_CLASS); + if (exception != null) { + addImport(helperClass, exception); + mainException = TopiaGeneratorUtil.getSimpleName(exception); + } + + initConstantPrefixFromModel(); + + createInnerAbstractEntityPropertyClass(); + createUtilOperations(); + } + + protected void createInnerAbstractEntityPropertyClass() { + + abstractEntityPropertyClass = (ObjectModelClass)addInnerClassifier(helperClass, + ObjectModelType.OBJECT_MODEL_CLASS, + ENTITY_PROPERTY_CLASS_NAME + ENTITY_PROPERTY_GENERIC_TYPE, + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.STATIC); + + addImport(helperClass, HashMap.class); + addImport(helperClass, Map.class); + + addAttribute(abstractEntityPropertyClass, "alias", + String.class, null, + ObjectModelModifier.PROTECTED); + + addAttribute(abstractEntityPropertyClass, "propertiesCache", + "Map<String, String>", null, + ObjectModelModifier.PROTECTED); + + // Constructor + // FIXME-fdesbois-2010-06-23 : need to take care of generic case in JavaBuilder in EUGene +// ObjectModelOperation constructor = +// addConstructor(abstractEntityPropertyClass, ObjectModelModifier.PUBLIC); + ObjectModelOperation constructor = + builder.addOperation(abstractEntityPropertyClass, ENTITY_PROPERTY_CLASS_NAME, null, ObjectModelModifier.PUBLIC); + + setOperationBody(constructor, "" + /*{ + propertiesCache = new HashMap<String, String>(); + }*/ + ); + + // Getter and setter for alias + ObjectModelOperation setAlias = + addOperation(abstractEntityPropertyClass, "setAlias", "void", + ObjectModelModifier.PROTECTED); + addParameter(setAlias, String.class, "alias"); + + + setOperationBody(setAlias, "" + /*{ + this.alias = alias; + }*/ + ); + + ObjectModelOperation getAlias = + addOperation(abstractEntityPropertyClass, "$alias", String.class, + ObjectModelModifier.PUBLIC); + + + setOperationBody(getAlias, "" + /*{ + return alias; + }*/ + ); + + // Getter for properties + ObjectModelOperation getProperty = + addOperation(abstractEntityPropertyClass, "$property", String.class, + ObjectModelModifier.PUBLIC); + addParameter(getProperty, String.class, "propertyName"); + + + setOperationBody(getProperty, "" + /*{ + String result = propertiesCache.get(propertyName); + if (result == null) { + result = TopiaQuery.getProperty(alias, propertyName); + propertiesCache.put(propertyName, result); + } + return result; + }*/ + ); + + ObjectModelOperation topiaCreateDate = + addOperation(abstractEntityPropertyClass, "topiaCreateDate", String.class, + ObjectModelModifier.PUBLIC); + + setOperationBody(topiaCreateDate, "" + /*{ + return $property(TopiaEntity.TOPIA_CREATE_DATE); + }*/ + ); + + ObjectModelOperation topiaId = + addOperation(abstractEntityPropertyClass, "topiaId", String.class, + ObjectModelModifier.PUBLIC); + + setOperationBody(topiaId, "" + /*{ + return $property(TopiaEntity.TOPIA_ID); + }*/ + ); + + ObjectModelOperation topiaVersion = + addOperation(abstractEntityPropertyClass, "topiaVersion", String.class, + ObjectModelModifier.PUBLIC); + + setOperationBody(topiaVersion, "" + /*{ + return $property(TopiaEntity.TOPIA_VERSION); + }*/ + ); + + // Abstract methods + addOperation(abstractEntityPropertyClass, "getEntityClass", + "Class" + ENTITY_PROPERTY_GENERIC_TYPE, + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + + addOperation(abstractEntityPropertyClass, "defaultAlias", String.class, + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + } + + protected void createUtilOperations() { + + // createQuery method with EntityProperty in argument + ObjectModelOperation createQuery = + addOperation(helperClass, "createQuery", TopiaQuery.class, + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + addParameter(createQuery, ENTITY_PROPERTY_CLASS_NAME, "property"); + + setOperationBody(createQuery, "" + /*{ + return new TopiaQuery((Class<? extends TopiaEntity>)property.getEntityClass(), property.$alias()); + }*/ + ); + + // format method to format statement using $1, $2 corresponding to property names + ObjectModelOperation format = + addOperation(helperClass, "format", String.class, + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + addParameter(format, String.class, "statement"); + addParameter(format, "String...", "propertyNames"); + + setOperationBody(format, "" + /*{ + for (int i = 1; i <= propertyNames.length; i++) { + statement = statement.replace("$" + i, propertyNames[i-1]); + } + return statement; + }*/ + ); + + // Methods to instantiate EntityProperty + String genericType = "<P extends " + ENTITY_PROPERTY_CLASS_NAME + "> P"; + ObjectModelOperation newEntityProperty1 = + addOperation(helperClass, "newEntityProperty", genericType, + ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + addParameter(newEntityProperty1, "Class<P>", "propertyClass"); + + setOperationBody(newEntityProperty1, "" + /*{ + return newEntityProperty(propertyClass, null); + }*/ + ); + ObjectModelOperation newEntityProperty2 = + addOperation(helperClass, "newEntityProperty", genericType, + ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + addParameter(newEntityProperty2, "Class<P>", "propertyClass"); + addParameter(newEntityProperty2, String.class, "alias"); + + StringBuilder buffer = new StringBuilder("" + /*{ + try { + P property = propertyClass.newInstance(); + if (alias == null) { + alias = property.defaultAlias(); + } + property.setAlias(alias); + return property; + } catch (Exception eee) { + }*/ + ); + + if (mainException != null) { + addException(newEntityProperty1, mainException); + addException(newEntityProperty2, mainException); + buffer.append("" + /*{ + throw new <%=mainException%>("Error instantiate " + propertyClass.getName(), eee); + }*/ + ); + } else { + buffer.append("" + /*{ + throw new Error("Error instantiate " + propertyClass.getName(), eee); + }*/ + ); + } + buffer.append("" + /*{ + } + }*/ + ); + + setOperationBody(newEntityProperty2, buffer.toString()); + } + + /*************************** INNER PROPERTY CLASSES ***********************/ + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!TopiaGeneratorUtil.hasStereotype(clazz, TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + return; + } + + // Create default alias for this entity + String aliasConstant = createAliasConstant(clazz.getName()); + + // Create inner class for this entity + ObjectModelClass entityPropertyClass = createInnerClass(clazz, aliasConstant); + + // Create methods to instantiate the inner class + createNewOperations(entityPropertyClass); + } + + protected String getPropertyClassName(ObjectModelClassifier entityClass) { + return entityClass.getName() + "Property"; + } + + protected String createAliasConstant(String entityName) { + + String constantName = + TopiaGeneratorUtil.convertVariableNameToConstantName(entityName); + + String[] words = constantName.split("_"); + String alias = ""; + // Use first letter of each word as alias + for (String word : words) { + alias += word.substring(0, 1); + } + + // Case of existing alias, check other letters in lastWord + String lastWord = words[words.length - 1]; + while(aliases.containsKey(alias)) { + // Remove first letter + lastWord = lastWord.substring(1, lastWord.length()); + if (!lastWord.isEmpty()) { + // Use first letter of new lastWord to concat the alias + alias += lastWord.charAt(0); + } else { + // Generate an alea char to concat + alias += StringUtils.upperCase(RandomStringUtils.randomAlphabetic(1)); + } + } + + String aliasPropertyName = CONSTANT_PREFIX + constantName; + + if (log.isDebugEnabled()) { + log.debug("Add alias '" + alias + "' named " + aliasPropertyName); + } + + aliases.put(alias, aliasPropertyName); + + addAttribute(helperClass, aliasPropertyName, String.class, "\"" + alias + "\"", + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC, ObjectModelModifier.FINAL); + + return aliasPropertyName; + } + + protected ObjectModelClass createInnerClass(ObjectModelClass input, String aliasConstant) { + String className = getPropertyClassName(input); + + ObjectModelClass propertyClass = (ObjectModelClass) + addInnerClassifier(helperClass, + ObjectModelType.OBJECT_MODEL_CLASS, + className, + ObjectModelModifier.STATIC); + + if (log.isDebugEnabled()) { + log.debug("Generate for entity : " + input.getQualifiedName()); + } + + // FIXME-fdesbois-2010-06-23 : need to manage imports for inner classes : EUGene ImportsManager + addImport(helperClass, input.getQualifiedName()); + + // Important to keep qualifiedName for setSuperClass + String superClassQualifiedName = abstractEntityPropertyClass.getQualifiedName(). + replace(ENTITY_PROPERTY_GENERIC_TYPE, "<" + input.getName() + ">"); + + setSuperClass(propertyClass, superClassQualifiedName); + + ObjectModelOperation constructor = + addConstructor(propertyClass, ObjectModelModifier.PROTECTED); + + setOperationBody(constructor, "" + /*{ + }*/ + ); + + ObjectModelOperation getEntityClass = + addOperation(propertyClass, "getEntityClass", "Class<" + input.getName() + ">", + ObjectModelModifier.PUBLIC); + + addAnnotation(propertyClass, getEntityClass, "Override"); + + setOperationBody(getEntityClass, "" + /*{ + return <%=input.getName()%>.class; + }*/ + ); + + ObjectModelOperation defaultAlias = + addOperation(propertyClass, "defaultAlias", String.class, + ObjectModelModifier.PUBLIC); + + addAnnotation(propertyClass, defaultAlias, "Override"); + + setOperationBody(defaultAlias, "" + /*{ + return <%=aliasConstant%>; + }*/ + ); + + createGetterOperations(input, propertyClass); + + return propertyClass; + } + + protected void createGetterOperations(ObjectModelClass input, ObjectModelClass propertyClass) { + + // Generate for all attributes + for (ObjectModelAttribute attr : input.getAttributes()) { + + if (log.isDebugEnabled()) { + log.debug("Entity property : name=" + attr.getName() + + " _ navigable=" + attr.isNavigable() + + " _ maxMultiplicity=" + attr.getMaxMultiplicity() + + " _ associationClass=" + attr.hasAssociationClass() + + " _ referenceClassifier=" + attr.referenceClassifier()); + } + + // Case we don't want generation for + if (!attr.isNavigable() || attr.hasAssociationClass()) { + continue; + } + + ObjectModelOperation propertyNameOperation = + createGetPropertyNameOperation(propertyClass, attr.getName(), input.getName()); + + createGetPropertyObjectOperation(propertyClass, attr, propertyNameOperation); + } + + // Case of Association class + if (input instanceof ObjectModelAssociationClass) { + + ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)input; + + for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { + ObjectModelOperation propertyNameOperation = + createGetPropertyNameOperation(propertyClass, attr.getName(), input.getName()); + + createGetPropertyObjectOperation(propertyClass, attr, propertyNameOperation); + } + } + } + + protected ObjectModelOperation createGetPropertyNameOperation(ObjectModelClass output, String attrName, String entityClassName) { + ObjectModelOperation result = + addOperation(output, attrName, String.class, ObjectModelModifier.PUBLIC); + + String constantName = + entityClassName + "." + getConstantName(attrName); + + if (log.isDebugEnabled()) { + log.debug("Add getter for property : " + attrName + + " _ constantName = " + constantName + + " _ constantPrefix = " + getConstantPrefix()); + } + + setOperationBody(result, "" + /*{ + return $property(<%=constantName%>); + }*/ + ); + + return result; + } + + protected ObjectModelOperation createGetPropertyObjectOperation(ObjectModelClass output, + ObjectModelAttribute attrReference, + ObjectModelOperation propertyNameOperation) { + ObjectModelOperation result = null; + if (attrReference.referenceClassifier() && attrReference.getMaxMultiplicity() == 1) { + + String opName = attrReference.getName() + "Property"; + + String referencePropertyClassName = getPropertyClassName(attrReference.getClassifier()); + + result = addOperation(output, opName, referencePropertyClassName, ObjectModelModifier.PUBLIC); + + if (log.isDebugEnabled()) { + log.debug("Extra operation : " + opName + + " _ className = " + referencePropertyClassName); + } + + setOperationBody(result, "" + /*{ + return new<%=referencePropertyClassName%>(<%=propertyNameOperation.getName()%>()); + }*/ + ); + } + + return result; + } + + protected void createNewOperations(ObjectModelClass entityProperty) { + + String className = entityProperty.getName(); + + String methodName = "new" + className; + + ObjectModelOperation newEntityProperty1 = + addOperation(helperClass, "new" + className, className, + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + + setOperationBody(newEntityProperty1, "" + /*{ + return <%=methodName%>(null); + }*/ + ); + + ObjectModelOperation newEntityProperty2 = + addOperation(helperClass, "new" + className, className, + ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + addParameter(newEntityProperty2, String.class, "alias"); + + setOperationBody(newEntityProperty2, "" + /*{ + return newEntityProperty(<%=className%>.class, alias); + }*/ + ); + } + + // For tests + protected void setBuilder(JavaBuilder builder) { + this.builder = builder; + } +} Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2010-06-24 14:13:08 UTC (rev 2025) @@ -0,0 +1,44 @@ +package org.nuiton.topia.generator; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.eugene.java.JavaBuilder; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; + +import java.util.HashMap; + +/** + * Created: 24 juin 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class QueryHelperTransformerTest { + + @Test + public void testCreateAliasConstant() { + QueryHelperTransformer transformer = new QueryHelperTransformer(); + transformer.aliases = new HashMap<String, String>(); + transformer.helperClass = new ObjectModelClassImpl(); + transformer.setBuilder(new JavaBuilder("TopiaTest")); + + String entityName = "Department"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(1, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("D")); + + entityName = "Depot"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(2, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("DE")); + + entityName = "Deposite"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(3, transformer.aliases.size()); + Assert.assertTrue(transformer.aliases.containsKey("DEP")); + + entityName = "Dep"; + transformer.createAliasConstant(entityName); + Assert.assertEquals(4, transformer.aliases.size()); + } +}

1 0

r2024 - trunk
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-24 16:10:48 +0200 (Thu, 24 Jun 2010) New Revision: 2024 Url: http://nuiton.org/repositories/revision/topia/2024 Log: Use last eugene snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-24 14:09:49 UTC (rev 2023) +++ trunk/pom.xml 2010-06-24 14:10:48 UTC (rev 2024) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.2</eugene.version> + <eugene.version>2.0.3-SNAPSHOT</eugene.version> <lutinutil.version>1.3.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2023 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-24 16:09:49 +0200 (Thu, 24 Jun 2010) New Revision: 2023 Url: http://nuiton.org/repositories/revision/topia/2023 Log: Ano #705 : Ignore mainAlias from loading properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-24 14:06:30 UTC (rev 2022) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-24 14:09:49 UTC (rev 2023) @@ -1615,6 +1615,12 @@ TopiaEntity currEntity = entity; while (it.hasNext()) { String s = it.next(); + if (mainAlias != null && s.equals(mainAlias)) { + if (log.isTraceEnabled()) { + log.trace("Skip alias : " + mainAlias); + } + continue; + } if (log.isTraceEnabled()) { log.trace("Current entity : " + currEntity.getClass().getSimpleName());

1 0

r2022 - in trunk: . topia-persistence topia-persistence/src/test/resources
by fdesbois＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: fdesbois Date: 2010-06-24 16:06:30 +0200 (Thu, 24 Jun 2010) New Revision: 2022 Url: http://nuiton.org/repositories/revision/topia/2022 Log: Revert previous bad commit Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-persistence/src/test/resources/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-24 13:59:11 UTC (rev 2021) +++ trunk/pom.xml 2010-06-24 14:06:30 UTC (rev 2022) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.3-SNAPSHOT</eugene.version> + <eugene.version>2.0.2</eugene.version> <lutinutil.version>1.3.1</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-06-24 13:59:11 UTC (rev 2021) +++ trunk/topia-persistence/pom.xml 2010-06-24 14:06:30 UTC (rev 2022) @@ -192,8 +192,7 @@ org.nuiton.topia.generator.EntityTransformer, org.nuiton.topia.generator.InterfaceTransformer, org.nuiton.topia.generator.BeanTransformer, - org.nuiton.topia.generator.EntityDTOTransformer, - org.nuiton.topia.generator.QueryHelperTransformer + org.nuiton.topia.generator.EntityDTOTransformer </templates> <excludeTemplates> <excludeTemplate>org.nuiton.topia.generator.EntityAbstractTransformer</excludeTemplate> Modified: trunk/topia-persistence/src/test/resources/log4j.properties =================================================================== --- trunk/topia-persistence/src/test/resources/log4j.properties 2010-06-24 13:59:11 UTC (rev 2021) +++ trunk/topia-persistence/src/test/resources/log4j.properties 2010-06-24 14:06:30 UTC (rev 2022) @@ -10,4 +10,3 @@ log4j.logger.org.nuiton.topia=INFO #log4j.logger.org.nuiton.topiatest=DEBUG log4j.logger.org.nuiton.topia.persistence.util=INFO -log4j.logger.org.nuiton.topia.generator=DEBUG

1 0