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

r2411 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: maven-release Date: 2012-02-20 15:20:23 +0100 (Mon, 20 Feb 2012) New Revision: 2411 Url: http://nuiton.org/repositories/revision/topia/2411 Log: [maven-release-plugin] prepare release topia-2.6.7 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) +++ trunk/pom.xml 2012-02-20 14:20:23 UTC (rev 2411) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> <modules> <module>topia-persistence</module> @@ -443,9 +443,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.6.7</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.7</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.7</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) +++ trunk/topia-persistence/pom.xml 2012-02-20 14:20:23 UTC (rev 2411) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) +++ trunk/topia-service-migration/pom.xml 2012-02-20 14:20:23 UTC (rev 2411) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) +++ trunk/topia-service-replication/pom.xml 2012-02-20 14:20:23 UTC (rev 2411) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) +++ trunk/topia-service-security/pom.xml 2012-02-20 14:20:23 UTC (rev 2411) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.7-SNAPSHOT</version> + <version>2.6.7</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2410 - trunk
by tchemit＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: tchemit Date: 2012-02-20 15:18:09 +0100 (Mon, 20 Feb 2012) New Revision: 2410 Url: http://nuiton.org/repositories/revision/topia/2410 Log: back to mavenpom 3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:16:51 UTC (rev 2409) +++ trunk/pom.xml 2012-02-20 14:18:09 UTC (rev 2410) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.1</version> </parent> <artifactId>topia</artifactId>

1 0

r2409 - trunk
by tchemit＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: tchemit Date: 2012-02-20 15:16:51 +0100 (Mon, 20 Feb 2012) New Revision: 2409 Url: http://nuiton.org/repositories/revision/topia/2409 Log: back to mavenpom 3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 14:08:08 UTC (rev 2408) +++ trunk/pom.xml 2012-02-20 14:16:51 UTC (rev 2409) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent> <artifactId>topia</artifactId>

1 0

r2408 - in trunk/topia-persistence/src: license main/resources/i18n test/java/org/nuiton/topia/test/ano1882 test/java/org/nuiton/topia/test/evo1912
by maven-release＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: maven-release Date: 2012-02-20 15:08:08 +0100 (Mon, 20 Feb 2012) New Revision: 2408 Url: http://nuiton.org/repositories/revision/topia/2408 Log: svn properties, headers and i18n Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2012-02-20 14:08:08 UTC (rev 2408) @@ -2,6 +2,7 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -10,6 +11,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - Mozilla Public License Version 1.0 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://jaxen.codehaus.org/license.html @@ -18,11 +20,10 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:45:58 CEST 2011 +#Thu Jan 12 16:55:28 CET 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 Modified: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2012-02-20 14:08:08 UTC (rev 2408) @@ -5,6 +5,7 @@ topia.persistence.error.empty.doc=Empty document topia.persistence.error.no.hibernate.session=No hinernate session found, you must at first, open a new transaction via 'beaginTransaction' method. topia.persistence.error.null.param=The method '%1$s' requires a non null parameter '%2$s'. +topia.persistence.error.on.clear= topia.persistence.error.on.commit=An error occurs while commit operation \: %1$s topia.persistence.error.on.export=An error occurs while export operation \: %1$s topia.persistence.error.on.loding.xml.doc=Could not read xml document for following reason \: %1$s @@ -20,6 +21,7 @@ topia.persistence.error.service.unknown=The service %1$s of type %2$s was not found. topia.persistence.error.unsupported.class=The following entity type %1$s is not managed by this context, you probably forgot to declare it. topia.persistence.error.unsupported.operation.on.closed.context=This context is closed, it is not possible to release the operation '%1$s' +topia.persistence.error.unsupported.operation.on.root.context= topia.persistence.error.update.schema=Schema could not be updated for following reason \: %1$s topia.persistence.service.loaded=Service '%1$s' loaded (implementation %2$s) topia.persistence.supported.classes.for.context=List of supported persistence classes \: %1$s Modified: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_es_ES.properties 2012-02-20 14:08:08 UTC (rev 2408) @@ -5,6 +5,7 @@ topia.persistence.error.empty.doc=Documento vacío topia.persistence.error.no.hibernate.session=No se encuentra ninguna sesión hibernada, debe iniciar una transacción con el método 'BeginTransaction' topia.persistence.error.null.param=El método '%1$s' requiere un parámetro '%2$s' no nulo. +topia.persistence.error.on.clear= topia.persistence.error.on.commit=Se produjo un error durante el guardado \: %1$s topia.persistence.error.on.export=Se produjo un error durante la exportación \: %1$s topia.persistence.error.on.loding.xml.doc=No se puede leer el documento debido a \: %1$s @@ -20,6 +21,7 @@ topia.persistence.error.service.unknown=El servicio '%1$s' de clase '%2$s' es desconocido topia.persistence.error.unsupported.class=La clase %1$n no está soportada por TopiaContext, puede que se halla olvidado de añadir su mapa topia.persistence.error.unsupported.operation.on.closed.context=El contexto está cerrado, no se puede realizar la operación %1$s +topia.persistence.error.unsupported.operation.on.root.context= topia.persistence.error.update.schema=El esquema no se puede actualizar debido a \: %2$s topia.persistence.service.loaded=Servicio '%1$s' cargado por '%2$s' topia.persistence.supported.classes.for.context=Classes supportées par ce TopiaContext \: %1$s Modified: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2012-02-20 14:08:08 UTC (rev 2408) @@ -5,6 +5,7 @@ topia.persistence.error.empty.doc=Document vide topia.persistence.error.no.hibernate.session=Aucune session hibernate trouvée, vous devez démarré une transaction avec la méthode 'beginTransaction' topia.persistence.error.null.param=La méthode '%1$s' requière un paramètre '%2$s' non null. +topia.persistence.error.on.clear= topia.persistence.error.on.commit=Une erreur est apparue pendant le commit \: %1$s topia.persistence.error.on.export=Une erreur est apparue pendant l'export \: %1$s topia.persistence.error.on.loding.xml.doc=Lecture du document impossible pour la raison suivante \: %1$s @@ -20,6 +21,7 @@ topia.persistence.error.service.unknown=Le service '%1$s' ayant pour classe '%2$s' n'est pas connu topia.persistence.error.unsupported.class=La classe %1$s n'est pas supportée par ce TopiaContext, vous avez sans doute oublié d'ajouter son mapping topia.persistence.error.unsupported.operation.on.closed.context=Ce contexte a été fermé, impossible de réaliser l'opération %1$s +topia.persistence.error.unsupported.operation.on.root.context= topia.persistence.error.update.schema=Le schéma n'a pas pu être mis à jour pour la raison suivante \: %2$s topia.persistence.service.loaded=Service '%1$s' chargé par '%2$s' topia.persistence.supported.classes.for.context=Classes supportées par ce TopiaContext \: %1$s Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2012-02-20 14:08:08 UTC (rev 2408) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ package org.nuiton.topia.test.ano1882; import org.apache.commons.logging.Log; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-02-20 13:27:33 UTC (rev 2407) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-02-20 14:08:08 UTC (rev 2408) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ package org.nuiton.topia.test.evo1912; import org.junit.Assert;

1 0

r2407 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: tchemit Date: 2012-02-20 14:27:33 +0100 (Mon, 20 Feb 2012) New Revision: 2407 Url: http://nuiton.org/repositories/revision/topia/2407 Log: Anomalie #1976: Can not pass a list parameter in aTopiaQuery Evolution #1931: Improve TopiaQuery (Where, order by and group by parts as List) - reformat TopiaContextImpl (i18n sentences must be on same line thant the _( invocation)) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-02-15 14:15:11 UTC (rev 2406) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-02-20 13:27:33 UTC (rev 2407) @@ -819,12 +819,10 @@ @Override public void commitTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_( - "topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", "commit")); } - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "commit")); try { @@ -859,12 +857,10 @@ @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_( - "topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", "rollback")); } - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "rollback")); try { // for (TopiaDAO<? extends TopiaEntity> dao : daoCache.values()) { @@ -971,8 +967,7 @@ @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "findById")); Class<TopiaEntity> entityClass = TopiaId.getClassName(id); @@ -994,8 +989,7 @@ @Override public List<?> find(String hql, Object... args) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -1005,6 +999,8 @@ Object value = args[j + 1]; if (value.getClass().isArray()) { query.setParameterList(name, (Object[]) value); + } else if (value instanceof Collection<?>) { + query.setParameterList(name, (Collection<?>) value); } else { query.setParameter(name, value); } @@ -1025,8 +1021,7 @@ @Override public List<?> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -1065,8 +1060,7 @@ */ @Override public int execute(String hql, Object... args) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -1084,8 +1078,7 @@ @Override public void add(TopiaEntity e) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "add")); String id = e.getTopiaId(); @@ -1096,8 +1089,7 @@ @Override public void importXML(Reader xml) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "importXML")); Document doc; @@ -1138,8 +1130,7 @@ @Override public void exportXML(Writer xml, Object... entityAndcondition) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "exportXML")); String[] queries = buildQueries(entityAndcondition); @@ -1208,8 +1199,7 @@ @Override public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; @@ -1246,13 +1236,11 @@ public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); if (getRootContext().equals(dstContextImpl.getRootContext())) { @@ -1266,18 +1254,15 @@ public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(_( - "topia.persistence.error.replicate.on.same.context")); + throw new IllegalArgumentException(_("topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entities.toArray()); } @@ -1298,8 +1283,7 @@ */ @Override public void backup(File file, boolean compress) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "backup")); try { String options = ""; @@ -1329,8 +1313,7 @@ public void restore(File file) throws TopiaException { // send event getFiresSupport().firePreRestoreSchema(this); - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "restore")); String sql = null; @@ -1389,8 +1372,8 @@ tx.closeContext(); root.finalize(); } catch (Throwable eee) { - throw new TopiaException(_( - "topia.persistence.error.on.clear", eee.getMessage()), eee); + throw new TopiaException( + _("topia.persistence.error.on.clear", eee.getMessage()), eee); } } @@ -1402,8 +1385,7 @@ @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { - checkClosed(_( - "topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); boolean result = TopiaUtil.isSchemaExist(this, clazz.getName()); return result; 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 2012-02-15 14:15:11 UTC (rev 2406) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-02-20 13:27:33 UTC (rev 2407) @@ -41,6 +41,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -239,69 +240,92 @@ public static final String FROM_SEPARATOR_LEFT_JOIN = "LEFT JOIN"; - /** Params for HQL query * */ + /** Params for HQL query. */ protected List<Object> params; // /** Select part of the query * */ // protected StringBuilder select; /** - * To keep select part of the query filled by user. + * To keep SELECT part of the query filled by user. * * @since 2.6.7 */ protected List<String> userSelects; + /** + * To keep GROUP BY part of the query filled by user. + * + * @since 2.6.7 + */ + protected List<String> groupBys; + + /** + * To keep ORDER BY part of the query filled by user. + * + * @since 2.6.7 + */ + protected List<String> orderBys; + + /** + * To keep WHERE part of the query filled by user. + * + * @since 2.6.7 + */ + protected List<String> wheres; + protected boolean distinct; //TODO tchemit-2012-02-01 Remove this (see Evol #1931) - /** From part of the query * */ + /** From part of the query. */ protected StringBuilder from; //TODO tchemit-2012-02-01 Remove this (see Evol #1931) - /** Where part of the query * */ - protected StringBuilder where; +// /** Where part of the query. */ +// protected StringBuilder where; - //TODO tchemit-2012-02-01 Remove this (see Evol #1931) - /** Order By part of the query * */ - protected StringBuilder orderBy; +// /** Order By part of the query. */ +// protected StringBuilder orderBy; - //TODO tchemit-2012-02-01 Remove this (see Evol #1931) - /** Group By part of the query * */ - protected StringBuilder groupBy; +// /** Group By part of the query. */ +// protected StringBuilder groupBy; protected Integer startIndex; protected Integer endIndex; - /** Used to determine if parentheses are needed for Where statement * */ - protected boolean parentheses; +// /** Used to determine if parentheses are needed for Where statement. */ +// protected boolean parentheses; protected List<String> propertiesToLoad; protected String mainAlias; - /** Enum to simmplify using operation in query */ + /** Enum to simmplify using operation in query. */ public enum Op { - /** EQUALS */ + /** EQUALS. */ EQ("="), - /** GREATER THAN */ + /** GREATER THAN. */ GT(">"), - /** GREATER OR EQUALS */ + /** GREATER OR EQUALS. */ GE(">="), - /** LIKE for String manipulation */ + /** LIKE for String manipulation. */ LIKE("LIKE"), - /** LESS THAN */ + /** LESS THAN. */ LT("<"), - /** LESS OR EQUALS */ + /** LESS OR EQUALS. */ LE("<="), - /** IS NOT NULL */ + /** IS NOT NULL. */ NOT_NULL("IS NOT NULL"), - /** IS NULL */ + /** IS NULL. */ NULL("IS NULL"), - /** NOT EQUAL */ - NEQ("!="); + /** NOT EQUAL. */ + NEQ("!="), + /** IN. */ + IN("IN"), + /** NOT IN. */ + NOT_IN("NOT IN"); protected String value; @@ -321,7 +345,7 @@ } public TopiaQuery() { - parentheses = true; +// parentheses = true; } /** @@ -499,7 +523,8 @@ } if (CollectionUtils.isNotEmpty(userSelects)) { - result.append(selectStatement).append(StringUtils.join(userSelects, ',')); + result.append(selectStatement); + result.append(StringUtils.join(userSelects, ',')); } else if (StringUtils.contains(from.toString(), ',') && StringUtils.isNotEmpty(mainAlias)) { // Set default select if there is more than one table in from @@ -518,15 +543,40 @@ // result.append(selectStatement).append(mainAlias); // } result.append(from); - if (where != null) { - result.append(where); + + if (CollectionUtils.isNotEmpty(wheres)) { + result.append(" WHERE "); + boolean first = true; + boolean moreThanOne = wheres.size() > 1; + for (String where : wheres) { + if (!first) { + result.append(" AND "); + } + if (moreThanOne) { + result.append('('); + } + result.append(where); + if (moreThanOne) { + result.append(')'); + } + first = false; + } } - if (groupBy != null) { - result.append(groupBy); + if (CollectionUtils.isNotEmpty(groupBys)) { + result.append(" GROUP BY ").append(StringUtils.join(groupBys, ',')); } - if (orderBy != null) { - result.append(orderBy); + if (CollectionUtils.isNotEmpty(orderBys)) { + result.append(" ORDER BY ").append(StringUtils.join(orderBys, ',')); } +// if (where != null) { +// result.append(where); +// } +// if (groupBy != null) { +// result.append(groupBy); +// } +// if (orderBy != null) { +// result.append(orderBy); +// } return StringUtils.trim(result.toString()); } @@ -689,23 +739,28 @@ * @since 2.3.4 */ public TopiaQuery addWhere(String where) { - if (StringUtils.isEmpty(where)) { - return this; + if (StringUtils.isNotEmpty(where)) { + if (wheres == null) { + wheres = new ArrayList<String>(); + } + wheres.add(where); +// // Reinitialize parentheses boolean for next add call +// parentheses = true; } - if (this.where == null) { - this.where = new StringBuilder(" WHERE "); - } else { - this.where.append(" AND "); - } - if (parentheses) { - this.where.append('('); - } - this.where.append(where); - if (parentheses) { - this.where.append(')'); - } - // Reinitialize parentheses boolean for next add call - parentheses = true; +// if (this.where == null) { +// this.where = new StringBuilder(" WHERE "); +// } else { +// this.where.append(" AND "); +// } +// if (parentheses) { +// this.where.append('('); +// } +// this.where.append(where); +// if (parentheses) { +// this.where.append(')'); +// } +// // Reinitialize parentheses boolean for next add call +// parentheses = true; return this; } @@ -750,7 +805,7 @@ result.append(operator).append(" :").append(valueName); addParam(valueName, paramValue); } - parentheses = false; +// parentheses = false; return addWhere(result.toString()); } @@ -780,6 +835,7 @@ * @since 2.3.1 * @deprecated since 2.3.4, use {@link #addEquals(String, Object...)} instead */ + @Deprecated public TopiaQuery add(String paramName, Object... paramValue) { return addEquals(paramName, paramValue); } @@ -843,8 +899,8 @@ buffer.append(" OR "). append(paramName).append(' ').append(Op.NULL.toString()); } else { - // no parentheses needed in this case (no OR statement) - parentheses = false; +// // no parentheses needed in this case (no OR statement) +// parentheses = false; } return addWhere(buffer.toString()); } @@ -885,9 +941,9 @@ public TopiaQuery addNotNull(String paramName) { StringBuilder result = new StringBuilder(paramName).append(' ').append(Op.NOT_NULL); - parentheses = false; +// parentheses = false; addWhere(result.toString()); - parentheses = true; +// parentheses = true; return this; } @@ -951,9 +1007,9 @@ append(" AND "). append(':').append(valueName2); - parentheses = false; +// parentheses = false; addWhere(builder.toString()); - parentheses = true; +// parentheses = true; return this; } @@ -972,9 +1028,9 @@ public TopiaQuery addInElements(String elementProperty, String containerProperty) { StringBuilder builder = new StringBuilder(elementProperty). append(" IN elements(").append(containerProperty).append(')'); - parentheses = false; +// parentheses = false; addWhere(builder.toString()); - parentheses = true; +// parentheses = true; return this; } @@ -1122,12 +1178,16 @@ * @return the TopiaQuery */ public TopiaQuery addOrder(String... order) { - if (orderBy == null) { - orderBy = new StringBuilder(" ORDER BY "); - } else { - orderBy.append(", "); + if (orderBys==null) { + orderBys = new ArrayList<String>(); } - orderBy.append(convertStringArray(order)); + Collections.addAll(orderBys, order); +// if (orderBy == null) { +// orderBy = new StringBuilder(" ORDER BY "); +// } else { +// orderBy.append(", "); +// } +// orderBy.append(convertStringArray(order)); return this; } @@ -1143,33 +1203,37 @@ * @return the TopiaQuery */ public TopiaQuery addGroup(String... group) { - if (groupBy == null) { - groupBy = new StringBuilder(" GROUP BY "); - } else { - groupBy.append(", "); + if (groupBys==null) { + groupBys = new ArrayList<String>(); } - groupBy.append(convertStringArray(group)); + Collections.addAll(groupBys, group); +// if (groupBy == null) { +// groupBy = new StringBuilder(" GROUP BY "); +// } else { +// groupBy.append(", "); +// } +// groupBy.append(convertStringArray(group)); return this; } - /** - * Helper method for array type. Each value will be separated by a comma. - * TODO-fdesbois-2010-05-25 : replace this algo by StringUtil.join() - * - * @param array of String - * @return a String with values of the array separated by a comma - */ - protected String convertStringArray(String... array) { - StringBuilder result = new StringBuilder(); - for (String value : array) { - result.append(", ").append(value); - } - String str = ""; - if (result.length() > 0) { - str = result.substring(2); - } - return str; - } +// /** +// * Helper method for array type. Each value will be separated by a comma. +// * TODO-fdesbois-2010-05-25 : replace this algo by StringUtil.join() +// * +// * @param array of String +// * @return a String with values of the array separated by a comma +// */ +// protected String convertStringArray(String... array) { +// StringBuilder result = new StringBuilder(); +// for (String value : array) { +// result.append(", ").append(value); +// } +// String str = ""; +// if (result.length() > 0) { +// str = result.substring(2); +// } +// return str; +// } /** * Limit the result of the query with startIndex and endIndex. @@ -1312,11 +1376,14 @@ if (log.isDebugEnabled()) { log.debug(this); } + List result; if (startIndex != null && endIndex != null) { - return transaction.find(query, startIndex, endIndex, + result = transaction.find(query, startIndex, endIndex, getParams().toArray()); + } else { + result = transaction.find(query, getParams().toArray()); } - return transaction.find(query, getParams().toArray()); + return result; } /** @@ -1514,8 +1581,10 @@ * @throws TopiaException for error on query execution */ public int executeCount(TopiaContext transaction) throws TopiaException { - StringBuilder oldOrder = orderBy; - orderBy = null; + List<String> oldOrderBys = orderBys; + orderBys=null; +// StringBuilder oldOrder = orderBy; +// orderBy = null; StringBuilder count = new StringBuilder("COUNT("); // Ano #560 : manage distinct case when the alias is set (otherwise // no need the distinct keyword because the entity type in query is @@ -1559,7 +1628,8 @@ } count.append(')'); int result = executeToInteger(transaction, count.toString()); - orderBy = oldOrder; + orderBys = oldOrderBys; +// orderBy = oldOrder; return result; } @@ -1705,9 +1775,9 @@ // Clean StringBuilder statements // select = null; from = null; - where = null; - orderBy = null; - groupBy = null; +// where = null; +// orderBy = null; +// groupBy = null; super.finalize(); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2012-02-15 14:15:11 UTC (rev 2406) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2012-02-20 13:27:33 UTC (rev 2407) @@ -72,7 +72,7 @@ query.addEquals(QueriedEntity.PROPERTY_TEST_ADD, value, value2, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE (testAdd IN (:testAdd1, :testAdd2) OR testAdd IS NULL)", + "WHERE testAdd IN (:testAdd1, :testAdd2) OR testAdd IS NULL", query.fullQuery()); }

1 0

r2406 - trunk
by tchemit＠users.nuiton.org 15 Feb '12

15 Feb '12

Author: tchemit Date: 2012-02-15 15:15:11 +0100 (Wed, 15 Feb 2012) New Revision: 2406 Url: http://nuiton.org/repositories/revision/topia/2406 Log: revert trunk site deploy modifications + T?\195?\162che #1967: Updates to hibernate 3.6.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-09 23:10:35 UTC (rev 2405) +++ trunk/pom.xml 2012-02-15 14:15:11 UTC (rev 2406) @@ -60,7 +60,7 @@ Framework de persistance et de distribution d'application. </description> <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/topia${projectUrlSuffix}</url> + <url>http://maven-site.nuiton.org/topia</url> <properties>  @@ -72,7 +72,7 @@ <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>3.6.9.Final</hibernateVersion> + <hibernateVersion>3.6.10.Final</hibernateVersion>  <sl4jVersion>1.6.4</sl4jVersion> <h2Version>1.3.163</h2Version> @@ -451,7 +451,7 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url> + <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement>

1 0

r2405 - trunk
by tchemit＠users.nuiton.org 09 Feb '12

09 Feb '12

Author: tchemit Date: 2012-02-10 00:10:35 +0100 (Fri, 10 Feb 2012) New Revision: 2405 Url: http://nuiton.org/repositories/revision/topia/2405 Log: T?\195?\162che #1963: Updates to mavenpom 3.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-03 00:14:03 UTC (rev 2404) +++ trunk/pom.xml 2012-02-09 23:10:35 UTC (rev 2405) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -60,7 +60,7 @@ Framework de persistance et de distribution d'application. </description> <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/topia</url> + <url>http://maven-site.nuiton.org/topia${projectUrlSuffix}</url> <properties>  @@ -451,7 +451,7 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url> </site> </distributionManagement>

1 0

r2404 - trunk
by tchemit＠users.nuiton.org 03 Feb '12

03 Feb '12

Author: tchemit Date: 2012-02-03 01:14:03 +0100 (Fri, 03 Feb 2012) New Revision: 2404 Url: http://nuiton.org/repositories/revision/topia/2404 Log: updates to mavenpom 3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-01 13:07:33 UTC (rev 2403) +++ trunk/pom.xml 2012-02-03 00:14:03 UTC (rev 2404) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.7</version> + <version>3.1</version> </parent> <artifactId>topia</artifactId>

1 0

r2403 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-tutorial
by tchemit＠users.nuiton.org 01 Feb '12

01 Feb '12

Author: tchemit Date: 2012-02-01 14:07:33 +0100 (Wed, 01 Feb 2012) New Revision: 2403 Url: http://nuiton.org/repositories/revision/topia/2403 Log: Evolution #1931: Improve TopiaQuery Anomalie #1930: dao.countByquery does not work in some cases Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-tutorial/ 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 2012-01-18 16:25:55 UTC (rev 2402) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-02-01 13:07:33 UTC (rev 2403) @@ -242,20 +242,31 @@ /** Params for HQL query * */ protected List<Object> params; - /** Select part of the query * */ - protected StringBuilder select; +// /** Select part of the query * */ +// protected StringBuilder select; + /** + * To keep select part of the query filled by user. + * + * @since 2.6.7 + */ + protected List<String> userSelects; + protected boolean distinct; + //TODO tchemit-2012-02-01 Remove this (see Evol #1931) /** From part of the query * */ protected StringBuilder from; + //TODO tchemit-2012-02-01 Remove this (see Evol #1931) /** Where part of the query * */ protected StringBuilder where; + //TODO tchemit-2012-02-01 Remove this (see Evol #1931) /** Order By part of the query * */ protected StringBuilder orderBy; + //TODO tchemit-2012-02-01 Remove this (see Evol #1931) /** Group By part of the query * */ protected StringBuilder groupBy; @@ -273,23 +284,23 @@ /** Enum to simmplify using operation in query */ public enum Op { - /** EQUALS * */ + /** EQUALS */ EQ("="), - /** GREATER THAN * */ + /** GREATER THAN */ GT(">"), - /** GREATER OR EQUALS * */ + /** GREATER OR EQUALS */ GE(">="), - /** LIKE for String manipulation * */ + /** LIKE for String manipulation */ LIKE("LIKE"), - /** LESS THAN * */ + /** LESS THAN */ LT("<"), - /** LESS OR EQUALS * */ + /** LESS OR EQUALS */ LE("<="), - /** IS NOT NULL * */ + /** IS NOT NULL */ NOT_NULL("IS NOT NULL"), - /** IS NULL * */ + /** IS NULL */ NULL("IS NULL"), - /** NOT EQUAL * */ + /** NOT EQUAL */ NEQ("!="); protected String value; @@ -388,6 +399,7 @@ * the query or for join as specific {@code separator}. * * @param property the property to add + * @param alias alias of the property to add in form part of the query * @param separator The separator to use before adding the element (if null * the {@link #FROM_SEPARATOR_DEFAULT} will be used). * @return the TopiaQuery @@ -485,15 +497,26 @@ if (distinct) { selectStatement.append("DISTINCT "); } - if (select != null) { - result.append(selectStatement).append(select); + if (CollectionUtils.isNotEmpty(userSelects)) { + + result.append(selectStatement).append(StringUtils.join(userSelects, ',')); + } else if (StringUtils.contains(from.toString(), ',') && + StringUtils.isNotEmpty(mainAlias)) { // Set default select if there is more than one table in from // part and main alias is defined // Note : maybe a problem with using new {@link #addFrom(String, String) with other than ',' separator - } else if (StringUtils.contains(from.toString(), ',') && - StringUtils.isNotEmpty(mainAlias)) { result.append(selectStatement).append(mainAlias); } + +// if (select != null) { +// result.append(selectStatement).append(select); +// // Set default select if there is more than one table in from +// // part and main alias is defined +// // Note : maybe a problem with using new {@link #addFrom(String, String) with other than ',' separator +// } else if (StringUtils.contains(from.toString(), ',') && +// StringUtils.isNotEmpty(mainAlias)) { +// result.append(selectStatement).append(mainAlias); +// } result.append(from); if (where != null) { result.append(where); @@ -603,7 +626,10 @@ } // Init select for single result - if (select == null) { +// if (select == null) { +// setSelect(mainAlias); +// } + if (userSelects == null) { setSelect(mainAlias); } @@ -1025,21 +1051,42 @@ * @return the TopiaQuery */ public TopiaQuery addSelect(String... select) { - String str = convertStringArray(select); - // if select is the mainAlias, do nothing - if (mainAlias != null && str.equals(mainAlias)) { - return this; + +// if (mainAlias != null && +// CollectionUtils.isNotEmpty(userSelects) && +// userSelects.contains(mainAlias)) { +// // if select is the mainAlias, do nothing +// return this; +// } +// String str = convertStringArray(select); +// // if select is the mainAlias, do nothing +// if (mainAlias != null && str.equals(mainAlias)) { +// return this; +// } + + if (userSelects == null) { + + userSelects = new ArrayList<String>(); + + if (mainAlias != null) { + + // if mainAlias is not null, add it before adding the select in argument + userSelects.add(mainAlias); + } } - // if select is not null, add the new element to the select - if (this.select != null) { - this.select.append(", "); - // if mainAlias is not null, add it before adding the select in argument - } else if (mainAlias != null) { - this.select = new StringBuilder(mainAlias).append(", "); - } else { - this.select = new StringBuilder(); - } - this.select.append(convertStringArray(select)); + + userSelects.addAll(Arrays.asList(select)); + +// // if select is not null, add the new element to the select +// if (this.select != null) { +// this.select.append(", "); +// // if mainAlias is not null, add it before adding the select in argument +// } else if (mainAlias != null) { +// this.select = new StringBuilder(mainAlias).append(", "); +// } else { +// this.select = new StringBuilder(); +// } +// this.select.append(convertStringArray(select)); return this; } @@ -1051,7 +1098,8 @@ * @return the TopiaQuery */ public TopiaQuery setSelect(String... select) { - this.select = new StringBuilder(convertStringArray(select)); + userSelects = new ArrayList<String>(Arrays.asList(select)); +// this.select = new StringBuilder(convertStringArray(select)); return this; } @@ -1404,7 +1452,8 @@ */ public Object executeToObject(TopiaContext transaction, String select) throws TopiaException { - StringBuilder oldValue = this.select; + List<String> oldValue = this.userSelects; +// StringBuilder oldValue = this.select; if (!StringUtils.isEmpty(select)) { setSelect(select); } @@ -1414,7 +1463,8 @@ if (!results.isEmpty()) { result = results.get(0); } - this.select = oldValue; +// this.select = oldValue; + userSelects = oldValue; resetLimit(); return result; } @@ -1470,9 +1520,40 @@ // Ano #560 : manage distinct case when the alias is set (otherwise // no need the distinct keyword because the entity type in query is // unique) - if (distinct && StringUtils.isNotEmpty(mainAlias)) { - count.append("DISTINCT ").append(mainAlias); - // When distinct is not set, use <pre>*</pre> + + //Note Ano #1930 tchemit 2012-02-01 this code does not work if a setSelect was done + +// if (distinct && StringUtils.isNotEmpty(mainAlias) && +// isUserSelectEqualsMainAlias()) { +// count.append("DISTINCT ").append(mainAlias); +// // When distinct is not set, use <pre>*</pre> +// } else { +// count.append('*'); +// } + + String mainSelect = null; + + if (distinct) { + + if (CollectionUtils.isNotEmpty(userSelects)) { + + if (userSelects.size() > 1) { + + // can not count this on multiple select... + throw new TopiaException( + "To count, can not have more than one select, but found " + + userSelects); + } + mainSelect = userSelects.get(0); + } else if (StringUtils.isNotEmpty(mainAlias)) { + + // use main alias + mainSelect = mainAlias; + } + } + + if (mainSelect != null) { + count.append("DISTINCT ").append(mainSelect); } else { count.append('*'); } @@ -1481,6 +1562,13 @@ orderBy = oldOrder; return result; } + + protected boolean isUserSelectEqualsMainAlias() { + boolean result = !CollectionUtils.isEmpty(userSelects) && + userSelects.size()==1 && + userSelects.get(0).equals(mainAlias); + return result; + } /** * Load all properties for the entity. @@ -1615,7 +1703,7 @@ @Override protected void finalize() throws Throwable { // Clean StringBuilder statements - select = null; +// select = null; from = null; where = null; orderBy = null; Property changes on: trunk/topia-tutorial ___________________________________________________________________ Modified: svn:ignore - target .settings .project + target .settings .project $.ipr *.iws *.iml

1 0

r2402 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topia/test/evo1912 test/xmi
by ymartel＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: ymartel Date: 2012-01-18 17:25:55 +0100 (Wed, 18 Jan 2012) New Revision: 2402 Url: http://nuiton.org/repositories/revision/topia/2402 Log: evo#1912 modify TagValue and property name to topiaId in DTO to avoid confusion with potential field named "id" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java trunk/topia-persistence/src/test/xmi/topiatest.properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -41,7 +41,7 @@ import java.io.Serializable; import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOIdTagValue; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOTopiaIdTagValue; /*{generator option: parentheses = false}*/ @@ -101,9 +101,9 @@ addAttribute(result, "serialVersionUID", "long", svUID, ObjectModelModifier.FINAL, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); } - boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); + boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); if (generateDTOId) { - addAttribute(result, "id", "String"); + addAttribute(result, "topiaId", "String"); } ObjectModelAttribute attr2; @@ -175,21 +175,21 @@ protected void addOperations(ObjectModelClass result,ObjectModelClass clazz) { - boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); + boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); ObjectModelOperation op; if (generateDTOId) { - op = addOperation(result, "setId", "void", ObjectModelModifier.PUBLIC); - addParameter(op, "String", "id"); + op = addOperation(result, "setTopiaId", "void", ObjectModelModifier.PUBLIC); + addParameter(op, "String", "topiaId"); setOperationBody(op, "" /*{ - this.id = id; + this.topiaId = topiaId; }*/ ); - op = addOperation(result, "getId", "String", ObjectModelModifier.PUBLIC); + op = addOperation(result, "getTopiaId", "String", ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ - return id; + return topiaId; }*/ ); } 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 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -1802,17 +1802,17 @@ } /** - * Search if the TagValue {@link TopiaTagValues#TAG_GENERATE_ID_IN_DTO} has been + * Search if the TagValue {@link TopiaTagValues#TAG_GENERATE_TOPIA_ID_IN_DTO} has been * activated in the model. * * @param classifier classifier to seek * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. - * @see TopiaTagValues#TAG_GENERATE_ID_IN_DTO + * @see TopiaTagValues#TAG_GENERATE_TOPIA_ID_IN_DTO * @since 2.6.7 */ - public static boolean shouldGenerateDTOIdTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String tagValue = findTagValue(TopiaTagValues.TAG_GENERATE_ID_IN_DTO, classifier, model); + public static boolean shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier classifier, ObjectModel model) { + String tagValue = findTagValue(TopiaTagValues.TAG_GENERATE_TOPIA_ID_IN_DTO, classifier, model); boolean generate = StringUtils.isNotEmpty(tagValue) && Boolean.valueOf(tagValue); return generate; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -462,10 +462,10 @@ * <p/> * * @see EntityDTOTransformer - * @see TopiaGeneratorUtil#shouldGenerateDTOIdTagValue(ObjectModelClassifier, ObjectModel) + * @see TopiaGeneratorUtil#shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier, ObjectModel) * @since 2.6.7 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Add a \"id\" property with its getter/setter on a DTO.") - String TAG_GENERATE_ID_IN_DTO = "generateDTOId"; + String TAG_GENERATE_TOPIA_ID_IN_DTO = "generateDTOTopiaId"; } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -13,11 +13,11 @@ public void testEvo1912() throws Exception { // simply test the getter/setter on id property : with the tagValue, they should be generated CompanyDTO companyDTO = new CompanyDTO(); - String originalId = companyDTO.getId(); + String originalId = companyDTO.getTopiaId(); Assert.assertNull(originalId); String wantedId = "mycompany"; - companyDTO.setId(wantedId); - String updatedId = companyDTO.getId(); + companyDTO.setTopiaId(wantedId); + String updatedId = companyDTO.getTopiaId(); Assert.assertEquals(wantedId, updatedId); } Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-18 16:25:55 UTC (rev 2402) @@ -25,7 +25,7 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.constantPrefix=PROPERTY_ -model.tagvalue.generateDTOId=true +model.tagvalue.generateDTOTopiaId=true # Do not use this tag value (deprecated since 2.5) #model.tagvalue.useLegacyDAO=true

1 0