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

r2361 - trunk
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 03:13:09 +0200 (Thu, 20 Oct 2011) New Revision: 2361 Url: http://nuiton.org/repositories/revision/topia/2361 Log: T?\195?\162che #1775: Updates to eugene 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-20 01:08:58 UTC (rev 2360) +++ trunk/pom.xml 2011-10-20 01:13:09 UTC (rev 2361) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.4.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0

r2360 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 03:08:58 +0200 (Thu, 20 Oct 2011) New Revision: 2360 Url: http://nuiton.org/repositories/revision/topia/2360 Log: Evolution #1770: Empty documentation on entities should not be generated Evolution #1780: Improve generated java files Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-19 16:07:41 UTC (rev 2359) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-20 01:08:58 UTC (rev 2360) @@ -61,16 +61,19 @@ */ public class DAOHelperTransformer extends ObjectModelTransformerToJava { - private static final Log log = LogFactory.getLog(DAOHelperTransformer.class); + private static final Log log = + LogFactory.getLog(DAOHelperTransformer.class); @Override public void transformFromModel(ObjectModel model) { - String packageName = getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + String packageName = + getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); String modelName = model.getName(); String daoHelperClazzName = modelName + "DAOHelper"; String entityEnumName = modelName + "EntityEnum"; - List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); + List<ObjectModelClass> classes = + TopiaGeneratorUtil.getEntityClasses(model, true); boolean generateOperator = TopiaGeneratorUtil.shouldGenerateOperatorForDAOHelper(model); @@ -78,7 +81,8 @@ boolean generateStandaloneEnum = TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); - ObjectModelClass daoHelper = createClass(daoHelperClazzName, packageName); + ObjectModelClass daoHelper = createClass(daoHelperClazzName, + packageName); ObjectModelEnumeration entityEnum; @@ -98,7 +102,6 @@ ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName ); -// addImport(daoHelper, TopiaEntity.class); addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, EntityOperatorStore.class); addImport(daoHelper, Arrays.class); @@ -137,9 +140,7 @@ addImport(daoHelper, TopiaDAO.class); addImport(daoHelper, TopiaEntity.class); addImport(daoHelper, TopiaContext.class); -// addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, Array.class); -// addImport(daoHelper, Arrays.class); if (generateOperator) { addImport(daoHelper,EntityOperator.class); @@ -156,17 +157,17 @@ // getModelVersion method op = addOperation(daoHelper, "getModelVersion", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return "<%=modelVersion%>"; - }*/ +/*{ + return "<%=modelVersion%>"; + }*/ ); // getModelName method op = addOperation(daoHelper, "getModelName", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return "<%=modelName%>"; - }*/ +/*{ + return "<%=modelName%>"; + }*/ ); @@ -180,11 +181,11 @@ addImport(daoHelper, clazz); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=daoClazzName%> result = ci.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); - return result; - }*/ +/*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=daoClazzName%> result = ci.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); + return result; + }*/ ); } @@ -195,12 +196,12 @@ addParameter(op, "Class<T>", "klass"); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - D dao = (D) ci.getDAO(constant.getContract()); - return dao; - }*/ +/*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + D dao = (D) ci.getDAO(constant.getContract()); + return dao; + }*/ ); op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); @@ -208,78 +209,78 @@ addParameter(op, "T", "entity"); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); - D dao = (D) ci.getDAO(constant.getContract()); - return dao; - }*/ +/*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); + D dao = (D) ci.getDAO(constant.getContract()); + return dao; + }*/ ); // getContractClass method op = addOperation(daoHelper, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (Class<T>) constant.getContract(); - }*/ +/*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getContract(); + }*/ ); // getImplementationClass method op = addOperation(daoHelper, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (Class<T>) constant.getImplementation(); - }*/ +/*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getImplementation(); + }*/ ); // getContractClasses method op = addOperation(daoHelper, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); - Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); - for (int i = 0; i < values.length; i++) { - result[i] = values[i].getContract(); - } - return result; - }*/ +/*{ + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getContract(); + } + return result; + }*/ ); // getImplementationClasses method op = addOperation(daoHelper, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); - Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); - for (int i = 0; i < values.length; i++) { - result[i] = values[i].getImplementation(); - } - return result; - }*/ +/*{ + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getImplementation(); + } + return result; + }*/ ); // getImplementationClassesAsString method op = addOperation(daoHelper, "getImplementationClassesAsString", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - }*/ +/*{ + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + }*/ ); // getContracts method op = addOperation(daoHelper, "getContracts", entityEnumName+"[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return <%=entityEnumName%>.values(); - }*/ +/*{ + return <%=entityEnumName%>.values(); + }*/ ); if (generateOperator) { @@ -287,10 +288,10 @@ op = addOperation(daoHelper, "getOperator", "<T extends TopiaEntity> EntityOperator<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op,"Class<T>","klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (EntityOperator<T>) EntityOperatorStore.getOperator(constant); - }*/ +/*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return EntityOperatorStore.getOperator(constant); + }*/ ); } } @@ -335,16 +336,16 @@ } attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "contract", "Class<? extends TopiaEntity>"); - attr.setDocumentation("the contract of the entity"); + attr.setDocumentation("The contract of the entity."); attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "implementationFQN", "String"); - attr.setDocumentation("the fully qualified name of the implementation of the entity"); + attr.setDocumentation("The fully qualified name of the implementation of the entity."); attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "implementation", "Class<? extends TopiaEntity>"); - attr.setDocumentation("the implementation class of the entity (will be lazy computed at runtime)"); + attr.setDocumentation("The implementation class of the entity (will be lazy computed at runtime)."); attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "naturalIds", "String[]"); - attr.setDocumentation("the array of property involved in the natural key of the entity."); + attr.setDocumentation("The array of property involved in the natural key of the entity."); // constructor op = addConstructor(entityEnum, ObjectModelModifier.PACKAGE); @@ -352,112 +353,112 @@ addParameter(op,"String...","naturalIds"); setOperationBody(op, "" /*{ - this.contract = contract; - this.naturalIds = naturalIds; - this.implementationFQN = contract.getName()+"Impl"; -}*/ + this.contract = contract; + this.naturalIds = naturalIds; + implementationFQN = contract.getName() + "Impl"; + }*/ ); // getContract method op = addOperation(entityEnum, "getContract", "Class<? extends TopiaEntity>", ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return contract; -}*/ + return contract; + }*/ ); // getContract method op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return naturalIds; -}*/ + return naturalIds; + }*/ ); // getImplementationFQN method op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return implementationFQN; -}*/ + return implementationFQN; + }*/ ); // setImplementationFQN method op = addOperation(entityEnum, "setImplementationFQN","void",ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); addParameter(op,"String","implementationFQN"); if (generateOperator) { setOperationBody(op, "" /*{ - this.implementationFQN = implementationFQN; - this.implementation = null; - // on reinitialise le magasin d'operators - EntityOperatorStore.clear(); -}*/ + this.implementationFQN = implementationFQN; + implementation = null; + // reinit the operators store + EntityOperatorStore.clear(); + }*/ ); } else { setOperationBody(op, "" /*{ - this.implementationFQN = implementationFQN; - this.implementation = null; -}*/ + this.implementationFQN = implementationFQN; + this.implementation = null; + }*/ ); } // accept method op = addOperation(entityEnum, "accept","boolean",ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); addParameter(op,"Class<? extends TopiaEntity>","klass"); setOperationBody(op, "" /*{ - return <%=daoHelperClazzName%>.getContractClass(klass) == contract; -}*/ + return <%=daoHelperClazzName%>.getContractClass(klass) == contract; + }*/ ); // getImplementation method op = addOperation(entityEnum, "getImplementation","Class<? extends TopiaEntity>",ObjectModelModifier.PUBLIC); - addAnnotation(entityEnum,op,"Override"); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - if (implementation == null) { - try { - implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); - } catch (ClassNotFoundException e) { - throw new RuntimeException("could not find class " + implementationFQN); + if (implementation == null) { + try { + implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); + } catch (ClassNotFoundException e) { + throw new RuntimeException("could not find class " + implementationFQN); + } } - } - return implementation; -}*/ + return implementation; + }*/ ); // valueOf method op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); addParameter(op,"TopiaEntity","entity"); setOperationBody(op, "" - /*{ - return valueOf(entity.getClass()); - }*/ +/*{ + return valueOf(entity.getClass()); + }*/ ); // valueOf method op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); addParameter(op,"Class<?>","klass"); setOperationBody(op, "" - /*{ - if (klass.isInterface()) { - return <%=entityEnumName%>.valueOf(klass.getSimpleName()); - } - for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { - if (entityEnum.getContract().isAssignableFrom(klass)) { - //todo check it works for inheritance - return entityEnum; - } - } - throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); - }*/ +/*{ + if (klass.isInterface()) { + return valueOf(klass.getSimpleName()); + } + for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { + if (entityEnum.getContract().isAssignableFrom(klass)) { + //todo check it works for inheritance + return entityEnum; + } + } + throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); + }*/ ); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-19 16:07:41 UTC (rev 2359) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-20 01:08:58 UTC (rev 2360) @@ -354,8 +354,6 @@ } setSuperClass(daoAbstractClass, extendClass); -// addInterface(daoAbstractClass, TopiaDAO.class.getName() + "<E>"); - String prefix = getConstantPrefix(clazz, ""); setConstantPrefix(prefix); @@ -371,9 +369,7 @@ addImport(daoAbstractClass, Set.class); } addImport(daoAbstractClass, List.class); -// addImport(daoAbstractClass, Arrays.class); addImport(daoAbstractClass, TopiaException.class); -// addImport(daoAbstractClass, TopiaContextImplementor.class); boolean enableSecurity = TopiaGeneratorUtil.isClassWithSecurity(clazz); @@ -461,8 +457,8 @@ "getRequestPermission", "List<Permission>", ObjectModelModifier.PUBLIC); - setDocumentation(op, "Retourne les permissions a verifier pour " + - "l'acces a l'entite pour le service Taas"); +// setDocumentation(op, "Retourne les permissions a verifier pour " + +// "l'acces a l'entite pour le service Taas"); addException(op, TopiaException.class); addParameter(op, String.class, "topiaId"); addParameter(op, int.class, "actions"); @@ -522,8 +518,8 @@ addParameter(op, String.class, "query"); addParameter(op, Class.class, "daoClass"); addException(op, TopiaException.class); - setDocumentation(op, "Retourne les permissions a verifier pour " + - "l'acces a l'entite pour le service Taas"); +// setDocumentation(op, "Retourne les permissions a verifier pour " + +// "l'acces a l'entite pour le service Taas"); setOperationBody(op, "" /*{ TopiaContextImplementor context = getContext(); List<String> result = context.find(query, "id", topiaId); @@ -643,7 +639,7 @@ // autres entites en one-to-* // TODO peut-etre qu'hibernate est capable de faire ca tout seul ? // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude - builder.addImport(result, attrType); + addImport(result, attrType); String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); body.append("" @@ -906,29 +902,6 @@ ObjectModelModifier.ABSTRACT, ObjectModelModifier.toValue(op.getVisibility()) ); - -// ObjectModelOperation op2; -// op2 = addOperation(result, -// op.getName(), -// op.getReturnType(), -// ObjectModelModifier.ABSTRACT, -// ObjectModelModifier.toValue(op.getVisibility())); -// setDocumentation(op2, op.getDocumentation()); -// -// // parameters -// -// for (ObjectModelParameter param : op.getParameters()) { -// ObjectModelParameter param2 = addParameter(op2, -// param.getType(), param.getName()); -// setDocumentation(param2, param.getDocumentation()); -// } -// -// // exceptions -// Set<String> exceptions = op.getExceptions(); -// exceptions.add(TopiaException.class.getName()); -// for (String exception : exceptions) { -// addException(op2, exception); -// } } } @@ -1002,7 +975,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); - setDocumentation(op, "Retourne le premier élément trouvé ayant comme valeur pour l'attribut " + attrName + " le paramètre."); setOperationBody(op, "" /*{ E result = findByProperty(<%=clazzName + "." + getConstantName(propertyName)%>, v); @@ -1016,8 +988,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); - setDocumentation(op, "Retourne les éléments ayant comme valeur pour " + - "l'attribut " + attrName + " le paramètre."); setOperationBody(op, "" /*{ List<E> result = findAllByProperty(<%=clazzName + "." + getConstantName(propertyName)%>, v); @@ -1034,10 +1004,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); - setDocumentation(op, "Retourne le premier élément trouvé ayant " + - "comme valeur pour l'attribut " + - TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName) + - " le paramètre."); setOperationBody(op, "" /*{ E result = findByProperty(<%=clazzName + "." + getConstantName(TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName))%>, value); @@ -1051,10 +1017,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); - setDocumentation(op, "Retourne les éléments ayant comme valeur pour" + - " l'attribut " + - TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName) + - " le paramètre."); setOperationBody(op, "" /*{ List<E> result = findAllByProperty(<%=clazzName + "." + getConstantName(TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName))%>, value); @@ -1081,10 +1043,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); - setDocumentation(op, "Retourne le premier élément ayant comme valeur pour" + - " l'attribut " + - TopiaGeneratorUtil.toLowerCaseFirstLetter(attrName) + - " le paramètre."); setOperationBody(op, "" /*{ E result = findContains(<%=clazzName + "." + getConstantName(attrName)%>, v); @@ -1098,10 +1056,6 @@ ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); - setDocumentation(op, "Retourne les éléments ayant comme valeur pour" + - " l'attribut " + - TopiaGeneratorUtil.toLowerCaseFirstLetter(attrName) + - " le paramètre."); setOperationBody(op, "" /*{ List<E> result = findAllContains(<%=clazzName + "." + getConstantName(attrName)%>, v); 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 2011-10-19 16:07:41 UTC (rev 2359) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 01:08:58 UTC (rev 2360) @@ -98,7 +98,9 @@ private boolean associationClass; protected boolean generateInterface; + protected boolean generateAbstract; + protected boolean generateImpl; protected void clean() { @@ -166,7 +168,8 @@ // Case of association class : properties from participants/extremities // of the association class. if (input instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass association = (ObjectModelAssociationClass)input; + ObjectModelAssociationClass association = + (ObjectModelAssociationClass)input; associationClass = true; generateProperties(association.getParticipantsAttributes()); associationClass = false; @@ -332,7 +335,7 @@ ObjectModelOperation op = addOperation(outputAbstract, "update", "void", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); - setDocumentation(op,"@since 2.5.3"); +// setDocumentation(op,"@since 2.5.3"); addAnnotation(outputAbstract, op, Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -342,7 +345,7 @@ op = addOperation(outputAbstract, "delete", "void", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); - setDocumentation(op,"@since 2.5.3"); +// setDocumentation(op,"@since 2.5.3"); addAnnotation(outputAbstract, op, Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -663,7 +666,7 @@ // Interface operation ObjectModelOperation interfaceOperation = createPropertySetterSignature(outputInterface, attrType, attrName, - attribute.getDocumentation()); + ""); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -676,7 +679,7 @@ fireOnPreWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); this.<%=attrName%> = <%=attrName%>; fireOnPostWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); -}*/ + }*/ ); } @@ -710,13 +713,9 @@ addOperation(outputInterface, operationPrefix + StringUtils.capitalize(attrName), attrType, ObjectModelModifier.PACKAGE); - // Documentation - if (TopiaGeneratorUtil.hasDocumentation(attribute)) { - setDocumentation(interfaceOperation, attribute.getDocumentation()); - } - // Implementation - ObjectModelOperation implOperation = createImplOperation(interfaceOperation); + ObjectModelOperation implOperation = + createImplOperation(interfaceOperation); attrType = TopiaGeneratorUtil.getSimpleName(attrType); @@ -726,7 +725,7 @@ <%=attrType%> result = this.<%=attrName%>; fireOnPostRead(<%=getConstantName(attrName)%>, <%=attrName%>); return result; -}*/ + }*/ ); // Generate 'is' getter for boolean attributes @@ -756,12 +755,6 @@ 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 = createImplOperation(interfaceOperation); @@ -804,7 +797,7 @@ /*{ this.<%=attrName%>.add(<%=attrName%>); fireOnPostWrite(<%=getConstantName(attrName)%>, this.<%=attrName%>.size(), null, <%=attrName%>); -}*/ + }*/ ); setOperationBody(implOperation, body.toString()); } @@ -827,14 +820,9 @@ 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 = createImplOperation(interfaceOperation); + ObjectModelOperation implOperation = + createImplOperation(interfaceOperation); attrType = TopiaGeneratorUtil.getSimpleName(attrType); @@ -846,7 +834,7 @@ for (<%=attrType%> item : <%=attrName%>) { add<%=StringUtils.capitalize(attrName)%>(item); } -}*/ + }*/ ); } @@ -866,7 +854,7 @@ // Interface operation ObjectModelOperation interfaceOperation = createPropertySetterSignature(outputInterface, attrType, attrName, - attribute.getDocumentation()); + ""); ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -881,7 +869,7 @@ fireOnPreWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); this.<%=attrName%> = <%=attrName%>; fireOnPostWrite(<%=getConstantName(attrName)%>, oldValue, <%=attrName%>); -}*/ + }*/ ); } @@ -903,12 +891,6 @@ 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 = createImplOperation(interfaceOperation); @@ -919,7 +901,7 @@ body.append("" /*{ fireOnPreWrite(<%=getConstantName(attrName)%>, <%=attrName%>, null); - if ((this.<%=attrName%> == null) || (!this.<%=attrName%>.remove(<%=attrName%>))) { + if (this.<%=attrName%> == null || !this.<%=attrName%>.remove(<%=attrName%>)) { throw new IllegalArgumentException("List does not contain given element"); } }*/ @@ -946,7 +928,7 @@ body.append("" /*{ fireOnPostWrite(<%=getConstantName(attrName)%>, this.<%=attrName%>.size() + 1, <%=attrName%>, null); -}*/ + }*/ ); setOperationBody(implOperation, body.toString()); } @@ -969,11 +951,6 @@ addOperation(outputInterface, "clear" + StringUtils.capitalize(attrName), void.class, ObjectModelModifier.PACKAGE); - // Documentation - if (TopiaGeneratorUtil.hasDocumentation(attribute)) { - setDocumentation(interfaceOperation, attribute.getDocumentation()); - } - // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1016,7 +993,7 @@ fireOnPreWrite(<%=getConstantName(attrName)%>, oldValue, this.<%=attrName%>); this.<%=attrName%>.clear(); fireOnPostWrite(<%=getConstantName(attrName)%>, oldValue, this.<%=attrName%>); -}*/ + }*/ ); setOperationBody(implOperation, body.toString()); } @@ -1037,16 +1014,13 @@ addOperation(outputInterface, "get" + StringUtils.capitalize(attrName), attrType, ObjectModelModifier.PACKAGE); - // Documentation - setDocumentation(interfaceOperation, "Retourne la collection."); - // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); setOperationBody(implOperation, "" /*{ return <%=attrName%>; -}*/ + }*/ ); } @@ -1067,20 +1041,16 @@ 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 = createImplOperation(interfaceOperation); + ObjectModelOperation implOperation = + createImplOperation(interfaceOperation); addImport(outputAbstract, TopiaEntityHelper.class); setOperationBody(implOperation, "" /*{ return TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); - }*/ + }*/ ); } @@ -1106,9 +1076,6 @@ addParameter(interfaceOperation, referenceType, referenceName); - // Documentation - // no doc from previous code - // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1125,7 +1092,7 @@ } } return null; -}*/ + }*/ ); } @@ -1142,9 +1109,6 @@ 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 = createImplOperation(interfaceOperation); @@ -1154,7 +1118,7 @@ return 0; } return <%=attrName%>.size(); -}*/ + }*/ ); } @@ -1171,9 +1135,6 @@ 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 = createImplOperation(interfaceOperation); @@ -1181,7 +1142,7 @@ /*{ int size = size<%=StringUtils.capitalize(attrName)%>(); return size == 0; -}*/ + }*/ ); } @@ -1197,17 +1158,12 @@ // Declaration acceptOperation = addOperation(outputAbstract, "accept", void.class); + addAnnotation(outputAbstract, acceptOperation , Override.class.getSimpleName()); ObjectModelParameter param = addParameter(acceptOperation, EntityVisitor.class, "visitor"); addException(acceptOperation, TopiaException.class); - // Documentation - setDocumentation(acceptOperation, "Envoi via les methodes du visitor l'ensemble des " + - "champs de l'entity\n" + - "avec leur nom, type et valeur."); - setDocumentation(param, "le visiteur de l'entite."); - // Body init acceptOperationBody = new StringBuilder("" /*{ @@ -1240,7 +1196,7 @@ protected void closeAcceptOperation() { acceptOperationBody.append("" /*{ visitor.end(this); -}*/ + }*/ ); setOperationBody(acceptOperation, acceptOperationBody.length() == 0 ? " " : acceptOperationBody.toString()); @@ -1290,7 +1246,7 @@ body.append("" /*{ toString(); return result; -}*/ + }*/ ); setOperationBody(operation, body.length() == 0 ? " " : body.toString()); @@ -1393,7 +1349,6 @@ result.addAll(entity.getComposite()); } } - return result; }*/ ); @@ -1451,9 +1406,8 @@ result.add(entity); result.addAll(entity.getAggregate()); } - return result; -}*/ + }*/ ); setOperationBody(operation, body.length() == 0 ? " " : body.toString()); @@ -1559,8 +1513,8 @@ // Documentation if (StringUtils.isNotEmpty(operationDocumentation)) { setDocumentation(operation, operationDocumentation); + setDocumentation(param, "La valeur de l'attribut à positionner."); } - setDocumentation(param, "La valeur de l'attribut à positionner."); return operation; }

1 0

r2359 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 19 Oct '11

19 Oct '11

Author: tchemit Date: 2011-10-19 18:07:41 +0200 (Wed, 19 Oct 2011) New Revision: 2359 Url: http://nuiton.org/repositories/revision/topia/2359 Log: Evolution #1778: Do not generate delete method in DAOAbstract if not needed Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-17 07:55:21 UTC (rev 2358) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-19 16:07:41 UTC (rev 2359) @@ -49,7 +49,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; -import java.net.URL; import java.security.Permission; import java.util.ArrayList; import java.util.Collection; @@ -551,11 +550,7 @@ protected void generateDelete(ObjectModelClass clazz, ObjectModelClass result) { - ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); - addAnnotation(result, op,Override.class.getSimpleName()); - addException(op, TopiaException.class); - addParameter(op, "E", "entity"); + StringBuilder body = new StringBuilder(); String modelName = StringUtils.capitalize(model.getName()); String providerFQN = getOutputProperties().getProperty( @@ -682,13 +677,24 @@ } } - body.append("" + + if (body.length()>0) { + // something specific was done, need to generate the method + ObjectModelOperation op; + op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); + addAnnotation(result, op,Override.class.getSimpleName()); + addException(op, TopiaException.class); + addParameter(op, "E", "entity"); + body.append("" /*{ super.delete(entity); }*/ ); + setOperationBody(op, body.toString()); + } - setOperationBody(op, body.toString()); + + } protected void generateFindUsages(ObjectModelClass clazz,

1 0

r2358 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org 17 Oct '11

17 Oct '11

Author: echatellier Date: 2011-10-17 09:55:21 +0200 (Mon, 17 Oct 2011) New Revision: 2358 Url: http://nuiton.org/repositories/revision/topia/2358 Log: Definitively H2 problem. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-16 21:46:22 UTC (rev 2357) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-17 07:55:21 UTC (rev 2358) @@ -1355,11 +1355,6 @@ in.close(); } - // FIXME echatellier 20111016 : fix runscript failure in h2 - // due to change in clustering between version 1.2.142 and 1.2.143 - // "Cluster: auto-commit was disabled after opening a connection." - getHibernate().connection().setAutoCommit(true); - SQLQuery query = getHibernate().createSQLQuery( "RUNSCRIPT FROM '" + file.getAbsolutePath() + "'" + options);

1 0

r2357 - in trunk/topia-persistence/src/main: java/org/nuiton/topia/generator resources/META-INF
by tchemit＠users.nuiton.org 16 Oct '11

16 Oct '11

Author: tchemit Date: 2011-10-16 23:46:22 +0200 (Sun, 16 Oct 2011) New Revision: 2357 Url: http://nuiton.org/repositories/revision/topia/2357 Log: Anomalie #1769: Hibernate mappings fails to load in offline mode (use DTD from hibernate) Removed: trunk/topia-persistence/src/main/resources/META-INF/dtd/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-10-16 20:08:41 UTC (rev 2356) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-10-16 21:46:22 UTC (rev 2357) @@ -121,7 +121,7 @@ return; } /*{<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "classpath://META-INF/dtd/hibernate-mapping-3.0.dtd"> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "classpath://org/hibernate/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="<%=input.getPackageName()%>"> }*/ boolean haveSuper = input.getSuperclasses().size() > 0;

1 0

r2356 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org 16 Oct '11

16 Oct '11

Author: echatellier Date: 2011-10-16 22:08:41 +0200 (Sun, 16 Oct 2011) New Revision: 2356 Url: http://nuiton.org/repositories/revision/topia/2356 Log: Fix h2 restore clustering bug Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-14 14:08:09 UTC (rev 2355) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-16 20:08:41 UTC (rev 2356) @@ -1355,8 +1355,14 @@ in.close(); } + // FIXME echatellier 20111016 : fix runscript failure in h2 + // due to change in clustering between version 1.2.142 and 1.2.143 + // "Cluster: auto-commit was disabled after opening a connection." + getHibernate().connection().setAutoCommit(true); + SQLQuery query = getHibernate().createSQLQuery( "RUNSCRIPT FROM '" + file.getAbsolutePath() + "'" + options); + query.executeUpdate(); // send event AFTER restore

1 0

r2355 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework
by tchemit＠users.nuiton.org 14 Oct '11

14 Oct '11

Author: tchemit Date: 2011-10-14 16:08:09 +0200 (Fri, 14 Oct 2011) New Revision: 2355 Url: http://nuiton.org/repositories/revision/topia/2355 Log: Evolution #1776: add a executeSQL in TopiaContext + little clean in TopiaContextImpl Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2011-10-14 14:02:01 UTC (rev 2354) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2011-10-14 14:08:09 UTC (rev 2355) @@ -363,4 +363,12 @@ */ boolean isClosed(); + /** + * Execute a given sql code inside this transaction. + * + * @param sqlScript the sql script to execute + * @throws TopiaException if any problem occurs while executing the sql script. + */ + void executeSQL(String sqlScript) throws TopiaException; + } //TopiaContext Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-14 14:02:01 UTC (rev 2354) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-14 14:08:09 UTC (rev 2355) @@ -53,6 +53,7 @@ import org.hibernate.event.PreInsertEventListener; import org.hibernate.event.PreLoadEventListener; import org.hibernate.event.PreUpdateEventListener; +import org.hibernate.jdbc.Work; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.nuiton.topia.TopiaContext; @@ -80,6 +81,9 @@ import java.io.Reader; import java.io.Writer; import java.lang.reflect.Field; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -715,7 +719,7 @@ _("topia.persistence.error.null.param", "entityClass", "getDAO")); } - if (this == getRootContext()) { + if (equals(getRootContext())) { throw new TopiaException( _("topia.persistence.error.rootContext.access")); } @@ -742,7 +746,7 @@ try { Class<TopiaDAO<E>> daoClass = (Class<TopiaDAO<E>>) Class.forName(daoClassname); - TopiaDAO<E> spe = daoClass.newInstance(); + TopiaDAO<E> spe = daoClass.getConstructor().newInstance(); result = spe; } catch (Exception eee) { log.warn("specialized DAO " + daoClassname + @@ -814,7 +818,7 @@ @Override public void commitTransaction() throws TopiaException { - if (getRootContext() == this) { + if (equals(getRootContext())) { throw new TopiaException(_( "topia.persistence.error.unsupported.operation.on.root.context", "commit")); @@ -945,6 +949,16 @@ return closed; } + @Override + public void executeSQL(String sqlScript) throws TopiaException { + SQLWork sqlWork = new SQLWork(sqlScript); + try { + getHibernate().doWork(sqlWork); + } catch (HibernateException e) { + throw new TopiaException("Could not execute sql code", e); + } + } + protected void checkClosed(String message) throws TopiaException { if (closed) { throw new TopiaException(message); @@ -968,7 +982,7 @@ } @Override - public List findByQuery(TopiaQuery query) throws TopiaException { + public List<?> findByQuery(TopiaQuery query) throws TopiaException { return query.execute(this); } @@ -979,7 +993,7 @@ } @Override - public List find(String hql, Object... args) throws TopiaException { + public List<?> find(String hql, Object... args) throws TopiaException { checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -1330,7 +1344,7 @@ // read header to see if is compressed file int b = in.read(); // redundant cast : int magic = ((int) in.read() << 8) | b; - int magic = (in.read() << 8) | b; + int magic = in.read() << 8 | b; in.reset(); if (magic == GZIPInputStream.GZIP_MAGIC) { @@ -1523,7 +1537,7 @@ // si entityAndcondition est vide alors il faut le remplir // avec toutes les entités du mapping (class, null) if (entityAndCondition.length == 0) { - Map classMetadata = getHibernateFactory().getAllClassMetadata(); + Map<?,?> classMetadata = getHibernateFactory().getAllClassMetadata(); entityAndCondition = new Object[classMetadata.size() * 2]; int i = 0; for (Object className : classMetadata.keySet()) { @@ -1587,5 +1601,22 @@ } } + public static class SQLWork implements Work { + private final String script; + + public SQLWork(String script) { + this.script = script; + } + + @Override + public void execute(Connection connection) throws SQLException { + PreparedStatement sta = connection.prepareStatement(script); + try { + sta.execute(); + } finally { + sta.close(); + } + } + } } //TopiaContextImpl

1 0

r2354 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 14 Oct '11

14 Oct '11

Author: tchemit Date: 2011-10-14 16:02:01 +0200 (Fri, 14 Oct 2011) New Revision: 2354 Url: http://nuiton.org/repositories/revision/topia/2354 Log: remove unused import 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 2011-10-13 15:47:37 UTC (rev 2353) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-14 14:02:01 UTC (rev 2354) @@ -48,7 +48,6 @@ import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList;

1 0

r2353 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 13 Oct '11

13 Oct '11

Author: tchemit Date: 2011-10-13 17:47:37 +0200 (Thu, 13 Oct 2011) New Revision: 2353 Url: http://nuiton.org/repositories/revision/topia/2353 Log: Evolution #1773: Remove code in generators that prevent generation of classes alerady in classpath Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-13 15:12:26 UTC (rev 2352) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-13 15:47:37 UTC (rev 2353) @@ -117,7 +117,7 @@ getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); if (generateStandaloneEnum) { - entityEnumPackage = packageName+"."+entityEnumName; + entityEnumPackage = packageName + "." + entityEnumName; } else { String daoHelperClazzName = modelName + "DAOHelper"; entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; @@ -221,43 +221,69 @@ @Override public void transformFromClass(ObjectModelClass clazz) { if (!TopiaGeneratorUtil.isEntity(clazz)) { + // not an entity return; } String clazzName = clazz.getName(); String clazzFQN = clazz.getQualifiedName(); - // generate DAO - generateDAOClass(clazz, clazzName, clazzFQN); + if (isGenerateDAO(clazz)) { + // generate DAO + generateDAOClass(clazz, clazzName, clazzFQN); + + } if (isGenerateImpl(clazz)) { // generate DAOImpl generateDAOImpl(clazz, clazzName, clazzFQN); } - // generate DAOAbstract - generateDAOAbstract(clazz, clazzName, clazzFQN); + if (isGenerateDAOAbstract(clazz)) { + + // generate DAOAbstract + generateDAOAbstract(clazz, clazzName, clazzFQN); + } } - protected boolean isGenerateImpl(ObjectModelClass input) { + protected boolean isGenerateDAO(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "DAOImpl"; + String fqn = input.getQualifiedName() + "DAO"; - URL fileLocation = getFileInClassPath(fqn); + if (isInClassPath(fqn)) { - if (fileLocation != null) { + // already in class-path + return false; + } - // there is already a existing file in class-path, skip + // can safely generate the dao impl + return true; + } - if (isVerbose()) { + protected boolean isGenerateDAOAbstract(ObjectModelClass input) { - log.info("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); - } else { - log.info("Will not generate [" + fqn + "], already found in class-path."); - } + String fqn = input.getQualifiedName() + "DAOAbstract"; + + if (isInClassPath(fqn)) { + + // already in class-path return false; } + // can safely generate the dao impl + return true; + } + + protected boolean isGenerateImpl(ObjectModelClass input) { + + String fqn = input.getQualifiedName() + "DAOImpl"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + Collection<ObjectModelOperation> moreOperations = extraOperations.get(input.getQualifiedName()); @@ -306,7 +332,7 @@ protected void generateDAOAbstract(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoAbstractClass = createAbstractClass( + ObjectModelClass daoAbstractClass = createAbstractClass( clazzName + "DAOAbstract<E extends " + clazzName + '>', clazz.getPackageName()); 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 2011-10-13 15:12:26 UTC (rev 2352) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-13 15:47:37 UTC (rev 2353) @@ -98,6 +98,10 @@ private boolean associationClass; + protected boolean generateInterface; + protected boolean generateAbstract; + protected boolean generateImpl; + protected void clean() { outputInterface = null; outputAbstract = null; @@ -132,12 +136,22 @@ } setConstantPrefix(prefix); - // Create Entity Interface and its header - createEntityInterface(input); + generateInterface = isGenerateInterface(input); + generateAbstract = isGenerateAbstract(input); + generateImpl = isGenerateImpl(input); - // Create Entity Abstract class and its header - createEntityAbstractClass(input); + if (generateInterface) { + + // Create Entity Interface and its header + createEntityInterface(input); + } + if (generateAbstract) { + + // Create Entity Abstract class and its header + createEntityAbstractClass(input); + } + // Generate i18n block String i18nPrefix = JavaGeneratorUtil.getI18nPrefixTagValue(input, model); if (!StringUtils.isEmpty(i18nPrefix)) { @@ -180,7 +194,6 @@ generateSerialVersionUID(input, outputAbstract); // Generate Entity Implementation class - boolean generateImpl = isGenerateImpl(input, input.getOperations()); if (generateImpl) { generateImpl(input); generateSerialVersionUID(input, outputImpl); @@ -340,23 +353,27 @@ } } - protected boolean isGenerateImpl(ObjectModelClass input, - Collection<ObjectModelOperation> operations) { + protected boolean isGenerateInterface(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "Impl"; + boolean alreadyInClassPath = !isInClassPath(input); + return alreadyInClassPath; + } - URL fileLocation = getFileInClassPath(fqn); + protected boolean isGenerateAbstract(ObjectModelClass input) { - if (fileLocation != null) { + String fqn = input.getQualifiedName() + " Abstract"; + boolean alreadyInClassPath = !isInClassPath(fqn); + return alreadyInClassPath; + } - // there is already a existing file in class-path, skip + protected boolean isGenerateImpl(ObjectModelClass input) { - if (isVerbose()) { + Collection<ObjectModelOperation> operations = input.getOperations(); + String fqn = input.getQualifiedName() + "Impl"; - log.info("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); - } else { - log.info("Will not generate [" + fqn + "], already found in class-path."); - } + boolean alreadyInClassPath = isInClassPath(fqn); + if (alreadyInClassPath) { + return false; } @@ -1443,42 +1460,6 @@ setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - /** - * - * @deprecated since 2.5, use the - * {@link ObjectModelTransformerToJava#generateI18nBlock(ObjectModelClassifier, ObjectModelClassifier, String)} - */ - @Deprecated - protected void generateI18nBlock(ObjectModelClass input, String i18nPrefix) { - generateI18nBlock(input,outputAbstract,i18nPrefix); -// ObjectModelOperation block = -// addBlock(outputAbstract, ObjectModelModifier.STATIC); -// -// StringBuilder buffer = new StringBuilder(300); -// addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); -// for (ObjectModelAttribute attr : input.getAttributes()) { -// //TC-20100225 only treate navigable relations -// if (attr.isNavigable()) { -// addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName())); -// } -// } -// setOperationBody(block, buffer.toString()); - } - - /** - * - * @deprecated since 2.5, use the {@link ObjectModelTransformerToJava#addI18n(StringBuilder, String, String)} - */ - @Deprecated - protected void addI18n(StringBuilder buffer, String i18nPrefix, - String suffix) { - super.addI18n(buffer,i18nPrefix,suffix); -// buffer.append("\n org.nuiton.i18n.I18n.n_(\""); -// buffer.append(i18nPrefix); -// buffer.append(suffix); -// buffer.append("\");"); - } - // ------------------------------------------------------------------------- // Helpers // -------------------------------------------------------------------------

1 0

r2352 - trunk
by tchemit＠users.nuiton.org 13 Oct '11

13 Oct '11

Author: tchemit Date: 2011-10-13 17:12:26 +0200 (Thu, 13 Oct 2011) New Revision: 2352 Url: http://nuiton.org/repositories/revision/topia/2352 Log: T?\195?\162che #1775: Updates to eugene 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-10 08:51:23 UTC (rev 2351) +++ trunk/pom.xml 2011-10-13 15:12:26 UTC (rev 2352) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4</eugeneVersion> + <eugeneVersion>2.5-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0