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

r1865 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org March 31, 2010

March 31, 2010

Author: fdesbois Date: 2010-03-31 10:41:27 +0200 (Wed, 31 Mar 2010) New Revision: 1865 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -260,9 +260,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-persistence/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-service-history/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-service-index/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-service-migration/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-service-replication/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-service-security/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-03-31 08:41:23 UTC (rev 1864) +++ trunk/topia-soa/pom.xml 2010-03-31 08:41:27 UTC (rev 1865) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1864 - in tags: . topia-2.3.1
by fdesbois＠users.nuiton.org March 31, 2010

March 31, 2010

Author: fdesbois Date: 2010-03-31 10:41:23 +0200 (Wed, 31 Mar 2010) New Revision: 1864 Log: [maven-release-plugin] copy for tag topia-2.3.1 Added: tags/topia-2.3.1/ Property changes on: tags/topia-2.3.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r1863 - in trunk: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa
by fdesbois＠users.nuiton.org March 31, 2010

March 31, 2010

Author: fdesbois Date: 2010-03-31 10:41:20 +0200 (Wed, 31 Mar 2010) New Revision: 1863 Log: [maven-release-plugin] prepare release topia-2.3.1 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-history/pom.xml trunk/topia-service-index/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-soa/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> <modules> <module>topia-persistence</module> @@ -260,9 +260,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.3.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.3.1</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-persistence/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-history/pom.xml =================================================================== --- trunk/topia-service-history/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-service-history/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-index/pom.xml =================================================================== --- trunk/topia-service-index/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-service-index/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-service-migration/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-service-replication/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-service-security/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) +++ trunk/topia-soa/pom.xml 2010-03-31 08:41:20 UTC (rev 1863) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1862 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org March 31, 2010

March 31, 2010

Author: fdesbois Date: 2010-03-31 10:27:58 +0200 (Wed, 31 Mar 2010) New Revision: 1862 Log: - Evo #412 : rename BusinessTransformer to ServiceTransformer + improve html javadoc - Evo #430 : use 1.2 version of i18n Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-30 20:51:55 UTC (rev 1861) +++ trunk/pom.xml 2010-03-31 08:27:58 UTC (rev 1862) @@ -190,7 +190,7 @@ <eugene.version>2.0</eugene.version> <lutinutil.version>1.2</lutinutil.version> <processor.version>1.0.3</processor.version> - <i18n.version>1.1</i18n.version> + <i18n.version>1.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-30 20:51:55 UTC (rev 1861) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-31 08:27:58 UTC (rev 1862) @@ -1,592 +0,0 @@ - -package org.nuiton.topia.generator; - -import java.util.ArrayList; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.Template; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.i18n.I18n; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; - -/*{generator option: parentheses = false}*/ - -/*{generator option: writeString = +}*/ - -/** - * This Template is used to create the skeleton of services for a final - * application which using Topia. - * <pre> - * Generation from a model named 'App' : - * - * - AppContext : empty super interface to used in application UI. Can - * be override in model if put in defaultPackage (ex : org.chorem.app) set - * in maven-eugene-plugin configuration. - * - * - AppContextImplementor : interface which extends AppContext to add - * technical methods for the application. Generation of methods : - * * doCatch : used to catch all exception from a service method. - * * doFinally : used to finally the try/catch of a service method - * * beginTransaction : start the transaction using rootContext. - * These three methods have to be implemented in a class which implements - * AppContextImplementor (ex : AppContextImpl). You can also add others - * methods to AppContextImplementor in the same way as AppContext. - * - * - AppException : exception class which extends RuntimeException for all - * technical exceptions which appears in service method. If you want to - * manage some specific exceptions, you have to managed them in doCatch - * implementation. - * - * Generation from interfaces with stereotype <<service>> : - * - * - Service : interface of the service defined in model. - * - * - ServiceAbstract : abstract class which contains : - * * constructor with AppContextImplementor in argument - * * for each method : the implementation of the method (skeleton with - * try/catch and beginTransaction call to open a new TopiaContext from - * AppContextImplementor). Usage of i18n keys for error messages in - * exception. - * * for each method : an abstract method used to execute the business - * code of the method : need to be implemented in subclass. - * - * Exemple of AppContextImpl : - * - * public class AppContextImpl implements AppContextImplementor { - * - * // properties for Topia configuration - * protected Properties properties; - * ... - * - * @Override - * public void doCatch(TopiaContext transaction, Exception eee, - * String message, Object... args) throws AppException { - * - * // Note that the message from service doesn't directly use _() for - * // i18 messages but n_(). In this log, the _() is used to translate - * // correctly the message. But the message must be translate when - * // catching the AppException in UI. - * if (log.isErrorEnabled()) { - * log.error(_(message, args), eee); - * } - * - * // rollback of current transaction - * if (transaction != null) { - * try { - * transaction.rollbackTransaction(); - * } catch (TopiaException ex) { - * if (log.isErrorEnabled()) { - * log.error(_("app.error.context.rollback"), ex); - * } - * } - * } - * // wrapping the exception in a AppException with message and - * // arguments for i18n translation - * throw new AppException(eee, message, args); - * } - * - * @Override - * public void doFinally(TopiaContext transaction) { - * if (transaction != null) { - * try { - * transaction.closeContext(); - * } catch (TopiaException eee) { - * if (log.isErrorEnabled()) { - * log.error(_("app.error.context.close"), eee); - * } - * } - * } - * } - * - * @Override - * public TopiaContext beginTransaction() throws TopiaException { - * TopiaContext rootContext = null; - * try { - * // You have to manage the properties using ApplicationConfig - * // or other lib to have configuration for Topia - * rootContext = TopiaContextFactory.getContext(properties); - * - * return getTopiaRootContext().beginTransaction(); - * - * // only catch exception for rootContext - * } catch (TopiaNotFoundException eee) { - * doCatch(eee, n_("app.error.context.getTopiaRootContext")); - * } - * return null; - * } - * ... - * } - * - * Exemple of ServiceImpl : - * - * public class ServiceImpl extends ServiceAbstract { - * - * public ServiceImpl(AppContextImplementor context) { - * super(context); - * } - * - * // Implementation of abstract method, the interface method is - * // called 'createMyEntity(MyEntity entity)' in this case. - * @Override - * public void executeCreateMyEntity(TopiaContext transaction, - * MyEntity entity) throws TopiaException { - * - * MyEntityDAO dao = AppDAOHelper.getMyEntityDAO(transaction); - * dao.create(entity); - * // That's it, no need to manage errors or transaction, the abstract - * // service will do this job. - * } - * } - * - * TAG_TRANSACTION - * --------------- - * - * You can use the tagValue 'transaction=false' to specify that a method doesn't - * need any TopiaContext, so no need to instantiate a new one. This tagValue - * can only be put directly in the model and not in properties file (because - * of multiple methods with same name problem). - * - * TAG_ERROR_ARGS - * -------------- - * - * You can use the tagValue 'errorArgs=false' to specify that a method doesn't - * need any arguments for error message. This tagValue can only be put directly - * in the model and not in properties file. - * - * It is smooth, isn't it :p ? - * - * TODO : may be refactor to integrate JTA or webservice or may be not in this - * transformer. - * - * TODO : find a good way to change log level - * - * </pre> - * - * Created: 23 mars 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class BusinessTransformer extends ObjectModelTransformerToJava { - - protected String modelName; - - protected String defaultPackageName; - - protected String getContextInterfaceName() { - return modelName + "Context"; - } - - protected String getContextImplementorInterfaceName() { - return getContextInterfaceName() + "Implementor"; - } - - protected String getExceptionClassName() { - return modelName + "Exception"; - } - - protected String getServiceAbstractClassName(String serviceName) { - return serviceName + "Abstract"; - } - - @Override - public void transformFromModel(ObjectModel model) { - modelName = model.getName(); - defaultPackageName = getOutputProperties(). - getProperty(Template.PROP_DEFAULT_PACKAGE); - - ObjectModelInterface contextImplementor = - model.getInterface(defaultPackageName + "." + - getContextImplementorInterfaceName()); - - ObjectModelInterface context = - model.getInterface(defaultPackageName + "." + - getContextInterfaceName()); - - ObjectModelClass exception = createExceptionClass(); - - ObjectModelInterface newContextImplementor = - this.createInterface(getContextImplementorInterfaceName(), - defaultPackageName); - ObjectModelInterface newContext = - this.createInterface(getContextInterfaceName(), - defaultPackageName); - - this.addInterface(newContextImplementor, - newContext.getQualifiedName()); - - if (contextImplementor != null) { - // Copy of defined operations - // interfaces of contextImplementor are not copied - copyInterfaceOperations(contextImplementor, newContextImplementor); - } - - if (context != null) { - // Copy of defined operations - // interfaces of context are not copied - copyInterfaceOperations(context, newContext); - } - - ObjectModelOperation beginTransaction = - this.addOperation(newContextImplementor, - "beginTransaction", TopiaContext.class); - this.addException(beginTransaction, TopiaException.class); - - ObjectModelOperation doCatch1 = - this.addOperation(newContextImplementor, "doCatch", "void"); - this.addParameter(doCatch1, Exception.class, "eee"); - this.addParameter(doCatch1, String.class, "message"); - this.addParameter(doCatch1, "Object...", "args"); - this.addException(doCatch1, exception.getQualifiedName()); - - ObjectModelOperation doCatch2 = - this.addOperation(newContextImplementor, "doCatch", "void"); - this.addParameter(doCatch2, TopiaContext.class, "transaction"); - this.addParameter(doCatch2, Exception.class, "eee"); - this.addParameter(doCatch2, String.class, "message"); - this.addParameter(doCatch2, "Object...", "args"); - this.addException(doCatch2, exception.getQualifiedName()); - - ObjectModelOperation doFinally = - this.addOperation(newContextImplementor, "doFinally", "void"); - this.addParameter(doFinally, TopiaContext.class, "transaction"); - } - - protected ObjectModelClass createExceptionClass() { - - ObjectModelClass exception = - this.createClass(getExceptionClassName(), defaultPackageName); - - this.setSuperClass(exception, RuntimeException.class); - this.addAttribute(exception, "args", "Object[]", null, - ObjectModelModifier.PROTECTED); - - ObjectModelOperation constructor = - this.addConstructor(exception, ObjectModelModifier.PUBLIC); - - this.addParameter(constructor, Throwable.class, "eee"); - this.addParameter(constructor, String.class, "message"); - this.addParameter(constructor, "Object...", "args"); - - setOperationBody(constructor, "" - /*{ - super(message, eee); - this.args = args; - }*/ - ); - - ObjectModelOperation getArgs = - this.addOperation(exception, "getArgs", "Object[]", - ObjectModelModifier.PUBLIC); - - setOperationBody(getArgs, "" - /*{ - return args; - }*/ - ); - - ObjectModelOperation hasArgs = - this.addOperation(exception, "hasArgs", "boolean", - ObjectModelModifier.PUBLIC); - - setOperationBody(hasArgs, "" - /*{ - return args.length > 0; - }*/ - ); - - return exception; - } - - /** - * Used to simply copy the {@code source} interface signature to the - * {@code dest} interface. - * - * @param source interface - * @param dest interface - */ - protected void copyInterfaceOperations(ObjectModelInterface source, - ObjectModelInterface dest) { - for (ObjectModelOperation op : source.getOperations()) { - ObjectModelOperation newOp = - this.addOperation(dest, - op.getName(), op.getReturnType()); - setDocumentation(newOp.getReturnParameter(), - op.getReturnParameter().getDocumentation()); - for (ObjectModelParameter param : op.getParameters()) { - ObjectModelParameter newParam = - this.addParameter(newOp, param.getType(), - param.getName()); - setDocumentation(newParam, param.getDocumentation()); - } - for (String ex : op.getExceptions()) { - this.addException(newOp, ex); - } - setDocumentation(newOp, op.getDocumentation()); - } - } - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - // skip ContextImplementor and Context interfaces - if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { - return; - } - - // Create INTERFACE - ObjectModelInterface serviceInterface = - this.createInterface(interfacez.getName(), - interfacez.getPackageName()); - - copyInterfaceOperations(interfacez, serviceInterface); - - - // Create ABSTRACT CLASS - ObjectModelClass service = this.createAbstractClass( - getServiceAbstractClassName(interfacez.getName()), - interfacez.getPackageName()); - - this.addInterface(service, serviceInterface.getQualifiedName()); - - // Add Logger - // FIXME in EUGene, we want the default value not to be managed - // for import. -// this.addAttribute(service, "log", -// Log.class, -// "LogFactory.getLog(" + interfacez.getName() + ".class)", -// ObjectModelModifier.PRIVATE, -// ObjectModelModifier.STATIC, -// ObjectModelModifier.FINAL); - this.addAttribute(service, "log", - Log.class, null, - ObjectModelModifier.PRIVATE, - ObjectModelModifier.FINAL); - - this.addImport(service, Log.class); - this.addImport(service, LogFactory.class); - - String contextFqn = defaultPackageName + "." + - getContextImplementorInterfaceName(); - - // Add Context Attribute + constructor - this.addAttribute(service, "context", contextFqn, null, - ObjectModelModifier.PROTECTED); - - // Constructor - ObjectModelOperation constructor = - this.addConstructor(service, ObjectModelModifier.PUBLIC); - //this.addParameter(constructor, contextFqn, "context"); - setOperationBody(constructor, "" - /*{ - //this.context = context; - // FIXME : must be fixed attribute value in EUGene - this.log = LogFactory.getLog(<%=interfacez.getName()%>.class); - }*/ - ); - - ObjectModelOperation setContext = - this.addOperation(service, "setContext", "void", - ObjectModelModifier.PUBLIC); - this.addParameter(setContext, contextFqn, "context"); - setOperationBody(setContext, "" - /*{ - this.context = context; - }*/ - ); - - // Prepare operation generations - String first = modelName.substring(0, 1); - String serviceName = - GeneratorUtil.toLowerCaseFirstLetter(interfacez.getName()); - - this.addImport(service, TopiaContext.class); - this.addImport(service, I18n.class); - this.addImport(service, ArrayList.class); - - for (ObjectModelOperation op : interfacez.getOperations()) { - - // boolean to specify if the method need a transaction or not - // Default set to true but can be override by a tagvalue on the - // method - boolean needTransaction = true; - - String transactionTag = - op.getTagValue(TopiaGeneratorUtil.TAG_TRANSACTION); - - if (transactionTag != null) { - needTransaction = Boolean.parseBoolean(transactionTag); - } - - // boolean to specify if the method need error arguments or not - // Default set to true but can be override by a tagvalue on the - // method - boolean needErrorArgs = true; - - String errorArgsTag = - op.getTagValue(TopiaGeneratorUtil.TAG_ERROR_ARGS); - - if (errorArgsTag != null) { - needErrorArgs = Boolean.parseBoolean(errorArgsTag); - } - - // Implementation of interface operation - ObjectModelOperation implOp = - this.addOperation(service, - op.getName(), op.getReturnType(), - ObjectModelModifier.PUBLIC); - this.addAnnotation(service, implOp, Override.class.getSimpleName()); - - String opName = StringUtils.capitalize(op.getName()); - - // Abstract operation to execute method content - ObjectModelOperation abstOp = - this.addOperation(service, "execute" + opName, - op.getReturnType(), - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); - - // Throw all exception from abstract method - // They will be catched by interface method to use doCatch - this.addException(abstOp, Exception.class); - - if (needTransaction) { - this.addParameter(abstOp, TopiaContext.class, "transaction"); - this.addException(abstOp, TopiaException.class); - } - - String toStringAppend = ""; - String separatorLog = " : "; - // Prepare operation parameters - String opParams = ""; - String separatorParams = ""; - if (needErrorArgs) { - opParams += "errorArgs"; - separatorParams = ", "; - // Add errorArgs to abstract operation - this.addParameter(abstOp, - "java.util.List<Object>", "errorArgs"); - } - - // Copy other operation parameters - for (ObjectModelParameter param : op.getParameters()) { - String paramName = param.getName(); - this.addParameter(implOp, param.getType(), param.getName()); - this.addParameter(abstOp, param.getType(), param.getName()); - - // Prepare Log - toStringAppend += - "\n\t\t\t.append(\"" + separatorLog + paramName + " = \")" + - ".append(" + paramName + ")"; - separatorLog = " _ "; - - // Prepare Abstract method params - opParams += separatorParams + param.getName(); - separatorParams = ", "; - } - - // Use buffer for operation body - StringBuilder buffer = new StringBuilder(); - - // Error key for i18n - String errorKey = StringUtils.lowerCase(modelName) + ".error." + - serviceName + "." + op.getName(); - - String doCatchParams = "eee, I18n.n_(\"" + errorKey + "\")"; - doCatchParams += needErrorArgs ? ", errorArgs.toArray()" : ""; - - // Return managment - String opReturn = ""; - String finalReturn = ""; - if (!op.getReturnType().equals("void")) { - opReturn = "return "; - finalReturn = "return null;"; - } - - if (needErrorArgs) { - // Init errorArgs - buffer.append("" - /*{ - List<Object> errorArgs = new ArrayList<Object>(); - }*/ ); - } - - if (needTransaction) { - // Open the transaction - buffer.append("" - /*{ - TopiaContext transaction = null; - try { - transaction = context.beginTransaction(); - }*/ - ); - // Add transaction in the execute operation parameters - // and doCatch parameters - opParams = "transaction, " + opParams; - doCatchParams = "transaction, " + doCatchParams; - } else { - buffer.append("" - /*{ - try { - }*/ - ); - } - - buffer.append("" - /*{ - if (log.isDebugEnabled()) { - String message = new StringBuilder("<%=first%>:[ <%=opName%> ]")<%=toStringAppend%>. - toString(); - log.debug(message); - } - - <%=opReturn%>execute<%=opName%>(<%=opParams%>); }*/); - - // Copy exceptions - for (String ex : op.getExceptions()) { - this.addException(implOp, ex); - this.addException(abstOp, ex); - // Add catch block for known exceptions we want to throw - String exName = GeneratorUtil.getSimpleName(ex); - buffer.append("" - /*{ - } catch (<%=exName%> eee) { - throw eee; }*/); - } - - buffer.append("" - /*{ - } catch (Exception eee) { - context.doCatch(<%=doCatchParams%>); }*/); - - if (needTransaction) { - // Finally block to close transaction - buffer.append("" - /*{ - } finally { - context.doFinally(transaction); }*/); - } - - buffer.append("" - /*{ - } - <%=finalReturn%> - }*/ - ); - - this.setOperationBody(implOp, buffer.toString()); - } - - } -} Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java (from rev 1860, trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-03-31 08:27:58 UTC (rev 1862) @@ -0,0 +1,594 @@ + +package org.nuiton.topia.generator; + +import java.util.ArrayList; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.i18n.I18n; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ + +/** + * This Template is used to create the skeleton of services for a final + * application which using Topia. + * <div> + * Generation from a model named 'App' : + * <ul> + * <li>AppContext : empty super interface to used in application UI. Can + * be override in model if put in defaultPackage (ex : org.chorem.app) set + * in maven-eugene-plugin configuration. + * </li> + * <li><p>AppContextImplementor : interface which extends AppContext to add + * technical methods for the application. Generation of methods :</p> + * <p>* doCatch : used to catch all exception from a service method.</p> + * <p>* doFinally : used to finally the try/catch of a service method</p> + * <p>* beginTransaction : start the transaction using rootContext.</p> + * <p>These three methods have to be implemented in a class which implements + * AppContextImplementor (ex : AppContextImpl). You can also add others + * methods to AppContextImplementor in the same way as AppContext.</p> + * </li> + * <li>AppException : exception class which extends RuntimeException for all + * technical exceptions which appears in service method. If you want to + * manage some specific exceptions, you have to managed them in doCatch + * implementation. + * </li> + * </ul> + * </div> + * <div> + * Generation from interfaces with stereotype <<service>> : + * <ul> + * <li>Service : interface of the service defined in model.</li> + * <li><p>ServiceAbstract : abstract class which contains :</p> + * <p>* constructor with AppContextImplementor in argument</p> + * <p>* for each method : the implementation of the method (skeleton with + * try/catch and beginTransaction call to open a new TopiaContext from + * AppContextImplementor). Usage of i18n keys for error messages in + * exception.</p> + * <p>* for each method : an abstract method used to execute the business + * code of the method : need to be implemented in subclass.</p> + * </li> + * </ul> + * </div> + * <div> + * Exemple of AppContextImpl :<br /> + * <pre> + * public class AppContextImpl implements AppContextImplementor { + * + * // properties for Topia configuration + * protected Properties properties; + * ... + * + * @Override + * public void doCatch(TopiaContext transaction, Exception eee, + * String message, Object... args) throws AppException { + * + * // Note that the message from service doesn't directly use _() for + * // i18 messages but n_(). In this log, the _() is used to translate + * // correctly the message. But the message must be translate when + * // catching the AppException in UI. + * if (log.isErrorEnabled()) { + * log.error(_(message, args), eee); + * } + * + * // rollback of current transaction + * if (transaction != null) { + * try { + * transaction.rollbackTransaction(); + * } catch (TopiaException ex) { + * if (log.isErrorEnabled()) { + * log.error(_("app.error.context.rollback"), ex); + * } + * } + * } + * // wrapping the exception in a AppException with message and + * // arguments for i18n translation + * throw new AppException(eee, message, args); + * } + * + * @Override + * public void doFinally(TopiaContext transaction) { + * if (transaction != null) { + * try { + * transaction.closeContext(); + * } catch (TopiaException eee) { + * if (log.isErrorEnabled()) { + * log.error(_("app.error.context.close"), eee); + * } + * } + * } + * } + * + * @Override + * public TopiaContext beginTransaction() throws TopiaException { + * TopiaContext rootContext = null; + * try { + * // You have to manage the properties using ApplicationConfig + * // or other lib to have configuration for Topia + * rootContext = TopiaContextFactory.getContext(properties); + * + * return getTopiaRootContext().beginTransaction(); + * + * // only catch exception for rootContext + * } catch (TopiaNotFoundException eee) { + * doCatch(eee, n_("app.error.context.getTopiaRootContext")); + * } + * return null; + * } + * ... + * } + * </pre> + * </div> + * <div> + * Exemple of ServiceImpl :<br /> + * <pre> + * public class ServiceImpl extends ServiceAbstract { + * + * public ServiceImpl(AppContextImplementor context) { + * super(context); + * } + * + * // Implementation of abstract method, the interface method is + * // called 'createMyEntity(MyEntity entity)' in this case. + * @Override + * public void executeCreateMyEntity(TopiaContext transaction, + * MyEntity entity) throws TopiaException { + * + * MyEntityDAO dao = AppDAOHelper.getMyEntityDAO(transaction); + * dao.create(entity); + * // That's it, no need to manage errors or transaction, the abstract + * // service will do this job. + * } + * } + * </pre> + * <div> + * <h2>TAG_TRANSACTION</h2> + * <p>You can use the tagValue 'transaction=false' to specify that a method + * doesn't need any TopiaContext, so no need to instantiate a new one. + * This tagValue can only be put directly in the model and not in properties + * file (because of multiple methods with same name problem).</p> + * </div> + * <div> + * <h2>TAG_ERROR_ARGS</h2> + * <p>You can use the tagValue 'errorArgs=false' to specify that a method doesn't + * need any arguments for error message. This tagValue can only be put directly + * in the model and not in properties file.</p> + * </div> + * <p>It is smooth, isn't it :p ?</p> + * <p>TODO : may be refactor to integrate JTA or webservice or may be not in this + * transformer.</p> + * <p>TODO : find a good way to change log level</p> + * + * Created: 23 mars 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ServiceTransformer extends ObjectModelTransformerToJava { + + protected String modelName; + + protected String defaultPackageName; + + protected String getContextInterfaceName() { + return modelName + "Context"; + } + + protected String getContextImplementorInterfaceName() { + return getContextInterfaceName() + "Implementor"; + } + + protected String getExceptionClassName() { + return modelName + "Exception"; + } + + protected String getServiceAbstractClassName(String serviceName) { + return serviceName + "Abstract"; + } + + @Override + public void transformFromModel(ObjectModel model) { + modelName = model.getName(); + defaultPackageName = getOutputProperties(). + getProperty(Template.PROP_DEFAULT_PACKAGE); + + ObjectModelInterface contextImplementor = + model.getInterface(defaultPackageName + "." + + getContextImplementorInterfaceName()); + + ObjectModelInterface context = + model.getInterface(defaultPackageName + "." + + getContextInterfaceName()); + + ObjectModelClass exception = createExceptionClass(); + + ObjectModelInterface newContextImplementor = + this.createInterface(getContextImplementorInterfaceName(), + defaultPackageName); + ObjectModelInterface newContext = + this.createInterface(getContextInterfaceName(), + defaultPackageName); + + this.addInterface(newContextImplementor, + newContext.getQualifiedName()); + + if (contextImplementor != null) { + // Copy of defined operations + // interfaces of contextImplementor are not copied + copyInterfaceOperations(contextImplementor, newContextImplementor); + } + + if (context != null) { + // Copy of defined operations + // interfaces of context are not copied + copyInterfaceOperations(context, newContext); + } + + ObjectModelOperation beginTransaction = + this.addOperation(newContextImplementor, + "beginTransaction", TopiaContext.class); + this.addException(beginTransaction, TopiaException.class); + + ObjectModelOperation doCatch1 = + this.addOperation(newContextImplementor, "doCatch", "void"); + this.addParameter(doCatch1, Exception.class, "eee"); + this.addParameter(doCatch1, String.class, "message"); + this.addParameter(doCatch1, "Object...", "args"); + this.addException(doCatch1, exception.getQualifiedName()); + + ObjectModelOperation doCatch2 = + this.addOperation(newContextImplementor, "doCatch", "void"); + this.addParameter(doCatch2, TopiaContext.class, "transaction"); + this.addParameter(doCatch2, Exception.class, "eee"); + this.addParameter(doCatch2, String.class, "message"); + this.addParameter(doCatch2, "Object...", "args"); + this.addException(doCatch2, exception.getQualifiedName()); + + ObjectModelOperation doFinally = + this.addOperation(newContextImplementor, "doFinally", "void"); + this.addParameter(doFinally, TopiaContext.class, "transaction"); + } + + protected ObjectModelClass createExceptionClass() { + + ObjectModelClass exception = + this.createClass(getExceptionClassName(), defaultPackageName); + + this.setSuperClass(exception, RuntimeException.class); + this.addAttribute(exception, "args", "Object[]", null, + ObjectModelModifier.PROTECTED); + + ObjectModelOperation constructor = + this.addConstructor(exception, ObjectModelModifier.PUBLIC); + + this.addParameter(constructor, Throwable.class, "eee"); + this.addParameter(constructor, String.class, "message"); + this.addParameter(constructor, "Object...", "args"); + + setOperationBody(constructor, "" + /*{ + super(message, eee); + this.args = args; + }*/ + ); + + ObjectModelOperation getArgs = + this.addOperation(exception, "getArgs", "Object[]", + ObjectModelModifier.PUBLIC); + + setOperationBody(getArgs, "" + /*{ + return args; + }*/ + ); + + ObjectModelOperation hasArgs = + this.addOperation(exception, "hasArgs", "boolean", + ObjectModelModifier.PUBLIC); + + setOperationBody(hasArgs, "" + /*{ + return args.length > 0; + }*/ + ); + + return exception; + } + + /** + * Used to simply copy the {@code source} interface signature to the + * {@code dest} interface. + * + * @param source interface + * @param dest interface + */ + protected void copyInterfaceOperations(ObjectModelInterface source, + ObjectModelInterface dest) { + setDocumentation(dest, source.getDocumentation()); + for (ObjectModelOperation op : source.getOperations()) { + ObjectModelOperation newOp = + this.addOperation(dest, + op.getName(), op.getReturnType()); + setDocumentation(newOp.getReturnParameter(), + op.getReturnParameter().getDocumentation()); + for (ObjectModelParameter param : op.getParameters()) { + ObjectModelParameter newParam = + this.addParameter(newOp, param.getType(), + param.getName()); + setDocumentation(newParam, param.getDocumentation()); + } + for (String ex : op.getExceptions()) { + this.addException(newOp, ex); + } + setDocumentation(newOp, op.getDocumentation()); + } + } + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + // skip ContextImplementor and Context interfaces + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { + return; + } + + // Create INTERFACE + ObjectModelInterface serviceInterface = + this.createInterface(interfacez.getName(), + interfacez.getPackageName()); + + copyInterfaceOperations(interfacez, serviceInterface); + + + // Create ABSTRACT CLASS + ObjectModelClass service = this.createAbstractClass( + getServiceAbstractClassName(interfacez.getName()), + interfacez.getPackageName()); + + this.addInterface(service, serviceInterface.getQualifiedName()); + + // Add Logger + // FIXME in EUGene, we want the default value not to be managed + // for import. +// this.addAttribute(service, "log", +// Log.class, +// "LogFactory.getLog(" + interfacez.getName() + ".class)", +// ObjectModelModifier.PRIVATE, +// ObjectModelModifier.STATIC, +// ObjectModelModifier.FINAL); + this.addAttribute(service, "log", + Log.class, null, + ObjectModelModifier.PRIVATE, + ObjectModelModifier.FINAL); + + this.addImport(service, Log.class); + this.addImport(service, LogFactory.class); + + String contextFqn = defaultPackageName + "." + + getContextImplementorInterfaceName(); + + // Add Context Attribute + constructor + this.addAttribute(service, "context", contextFqn, null, + ObjectModelModifier.PROTECTED); + + // Constructor + ObjectModelOperation constructor = + this.addConstructor(service, ObjectModelModifier.PUBLIC); + //this.addParameter(constructor, contextFqn, "context"); + setOperationBody(constructor, "" + /*{ + //this.context = context; + // FIXME : must be fixed attribute value in EUGene + this.log = LogFactory.getLog(<%=interfacez.getName()%>.class); + }*/ + ); + + ObjectModelOperation setContext = + this.addOperation(service, "setContext", "void", + ObjectModelModifier.PUBLIC); + this.addParameter(setContext, contextFqn, "context"); + setOperationBody(setContext, "" + /*{ + this.context = context; + }*/ + ); + + // Prepare operation generations + String first = modelName.substring(0, 1); + String serviceName = + GeneratorUtil.toLowerCaseFirstLetter(interfacez.getName()); + + this.addImport(service, TopiaContext.class); + this.addImport(service, I18n.class); + this.addImport(service, ArrayList.class); + + for (ObjectModelOperation op : interfacez.getOperations()) { + + // boolean to specify if the method need a transaction or not + // Default set to true but can be override by a tagvalue on the + // method + boolean needTransaction = true; + + String transactionTag = + op.getTagValue(TopiaGeneratorUtil.TAG_TRANSACTION); + + if (transactionTag != null) { + needTransaction = Boolean.parseBoolean(transactionTag); + } + + // boolean to specify if the method need error arguments or not + // Default set to true but can be override by a tagvalue on the + // method + boolean needErrorArgs = true; + + String errorArgsTag = + op.getTagValue(TopiaGeneratorUtil.TAG_ERROR_ARGS); + + if (errorArgsTag != null) { + needErrorArgs = Boolean.parseBoolean(errorArgsTag); + } + + // Implementation of interface operation + ObjectModelOperation implOp = + this.addOperation(service, + op.getName(), op.getReturnType(), + ObjectModelModifier.PUBLIC); + this.addAnnotation(service, implOp, Override.class.getSimpleName()); + + String opName = StringUtils.capitalize(op.getName()); + + // Abstract operation to execute method content + ObjectModelOperation abstOp = + this.addOperation(service, "execute" + opName, + op.getReturnType(), + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.PROTECTED); + + // Throw all exception from abstract method + // They will be catched by interface method to use doCatch + this.addException(abstOp, Exception.class); + + if (needTransaction) { + this.addParameter(abstOp, TopiaContext.class, "transaction"); + this.addException(abstOp, TopiaException.class); + } + + String toStringAppend = ""; + String separatorLog = " : "; + // Prepare operation parameters + String opParams = ""; + String separatorParams = ""; + if (needErrorArgs) { + opParams += "errorArgs"; + separatorParams = ", "; + // Add errorArgs to abstract operation + this.addParameter(abstOp, + "java.util.List<Object>", "errorArgs"); + } + + // Copy other operation parameters + for (ObjectModelParameter param : op.getParameters()) { + String paramName = param.getName(); + this.addParameter(implOp, param.getType(), param.getName()); + this.addParameter(abstOp, param.getType(), param.getName()); + + // Prepare Log + toStringAppend += + "\n\t\t\t.append(\"" + separatorLog + paramName + " = \")" + + ".append(" + paramName + ")"; + separatorLog = " _ "; + + // Prepare Abstract method params + opParams += separatorParams + param.getName(); + separatorParams = ", "; + } + + // Use buffer for operation body + StringBuilder buffer = new StringBuilder(); + + // Error key for i18n + String errorKey = StringUtils.lowerCase(modelName) + ".error." + + serviceName + "." + op.getName(); + + String doCatchParams = "eee, I18n.n_(\"" + errorKey + "\")"; + doCatchParams += needErrorArgs ? ", errorArgs.toArray()" : ""; + + // Return managment + String opReturn = ""; + String finalReturn = ""; + if (!op.getReturnType().equals("void")) { + opReturn = "return "; + finalReturn = "return null;"; + } + + if (needErrorArgs) { + // Init errorArgs + buffer.append("" + /*{ + List<Object> errorArgs = new ArrayList<Object>(); + }*/ ); + } + + if (needTransaction) { + // Open the transaction + buffer.append("" + /*{ + TopiaContext transaction = null; + try { + transaction = context.beginTransaction(); + }*/ + ); + // Add transaction in the execute operation parameters + // and doCatch parameters + opParams = "transaction, " + opParams; + doCatchParams = "transaction, " + doCatchParams; + } else { + buffer.append("" + /*{ + try { + }*/ + ); + } + + buffer.append("" + /*{ + if (log.isDebugEnabled()) { + String message = new StringBuilder("<%=first%>:[ <%=opName%> ]")<%=toStringAppend%>. + toString(); + log.debug(message); + } + + <%=opReturn%>execute<%=opName%>(<%=opParams%>); }*/); + + // Copy exceptions + for (String ex : op.getExceptions()) { + this.addException(implOp, ex); + this.addException(abstOp, ex); + // Add catch block for known exceptions we want to throw + String exName = GeneratorUtil.getSimpleName(ex); + buffer.append("" + /*{ + } catch (<%=exName%> eee) { + throw eee; }*/); + } + + buffer.append("" + /*{ + } catch (Exception eee) { + context.doCatch(<%=doCatchParams%>); }*/); + + if (needTransaction) { + // Finally block to close transaction + buffer.append("" + /*{ + } finally { + context.doFinally(transaction); }*/); + } + + buffer.append("" + /*{ + } + <%=finalReturn%> + }*/ + ); + + this.setOperationBody(implOp, buffer.toString()); + } + + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: svn:mergeinfo +

1 0

r1861 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 30, 2010

March 30, 2010

Author: tchemit Date: 2010-03-30 22:51:55 +0200 (Tue, 30 Mar 2010) New Revision: 1861 Log: reformat code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java 2010-03-30 17:51:53 UTC (rev 1860) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java 2010-03-30 20:51:55 UTC (rev 1861) @@ -25,11 +25,11 @@ import java.util.List; /** - * Pour qualifier l'etat d'une entite lors du calcul d'un differentiel entre deux - * entites. + * Pour qualifier l'etat d'une entite lors du calcul d'un differentiel entre + * deux entites. * - * @see TopiaEntityHelper#buildDifferentiel(java.util.List, java.util.List) - * + * @author tchemit <chemit(a)codelutin.com> + * @see TopiaEntityHelper#buildDifferentiel(List, List) * @since 2.2.0 */ public enum DiffState { @@ -59,7 +59,8 @@ * @return le dictionnaire crée */ public static EnumMap<DiffState, List<String>> newMap() { - EnumMap<DiffState, List<String>> result = new EnumMap<DiffState, List<String>>(DiffState.class); + EnumMap<DiffState, List<String>> result = + new EnumMap<DiffState, List<String>>(DiffState.class); for (DiffState state : values()) { result.put(state, new ArrayList<String>()); } @@ -72,7 +73,8 @@ * @param mainMap le dictionnaire principale * @param toAdd le dictionne a ajouter dans le dictionnaire principale */ - public static void addAll(EnumMap<DiffState, List<String>> mainMap, EnumMap<DiffState, List<String>> toAdd) { + public static void addAll(EnumMap<DiffState, List<String>> mainMap, + EnumMap<DiffState, List<String>> toAdd) { for (DiffState state : values()) { List<String> newList = toAdd.get(state); if (newList != null && !newList.isEmpty()) { @@ -101,7 +103,8 @@ * * @param mainMap le dictionnaire a nettoyer */ - public static void removeEmptyStates(EnumMap<DiffState, List<String>> mainMap) { + public static void removeEmptyStates( + EnumMap<DiffState, List<String>> mainMap) { for (DiffState state : values()) { List<String> newList = mainMap.get(state); if (newList == null || newList.isEmpty()) {

1 0

r1860 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org March 30, 2010

March 30, 2010

Author: fdesbois Date: 2010-03-30 19:51:53 +0200 (Tue, 30 Mar 2010) New Revision: 1860 Log: - Add catch parts for known exceptions identified from operation in model. - Accept all throw exceptions from abstract execute methods. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-27 20:06:23 UTC (rev 1859) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-30 17:51:53 UTC (rev 1860) @@ -457,17 +457,15 @@ ObjectModelModifier.ABSTRACT, ObjectModelModifier.PROTECTED); + // Throw all exception from abstract method + // They will be catched by interface method to use doCatch + this.addException(abstOp, Exception.class); + if (needTransaction) { this.addParameter(abstOp, TopiaContext.class, "transaction"); this.addException(abstOp, TopiaException.class); } - // Copy exceptions - for (String ex : op.getExceptions()) { - this.addException(implOp, ex); - this.addException(abstOp, ex); - } - String toStringAppend = ""; String separatorLog = " : "; // Prepare operation parameters @@ -553,28 +551,39 @@ log.debug(message); } - <%=opReturn%>execute<%=opName%>(<%=opParams%>); + <%=opReturn%>execute<%=opName%>(<%=opParams%>); }*/); + + // Copy exceptions + for (String ex : op.getExceptions()) { + this.addException(implOp, ex); + this.addException(abstOp, ex); + // Add catch block for known exceptions we want to throw + String exName = GeneratorUtil.getSimpleName(ex); + buffer.append("" + /*{ + } catch (<%=exName%> eee) { + throw eee; }*/); + } + + buffer.append("" + /*{ } catch (Exception eee) { - context.doCatch(<%=doCatchParams%>); - }*/ - ); + context.doCatch(<%=doCatchParams%>); }*/); if (needTransaction) { // Finally block to close transaction buffer.append("" /*{ } finally { - context.doFinally(transaction); - }*/ - ); + context.doFinally(transaction); }*/); } buffer.append("" /*{ } - <%=finalReturn%> + <%=finalReturn%> }*/ - ); + ); this.setOperationBody(implOp, buffer.toString()); }

1 0

r1859 - trunk
by tchemit＠users.nuiton.org March 27, 2010

March 27, 2010

Author: tchemit Date: 2010-03-27 21:06:23 +0100 (Sat, 27 Mar 2010) New Revision: 1859 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-26 14:04:27 UTC (rev 1858) +++ trunk/pom.xml 2010-03-27 20:06:23 UTC (rev 1859) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>topia</artifactId>

1 0

r1858 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator site
by fdesbois＠users.nuiton.org March 26, 2010

March 26, 2010

Author: fdesbois Date: 2010-03-26 15:04:27 +0100 (Fri, 26 Mar 2010) New Revision: 1858 Log: - Add context setter in serviceAbstract generation. Remove constructor with param. - Add missing link for TopiaQuery in documentation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-25 11:21:40 UTC (rev 1857) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-26 14:04:27 UTC (rev 1858) @@ -387,15 +387,25 @@ // Constructor ObjectModelOperation constructor = this.addConstructor(service, ObjectModelModifier.PUBLIC); - this.addParameter(constructor, contextFqn, "context"); + //this.addParameter(constructor, contextFqn, "context"); setOperationBody(constructor, "" /*{ - this.context = context; + //this.context = context; // FIXME : must be fixed attribute value in EUGene this.log = LogFactory.getLog(<%=interfacez.getName()%>.class); }*/ ); + ObjectModelOperation setContext = + this.addOperation(service, "setContext", "void", + ObjectModelModifier.PUBLIC); + this.addParameter(setContext, contextFqn, "context"); + setOperationBody(setContext, "" + /*{ + this.context = context; + }*/ + ); + // Prepare operation generations String first = modelName.substring(0, 1); String serviceName = Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2010-03-25 11:21:40 UTC (rev 1857) +++ trunk/topia-persistence/src/site/site_fr.xml 2010-03-26 14:04:27 UTC (rev 1858) @@ -41,6 +41,7 @@ <item name="How-to" href="howto.html"/> <item name="Génération des modèles" href="ModelGeneration.html"/> <item name="TopiaContextFactory" href="Devel.html"/> + <item name="TopiaQuery" href="TopiaQuery.html"/> <item name="FAQ" href="FAQ.html"/> <item name="Projets similaires" href="project.html"/> </menu>

1 0

r1857 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org March 25, 2010

March 25, 2010

Author: fdesbois Date: 2010-03-25 12:21:40 +0100 (Thu, 25 Mar 2010) New Revision: 1857 Log: change log level 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-03-25 10:53:03 UTC (rev 1856) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-03-25 11:21:40 UTC (rev 1857) @@ -506,28 +506,6 @@ result.append(orderBy); } return StringUtils.trim(result.toString()); - - -// String result = ""; -// String selectKeyWord = "SELECT "; -// selectKeyWord += distinct ? " DISTINCT " : ""; -// if (select != null) { -// result = selectKeyWord + select; -// // Set default select if there is more than one table in from part and main alias is defined -// } else if (from.contains(",") && !StringUtils.isEmpty(mainAlias)) { -// result = selectKeyWord + mainAlias; -// } -// result += from; -// if (where != null) { -// result += where; -// } -// if (groupBy != null) { -// result += groupBy; -// } -// if (orderBy != null) { -// result += orderBy; -// } -// return result.trim(); } /** @@ -650,8 +628,8 @@ */ public TopiaQuery add(String paramName, Op constraint, Object paramValue) { StringBuilder result = new StringBuilder(paramName).append(' '); - if (log.isInfoEnabled()) { - log.info("paramValue = " + paramValue); + if (log.isDebugEnabled()) { + log.debug("paramValue = " + paramValue); } if (paramValue == null) { result.append(Op.NULL); @@ -733,8 +711,8 @@ } // Only one paramValue if (length == 1) { - if (log.isInfoEnabled()) { - log.info("Only one value " + Arrays.toString(paramValue)); + if (log.isDebugEnabled()) { + log.debug("Only one value " + Arrays.toString(paramValue)); } return add(paramName, Op.EQ, paramValue[0]); }

1 0

r1856 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework test/xmi
by fdesbois＠users.nuiton.org March 25, 2010

March 25, 2010

Author: fdesbois Date: 2010-03-25 11:53:03 +0100 (Thu, 25 Mar 2010) New Revision: 1856 Log: Evo #418 : Add method 'add(String paramName, Object... paramValue)' Added: 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/test/xmi/topiatest.zargo 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-03-25 09:07:09 UTC (rev 1855) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-03-25 10:53:03 UTC (rev 1856) @@ -87,22 +87,21 @@ * * String query = "FROM " + Person.class.getName(); * List<Object> params = new ArrayList<Object>(); - * boolean filtered = false; + * String separator = " WHERE "; * // company parameter can be null * if (company != null) { - * query += " WHERE company = :company"; + * query += separator + "company = :company"; * params.add("company"); * params.add(company); - * filtered = true; + * separator = " AND "; * } * * // contact paramater can be null * if (contact != null) { - * query += filtered ? " AND " : " WHERE " - * query += " contact = :contact"; + * query += separator + "contact = :contact"; * params.add("contact"); * params.add(contact); - * filtered = true; + * separator = " AND "; * } * * context.find(query, params.toArray()); @@ -129,7 +128,7 @@ * * HQL : "FROM PersonImpl AS P WHERE (P.company IS NULL OR P.company = :company) AND P.firstName LIKE :firstName" * - * Using TopiaQuery and an Alias : + * Using TopiaQuery and an Alias (these different queries are equivalent) : * query = TopiaQuery.createQuery(Person.class, "P"); * 1- query.add("(P.company IS NULL OR P.company = :company") AND P.firstName LIKE :firstName") * .addParam("company", company).addParam("firstName",firstName + "%"); @@ -139,6 +138,8 @@ * 3- query.add("P.company IS NULL OR P.company = :company") * .add("P.firstName", Op.LIKE, firstName + "%") * .addParam("company", company); + * 4- query.addNullOr("P.company", Op.EQ, company). + * add("P.firstName", Op.LIKE, firstName + "%"); * * You can use TopiaQuery to create a subquery in an other TopiaQuery, you have * to use the method {@link #fullQuery() } to get the full query in HQL and give @@ -649,6 +650,9 @@ */ public TopiaQuery add(String paramName, Op constraint, Object paramValue) { StringBuilder result = new StringBuilder(paramName).append(' '); + if (log.isInfoEnabled()) { + log.info("paramValue = " + paramValue); + } if (paramValue == null) { result.append(Op.NULL); } else { @@ -710,29 +714,64 @@ * Add an element to the query. The parameter will be automatically added. * The default constrainst operation is Op.EQ for EQUALS. * Ex : add("boat", boat) means -> boat = :boat. + * If you add more than one values, the statement IN will be used. You + * can also have a null value in the {@code paramValue} list (except if it's + * the only one value, it's ambiguous). + * Note : this method do nothing if the {@code paramValue} is not defined. * * @param paramName name of the parameter in the query - * @param paramValue value of the parameter + * @param paramValue values of the parameter * @return the TopiaQuery * @see TopiaQuery#add(String, TopiaQuery.Op, Object) + * @since 2.3.1 */ - public TopiaQuery add(String paramName, Object paramValue) { - return add(paramName, Op.EQ, paramValue); + public TopiaQuery add(String paramName, Object... paramValue) { + int length = paramValue.length; + // Do nothing if there is no value defined + if (length == 0) { + return this; + } + // Only one paramValue + if (length == 1) { + if (log.isInfoEnabled()) { + log.info("Only one value " + Arrays.toString(paramValue)); + } + return add(paramName, Op.EQ, paramValue[0]); + } + // Multiple values is defined + StringBuilder values = new StringBuilder(); + int count = 1; + // Used if one of the value is null + boolean addNull = false; + for (Object value : paramValue) { + if (value != null) { + // Add the valueName to the values list for IN statement + String valueName = getValueName(paramName + count); + if (count != 1) { + values.append(", "); + } + values.append(':').append(valueName); + addParam(valueName, value); + count++; + } else { + addNull = true; + } + } + // Create buffer for IN statement with values + StringBuilder buffer = new StringBuilder(); + buffer.append(paramName).append(" IN(").append(values).append(")"); + // Add the OR statement for null value if needed + if (addNull) { + buffer.append(" OR "). + append(paramName).append(' ').append(Op.NULL.toString()); + } else { + // no parentheses needed in this case (no OR statement) + parentheses = false; + } + return add(buffer.toString()); } /** - * Add an element to the query with a list of different possible values. - * - * @param paramName name of the parameter in the query - * @param values different values for this parameter - * @return the TopiaQuery - * @see #add(java.lang.String, java.util.Collection, boolean) - */ - public TopiaQuery add(String paramName, Collection<Object> values) { - return add(paramName, values, false); - } - - /** * Add an element to the query with a list of different values. The IN key * word will be used to set the different values. An other constraint on * nullity can be set with isNull argument. @@ -744,32 +783,16 @@ * @param isNull use it to test the nullity of parameter * @return the TopiaQuery * @see #add(java.lang.String) + * @deprecated use {@link #add(java.lang.String, java.lang.Object[]) } + * with a null or not */ - public TopiaQuery add(String paramName, Collection<Object> values, boolean isNull) { - StringBuilder queryIn = new StringBuilder(); - if (!values.isEmpty()) { - queryIn.append(paramName).append(" IN ("); - int count = 1; - for (Object value : values) { - String valueName = getValueName(paramName + count); - if (count != 1) { - queryIn.append(", "); - } - queryIn.append(':').append(valueName); - addParam(valueName, value); - count++; - } - queryIn.append(')'); - } + @Deprecated + public TopiaQuery add(String paramName, Collection<Object> values, + boolean isNull) { if (isNull) { - if (!values.isEmpty()) { - queryIn.append(" OR "); - } - queryIn.append(paramName).append(' ').append(Op.NULL); - //queryIn += values.isNotEmpty() ? " OR " : ""; - //queryIn += paramName + " IS NULL"; + values.add(null); } - return add(queryIn.toString()); + return add(paramName, values.toArray()); } /** Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-03-25 10:53:03 UTC (rev 1856) @@ -0,0 +1,76 @@ + +package org.nuiton.topia.framework; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.topiatest.QueriedEntity; + +/** + * + * @author fdesbois + */ +public class TopiaQueryTest { + + public TopiaQueryTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + @Test + public void testAdd() { + + // Test with one paramValue + String value = "topia"; + TopiaQuery query = new TopiaQuery(QueriedEntity.class); + query.add(QueriedEntity.TEST_ADD, value); + Assert.assertEquals( + "FROM org.nuiton.topiatest.QueriedEntity " + + "WHERE testAdd = :testAdd", + query.fullQuery()); + + // Test with null paramValue + String nullValue = null; + query = new TopiaQuery(QueriedEntity.class); + query.add(QueriedEntity.TEST_ADD, nullValue); + Assert.assertEquals( + "FROM org.nuiton.topiatest.QueriedEntity " + + "WHERE testAdd IS NULL", + query.fullQuery()); + + // Test with two paramValues + String value2 = "eugene"; + query = new TopiaQuery(QueriedEntity.class); + query.add(QueriedEntity.TEST_ADD, value, value2); + Assert.assertEquals( + "FROM org.nuiton.topiatest.QueriedEntity " + + "WHERE testAdd IN(:testAdd1, :testAdd2)", + query.fullQuery()); + + // Test with two paramValues + null + query = new TopiaQuery(QueriedEntity.class); + query.add(QueriedEntity.TEST_ADD, value, value2, null); + Assert.assertEquals( + "FROM org.nuiton.topiatest.QueriedEntity " + + "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", + query.fullQuery()); + } + +} \ No newline at end of file Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1855 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org March 25, 2010

March 25, 2010

Author: fdesbois Date: 2010-03-25 10:07:09 +0100 (Thu, 25 Mar 2010) New Revision: 1855 Log: Evo #416 : Add Operator != in TopiaQuery 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-03-24 16:47:19 UTC (rev 1854) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-03-25 09:07:09 UTC (rev 1855) @@ -268,7 +268,9 @@ /** IS NOT NULL **/ NOT_NULL("IS NOT NULL"), /** IS NULL **/ - NULL("IS NULL"); + NULL("IS NULL"), + /** NOT EQUAL **/ + NEQ("!="); protected String value;

1 0

r1854 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 24, 2010

March 24, 2010

Author: tchemit Date: 2010-03-24 17:47:19 +0100 (Wed, 24 Mar 2010) New Revision: 1854 Log: add usefull getContractClasses method Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-23 23:29:29 UTC (rev 1853) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-24 16:47:19 UTC (rev 1854) @@ -348,6 +348,24 @@ return null; } + public static Set<Class<? extends TopiaEntity>> getContractClasses( + TopiaEntityEnum[] contracts, + Iterable<Class<? extends TopiaEntity>> klasses) { + Set<Class<? extends TopiaEntity>> result = new HashSet<Class<? extends TopiaEntity>>(); + if (contracts == null || contracts.length == 0) { + // pas de contract connus... + return result; + } + + for (Class<? extends TopiaEntity> klass : klasses) { + Class<? extends TopiaEntity> c = getContractClass(contracts, klass); + if (c != null) { + result.add(c); + } + } + return result; + } + public static TopiaEntityEnum getEntityEnum( Class<? extends TopiaEntity> klass, TopiaEntityEnum... contracts) { if (contracts == null || contracts.length == 0) {

1 0

r1853 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org March 23, 2010

March 23, 2010

Author: fdesbois Date: 2010-03-24 00:29:29 +0100 (Wed, 24 Mar 2010) New Revision: 1853 Log: Evo #412 : template for final application -> generate abstract services with skeleton which contains transaction (topiaContext) managment (try/catch/finally, errors, ...) See javadoc Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java 2010-03-23 23:29:29 UTC (rev 1853) @@ -0,0 +1,573 @@ + +package org.nuiton.topia.generator; + +import java.util.ArrayList; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.i18n.I18n; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ + +/** + * This Template is used to create the skeleton of services for a final + * application which using Topia. + * <pre> + * Generation from a model named 'App' : + * + * - AppContext : empty super interface to used in application UI. Can + * be override in model if put in defaultPackage (ex : org.chorem.app) set + * in maven-eugene-plugin configuration. + * + * - AppContextImplementor : interface which extends AppContext to add + * technical methods for the application. Generation of methods : + * * doCatch : used to catch all exception from a service method. + * * doFinally : used to finally the try/catch of a service method + * * beginTransaction : start the transaction using rootContext. + * These three methods have to be implemented in a class which implements + * AppContextImplementor (ex : AppContextImpl). You can also add others + * methods to AppContextImplementor in the same way as AppContext. + * + * - AppException : exception class which extends RuntimeException for all + * technical exceptions which appears in service method. If you want to + * manage some specific exceptions, you have to managed them in doCatch + * implementation. + * + * Generation from interfaces with stereotype <<service>> : + * + * - Service : interface of the service defined in model. + * + * - ServiceAbstract : abstract class which contains : + * * constructor with AppContextImplementor in argument + * * for each method : the implementation of the method (skeleton with + * try/catch and beginTransaction call to open a new TopiaContext from + * AppContextImplementor). Usage of i18n keys for error messages in + * exception. + * * for each method : an abstract method used to execute the business + * code of the method : need to be implemented in subclass. + * + * Exemple of AppContextImpl : + * + * public class AppContextImpl implements AppContextImplementor { + * + * // properties for Topia configuration + * protected Properties properties; + * ... + * + * @Override + * public void doCatch(TopiaContext transaction, Exception eee, + * String message, Object... args) throws AppException { + * + * // Note that the message from service doesn't directly use _() for + * // i18 messages but n_(). In this log, the _() is used to translate + * // correctly the message. But the message must be translate when + * // catching the AppException in UI. + * if (log.isErrorEnabled()) { + * log.error(_(message, args), eee); + * } + * + * // rollback of current transaction + * if (transaction != null) { + * try { + * transaction.rollbackTransaction(); + * } catch (TopiaException ex) { + * if (log.isErrorEnabled()) { + * log.error(_("app.error.context.rollback"), ex); + * } + * } + * } + * // wrapping the exception in a AppException with message and + * // arguments for i18n translation + * throw new AppException(eee, message, args); + * } + * + * @Override + * public void doFinally(TopiaContext transaction) { + * if (transaction != null) { + * try { + * transaction.closeContext(); + * } catch (TopiaException eee) { + * if (log.isErrorEnabled()) { + * log.error(_("app.error.context.close"), eee); + * } + * } + * } + * } + * + * @Override + * public TopiaContext beginTransaction() throws TopiaException { + * TopiaContext rootContext = null; + * try { + * // You have to manage the properties using ApplicationConfig + * // or other lib to have configuration for Topia + * rootContext = TopiaContextFactory.getContext(properties); + * + * return getTopiaRootContext().beginTransaction(); + * + * // only catch exception for rootContext + * } catch (TopiaNotFoundException eee) { + * doCatch(eee, n_("app.error.context.getTopiaRootContext")); + * } + * return null; + * } + * ... + * } + * + * Exemple of ServiceImpl : + * + * public class ServiceImpl extends ServiceAbstract { + * + * public ServiceImpl(AppContextImplementor context) { + * super(context); + * } + * + * // Implementation of abstract method, the interface method is + * // called 'createMyEntity(MyEntity entity)' in this case. + * @Override + * public void executeCreateMyEntity(TopiaContext transaction, + * MyEntity entity) throws TopiaException { + * + * MyEntityDAO dao = AppDAOHelper.getMyEntityDAO(transaction); + * dao.create(entity); + * // That's it, no need to manage errors or transaction, the abstract + * // service will do this job. + * } + * } + * + * TAG_TRANSACTION + * --------------- + * + * You can use the tagValue 'transaction=false' to specify that a method doesn't + * need any TopiaContext, so no need to instantiate a new one. This tagValue + * can only be put directly in the model and not in properties file (because + * of multiple methods with same name problem). + * + * TAG_ERROR_ARGS + * -------------- + * + * You can use the tagValue 'errorArgs=false' to specify that a method doesn't + * need any arguments for error message. This tagValue can only be put directly + * in the model and not in properties file. + * + * It is smooth, isn't it :p ? + * + * TODO : may be refactor to integrate JTA or webservice or may be not in this + * transformer. + * + * TODO : find a good way to change log level + * + * </pre> + * + * Created: 23 mars 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class BusinessTransformer extends ObjectModelTransformerToJava { + + protected String modelName; + + protected String defaultPackageName; + + protected String getContextInterfaceName() { + return modelName + "Context"; + } + + protected String getContextImplementorInterfaceName() { + return getContextInterfaceName() + "Implementor"; + } + + protected String getExceptionClassName() { + return modelName + "Exception"; + } + + protected String getServiceAbstractClassName(String serviceName) { + return serviceName + "Abstract"; + } + + @Override + public void transformFromModel(ObjectModel model) { + modelName = model.getName(); + defaultPackageName = getOutputProperties(). + getProperty(Template.PROP_DEFAULT_PACKAGE); + + ObjectModelInterface contextImplementor = + model.getInterface(defaultPackageName + "." + + getContextImplementorInterfaceName()); + + ObjectModelInterface context = + model.getInterface(defaultPackageName + "." + + getContextInterfaceName()); + + ObjectModelClass exception = createExceptionClass(); + + ObjectModelInterface newContextImplementor = + this.createInterface(getContextImplementorInterfaceName(), + defaultPackageName); + ObjectModelInterface newContext = + this.createInterface(getContextInterfaceName(), + defaultPackageName); + + this.addInterface(newContextImplementor, + newContext.getQualifiedName()); + + if (contextImplementor != null) { + // Copy of defined operations + // interfaces of contextImplementor are not copied + copyInterfaceOperations(contextImplementor, newContextImplementor); + } + + if (context != null) { + // Copy of defined operations + // interfaces of context are not copied + copyInterfaceOperations(context, newContext); + } + + ObjectModelOperation beginTransaction = + this.addOperation(newContextImplementor, + "beginTransaction", TopiaContext.class); + this.addException(beginTransaction, TopiaException.class); + + ObjectModelOperation doCatch1 = + this.addOperation(newContextImplementor, "doCatch", "void"); + this.addParameter(doCatch1, Exception.class, "eee"); + this.addParameter(doCatch1, String.class, "message"); + this.addParameter(doCatch1, "Object...", "args"); + this.addException(doCatch1, exception.getQualifiedName()); + + ObjectModelOperation doCatch2 = + this.addOperation(newContextImplementor, "doCatch", "void"); + this.addParameter(doCatch2, TopiaContext.class, "transaction"); + this.addParameter(doCatch2, Exception.class, "eee"); + this.addParameter(doCatch2, String.class, "message"); + this.addParameter(doCatch2, "Object...", "args"); + this.addException(doCatch2, exception.getQualifiedName()); + + ObjectModelOperation doFinally = + this.addOperation(newContextImplementor, "doFinally", "void"); + this.addParameter(doFinally, TopiaContext.class, "transaction"); + } + + protected ObjectModelClass createExceptionClass() { + + ObjectModelClass exception = + this.createClass(getExceptionClassName(), defaultPackageName); + + this.setSuperClass(exception, RuntimeException.class); + this.addAttribute(exception, "args", "Object[]", null, + ObjectModelModifier.PROTECTED); + + ObjectModelOperation constructor = + this.addConstructor(exception, ObjectModelModifier.PUBLIC); + + this.addParameter(constructor, Throwable.class, "eee"); + this.addParameter(constructor, String.class, "message"); + this.addParameter(constructor, "Object...", "args"); + + setOperationBody(constructor, "" + /*{ + super(message, eee); + this.args = args; + }*/ + ); + + ObjectModelOperation getArgs = + this.addOperation(exception, "getArgs", "Object[]", + ObjectModelModifier.PUBLIC); + + setOperationBody(getArgs, "" + /*{ + return args; + }*/ + ); + + ObjectModelOperation hasArgs = + this.addOperation(exception, "hasArgs", "boolean", + ObjectModelModifier.PUBLIC); + + setOperationBody(hasArgs, "" + /*{ + return args.length > 0; + }*/ + ); + + return exception; + } + + /** + * Used to simply copy the {@code source} interface signature to the + * {@code dest} interface. + * + * @param source interface + * @param dest interface + */ + protected void copyInterfaceOperations(ObjectModelInterface source, + ObjectModelInterface dest) { + for (ObjectModelOperation op : source.getOperations()) { + ObjectModelOperation newOp = + this.addOperation(dest, + op.getName(), op.getReturnType()); + setDocumentation(newOp.getReturnParameter(), + op.getReturnParameter().getDocumentation()); + for (ObjectModelParameter param : op.getParameters()) { + ObjectModelParameter newParam = + this.addParameter(newOp, param.getType(), + param.getName()); + setDocumentation(newParam, param.getDocumentation()); + } + for (String ex : op.getExceptions()) { + this.addException(newOp, ex); + } + setDocumentation(newOp, op.getDocumentation()); + } + } + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + // skip ContextImplementor and Context interfaces + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { + return; + } + + // Create INTERFACE + ObjectModelInterface serviceInterface = + this.createInterface(interfacez.getName(), + interfacez.getPackageName()); + + copyInterfaceOperations(interfacez, serviceInterface); + + + // Create ABSTRACT CLASS + ObjectModelClass service = this.createAbstractClass( + getServiceAbstractClassName(interfacez.getName()), + interfacez.getPackageName()); + + this.addInterface(service, serviceInterface.getQualifiedName()); + + // Add Logger + // FIXME in EUGene, we want the default value not to be managed + // for import. +// this.addAttribute(service, "log", +// Log.class, +// "LogFactory.getLog(" + interfacez.getName() + ".class)", +// ObjectModelModifier.PRIVATE, +// ObjectModelModifier.STATIC, +// ObjectModelModifier.FINAL); + this.addAttribute(service, "log", + Log.class, null, + ObjectModelModifier.PRIVATE, + ObjectModelModifier.FINAL); + + this.addImport(service, Log.class); + this.addImport(service, LogFactory.class); + + String contextFqn = defaultPackageName + "." + + getContextImplementorInterfaceName(); + + // Add Context Attribute + constructor + this.addAttribute(service, "context", contextFqn, null, + ObjectModelModifier.PROTECTED); + + // Constructor + ObjectModelOperation constructor = + this.addConstructor(service, ObjectModelModifier.PUBLIC); + this.addParameter(constructor, contextFqn, "context"); + setOperationBody(constructor, "" + /*{ + this.context = context; + // FIXME : must be fixed attribute value in EUGene + this.log = LogFactory.getLog(<%=interfacez.getName()%>.class); + }*/ + ); + + // Prepare operation generations + String first = modelName.substring(0, 1); + String serviceName = + GeneratorUtil.toLowerCaseFirstLetter(interfacez.getName()); + + this.addImport(service, TopiaContext.class); + this.addImport(service, I18n.class); + this.addImport(service, ArrayList.class); + + for (ObjectModelOperation op : interfacez.getOperations()) { + + // boolean to specify if the method need a transaction or not + // Default set to true but can be override by a tagvalue on the + // method + boolean needTransaction = true; + + String transactionTag = + op.getTagValue(TopiaGeneratorUtil.TAG_TRANSACTION); + + if (transactionTag != null) { + needTransaction = Boolean.parseBoolean(transactionTag); + } + + // boolean to specify if the method need error arguments or not + // Default set to true but can be override by a tagvalue on the + // method + boolean needErrorArgs = true; + + String errorArgsTag = + op.getTagValue(TopiaGeneratorUtil.TAG_ERROR_ARGS); + + if (errorArgsTag != null) { + needErrorArgs = Boolean.parseBoolean(errorArgsTag); + } + + // Implementation of interface operation + ObjectModelOperation implOp = + this.addOperation(service, + op.getName(), op.getReturnType(), + ObjectModelModifier.PUBLIC); + this.addAnnotation(service, implOp, Override.class.getSimpleName()); + + String opName = StringUtils.capitalize(op.getName()); + + // Abstract operation to execute method content + ObjectModelOperation abstOp = + this.addOperation(service, "execute" + opName, + op.getReturnType(), + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.PROTECTED); + + if (needTransaction) { + this.addParameter(abstOp, TopiaContext.class, "transaction"); + this.addException(abstOp, TopiaException.class); + } + + // Copy exceptions + for (String ex : op.getExceptions()) { + this.addException(implOp, ex); + this.addException(abstOp, ex); + } + + String toStringAppend = ""; + String separatorLog = " : "; + // Prepare operation parameters + String opParams = ""; + String separatorParams = ""; + if (needErrorArgs) { + opParams += "errorArgs"; + separatorParams = ", "; + // Add errorArgs to abstract operation + this.addParameter(abstOp, + "java.util.List<Object>", "errorArgs"); + } + + // Copy other operation parameters + for (ObjectModelParameter param : op.getParameters()) { + String paramName = param.getName(); + this.addParameter(implOp, param.getType(), param.getName()); + this.addParameter(abstOp, param.getType(), param.getName()); + + // Prepare Log + toStringAppend += + "\n\t\t\t.append(\"" + separatorLog + paramName + " = \")" + + ".append(" + paramName + ")"; + separatorLog = " _ "; + + // Prepare Abstract method params + opParams += separatorParams + param.getName(); + separatorParams = ", "; + } + + // Use buffer for operation body + StringBuilder buffer = new StringBuilder(); + + // Error key for i18n + String errorKey = StringUtils.lowerCase(modelName) + ".error." + + serviceName + "." + op.getName(); + + String doCatchParams = "eee, I18n.n_(\"" + errorKey + "\")"; + doCatchParams += needErrorArgs ? ", errorArgs.toArray()" : ""; + + // Return managment + String opReturn = ""; + String finalReturn = ""; + if (!op.getReturnType().equals("void")) { + opReturn = "return "; + finalReturn = "return null;"; + } + + if (needErrorArgs) { + // Init errorArgs + buffer.append("" + /*{ + List<Object> errorArgs = new ArrayList<Object>(); + }*/ ); + } + + if (needTransaction) { + // Open the transaction + buffer.append("" + /*{ + TopiaContext transaction = null; + try { + transaction = context.beginTransaction(); + }*/ + ); + // Add transaction in the execute operation parameters + // and doCatch parameters + opParams = "transaction, " + opParams; + doCatchParams = "transaction, " + doCatchParams; + } else { + buffer.append("" + /*{ + try { + }*/ + ); + } + + buffer.append("" + /*{ + if (log.isDebugEnabled()) { + String message = new StringBuilder("<%=first%>:[ <%=opName%> ]")<%=toStringAppend%>. + toString(); + log.debug(message); + } + + <%=opReturn%>execute<%=opName%>(<%=opParams%>); + } catch (Exception eee) { + context.doCatch(<%=doCatchParams%>); + }*/ + ); + + if (needTransaction) { + // Finally block to close transaction + buffer.append("" + /*{ + } finally { + context.doFinally(transaction); + }*/ + ); + } + + buffer.append("" + /*{ + } + <%=finalReturn%> + }*/ + ); + + this.setOperationBody(implOp, buffer.toString()); + } + + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BusinessTransformer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" 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-03-23 13:04:37 UTC (rev 1852) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-03-23 23:29:29 UTC (rev 1853) @@ -138,6 +138,16 @@ */ public static final String TAG_NATURAL_ID_MUTABLE = "naturalIdMutable"; /** + * Tag pour specifier si une methode a besoin d'une transaction + * (TopiaContext) ou non + */ + public static final String TAG_TRANSACTION = "transaction"; + /** + * Tag pour specifier si une methode de service a besoin d'arguments pour + * le message d'erreur ou non + */ + public static final String TAG_ERROR_ARGS = "errorArgs"; + /** * Tag pour spécifier la caractère lazy d'une association multiple */ public static final String TAG_LAZY = "lazy";

1 0

r1852 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org March 23, 2010

March 23, 2010

Author: echatellier Date: 2010-03-23 14:04:37 +0100 (Tue, 23 Mar 2010) New Revision: 1852 Log: Set newInstance instance public and add it on interface. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-22 17:34:41 UTC (rev 1851) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-23 13:04:37 UTC (rev 1852) @@ -60,23 +60,35 @@ throws TopiaException; /** - * Return class of entity managed by this DAO + * Create a new instance of managed entity. + * + * @return new entity instance + * @since 2.3.1 + * @throws TopiaException + */ + Entity newInstance() throws TopiaException; + + /** + * Return class of entity managed by this DAO. + * * @return entity managed by this DAO */ Class<Entity> getEntityClass(); /** + * Return context used by this DAO. + * * @return Returns the context. */ TopiaContextImplementor getContext(); /** - * Appelé lorsque le context a eu un commit de fait. + * Appelé lorsque le context a eu un commit de fait. + * + * TODO il faudrait peut-etre plutot faire un commit a deux phase + * car plusieurs type de persistence peuvent etre melangé, et il + * serait bien que si l'une echoué les autres echoue aussi. * - * TODO il faudrait peut-etre plutot faire un commit a deux phase - * car plusieurs type de persistence peuvent etre melangé, et il - * serait bien que si l'une echoué les autres echoue aussi. - * * @throws TopiaException if any pb while commit */ void commitTransaction() throws TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-22 17:34:41 UTC (rev 1851) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-23 13:04:37 UTC (rev 1852) @@ -155,7 +155,8 @@ } @SuppressWarnings("unchecked") - protected E instanciateNew() throws TopiaException { + @Override + public E newInstance() throws TopiaException { E result = null; if (log.isDebugEnabled()) { log.debug("entityClass = " + entityClass); @@ -702,7 +703,7 @@ */ @Override public E create(Map<String, Object> properties) throws TopiaException { - E result = instanciateNew(); + E result = newInstance(); // TODO reflechir s'il ne faudrait pas creer l'id avant l'event precedent // reflechir toujours dans un context on les E pourrait ne pas

1 0

r1851 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org March 22, 2010

March 22, 2010

Author: echatellier Date: 2010-03-22 18:34:41 +0100 (Mon, 22 Mar 2010) New Revision: 1851 Log: Ajout d'une methode create(TopiaEntity) sur le DAO. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-22 10:43:24 UTC (rev 1850) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-22 17:34:41 UTC (rev 1851) @@ -110,6 +110,18 @@ Entity create(Map<String, Object> properties) throws TopiaException; /** + * Permet de sauver un object instancié sans le DAO. + * + * @param e l'entité instanciée à sauver + * @return l'entité avec son topiaID valorisé + * @throws TopiaException + * + * @since 2.3.1 + * @throw TopiaException if any pb while creating datas + */ + Entity create(Entity e) throws TopiaException; + + /** * Permet d'ajouter ou de mettre a jour un objet. Cela permet d'ajouter * par exemple un objet provenant d'un autre context mais du meme type * de DAO @@ -119,6 +131,11 @@ */ Entity update(Entity e) throws TopiaException; + /** + * Permet de supprimer + * @param e + * @throws TopiaException + */ void delete(Entity e) throws TopiaException; Entity findByTopiaId(String k) throws TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-22 10:43:24 UTC (rev 1850) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-22 17:34:41 UTC (rev 1851) @@ -675,6 +675,26 @@ getContext().removeTopiaEntityVetoable(entityClass, vetoable); } + @Override + public E create(E entity) throws TopiaException { + + // TODO EC-20100322 this code may be merged with other create() methods + try { + // first set topiaId + String topiaId = TopiaId.create(entityClass); + TopiaEntityAbstract entityAbstract = (TopiaEntityAbstract) entity; + entityAbstract.setTopiaId(topiaId); + entityAbstract.setTopiaContext(getContext()); + + // save entity + getSession().save(entity); + getContext().getFiresSupport().warnOnUpdateEntity(entity); + return entity; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + /** * Cette methode appelle fireVetoableCreate et fireOnCreated * Si vous la surchargé, faites attention a appeler le super

1 0

r1850 - trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 22, 2010

March 22, 2010

Author: tchemit Date: 2010-03-22 11:43:24 +0100 (Mon, 22 Mar 2010) New Revision: 1850 Log: reformat contract + fix javadoc Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-03-20 17:28:21 UTC (rev 1849) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-03-22 10:43:24 UTC (rev 1850) @@ -30,54 +30,55 @@ */ package org.nuiton.topia.replication; -import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.replication.model.ReplicationModel; /** * User visible interface for replication engin - * + * <p/> * To use replicator you must have properties defined in config file: - * <li>topia.replication.engin=[class used to indexation] - * <li>possible specific property for index engin used - * + * <li>topia.replication.engin=[class used to indexation] <li>possible specific + * property for index engin used + * <p/> * The replication is always done in two phases : + * <p/> + * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], + * String...)} - ({@link #prepareForAll(TopiaEntityEnum[])} + * <p/> + * <li> - lanch replication {@link #doReplicate(ReplicationModel, + * TopiaContext)} * - * <li> - prepare the replication model - * - ({@link #prepare(TopiaEntityEnum[], String[])} - * - ({@link #prepareForAll(TopiaEntityEnum[])} - * - * <li> - lanch replication {@link #doReplicate(ReplicationModel, TopiaContext)} - * * @author chemit * @since 2.2.0 */ public interface TopiaReplicationService extends TopiaService { - public static final String SERVICE_NAME = "replication"; + String SERVICE_NAME = "replication"; /** * Prepare le modele de replication pour les entites dans les topiaIds sont * donnes. * * @param contracts les contrats a repliquer - * @param topiaIds la liste des ids d'entites a repliquer + * @param topiaIds la liste des ids d'entites a repliquer * @return le model de replication initialise - * * @throws TopiaException pour toute erreur recontree */ - ReplicationModel prepare(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; + ReplicationModel prepare(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException; /** - * Prepare le modele de replication pour toutes les entites des types donnes. - * + * Prepare le modele de replication pour toutes les entites des types + * donnes. + * <p/> * La méthode calcule l'ordre de replication des données. - * + * <p/> * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * + * <p/> * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer @@ -87,47 +88,53 @@ ReplicationModel prepareForAll(TopiaEntityEnum[] contracts) throws TopiaException; /** - * Prepare le modele de replication pour les entites données en ne faisant + * Prepare le modele de replication pour les entites données en ne faisant * pas de calcul sur l'ordre des entités à répliquer. - * + * <p/> * L'ordre des types donnees sera celui utilisé. * * @param contracts les contrats a repliquer (dans l'ordre donnée) - * @param topiaIds les ids des entites a repliquer + * @param topiaIds les ids des entites a repliquer * @return le model de replication initialise - * * @throws TopiaException pour toute erreur recontree */ - ReplicationModel prepareWithComputedOrder(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; + ReplicationModel prepareWithComputedOrder(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException; /** * Ajouter une nouvelle operation pre-replication, sur un type de donnee. * - * @param model le modele de replication - * @param type le type du noeud de replication + * @param model le modele de replication + * @param type le type du noeud de replication * @param operationClass l'implantation de l'operation - * @param parameters les parametres supplementaires pour l'operation + * @param parameters les parametres supplementaires pour l'operation */ - void addBeforeOperation(ReplicationModel model, TopiaEntityEnum type, Class<? extends TopiaReplicationOperation> operationClass, Object... parameters); + void addBeforeOperation(ReplicationModel model, + TopiaEntityEnum type, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters); /** * Ajouter une nouvelle operation post-replication, sur un type de donnee. * - * @param model le modele de replication - * @param type le type du noeud de replication + * @param model le modele de replication + * @param type le type du noeud de replication * @param operationClass l'implantation de l'operation - * @param parameters les parametres supplementaires pour l'operation + * @param parameters les parametres supplementaires pour l'operation */ - void addAfterOperation(ReplicationModel model, TopiaEntityEnum type, Class<? extends TopiaReplicationOperation> operationClass, Object... parameters); + void addAfterOperation(ReplicationModel model, + TopiaEntityEnum type, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters); /** * Lance l'operation de replication a partir du context source vers le * context de destination sur les entites donnees et en utilisant le model - * de replication precedemment construit via la methode - * {@link #prepare(TopiaEntityEnum[], String[])} ou - * {@link #prepareForAll(TopiaEntityEnum[])}. + * de replication precedemment construit via la methode {@link + * #prepare(TopiaEntityEnum[], String...)} ou {@link + * #prepareForAll(TopiaEntityEnum[])}. * - * @param model le modele de replication + * @param model le modele de replication * @param dstCtxt le context sur la source de donnees ou repliquer * @throws Exception pour toute erreur pendant la replication */

1 0

r1849 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:28:21 +0100 (Sat, 20 Mar 2010) New Revision: 1849 Log: Evolution #408: Add a template to generate BinderHelper Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-03-20 17:28:21 UTC (rev 1849) @@ -0,0 +1,233 @@ +/* + * *##% + * ToPIA :: Persistence + * Copyright (C) 2004 - 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.topia.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.*; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; +import org.nuiton.util.beans.BinderBuilder; +import org.nuiton.util.beans.BinderProvider; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ + +/** + * A template to generate a helper for {@link TopiaEntityBinder}. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BinderHelperTransformer" + * @since 2.3.1 + */ +public class BinderHelperTransformer extends ObjectModelTransformerToJava { + + private static final Log log = + LogFactory.getLog(BinderHelperTransformer.class); + + @Override + public void transformFromModel(ObjectModel model) { + ObjectModelClass resultClass; + String packageName = getOutputProperties().getProperty(Template.PROP_DEFAULT_PACKAGE); + String modelName = model.getName(); + String binderHelperClazzName = modelName + "BinderHelper"; + String daoHelperClazzName = modelName + "DAOHelper"; + + resultClass = createClass(binderHelperClazzName, packageName); + + setSuperClass(resultClass, BinderProvider.class); + + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); + + addImport(resultClass, TopiaEntityBinder.class); + addImport(resultClass, TopiaEntityHelper.class); + addImport(resultClass, TopiaEntity.class); + addImport(resultClass, BinderBuilder.class); + + ObjectModelOperation op; + + op = addOperation(resultClass, + "getTopiaBinder", + "<E extends TopiaEntity> TopiaEntityBinder<E>", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "Class<E>", "entityClass"); + addParameter(op, "String", "contextName"); + setOperationBody(op, "" +/*{ + return (TopiaEntityBinder<E>) getBinder(entityClass, contextName); + }*/ + ); + + op = addOperation(resultClass, + "getSimpleTopiaBinder", + "<E extends TopiaEntity> TopiaEntityBinder<E>", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "Class<E>", "entityClass"); + setOperationBody(op, "" +/*{ + return getTopiaBinder(entityClass, "<%=modelName%>"); + }*/ + ); + + op = addOperation(resultClass, + "registerTopiaBinder", + "void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "BinderBuilder", "builder"); + addParameter(op, "String", "contextName"); + setOperationBody(op, "" +/*{ + BinderProvider.registerBinder(builder, TopiaEntityBinder.class, contextName); + }*/ + ); + + op = addOperation(resultClass, + "copy", + "<E extends TopiaEntity> void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "String", "contextName"); + addParameter(op, "E", "source"); + addParameter(op, "E", "target"); + addParameter(op, "boolean", "tech"); + setOperationBody(op, "" +/*{ + Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(<%=daoHelperClazzName%>.getContracts(), target.getClass()); + TopiaEntityBinder<E> binder = getTopiaBinder(entityClass, contextName); + if (binder == null) { + throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); + } + binder.load(source, target, tech); + }*/ + ); + + op = addOperation(resultClass, + "simpleCopy", + "<E extends TopiaEntity> void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "E", "source"); + addParameter(op, "E", "target"); + addParameter(op, "boolean", "tech"); + setOperationBody(op, "" +/*{ + Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(<%=daoHelperClazzName%>.getContracts(), target.getClass()); + TopiaEntityBinder<E> binder = getSimpleTopiaBinder(entityClass); + if (binder == null) { + throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); + } + binder.load(source, target, tech); + }*/ + ); + + StringBuilder initCode = new StringBuilder(); + + initCode.append("" +/*{ + BinderBuilder builder = new BinderBuilder(); +}*/ + ); + for (ObjectModelClass clazz : classes) { + + generateBinder(modelName, clazz, resultClass, initCode); + + } + + op = addOperation(resultClass, "initBinders", "void", ObjectModelModifier.PROTECTED, ObjectModelModifier.STATIC); + setOperationBody(op, initCode.toString()); + + op = addOperation(resultClass, null, (String) null, ObjectModelModifier.STATIC); + setOperationBody(op, "" + /*{ + initBinders(); +}*/ + ); + } + + protected void generateBinder(String modelName, ObjectModelClass clazz, ObjectModelClass resultClass, StringBuilder initCode) { + + List<ObjectModelAttribute> list = new ArrayList<ObjectModelAttribute>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + continue; + } + + if (GeneratorUtil.isNMultiplicity(attr)) { + // not dealing with association + continue; + } + + list.add(attr); + } + + String clazzName = clazz.getName(); + + if (list.isEmpty()) { + // no attribute, do nothing + if (log.isDebugEnabled()) { + log.debug("no attribute to add in a binder for " + clazzName + + ", will not generate it."); + } + return; + } + + + if (log.isDebugEnabled()) { + log.debug("generate simple binder for " + clazzName); + } + addImport(resultClass, clazz); + initCode.append("" +/*{ + builder.createBinderModel(<%=clazzName%>.class); + builder.addSimpleProperties( +}*/ + ); + Iterator<ObjectModelAttribute> itr = list.iterator(); + while (itr.hasNext()) { + ObjectModelAttribute attr = itr.next(); + String attrName = attr.getName(); + boolean hasNext = itr.hasNext(); + initCode.append("" +/*{ <%=clazzName%>.<%=getConstantName(attrName)%><%=(hasNext?",\n":"")%>}*/ + ); + } + initCode.append("" +/*{ + ); + registerTopiaBinder(builder, "<%=modelName%>"); + }*/ + ); + } +} + Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1848 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:26:44 +0100 (Sat, 20 Mar 2010) New Revision: 1848 Log: optimize imports Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2010-03-20 17:26:12 UTC (rev 1847) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2010-03-20 17:26:44 UTC (rev 1848) @@ -20,12 +20,9 @@ */ package org.nuiton.topia.persistence.util; -import org.apache.commons.lang.NotImplementedException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; -import java.util.Map; - /** * A {@link Binder} dedicated to {@link TopiaEntity} dealing with technical * values. @@ -60,4 +57,4 @@ } copy(source, target, propertyNames); } -} \ No newline at end of file +}

1 0

r1847 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:26:12 +0100 (Sat, 20 Mar 2010) New Revision: 1847 Log: remove deprecated classes Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java 2010-03-20 17:25:40 UTC (rev 1846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java 2010-03-20 17:26:12 UTC (rev 1847) @@ -1,184 +0,0 @@ -/* - * *##% - * ToPIA :: Persistence - * Copyright (C) 2004 - 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.topia.persistence.util; - - -import org.nuiton.util.ObjectUtil; - -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * A implementation fo the {@link org.nuiton.topia.persistence.util.Loador} contract using - * {@link PropertyDescriptor}. - * <p/> - * Some factory methods are defined to simplify the generic cast, prefer used them - * instead of the (protected) constructor. - * - * @author tchemit < chemit(a)codelutin.com > - * @param <E> type of bean to bind - * @deprecated since 2.3.0, prefer use the {@link TopiaEntityBinder} - */ -@Deprecated -public class BeanPropertyLoador<E> implements Loador<E> { - - public static <E> BeanPropertyLoador<E> newLoador(Class<E> klass, String... properties) { - return new BeanPropertyLoador<E>(klass, properties); - } - - private static final long serialVersionUID = 1L; -// protected static final Integer ZERO = 0; -// protected static final Float ZEROF = 0f; -// protected static final Long ZEROL = 0l; -// protected static final Double ZEROD = 0.; -// protected static final Byte ZEROB = 0; - protected List<String> properties; - protected transient PropertyDescriptor[] descriptors; - protected Class<E> klass; - - protected BeanPropertyLoador(Class<E> klass, String... properties) { - this.properties = java.util.Collections.unmodifiableList(Arrays.asList(properties)); - this.klass = klass; - } - - public List<String> getProperties() { - return properties; - } - - public PropertyDescriptor[] getDescriptors() { - if (descriptors == null) { - try { - descriptors = new PropertyDescriptor[properties.size()]; - for (PropertyDescriptor propertydescriptor : Introspector.getBeanInfo(klass).getPropertyDescriptors()) { - int index = properties.indexOf(propertydescriptor.getName()); - if (index != -1) { - descriptors[index] = propertydescriptor; - } - } - } catch (IntrospectionException e) { - throw new RuntimeException(e); - } - } - return descriptors; - } - - @Override - public Map<String, Object> obtainProperties(E from, String... propertyNames) { - if (from == null) { - return java.util.Collections.emptyMap(); - } - if (propertyNames.length > 0) { - throw new IllegalArgumentException("The BeanPropertyLoader does " + - "not accept subset of properties, prefer use the " + - "org.nuiton.util.beans.Binder api instead now."); - } - Map<String, Object> result = new HashMap<String, Object>(); - for (PropertyDescriptor descriptor : getDescriptors()) { - Object read; - try { - read = descriptor.getReadMethod().invoke(from); - if (read != null) { - result.put(descriptor.getName(), read); - } - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - - } - return result; - } - - @Override - public void load(E from, E dst, boolean tech, String... propertyNames) { - if (from == null) { - // reset all fields - for (PropertyDescriptor descriptor : getDescriptors()) { - Object read = - ObjectUtil.getNullValue(descriptor.getPropertyType()); - setProperty(dst, descriptor, read); - } - } else { - // set all fields from - for (PropertyDescriptor descriptor : getDescriptors()) { - try { - Object value = descriptor.getReadMethod().invoke(from); - setProperty(dst, descriptor, value); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - } - } - } - - protected void setProperty(E dst, PropertyDescriptor descriptor, Object value) { - try { - descriptor.getWriteMethod().invoke(dst, value); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * @param type type to test - * @return the null value for the given type - * @deprecated use {@link TopiaEntityHelper#getNullValue(Class)} - */ - @Deprecated - protected static Object getNullValue(Class<?> type) { - return ObjectUtil.getNullValue(type); - } - - /** - * @param value the value to test - * @return <code>true</code> if value is null - * @deprecated use {@link TopiaEntityHelper#isNullValue(Object)} - */ - @Deprecated - public static boolean isNullValue(Object value) { - return ObjectUtil.isNullValue(value); - } - - protected void checkProperties() { - PropertyDescriptor[] d = getDescriptors(); - for (int i = 0; i < d.length; i++) { - PropertyDescriptor descriptor = d[i]; - if (descriptor == null) { - throw new IllegalStateException("could not find descriptor for property " + properties.get(i) + " on " + klass); - } - if (descriptor.getReadMethod() == null) { - throw new IllegalStateException("property " + properties.get(i) + " is not readable on " + klass); - } - if (descriptor.getWriteMethod() == null) { - throw new IllegalStateException("property " + properties.get(i) + " is not writable on " + klass); - } - } - } -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java 2010-03-20 17:25:40 UTC (rev 1846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java 2010-03-20 17:26:12 UTC (rev 1847) @@ -1,68 +0,0 @@ -/* - * *##% - * ToPIA :: Persistence - * Copyright (C) 2004 - 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.topia.persistence.util; - -import org.nuiton.topia.persistence.TopiaEntity; - -/** - * A implementation of {@link BeanPropertyLoador} for {@link TopiaEntity} - * <p/> - * Some factory methods are defined to simplify the generic cast, prefer used them - * instead of the (protected) constructor). - * - * @param <E> type of entity - * @author tchemit < chemit(a)codelutin.com > - * @deprecated since 2.3.0, prefer use the {@link TopiaEntityBinder} - */ -@Deprecated -public class EntityLoador<E extends TopiaEntity> extends BeanPropertyLoador<E> { - - private static final long serialVersionUID = 1L; - protected E empty; - - public static <E extends TopiaEntity> EntityLoador<E> newEntityLoador( - Class<E> klass, E empty, String... properties) { - return new EntityLoador<E>(klass, empty, properties); - } - - public static <E extends TopiaEntity> EntityLoador<E> newEntityLoador( - Class<E> klass, String... properties) { - return newEntityLoador(klass, null, properties); - } - - @Override - public void load(E from, E dst, boolean tech,String... propertyNames) { - if (from == null) { - from = empty; - } - if (tech) { - TopiaEntityHelper.bindTechnical(from, dst); - } - super.load(from, dst, tech,propertyNames); - } - - protected EntityLoador(Class<E> klass, E empty, String... properties) { - super(klass, properties); - this.empty = empty; - // check properties - checkProperties(); - } -}

1 0

r1846 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:25:40 +0100 (Sat, 20 Mar 2010) New Revision: 1846 Log: fix javadoc + remove deprecated methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-17 13:06:52 UTC (rev 1845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-20 17:25:40 UTC (rev 1846) @@ -49,9 +49,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.beanutils.MethodUtils; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.util.ObjectUtil; /** * Une classe avec des méthodes utiles sur les entités. @@ -63,16 +61,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); - protected static final Integer ZERO = 0; - - protected static final Float ZEROF = 0f; - - protected static final Long ZEROL = 0l; - - protected static final Double ZEROD = 0.; - - protected static final Byte ZEROB = 0; - /** * Le pattern d'une reference sur une association */ @@ -80,73 +68,6 @@ "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; /** - * - * @param type the type to test - * @return null object (default value for primitive types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#getNullValue(Class)} method - */ - @Deprecated - protected static Object getNullValue(Class<?> type) { - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE; - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO; - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF; - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL; - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD; - } - if (Byte.class.isAssignableFrom(type)) { - return ZEROB; - } - } - return null; - } - - /** - * @param value the value to test - * @return {@code true} if value is null or default value for primitive - * types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#isNullValue(Object)} method - */ - @Deprecated - public static boolean isNullValue(Object value) { - if (value == null) { - return true; - } - Class<?> type = value.getClass(); - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - } - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE.equals(value); - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO.equals(value); - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF.equals(value); - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL.equals(value); - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD.equals(value); - } - return Byte.class.isAssignableFrom(type) && ZEROB.equals(value); - } - - /** * Bind les valeurs techniques depuis une entitée vers une autre. * * @param from l'entité source @@ -302,11 +223,13 @@ if (!dbDirectory.exists()) { if (!dbDirectory.mkdirs()) { - throw new IOException("could not create directory " + dbDirectory); + throw new IOException( + "could not create directory " + dbDirectory); } } - log.info("create database from [" + databaseDump + "] at [" + dbDirectory + "]"); + log.info("create database from [" + databaseDump + "] at [" + + dbDirectory + "]"); TopiaContext ctxt = topiaContext.beginTransaction(); @@ -328,7 +251,8 @@ * @param topiaContext the topiaContext of the db to store * @throws TopiaException if any pb while saving db * @throws NullPointerException if parameters are null - * @throws IOException if could not create gzipFile container directory + * @throws IOException if could not create gzipFile container + * directory */ public static void saveDB( File gzipFile, TopiaContext topiaContext) @@ -385,7 +309,8 @@ * * @param entities the list of entities to filter * @param filterClass the type of entities to keep - * @return the list of filtered entities for the given entity type in the list + * @return the list of filtered entities for the given entity type in the + * list * @since 2.1.4 */ public static List<TopiaEntity> filter( @@ -454,7 +379,8 @@ TopiaEntityEnum[] contracts, Set<Class<? extends TopiaEntity>> classes) { Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> dico; - dico = new HashMap<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>>(); + dico = new HashMap<Class<? extends TopiaEntity>, + Class<? extends TopiaEntity>>(); try { Set<Class<? extends TopiaEntity>> result = new HashSet<Class<? extends TopiaEntity>>(); @@ -511,7 +437,7 @@ * @return l'ensemble des types d'entites decouverts (uniquement les * contrats des entites). * - * @throws TopiaException + * @throws TopiaException if a problem while visiting entities */ public static Set<Class<? extends TopiaEntity>> detectTypes( final TopiaEntityEnum[] contracts, @@ -564,7 +490,7 @@ * @return l'ensemble des entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<TopiaEntity>> detectEntities(final TopiaEntityEnum[] contracts, @@ -626,7 +552,7 @@ * @return l'ensemble des ids d'entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<String>> detectEntityIds(final TopiaEntityEnum[] contracts, @@ -685,7 +611,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */ @@ -706,7 +632,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */

1 0

r1845 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence
by tchemit＠users.nuiton.org March 17, 2010

March 17, 2010

Author: tchemit Date: 2010-03-17 14:06:52 +0100 (Wed, 17 Mar 2010) New Revision: 1845 Log: fix signature of findAllUsages in DAO api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.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-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -396,7 +396,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -404,7 +404,7 @@ addAnnotation(result, operation,"Override"); setOperationBody(operation, "" /*{ - return new HashMap<Class<?>, List<? extends TopiaEntity>>(); + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); }*/ ); @@ -507,7 +507,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -517,8 +517,8 @@ buffer = new StringBuilder(300); buffer.append("" /*{ - Map<Class<?>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<?>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); List<? extends TopiaEntity> list; }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -348,7 +348,7 @@ * @since 2.3.0 */ - Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(Entity entity) + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(Entity entity) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -564,7 +564,7 @@ } @Override - public Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(E e) + public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E e) throws TopiaException { // must be implemented by specialized dao throw new UnsupportedOperationException();

1 0

r1844 - in trunk/topia-service-replication/src: main/java/org/nuiton/topia/replication/model test/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 17, 2010

March 17, 2010

Author: tchemit Date: 2010-03-17 01:18:04 +0100 (Wed, 17 Mar 2010) New Revision: 1844 Log: improve code and tester Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -72,34 +72,34 @@ public ReplicationModel(TopiaEntityEnum[] contracts, Set<Class<? extends TopiaEntity>> types, String... topiaIds) { this.contracts = contracts; this.topiaIds = topiaIds; - this.replicateAll = false; - this.nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); - this.order = new ArrayList<ReplicationNode>(); + replicateAll = false; + nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); + order = new ArrayList<ReplicationNode>(); Map<Class<? extends TopiaEntity>, ReplicationNode> tmpNodes = new HashMap<Class<? extends TopiaEntity>, ReplicationNode>(); for (Class<? extends TopiaEntity> k : types) { TopiaEntityEnum e = TopiaEntityHelper.getEntityEnum(k, contracts); ReplicationNode replicationNode = new ReplicationNode(e); tmpNodes.put(k, replicationNode); } - this.nodes = Collections.unmodifiableMap(tmpNodes); + nodes = Collections.unmodifiableMap(tmpNodes); } public ReplicationModel(TopiaEntityEnum[] contracts, boolean replicateAll, String... topiaIds) { this.contracts = contracts; this.topiaIds = topiaIds; this.replicateAll = replicateAll; - this.nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); - this.order = new ArrayList<ReplicationNode>(); + nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); + order = new ArrayList<ReplicationNode>(); Map<Class<? extends TopiaEntity>, ReplicationNode> tmpNodes = new HashMap<Class<? extends TopiaEntity>, ReplicationNode>(); for (TopiaEntityEnum e : contracts) { ReplicationNode replicationNode = new ReplicationNode(e); tmpNodes.put(e.getContract(), replicationNode); if (!replicateAll) { // mode restreint : l'ordre est induit par l'ordre sur les contrats passes - this.order.add(replicationNode); + order.add(replicationNode); } } - this.nodes = Collections.unmodifiableMap(tmpNodes); + nodes = Collections.unmodifiableMap(tmpNodes); } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -75,13 +75,13 @@ public ReplicationNode(TopiaEntityEnum contract) { this.contract = contract; - this.operator = EntityOperatorStore.getOperator(contract); - this.associations = new HashMap<String, ReplicationNode>(); - this.dependencies = new HashMap<String, ReplicationNode>(); - this.shell = new HashSet<ReplicationNode>(); - this.associationsToDettach = new HashSet<String>(); - this.dependenciesToDettach = new HashSet<String>(); - this.operations = new ArrayList<ReplicationOperationDef>(); + operator = EntityOperatorStore.getOperator(contract); + associations = new HashMap<String, ReplicationNode>(); + dependencies = new HashMap<String, ReplicationNode>(); + shell = new HashSet<ReplicationNode>(); + associationsToDettach = new HashSet<String>(); + dependenciesToDettach = new HashSet<String>(); + operations = new ArrayList<ReplicationOperationDef>(); if (log.isTraceEnabled()) { log.trace("new node : " + this); } @@ -209,14 +209,14 @@ if (getClass() != obj.getClass()) { return false; } - final ReplicationNode other = (ReplicationNode) obj; - return this.contract == other.contract; + ReplicationNode other = (ReplicationNode) obj; + return contract == other.contract; } @Override public int hashCode() { int hash = 7; - hash = 37 * hash + (this.contract.hashCode()); + hash = 37 * hash + contract.hashCode(); return hash; } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -57,7 +57,7 @@ protected TopiaContextImplementor dstCtxt; protected TopiaReplicationImplementor service; protected ReplicationModel model; - static private boolean init ; + static protected boolean init ; static private Long testsTimeStamp; static private File testsBasedir; static private final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; @@ -79,8 +79,13 @@ if (!init) { I18n.init(Locale.FRANCE); - - context = createDb("source"); + + try { + context = createDb("source"); + } catch (Exception e) { + getLog().error("could not create db source.", e); + throw e; + } init = true; } @@ -185,7 +190,10 @@ Set<?> detectTypes; detectTypes = service.detectTypes(getContracts(), entity.getTopiaId()); - assertEquals(expectedCouple.length, detectTypes.size()); + assertEquals("expected types : "+ + Arrays.toString(expectedCouple) + + " but was "+detectTypes, + expectedCouple.length, detectTypes.size()); for (Object o : expectedCouple) { assertTrue(detectTypes.contains(o)); } @@ -247,7 +255,10 @@ entity.getClass(), getContracts()); assertNotNull(c); shell = model.getNode(c.getContract()).getShell(); - assertEquals(expected.length, shell.size()); + assertEquals( + "expected shell : "+ Arrays.toString(expected) + ", but was " + + shell, expected.length, shell.size()); + for (int i = 0, j = expected.length; i < j; i++) { TopiaEntityEnum type = expected[i]; ReplicationNode node = model.getNode(type.getContract()); @@ -256,9 +267,9 @@ } } - protected void detectDependencies(TopiaEntity entity, - TopiaEntityEnum[]... expected) throws - TopiaException { + protected void detectDependencies( + TopiaEntity entity, + TopiaEntityEnum[]... expected) throws TopiaException { createModel(entity); model.detectAssociations(); @@ -440,7 +451,13 @@ protected void assertDbEquals(TopiaEntityEnum[] contracts, TopiaContextImplementor ctxt, TopiaContextImplementor ctxt2) throws TopiaException { Set<String> ids = new HashSet<String>(); + if (getLog().isInfoEnabled()) { + getLog().info("will verify db for contracts "+ Arrays.toString(contracts)); + } for (TopiaEntityEnum c : contracts) { + if (getLog().isDebugEnabled()) { + getLog().debug("verify for contract " + c); + } TopiaDAO<? extends TopiaEntity> daoSrc = ctxt.getDAO(c.getContract()); TopiaDAO<? extends TopiaEntity> daoDst = ctxt2.getDAO(c.getContract()); long nbSrc = daoSrc.size(); @@ -452,6 +469,9 @@ Collections.sort(idsDst); assertEquals(idsSrc, idsDst); for (String id : idsSrc) { + if (getLog().isDebugEnabled()) { + getLog().debug("verify for entity " + id); + } TopiaEntity eSrc = daoSrc.findByTopiaId(id); TopiaEntity eDst = daoDst.findByTopiaId(id); assertEquals(eSrc, eDst); @@ -476,6 +496,14 @@ getLog().debug("expected : " + expected + " / actual " + actual); } TopiaEntityEnum contract = TopiaEntityHelper.getEntityEnum(expected.getClass(), getContracts()); + if (contract==null) { + // this type of entity in not dealed here... + getLog().debug("untested property type " + expected.getClass()); + return; + } + Assert.assertNotNull( + "contract not found for "+ expected.getClass() + " in " + + Arrays.toString(getContracts()), contract); EntityOperator<TopiaEntity> operator = EntityOperatorStore.getOperator(contract); List<String> associationProperties = operator.getAssociationProperties(); for (String name : associationProperties) {

1 0

r1843 - trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 11:57:51 +0100 (Mon, 15 Mar 2010) New Revision: 1843 Log: reformat code (80 car max per line) + remove redundant initializer Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:55:07 UTC (rev 1842) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:57:51 UTC (rev 1843) @@ -21,7 +21,6 @@ import java.io.File; import java.util.*; -import org.junit.BeforeClass; import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.replication.model.ReplicationModel; @@ -104,7 +103,7 @@ protected abstract TopiaContext createDb(String name) throws Exception; protected TopiaContext createReplicateDb(Object contract) throws Exception { - TopiaContext rootCtxt = (TopiaContextImplementor) createDb2(contract.toString() + dbCounter++); + TopiaContext rootCtxt = createDb2(contract.toString() + dbCounter++); return rootCtxt; } @@ -185,7 +184,7 @@ Set<?> detectTypes; - detectTypes = ((ReplicationEngine) service).detectTypes(getContracts(), entity.getTopiaId()); + detectTypes = service.detectTypes(getContracts(), entity.getTopiaId()); assertEquals(expectedCouple.length, detectTypes.size()); for (Object o : expectedCouple) { assertTrue(detectTypes.contains(o)); @@ -197,7 +196,9 @@ assertEquals(shouldExist, operation != null); } - protected void detectAssociations(TopiaEntity entity, Object... expectedCouple) throws TopiaException { + protected void detectAssociations(TopiaEntity entity, + Object... expectedCouple) + throws TopiaException { createModel(entity); model.detectAssociations(); @@ -208,12 +209,15 @@ TopiaEntityEnum src = (TopiaEntityEnum) expectedCouple[2 * i]; String name = (String) expectedCouple[2 * i + 1]; ReplicationNode nodeSrc = model.getNode(src); + assertNotNull("association "+name+" not found", nodeSrc); assertTrue(nodeSrc.hasAssociation()); assertTrue(nodeSrc.getAssociations().containsKey(name)); } } - protected void detectDirectDependencies(TopiaEntity entity, Object... expectedCouple) throws TopiaException { + protected void detectDirectDependencies(TopiaEntity entity, + Object... expectedCouple) + throws TopiaException { createModel(entity); model.detectDirectDependencies(); @@ -229,7 +233,9 @@ } } - protected void detectShell(TopiaEntity entity, TopiaEntityEnum... expected) throws TopiaException { + protected void detectShell(TopiaEntity entity, + TopiaEntityEnum... expected) throws + TopiaException { Set<ReplicationNode> shell; createModel(entity); @@ -237,7 +243,9 @@ model.detectDirectDependencies(); model.detectShell(); - TopiaEntityEnum c = TopiaEntityHelper.getEntityEnum(entity.getClass(), getContracts()); + TopiaEntityEnum c = TopiaEntityHelper.getEntityEnum( + entity.getClass(), getContracts()); + assertNotNull(c); shell = model.getNode(c.getContract()).getShell(); assertEquals(expected.length, shell.size()); for (int i = 0, j = expected.length; i < j; i++) { @@ -248,7 +256,9 @@ } } - protected void detectDependencies(TopiaEntity entity, TopiaEntityEnum[]... expected) throws TopiaException { + protected void detectDependencies(TopiaEntity entity, + TopiaEntityEnum[]... expected) throws + TopiaException { createModel(entity); model.detectAssociations(); @@ -349,7 +359,7 @@ getLog().info("=========================================================================="); } } - private static int dbCounter = 0; + private static int dbCounter; protected void doReplicate(TopiaEntityEnum contract, TopiaEntity... entity) throws Exception {

1 0

r1842 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 11:55:07 +0100 (Mon, 15 Mar 2010) New Revision: 1842 Log: improve TopiaEntityRefTester + add javadoc Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java 2010-03-15 10:54:46 UTC (rev 1841) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java 2010-03-15 10:55:07 UTC (rev 1842) @@ -6,15 +6,15 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.SortedMap; +import java.util.*; import static java.util.Map.Entry; /** - * A abstract class to help testing {@link TopiaEntityRef} + * A abstract class to help testing {@link TopiaEntityRef} as detectes types, or + * detects or references. + * <p/> + * An example of use if given in the test {@link TopiaEntityRefTesterTest}. * * @author tchemit <chemit(a)codelutin.com> * @since 2.3.1 @@ -31,6 +31,8 @@ protected T[] contracts; + protected int index; + protected T[] getContracts() { if (contracts == null) { contracts = getContracts0(); @@ -38,6 +40,7 @@ return contracts; } + /** @return all the {@link TopiaEntityEnum} to be used */ protected abstract T[] getContracts0(); @After @@ -46,9 +49,92 @@ entry = null; refs = null; detected = null; + index = 0; } + /** + * Creates a new entity with the given {@code topiaId} (will use the {@link + * TopiaEntityEnum#getImplementation()} class). + * + * @param constant the constant defining the entity + * @param topiaId the topia to assign + * @param <T> the type of entity + * @return the new entity + * @throws IllegalAccessException if can no access entity constructor + * @throws InstantiationException if can no instanciate the entity + */ + protected <T extends TopiaEntity> T newEntity( + TopiaEntityEnum constant, String topiaId) throws + IllegalAccessException, + InstantiationException { + Class<? extends TopiaEntity> impl = constant.getImplementation(); + TopiaEntity topiaEntity = impl.newInstance(); + topiaEntity.setTopiaId(topiaId); + return (T) topiaEntity; + } + /** + * Obtain the reference of an association for a given entity. + * <p/> + * Example, to obtain the Pet 'pudding' on a Person : + * <pre>pet[@topiaId='pudding']</pre> + * invoke + * <pre>getAssociationRef('pet',pet);</pre> + * + * @param associationName the name of the association + * @param e the required entity + * @return the reference of the association + */ + protected String getAssociationRef(String associationName, TopiaEntity e) { + return getAssociationRef(associationName, e.getTopiaId()); + } + + /** + * Obtain the reference of an association for a given id. + * <p/> + * Example to obtain the Pet 'pudding' on a Person : + * <pre>pet[@topiaId='pudding']</pre> + * invoke + * <pre>getAssociationRef('pet','pudding');</pre> + * + * @param associationName the name of the association + * @param e the id + * @return the reference of the association + */ + protected String getAssociationRef(String associationName, String e) { + String s = String.format( + TopiaEntityHelper.ASSOCIATION_PATTERN, + associationName, + e + ); + return s; + } + + /** + * Obtain the next entry from the iterator. + * <p/> + * As a side-effect, it will increment the state {@link #index}. + */ + protected void nextEntry() { + if (!itr.hasNext()) { + throw new IllegalStateException("no more entry to get..."); + } + entry = itr.next(); + index = 0; + } + + /** + * Detects the references from the given {@code entity} which have their + * topiaId in the given list of {@code ids}. + * <p/> + * As a side-effect, it will update the states {@code detected} and set the + * iterator {@code itr} to the first position on detected entries. + * + * @param entity the entity to seek + * @param nb the required number of entries + * @param ids the ids to seek + * @throws TopiaException if any pb while visiting entities + */ protected void detectReferences( TopiaEntity entity, int nb, String... ids) throws TopiaException { detected = TopiaEntityHelper.detectReferences( @@ -57,6 +143,18 @@ } + /** + * Detects the references from the given {@code entity} which have their + * topiaId in the given list of {@code ids}. + * <p/> + * As a side-effect, it will update the states {@code detected} and set the + * iterator {@code itr} to the first position on detected entries. + * + * @param entity the entity to seek + * @param nb the required number of entries + * @param ids the ids to seek + * @throws TopiaException if any pb while visiting entities + */ protected void detectReferences( Collection<? extends TopiaEntity> entity, int nb, String... ids) throws TopiaException { @@ -65,10 +163,87 @@ assertDetected(nb); } + /** + * Detects the type of entities fro the given {@code data}. + * + * @param expected the array of expected types + * @param data the data to seek + * @throws TopiaException if any pb while visiting data + */ + protected void detectTypes(Class<?>[] expected, + TopiaEntity... data) throws TopiaException { + Set<String> fqns = new HashSet<String>(expected.length); + Set<Class<? extends TopiaEntity>> actual = null; + for (Class<?> c : expected) { + fqns.add(c.getName()); + } + try { + actual = TopiaEntityHelper.detectTypes(getContracts(), data); + Assert.assertEquals(expected.length, actual.size()); + for (Class<? extends TopiaEntity> c : actual) { + Assert.assertTrue(fqns.contains(c.getName())); + } + } finally { + fqns.clear(); + if (actual != null) { + actual.clear(); + } + } + } + + /** + * Asserts if the given entry definition is equals to the next entry + * references on internal state state {@code entry}. + * + * @param invoker the invoker of the reference + * @param invokerProperty the access path of the reference + * @param expected the expected topia entities path to access + * reference target + */ + protected void assertNextEntityRef(TopiaEntity invoker, + String invokerProperty, + TopiaEntity... expected) { + assertEntityRef(index, invoker, invokerProperty, expected); + index++; + } + + /** + * Asserts if the given entry definition (of an association) is equals to + * the next entry reference on internal state {@code entry}. + * + * @param invoker the invoker of the reference + * @param association the association name + * @param id the id of the association ( see {@link + * #getAssociationRef(String, TopiaEntity)} + * @param expected the expected topia entities path to access reference + * target + */ + protected void assertNextAssociationEntityRef(TopiaEntity invoker, + String association, + String id, + TopiaEntity... expected) { + String invokerProperty = getAssociationRef(association, id); + assertNextEntityRef(invoker, invokerProperty, expected); + } + + /** + * Asserts if the given entry definition is equals to the reference entry at + * position {@code index} on internal state {@code entry}. + * + * @param index the index of the reference to test in {@code + * entry} + * @param invoker the invoker of the reference + * @param invokerProperty the path of the reference + * @param expected th expected topia entities path to access + * reference target + */ protected void assertEntityRef(int index, TopiaEntity invoker, String invokerProperty, TopiaEntity... expected) { + Assert.assertNotNull(refs); + Assert.assertTrue("no index [" + index + "] in refs of size " + + refs.size(), index < refs.size()); TopiaEntityRef actual = refs.get(index); Assert.assertEquals(actual.getInvoker(), invoker); Assert.assertEquals(actual.getInvokerProperty(), invokerProperty); @@ -80,14 +255,44 @@ } } - protected void assertEntry(TopiaEntity expected, - int nbPath, - Entry<TopiaEntity, List<TopiaEntityRef>> entry) { + /** + * Asserts if the given {@code expected} entity is equals to the source of + * the internal state {@code entry}. + * + * @param expected the required source of the entry + * @param nbPath the expected number of references of the given entry + */ + protected void assertCurrentEntry(TopiaEntity expected, + int nbPath) { + assertEntry(expected, nbPath, entry); + } + + /** + * Asserts if the given {@code entry} has a good source and a good number of + * references. + * + * @param expected the expected entry source + * @param nbPath the expected number of reference of the entry + * @param entry the entry to test + */ + private void assertEntry(TopiaEntity expected, + int nbPath, + Entry<TopiaEntity, List<TopiaEntityRef>> entry) { + Assert.assertNotNull(entry); Assert.assertEquals(expected, entry.getKey()); refs = entry.getValue(); Assert.assertEquals(nbPath, refs.size()); } + /** + * Asserts that the number of detected entries (store in internal state + * {@code detected}) is ok. + * <p/> + * As a side-effect, it will reset the internal state {@code itr} on the + * first entry of the {@code detected} list. + * + * @param size the expected number of detected entries + */ protected void assertDetected(int size) { Assert.assertNotNull(detected); Assert.assertEquals(size, detected.size()); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-03-15 10:54:46 UTC (rev 1841) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-03-15 10:55:07 UTC (rev 1842) @@ -1,10 +1,12 @@ package org.nuiton.topia.persistence.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper.TopiaTestEntityEnum; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.test.entities.*; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.Pet; +import org.nuiton.topia.test.entities.Race; /** * Test the {@link TopiaEntityRefTester} on @@ -17,16 +19,18 @@ */ public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTestEntityEnum> { + /** Logger */ + private static final Log log = + LogFactory.getLog(TopiaEntityRefTesterTest.class); + private static final String PET1 = "pet1"; + private static final String PET2 = "pet2"; + private static final String RACE1 = "race1"; private static final String PERSON1 = "person1"; - private static final String PET2 = "pet2"; - - protected String PET_REF = "pet[@" + TopiaEntity.TOPIA_ID + "=\"%1$s\"]"; - @Override protected TopiaTestEntityEnum[] getContracts0() { return new TopiaTestEntityEnum[]{ @@ -37,88 +41,90 @@ } @Test - public void testPet() throws TopiaException { + public void testNoReferences() throws Exception { - Pet pet = new PetImpl(); - pet.setTopiaId(PET1); + Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); detectReferences(pet, 0); - Race race = new RaceImpl(); - race.setTopiaId(RACE1); + Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); detectReferences(race, 0); - Person person = new PersonImpl(); - person.setTopiaId(PERSON1); + Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); - detectReferences(race, 0); + detectReferences(person, 0); + } + + @Test + public void testReferences() throws Exception { + + Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); + Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); pet.setRace(race); + Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); detectReferences(pet, 1, RACE1); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, pet, race); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, pet, race); pet.setPerson(person); detectReferences(pet, 2, RACE1, PERSON1); - entry = itr.next(); - assertEntry(person, 1, entry); - assertEntityRef(0, pet, Pet.PERSON, pet, person); + nextEntry(); + assertCurrentEntry(person, 1); + assertNextEntityRef(pet, Pet.PERSON, pet, person); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, pet, race); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, pet, race); person.addPet(pet); detectReferences(person, 1, PET1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); - Pet pet2 = new PetImpl(); - pet2.setTopiaId(PET2); + Pet pet2 = newEntity(TopiaTestEntityEnum.Pet, PET2); person.addPet(pet2); detectReferences(person, 3, PET1, PET2, RACE1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + nextEntry(); + assertCurrentEntry(pet2, 1); + assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); - entry = itr.next(); - assertEntry(pet2, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET2), person, pet2); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, person, pet, race); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, person, pet, race); - pet2.setRace(race); detectReferences(person, 3, PET1, PET2, RACE1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + nextEntry(); + assertCurrentEntry(pet2, 1); + assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); - entry = itr.next(); - assertEntry(pet2, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET2), person, pet2); + nextEntry(); + assertCurrentEntry(race, 2); + assertNextEntityRef(pet, Pet.RACE, person, pet, race); + assertNextEntityRef(pet2, Pet.RACE, person, pet2, race); - entry = itr.next(); - assertEntry(race, 2, entry); - assertEntityRef(0, pet, Pet.RACE, person, pet, race); - assertEntityRef(1, pet2, Pet.RACE, person, pet2, race); - } }

1 0

r1841 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 11:54:46 +0100 (Mon, 15 Mar 2010) New Revision: 1841 Log: improve code + fix NPE when no contract found Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-15 10:53:57 UTC (rev 1840) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-15 10:54:46 UTC (rev 1841) @@ -74,6 +74,12 @@ protected static final Byte ZEROB = 0; /** + * Le pattern d'une reference sur une association + */ + public static final String ASSOCIATION_PATTERN = + "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; + + /** * * @param type the type to test * @return null object (default value for primitive types) @@ -425,9 +431,11 @@ } Class<? extends TopiaEntity> contractClass = getContractClass(contracts, klass); - for (TopiaEntityEnum t : contracts) { - if (t.accept(contractClass)) { - return t; + if (contractClass != null) { + for (TopiaEntityEnum t : contracts) { + if (t.accept(contractClass)) { + return t; + } } } return null; @@ -894,10 +902,15 @@ } accessorExpression.append(name); if (index > -1) { - accessorExpression.append("[@topiaId=\""); - accessorExpression.append(e.getTopiaId()); - accessorExpression.append("\"]"); + String association = String.format( + ASSOCIATION_PATTERN, "", e.getTopiaId()); + accessorExpression.append(association); } +// if (index > -1) { +// accessorExpression.append("[@topiaId=\""); +// accessorExpression.append(e.getTopiaId()); +// accessorExpression.append("\"]"); +// } if (log.isTraceEnabled()) { log.trace("add to stack : " + e.getTopiaId() + ", new size : " + path.size() + ", path : " +

1 0