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

r2153 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 27 Nov '10

27 Nov '10

Author: tchemit Date: 2010-11-27 16:58:11 +0100 (Sat, 27 Nov 2010) New Revision: 2153 Url: http://nuiton.org/repositories/revision/topia/2153 Log: use new MetaTransformer api fix @author on my files Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -38,7 +38,7 @@ /** * Created: 14 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOImplTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -34,7 +34,7 @@ /** * Created: 13 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -48,7 +48,7 @@ /** * Created: 20 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DTOTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -50,7 +50,7 @@ /** * Created: 14 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityAbstractTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -44,7 +44,7 @@ /** * Created: 14 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDTOTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -36,7 +36,7 @@ /** * Created: 14 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityImplTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -44,7 +44,7 @@ /** * Created: 14 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityInterfaceTransformer" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2010-11-27 15:58:11 UTC (rev 2153) @@ -40,20 +40,27 @@ /** * Created: 20 déc. 2009 * - * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.TopiaMetaTransformer" * @since 2.3.0 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.TopiaMetaTransformer" */ public class TopiaMetaTransformer extends AbstractMetaTransformer<ObjectModel> { - /** - * Logger - */ + /** Logger */ private static final Log log = LogFactory.getLog(TopiaMetaTransformer.class); public TopiaMetaTransformer() { - super( +// super( +// EntityTransformer.class, +// DAOTransformer.class, +// DAOImplTransformer.class, +// DAOAbstractTransformer.class, +// DAOHelperTransformer.class, +// EntityHibernateMappingGenerator.class +// ); + + setTemplateTypes( EntityTransformer.class, DAOTransformer.class, DAOImplTransformer.class, @@ -69,19 +76,19 @@ AttributeNamesValidator attrValidator = new AttributeNamesValidator( model); attrValidator.addNameAndReason("next", - "Le nom d'attribut \"next\" est incompatible avec HSQL"); + "Le nom d'attribut \"next\" est incompatible avec HSQL"); attrValidator.addNameAndReason("value", - "Le nom d'attribut \"value\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"value\" est incompatible avec certains SGBD"); attrValidator.addNameAndReason("values", - "Le nom d'attribut \"values\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"values\" est incompatible avec certains SGBD"); attrValidator.addNameAndReason("begin", - "Le nom d'attribut \"begin\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"begin\" est incompatible avec certains SGBD"); attrValidator.addNameAndReason("end", - "Le nom d'attribut \"end\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"end\" est incompatible avec certains SGBD"); attrValidator.addNameAndReason("authorization", - "Le nom d'attribut \"authorization\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"authorization\" est incompatible avec certains SGBD"); attrValidator.addNameAndReason("order", - "Le nom d'attribut \"order\" est incompatible avec certains SGBD"); + "Le nom d'attribut \"order\" est incompatible avec certains SGBD"); validators.add(attrValidator); ClassNamesValidator classValidator = new ClassNamesValidator(model);

1 0

r2152 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 18:25:14 +0100 (Fri, 26 Nov 2010) New Revision: 2152 Url: http://nuiton.org/repositories/revision/topia/2152 Log: Anomalie #1103: Can NOT use an association from an entity to a simple bean Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-11-25 10:44:42 UTC (rev 2151) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-11-26 17:25:14 UTC (rev 2152) @@ -53,6 +53,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -69,19 +70,25 @@ * Created: 13 déc. 2009 * * @author tchemit <chemit(a)codelutin.com> - * @version $Id: DAOAbstractTransformer.java 1960 2010-05-13 17:18:23Z tchemit - * $ + * @version $Id: DAOAbstractTransformer.java 1960 2010-05-13 17:18:23Z tchemit$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOAbstractTransformer" * @since 2.3.0 */ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog( DAOAbstractTransformer.class); - Map<ObjectModelClass, Set<ObjectModelClass>> usages; + /** TODO */ + protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; + /** + * All entities fqn of the model (used to detect if an attribute is not + * an entity). + */ + Set<String> allEntitiesFqn; + protected boolean extendLegacyDAO; /** @@ -96,6 +103,12 @@ usages = TopiaGeneratorUtil.searchDirectUsages(model); extendLegacyDAO = Boolean.valueOf(model.getTagValue("useLegacyDAO")); + + List<ObjectModelClass> allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); + allEntitiesFqn = new HashSet<String>(allEntities.size()); + for (ObjectModelClass entity : allEntities) { + allEntitiesFqn.add(entity.getQualifiedName()); + } } @Override @@ -361,7 +374,7 @@ generateFindUsages(clazz, result, usagesForclass); } - private void generateDelete(ObjectModelClass clazz, + protected void generateDelete(ObjectModelClass clazz, ObjectModelClass result) { ObjectModelOperation op; op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); @@ -372,12 +385,38 @@ String providerFQN = getOutputProperties().getProperty( PROP_DEFAULT_PACKAGE) + '.' + modelName + "DAOHelper.getImplementationClass"; + for (ObjectModelAttribute attr : clazz.getAttributes()) { + String attrType = GeneratorUtil.getSimpleName(attr.getType()); + String reverseAttrName = attr.getReverseAttributeName(); ObjectModelAttribute reverse = attr.getReverseAttribute(); - if (!attr.hasAssociationClass() && reverse != null && reverse.isNavigable() - && GeneratorUtil.isNMultiplicity(attr) && GeneratorUtil.isNMultiplicity(reverse)) { + if (attr.hasAssociationClass() || + reverse == null || !reverse.isNavigable()) { + + // never treate a non reverse and navigable attribute + // never treate an association class attribute + continue; + } + + // at this point we are sure to have a attribute which is + // - reverse + // - navigable + // - not from an association class + if (!allEntitiesFqn.contains(attr.getType())) { + + // this attribute is not from an entity, don't treate it + if (log.isDebugEnabled()) { + log.debug("[" + result.getName() + "] Skip attribute [" + + attr.getName() + "] with type " + attr.getType()); + } + continue; + } + + // At this point, the attribute type is a entity + if (GeneratorUtil.isNMultiplicity(attr) && + GeneratorUtil.isNMultiplicity(reverse)) { // On doit absolument supprimer pour les relations many-to-many // le this de la collection de l'autre cote @@ -428,9 +467,7 @@ } }*/ ); - } else if (!attr.hasAssociationClass() && reverse != null - && reverse.isNavigable() - && !GeneratorUtil.isNMultiplicity(reverse)) { + } else if (!GeneratorUtil.isNMultiplicity(reverse)) { // On doit mettre a null les attributs qui ont cet objet sur les // autres entites en one-to-* // TODO peut-etre qu'hibernate est capable de faire ca tout seul ?

1 0

r2151 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 11:44:42 +0100 (Thu, 25 Nov 2010) New Revision: 2151 Url: http://nuiton.org/repositories/revision/topia/2151 Log: fix import in generated code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-25 09:47:36 UTC (rev 2150) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-25 10:44:42 UTC (rev 2151) @@ -576,6 +576,7 @@ String treateErrorParams = "eee, I18n.n_(\"" + errorKey + "\")"; if (needErrorArgs) { + addImport(serviceAbstract, ArrayList.class); // Init errorArgs buffer.append("" /*{

1 0

r2150 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 10:47:36 +0100 (Thu, 25 Nov 2010) New Revision: 2150 Url: http://nuiton.org/repositories/revision/topia/2150 Log: format nicely the generated code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-25 09:41:54 UTC (rev 2149) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-25 09:47:36 UTC (rev 2150) @@ -591,8 +591,8 @@ TopiaContext transaction = null; try { transaction = beginTransaction(); - try { - }*/ + + try {}*/ ); // Add transaction in treateError parameters treateErrorParams = "transaction, " + treateErrorParams; @@ -641,9 +641,9 @@ // Finally block to close transaction buffer.append("" /*{ - } finally { - closeTransaction(transaction); - } + } finally { + closeTransaction(transaction); + } }*/ );

1 0

r2149 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: tchemit Date: 2010-11-25 10:41:54 +0100 (Thu, 25 Nov 2010) New Revision: 2149 Url: http://nuiton.org/repositories/revision/topia/2149 Log: Anomalie #1094: Service transformer does not generate well when using generics Evolution #1097: Add a new Tag noLogInService to be able to remove all tracing code in generated method of services Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-22 14:43:30 UTC (rev 2148) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-25 09:41:54 UTC (rev 2149) @@ -200,6 +200,14 @@ protected String exceptionName; + /** + * flag to not use any logger code inside service method, globally set + * for all the incoming model. + * + * @since 2.4.4 + */ + protected boolean noLog; + private static final String OP_NAME_BEGIN_TRANSACTION = "beginTransaction"; private static final String OP_NAME_CLOSE_TRANSACTION = "closeTransaction"; @@ -215,6 +223,7 @@ exceptionName = model.getTagValue(TopiaGeneratorUtil.TAG_EXCEPTION_CLASS); modelName = model.getName(); + noLog = isNoLog(null, model); } @Override @@ -225,11 +234,15 @@ // global transaction needed (if set to false then never use transaction) boolean needTransaction = isTransactionNeeded(input); + boolean noLog = this.noLog || isNoLog(input,null); ObjectModelInterface serviceContract = createServiceContract(input); - createServiceAbstract(input, serviceContract, needTransaction); + createServiceAbstract(input, + serviceContract, + needTransaction, + noLog); } /** @@ -247,15 +260,18 @@ setDocumentation(serviceContract, source.getDocumentation()); for (ObjectModelOperation op : source.getOperations()) { - ObjectModelOperation newOp = - addOperation(serviceContract, - op.getName(), op.getReturnType()); + ObjectModelOperation newOp = addOperation(serviceContract, + op.getName(), + op.getReturnType() + ); setDocumentation(newOp.getReturnParameter(), - op.getReturnParameter().getDocumentation()); + op.getReturnParameter().getDocumentation() + ); for (ObjectModelParameter param : op.getParameters()) { - ObjectModelParameter newParam = - addParameter(newOp, param.getType(), - param.getName()); + ObjectModelParameter newParam = addParameter(newOp, + param.getType(), + param.getName() + ); setDocumentation(newParam, param.getDocumentation()); } for (String ex : op.getExceptions()) { @@ -336,10 +352,12 @@ * @param source interface from model * @param serviceContract to implement * @param needTransaction flag to know if service globally use transaction + * @param noLog a flag to not add any log code in body of methods */ protected void createServiceAbstract(ObjectModelInterface source, ObjectModelInterface serviceContract, - boolean needTransaction) { + boolean needTransaction, + boolean noLog) { ObjectModelClass serviceAbstract = createAbstractClass( getServiceAbstractClassName(serviceContract.getName()), @@ -350,23 +368,26 @@ addImport(serviceAbstract, TopiaContext.class); } addImport(serviceAbstract, I18n.class); - addImport(serviceAbstract, ArrayList.class); - addImport(serviceAbstract, DurationFormatUtils.class); +// addImport(serviceAbstract, ArrayList.class); + if (!noLog) { + addImport(serviceAbstract, DurationFormatUtils.class); + + // Add Logger attribute + addAttribute(serviceAbstract, "log", + Log.class, + "LogFactory.getLog(" + source.getName() + ".class)", + ObjectModelModifier.PRIVATE, + ObjectModelModifier.STATIC, + ObjectModelModifier.FINAL); + + addImport(serviceAbstract, Log.class); + addImport(serviceAbstract, LogFactory.class); + } + // Implements contract interface addInterface(serviceAbstract, serviceContract.getQualifiedName()); - // Add Logger attribute - addAttribute(serviceAbstract, "log", - Log.class, - "LogFactory.getLog(" + source.getName() + ".class)", - ObjectModelModifier.PRIVATE, - ObjectModelModifier.STATIC, - ObjectModelModifier.FINAL); - - addImport(serviceAbstract, Log.class); - addImport(serviceAbstract, LogFactory.class); - // Create abstract methods if (needTransaction) { @@ -413,7 +434,8 @@ executeOperation, operation, source.getName(), - needTransaction + needTransaction, + noLog ); } } @@ -479,6 +501,7 @@ * @param source ObjectModelOperation from model * @param serviceContractName where the signature method is defined * @param needTransaction flag to know if service globally use transaction + * @param noLog a flag to not add any log inside method * @see #isErrorArgsNeeded(ObjectModelOperation) * @see #isTransactionNeeded(ObjectModelElement) */ @@ -487,7 +510,8 @@ ObjectModelOperation abstOp, ObjectModelOperation source, String serviceContractName, - boolean needTransaction) { + boolean needTransaction, + boolean noLog) { // boolean to specify if the method need a transaction or not // Default set to true but can be override by a tagvalue on the @@ -512,12 +536,13 @@ for (ObjectModelParameter param : source.getParameters()) { String paramName = param.getName(); addParameter(implOp, param.getType(), paramName); - - // Prepare Log - toStringAppend += - "\n\t\t\t.append(\"" + separatorLog + paramName + " = \")" + - ".append(" + paramName + ")"; - separatorLog = " _ "; + if (!noLog) { + // Prepare Log + toStringAppend += + "\n\t\t\t.append(\"" + separatorLog + paramName + " = \")" + + ".append(" + paramName + ")"; + separatorLog = " _ "; + } } // Use buffer for operation body @@ -532,9 +557,11 @@ String abstReturnType = ""; String abstReturn = ""; String finalReturn = ""; - if (!abstOp.getReturnType().equals("void")) { - abstReturnType = GeneratorUtil.getSimpleName(abstOp.getReturnType()) - + " result = "; + String returnType = GeneratorUtil.getSimpleName(abstOp.getReturnType(), + true + ); + if (!returnType.equals("void")) { + abstReturnType = returnType + " result = "; abstReturn = "return result;"; finalReturn = "return " + getReturnValue(abstOp.getReturnType()) + ";"; @@ -576,7 +603,13 @@ }*/ ); } - + if (noLog) { + buffer.append("" + /*{ + <%=abstReturnType%><%=abstName%>(<%=abstParams%>); + <%=abstReturn%> + }*/); + } else { String implName = StringUtils.capitalize(implOp.getName()); String first = modelName.substring(0, 1); @@ -603,7 +636,7 @@ stopTime - startTime) + " _ Memory = " + mem + " Mo"); } <%=abstReturn%> }*/); - + } if (needTransaction) { // Finally block to close transaction buffer.append("" @@ -666,6 +699,29 @@ } /** + * boolean to specify if inside the method body we should add log informations. + * + * @param op model element where the tagvalue is set + * @param model model where to tagvalue can be also set + * @return true if no log will be generated insde body's method + * @see TopiaGeneratorUtil#TAG_NO_LOG_IN_SERVICE + */ + protected boolean isNoLog(ObjectModelElement op, ObjectModel model) { + boolean noLog = false; + + String tagValue = GeneratorUtil.findTagValue( + TopiaGeneratorUtil.TAG_NO_LOG_IN_SERVICE, + op, + model + ); + + if (tagValue != null) { + noLog = Boolean.parseBoolean(tagValue); + } + return noLog; + } + + /** * boolean to specify if the method need error arguments or not * Default set to false but can be override using a tagvalue "errorArgs" on * the method from model. 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-11-22 14:43:30 UTC (rev 2148) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-11-25 09:41:54 UTC (rev 2149) @@ -257,6 +257,13 @@ * Tag pour spécifier le type d'une propriété dans le mapping hibernate */ public static final String TAG_TYPE= "type"; + /** + * Tag to specify if we want to add logs in any method of service generated by {@link ServiceTransformer}. + * + * <b>Note:</b> To have no log just use this tag on services or gloabally on model (for all services). + * @since 2.4.4 + */ + public static final String TAG_NO_LOG_IN_SERVICE = "noLogInService"; /** * Type de persistence Hibernate */

1 0

r2148 - trunk
by bleny＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: bleny Date: 2010-11-22 15:43:30 +0100 (Mon, 22 Nov 2010) New Revision: 2148 Url: http://nuiton.org/repositories/revision/topia/2148 Log: add myself has dev in POM Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 14:25:48 UTC (rev 2147) +++ trunk/pom.xml 2010-11-22 14:43:30 UTC (rev 2148) @@ -303,6 +303,17 @@ </developer> <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> <name>Jean Couteau</name> <id>jcouteau</id> <email>couteau(a)codelutin.com</email>

1 0

r2147 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by bleny＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: bleny Date: 2010-11-22 15:25:48 +0100 (Mon, 22 Nov 2010) New Revision: 2147 Url: http://nuiton.org/repositories/revision/topia/2147 Log: in TopiaQuery parameters of the subquery was lost in certain cases ; bug fix + regression-test Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.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-11-22 14:10:25 UTC (rev 2146) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-11-22 14:25:48 UTC (rev 2147) @@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; @@ -984,8 +983,11 @@ // Check existence of paramName int index = params.indexOf(paramName); - // If already defined - if (index != -1) { + if (index == -1) { // if not defined, param is only used + // in sub-query, so add it in the whole query + addParam(paramName, paramValue); + } else { // If already defined + Object existingValue = params.get(index + 1); // Only change paramName in not equals case Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-11-22 14:10:25 UTC (rev 2146) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-11-22 14:25:48 UTC (rev 2147) @@ -124,6 +124,22 @@ // Still 2 params Assert.assertEquals(2, query.getParams().size()); + // non-regression test, when parameters of main query is not empty + // and sub-query use different parameters from the one used in the + // main query, parameters needed by the subquery are lost in the + // resulting query + + // Test 4 : add a subquery with its own parameters + query = new TopiaQuery(QueriedEntity.class, "Q1"). + addEquals(QueriedEntity.TOPIA_ID, "ID1"); + + subquery = new TopiaQuery(QueriedEntity.class, "Q2"). + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value"); + + query.addSubQuery(QueriedEntity.PROPERTY_TEST_ADD + " IN (?)", subquery); + + log.debug(query); + Assert.assertEquals(4, query.getParams().size()); } /**

1 0

r2146 - trunk
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 15:10:25 +0100 (Mon, 22 Nov 2010) New Revision: 2146 Url: http://nuiton.org/repositories/revision/topia/2146 Log: use i18n 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:30:53 UTC (rev 2145) +++ trunk/pom.xml 2010-11-22 14:10:25 UTC (rev 2146) @@ -333,7 +333,7 @@ <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <processorPluginVersion>1.0.4</processorPluginVersion> - <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

r2145 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:53 +0100 (Sun, 21 Nov 2010) New Revision: 2145 Url: http://nuiton.org/repositories/revision/topia/2145 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 07:48:20 UTC (rev 2144) +++ trunk/pom.xml 2010-11-21 14:30:53 UTC (rev 2145) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>topia</artifactId>

1 0

r2144 - in trunk: topia-persistence/src/license topia-service-migration/src/license topia-service-replication/src/license topia-service-security/src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 08:48:20 +0100 (Fri, 19 Nov 2010) New Revision: 2144 Url: http://nuiton.org/repositories/revision/topia/2144 Log: use new thrid-partys missing files (maven-license-plugin 3.0) Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-security/src/license/THIRD-PARTY.properties Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-11-18 21:37:08 UTC (rev 2143) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-11-19 07:48:20 UTC (rev 2144) @@ -16,14 +16,14 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 29 15:50:25 CEST 2010 -antlr--antlr--2.7.6=BSD License -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.slf4j--slf4j-api--1.5.8=MIT License -org.slf4j--slf4j-log4j12--1.5.8=MIT License -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:42:33 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +org.slf4j--slf4j-api--1.5.8--jar=MIT License +org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-11-18 21:37:08 UTC (rev 2143) +++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-11-19 07:48:20 UTC (rev 2144) @@ -14,11 +14,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 29 15:50:27 CEST 2010 -antlr--antlr--2.7.6=BSD License -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.slf4j--slf4j-api--1.5.8=MIT License -org.slf4j--slf4j-log4j12--1.5.8=MIT License +#Fri Nov 19 08:44:41 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.slf4j--slf4j-api--1.5.8--jar=MIT License +org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License Modified: trunk/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-11-18 21:37:08 UTC (rev 2143) +++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-11-19 07:48:20 UTC (rev 2144) @@ -14,11 +14,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 29 15:50:27 CEST 2010 -antlr--antlr--2.7.6=BSD License -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.slf4j--slf4j-api--1.5.8=MIT License -org.slf4j--slf4j-log4j12--1.5.8=MIT License +#Fri Nov 19 08:43:27 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.slf4j--slf4j-api--1.5.8--jar=MIT License +org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License Modified: trunk/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-11-18 21:37:08 UTC (rev 2143) +++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-11-19 07:48:20 UTC (rev 2144) @@ -14,11 +14,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 29 15:50:31 CEST 2010 -antlr--antlr--2.7.6=BSD License -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.slf4j--slf4j-api--1.5.8=MIT License -org.slf4j--slf4j-log4j12--1.5.8=MIT License +#Fri Nov 19 08:44:46 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.slf4j--slf4j-api--1.5.8--jar=MIT License +org.slf4j--slf4j-log4j12--1.5.8--jar=MIT License

1 0