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

r2367 - in trunk/topia-service-security/src: main/java/org/nuiton/topia/taas main/java/org/nuiton/topia/taas/jaas test/java/org/nuiton/topia/security
by sletellier＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: sletellier Date: 2011-10-20 10:05:43 +0200 (Thu, 20 Oct 2011) New Revision: 2367 Url: http://nuiton.org/repositories/revision/topia/2367 Log: - Fix javadoc - Add static method getTaasPersistenceClasses - Add error log in TaasLoginModule - Use is for boolean getters Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -23,7 +23,7 @@ * #L% */ -/* * +/** * TopiaSecurityVetoableListener.java * * Created: 10 févr. 2006 @@ -32,7 +32,8 @@ * @version $Revision$ * * Mise a jour: $Date$ - * par : sletellier */ + * par : sletellier + */ package org.nuiton.topia.taas; @@ -118,6 +119,10 @@ @Override public Class<?>[] getPersistenceClasses() { + return getTaasPersistenceClasses(); + } + + public static Class<?>[] getTaasPersistenceClasses() { return new Class<?>[]{ TaasUserImpl.class, TaasPrincipalImpl.class, Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -72,10 +72,10 @@ public static final String DELETE_TEXT = "DELETE"; /** - * Applique un algorithme de hashage sur la chaine de carat�re pass�e en - * param�tre - * @param msg la chaine de carat�re sur laquelle on veut op�rer le hashage - * @return La chaine de caract�re une fois l'algorithme appliqu� + * Applique un algorithme de hashage sur la chaine de caratere passee en + * parametre + * @param msg la chaine de caratere sur laquelle on veut operer le hashage + * @return La chaine de caractere une fois l'algorithme applique */ public static String hash(String msg) { return digestSHAHex(msg); Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -37,7 +37,6 @@ package org.nuiton.topia.taas.jaas; - import java.util.Collection; import java.util.Date; import java.util.HashSet; @@ -87,6 +86,7 @@ @Override public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String,?> sharedState, Map<String,?> options) { + this.subject = subject; this.callbackHandler = callbackHandler; principals = null; @@ -144,7 +144,7 @@ TaasUserDAO userDAO = TopiaSecurityDAOHelper.getTaasUserDAO(transaction); TaasUser user = userDAO.findByLogin(login); - if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { + if(user != null && user.getPassword().equals(hashed) && user.isEnabled()) { privateCredential = user; // Update connection information @@ -169,7 +169,7 @@ } catch (Exception e) { LoginException le = new LoginException("Erreur lors de l'authentification" + login); le.initCause(e); - log.error(e); + log.error("Erreur lors de l'authentification", le); throw le; } finally { if (transaction != null) { @@ -177,14 +177,17 @@ transaction.commitTransaction(); transaction.closeContext(); } catch (TopiaException e) { - throw new LoginException("Erreur lors de l'authentification " + login); + LoginException le = new LoginException("Erreur lors de l'authentification" + login); + le.initCause(e); + log.error("Erreur lors de l'authentification", le); + throw le; } } } } catch(LoginException eee) { log.error("LoginException : ", eee); } catch(Throwable eee){ - log.error(eee); + log.error("Exception : ", eee); throw new LoginException(eee.getMessage()); } return true; @@ -239,5 +242,4 @@ callbackHandler = null; return true; } - } //TopiaLoginModule Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2011-10-20 07:42:40 UTC (rev 2366) +++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2011-10-20 08:05:43 UTC (rev 2367) @@ -64,7 +64,6 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import java.io.File; -import java.io.IOException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.List;

1 0

r2366 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 09:42:40 +0200 (Thu, 20 Oct 2011) New Revision: 2366 Url: http://nuiton.org/repositories/revision/topia/2366 Log: Evolution #1782: Permits not to generate getXXX() methods for boolean properties on Entities Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 07:32:58 UTC (rev 2365) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 07:42:40 UTC (rev 2366) @@ -143,7 +143,7 @@ String noGenerateBooleanGetMethods = JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); - boolean generateBooleanGetMethods = + generateBooleanGetMethods = StringUtils.isEmpty(noGenerateBooleanGetMethods) || !"true".equals(noGenerateBooleanGetMethods.trim());

1 0

r2365 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 09:32:58 +0200 (Thu, 20 Oct 2011) New Revision: 2365 Url: http://nuiton.org/repositories/revision/topia/2365 Log: fix dao helper generation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-20 04:25:09 UTC (rev 2364) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-20 07:32:58 UTC (rev 2365) @@ -96,6 +96,7 @@ addImport(entityEnum, TopiaEntity.class); addImport(entityEnum, EntityOperatorStore.class); addImport(entityEnum, Arrays.class); + addImport(entityEnum, TopiaRuntimeException.class); } else { entityEnum = (ObjectModelEnumerationImpl) @@ -103,6 +104,7 @@ ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName ); + addImport(daoHelper, TopiaRuntimeException.class); addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, EntityOperatorStore.class); addImport(daoHelper, Arrays.class); @@ -308,8 +310,7 @@ ObjectModelOperation op; addInterface(entityEnum, TopiaEntityEnum.class); - addImport(entityEnum, TopiaRuntimeException.class); - + for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); Collection<ObjectModelAttribute> attributes = clazz.getAttributes();

1 0

r2364 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 06:25:09 +0200 (Thu, 20 Oct 2011) New Revision: 2364 Url: http://nuiton.org/repositories/revision/topia/2364 Log: Evolution #1782: Permits not to generate getXXX() methods for boolean properties on Entities Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 03:00:38 UTC (rev 2363) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 04:25:09 UTC (rev 2364) @@ -101,6 +101,8 @@ protected boolean generateImpl; + protected boolean generateBooleanGetMethods; + protected void clean() { outputInterface = null; outputAbstract = null; @@ -139,6 +141,12 @@ generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); + String noGenerateBooleanGetMethods = + JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); + boolean generateBooleanGetMethods = + StringUtils.isEmpty(noGenerateBooleanGetMethods) || + !"true".equals(noGenerateBooleanGetMethods.trim()); + if (generateInterface) { // Create Entity Interface and its header @@ -574,7 +582,7 @@ * method (association class, reverse, entity reference, ...). * * @param attribute Input attribute to treate - * @see #addSingleGetOperation(ObjectModelAttribute, String) + * @see #addSingleGetOperation(ObjectModelAttribute, String, String) * @see #addSingleSetOperation(ObjectModelAttribute) * @see #addMultipleAddOperation(ObjectModelAttribute, String) * @see #addMultipleAddAllOperation(ObjectModelAttribute, String) @@ -594,9 +602,27 @@ // setXXX addSingleSetOperation(attribute); - // getXXX - addSingleGetOperation(attribute, null); + String attrType = getPropertyType(attribute); + boolean booleanProperty = attrType.toLowerCase().contains("boolean"); + if (booleanProperty) { + + // isXXX + addSingleGetOperation( + attribute, + attrType, + TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); + } + + if (!booleanProperty || generateBooleanGetMethods) { + + // getXXX + addSingleGetOperation( + attribute, + attrType, + TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX); + } + } else { // List, Set or Collection ? @@ -688,19 +714,16 @@ * outputAbstract} and {@code outputInterface}. * * @param attribute ObjectModelAttribute for getter operation + * @param attrType type of the attribute * @param operationPrefix Operation prefix : 'get' by default, if prefix * is null */ protected void addSingleGetOperation(ObjectModelAttribute attribute, - String operationPrefix) { + String attrType, + String operationPrefix) { String attrName = getPropertyName(attribute); - String attrType = getPropertyType(attribute); - if (operationPrefix == null) { - operationPrefix = TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; - } - if (log.isDebugEnabled()) { log.debug("Generate single '" + operationPrefix + "' operation for property : " + attrName + " [" + attrType + "]"); @@ -725,13 +748,6 @@ return result; }*/ ); - - // Generate 'is' getter for boolean attributes - if (attrType.toLowerCase().contains("boolean") && - !operationPrefix.equals(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { - addSingleGetOperation(attribute, - TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); - } } protected void addMultipleAddOperation(ObjectModelAttribute attribute,

1 0

r2363 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 05:00:38 +0200 (Thu, 20 Oct 2011) New Revision: 2363 Url: http://nuiton.org/repositories/revision/topia/2363 Log: move constant to eugene Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 02:33:45 UTC (rev 2362) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-10-20 03:00:38 UTC (rev 2363) @@ -87,8 +87,6 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); - public static final String SERIAL_VERSION_UID = "serialVersionUID"; - protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; @@ -211,7 +209,7 @@ ObjectModelClass ouput) { // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, + String svUID = TopiaGeneratorUtil.findTagValue(GeneratorUtil.SERIAL_VERSION_UID, input, model ); @@ -220,7 +218,7 @@ // use a default one svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; } - addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, + addConstant(ouput, GeneratorUtil.SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); }

1 0

r2362 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 04:33:45 +0200 (Thu, 20 Oct 2011) New Revision: 2362 Url: http://nuiton.org/repositories/revision/topia/2362 Log: preserve stack trace + no use of raw Exception Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-20 01:13:09 UTC (rev 2361) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-20 02:33:45 UTC (rev 2362) @@ -34,6 +34,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -307,7 +308,8 @@ ObjectModelOperation op; addInterface(entityEnum, TopiaEntityEnum.class); - + addImport(entityEnum, TopiaRuntimeException.class); + for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); Collection<ObjectModelAttribute> attributes = clazz.getAttributes(); @@ -427,7 +429,7 @@ try { implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); } catch (ClassNotFoundException e) { - throw new RuntimeException("could not find class " + implementationFQN); + throw new TopiaRuntimeException("could not find class " + implementationFQN, e); } } return implementation;

1 0

r2361 - trunk
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

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

1 0

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

Oct. 20, 2011

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

1 0

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

Oct. 19, 2011

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

1 0

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

Oct. 17, 2011

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

1 0