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

r2740 - in trunk: topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/csv topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata topia-servic
by bleny＠users.nuiton.org 05 Jul '13

05 Jul '13

Author: bleny Date: 2013-07-05 17:01:09 +0200 (Fri, 05 Jul 2013) New Revision: 2740 Url: http://nuiton.org/projects/topia/repository/revisions/2740 Log: fixes #1945 now throws TopiaException everywhere Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java Modified: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -32,7 +32,7 @@ public class TopiaAbstractTest { @Test - public void testCreateCar() throws TopiaException { + public void testCreateCar() { TopiaContext context = TopiaContextFactory.getContext(); try { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -26,7 +26,6 @@ import org.hibernate.jdbc.Work; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -89,7 +88,7 @@ findSingleResult(result, set); } catch (Exception e) { - throw new TopiaRuntimeException("Could not execute query", e); + throw new TopiaException("Could not execute query", e); } finally { ps.close(); } @@ -120,7 +119,7 @@ findMultipleResult(result, set); } catch (Exception e) { - throw new TopiaRuntimeException("Could not execute query", e); + throw new TopiaException("Could not execute query", e); } finally { ps.close(); } 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 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -25,18 +25,21 @@ package org.nuiton.topia.generator; -import java.util.Set; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelType; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.*; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; 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; @@ -46,8 +49,8 @@ import java.lang.reflect.Array; import java.util.Arrays; -import java.util.Collection; import java.util.List; +import java.util.Set; /*{generator option: parentheses = false}*/ @@ -98,7 +101,6 @@ addImport(entityEnum, TopiaEntity.class); addImport(entityEnum, EntityOperatorStore.class); addImport(entityEnum, Arrays.class); - addImport(entityEnum, TopiaRuntimeException.class); addImport(entityEnum, ArrayUtils.class); } else { @@ -107,7 +109,6 @@ ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName ); - addImport(daoHelper, TopiaRuntimeException.class); addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, EntityOperatorStore.class); addImport(daoHelper, Arrays.class); @@ -476,7 +477,7 @@ try { implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); } catch (ClassNotFoundException e) { - throw new TopiaRuntimeException("could not find class " + implementationFQN, e); + throw new TopiaException("could not find class " + implementationFQN, e); } } return implementation; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -47,7 +47,6 @@ import org.hibernate.Session; import org.hibernate.metadata.ClassMetadata; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -858,26 +857,23 @@ this.type = type; this.hql = hql; this.params = params; - try { - String hql2 = hql.toLowerCase(); - int i = hql2.indexOf("order by"); - if (i == -1) { - throw new IllegalStateException( - "must have a *order by* in hql, " + - "but did not find it in " + hql); - } - // get the count (removing the order-by) - long count2 = dao.countByQuery("SELECT COUNT(*) " + - hql.substring(0, i), params); - pager = new TopiaPagerBean(); - pager.setRecords(count2); - pager.setPageSize(batchSize); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + String hql2 = hql.toLowerCase(); + int i = hql2.indexOf("order by"); + if (i == -1) { + throw new IllegalStateException( + "must have a *order by* in hql, " + + "but did not find it in " + hql); } + // get the count (removing the order-by) + long count2 = dao.countByQuery("SELECT COUNT(*) " + + hql.substring(0, i), params); + pager = new TopiaPagerBean(); + pager.setRecords(count2); + pager.setPageSize(batchSize); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + // empty iterator (will be changed at first next call) data = Iterators.emptyIterator(); } @@ -903,14 +899,10 @@ PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); // load new window of data - try { - data = dao.findAllByQueryAndPager(type, - hql, - pager, - params).iterator(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + data = dao.findAllByQueryAndPager(type, + hql, + pager, + params).iterator(); } R next = data.next(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; import org.nuiton.util.csv.Common; @@ -219,7 +219,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new TopiaRuntimeException( + throw new TopiaException( "Could not find entity of type " + entityType.getSimpleName() + " with '" + propertyName + "' = " + value); @@ -265,7 +265,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new TopiaRuntimeException( + throw new TopiaException( "Could not find entity with '" + propertyName + "' = " + value); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -86,7 +85,7 @@ try { entity.accept(this); } catch (TopiaException e) { - throw new TopiaRuntimeException( + throw new TopiaException( "Could not export entity " + entity.getTopiaId(), e); } finally { TIME_LOG.log(s1, "export::" + entity.getTopiaId()); @@ -105,7 +104,7 @@ Preconditions.checkNotNull(entityExporter); entityExporter.write(entity); } catch (Exception e) { - throw new TopiaRuntimeException( + throw new TopiaException( "Could not export entity " + entity, e); } finally { if (log.isDebugEnabled()) { @@ -126,7 +125,7 @@ Preconditions.checkNotNull(entityExporter); entityExporter.writeAssociations(entity); } catch (Exception e) { - throw new TopiaRuntimeException( + throw new TopiaException( "Could not export associations of entity " + entity, e); } finally { if (log.isDebugEnabled()) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -32,7 +32,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; @@ -84,7 +84,7 @@ try { result = export.toString(Charsets.UTF_8); } catch (Exception eee) { - throw new TopiaRuntimeException("Can not export datas", eee); + throw new TopiaException("Can not export datas", eee); } TIME_LOG.log(s2, "exportData::exportToString"); return result; @@ -105,7 +105,7 @@ try { export.write(file, Charsets.UTF_8); } catch (Exception eee) { - throw new TopiaRuntimeException("Can not export datas", eee); + throw new TopiaException("Can not export datas", eee); } TIME_LOG.log(s2, "exportData::exportToFile"); } @@ -127,7 +127,7 @@ try { export.write(file, Charsets.UTF_8); } catch (Exception eee) { - throw new TopiaRuntimeException("Can not export datas", eee); + throw new TopiaException("Can not export datas", eee); } TIME_LOG.log(s2, "exportData::exportToFile"); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -24,7 +24,7 @@ */ import com.google.common.base.Charsets; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.util.EntityOperator; @@ -102,7 +102,7 @@ return new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new TopiaRuntimeException("Could not find file " + file); + throw new TopiaException("Could not find file " + file); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaPersistenceHelper; @@ -110,7 +110,7 @@ return new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new TopiaRuntimeException("Could not find file " + file); + throw new TopiaException("Could not find file " + file); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -32,7 +32,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextAdapter; import org.nuiton.topia.event.TopiaContextEvent; import org.nuiton.topia.event.TopiaContextListener; @@ -258,7 +257,7 @@ doMigrateSchema(); } catch (MigrationServiceException e) { - throw new TopiaRuntimeException("Can't migrate schema for reason " + e.getMessage(), e); + throw new TopiaException("Can't migrate schema for reason " + e.getMessage(), e); } } else { if (log.isDebugEnabled()) { @@ -281,7 +280,7 @@ if (log.isErrorEnabled()) { log.error(_("topia.migration.migration.incomplete")); } - throw new TopiaRuntimeException(_("topia.migration.migration.incomplete")); + throw new TopiaException(_("topia.migration.migration.incomplete")); } } @@ -431,67 +430,62 @@ log.debug("Detected version = " + dbVersion); } - try { + boolean createTable = !versionTableExist; + // update version even if database has not been migrated + // only case that database doesn't exist match this + if (createTable) { + // si la base n'etait pas versionnee, la table version n'existe pas + // creation + if (log.isDebugEnabled()) { + log.debug("Adding tms_version table"); + } - boolean createTable = !versionTableExist; - // update version even if database has not been migrated - // only case that database doesn't exist match this - if (createTable) { - // si la base n'etait pas versionnee, la table version n'existe pas - // creation - if (log.isDebugEnabled()) { - log.debug("Adding tms_version table"); - } + // creer le schema en base + // dans la configuration versionConfiguration, il n'y a que la table version + TMSVersionDAO.createTable(versionConfiguration); - // creer le schema en base - // dans la configuration versionConfiguration, il n'y a que la table version - TMSVersionDAO.createTable(versionConfiguration); - - if (log.isDebugEnabled()) { - log.debug("Table for " + TMSVersion.class.getSimpleName() + " created"); - } + if (log.isDebugEnabled()) { + log.debug("Table for " + TMSVersion.class.getSimpleName() + " created"); } + } - // Set new version in database - TopiaContext tx = rootContext.beginTransaction(); - try { + // Set new version in database + TopiaContext tx = rootContext.beginTransaction(); + try { - // delete all previous data in table - TMSVersionDAO.deleteAll(tx); + // delete all previous data in table + TMSVersionDAO.deleteAll(tx); - if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); - } + if (log.isInfoEnabled()) { + log.info(_("topia.migration.saving.db.version", version)); + } - // create new version and store it in table - TMSVersion tmsVersion = - TMSVersionDAO.create(tx, version.getVersion()); - if (log.isDebugEnabled()) { - log.debug("Created version : " + tmsVersion.getVersion()); - } + // create new version and store it in table + TMSVersion tmsVersion = + TMSVersionDAO.create(tx, version.getVersion()); + if (log.isDebugEnabled()) { + log.debug("Created version : " + tmsVersion.getVersion()); + } - tx.commitTransaction(); - } catch (TopiaException e) { - if (tx != null) { - tx.rollbackTransaction(); - } - throw e; - } finally { - if (tx != null) { - tx.closeContext(); - } + tx.commitTransaction(); + } catch (TopiaException e) { + if (tx != null) { + tx.rollbackTransaction(); } + throw e; + } finally { + if (tx != null) { + tx.closeContext(); + } + } - if (legacyVersionTableExist) { + if (legacyVersionTableExist) { - if (log.isDebugEnabled()) { - log.debug("Will drop legacy tmsVersion table"); - } - // on supprime l'ancienne table - TMSVersionDAO.dropTable(legacyVersionConfiguration); + if (log.isDebugEnabled()) { + log.debug("Will drop legacy tmsVersion table"); } - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + // on supprime l'ancienne table + TMSVersionDAO.dropTable(legacyVersionConfiguration); } // on change les etats internes du service @@ -642,7 +636,7 @@ } } } catch (TopiaException e) { - throw new TopiaRuntimeException("Can't obtain dbVersion for reason " + e.getMessage(), e); + throw new TopiaException("Can't obtain dbVersion for reason " + e.getMessage(), e); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -34,7 +34,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; 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.framework.TopiaUtil; import org.nuiton.util.Version; @@ -147,7 +146,7 @@ Version v = work.getVersion(); return v; } catch (TopiaException e) { - throw new TopiaRuntimeException("Can't obtain dbVersion for reason " + e.getMessage(), e); + throw new TopiaException("Can't obtain dbVersion for reason " + e.getMessage(), e); } } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -83,12 +83,7 @@ public static void after() throws Exception { if (context != null && !context.isClosed()) { - try { - context.closeContext(); - } catch (TopiaException e) { - // cela peut arriver si on demande la fermeture dans un thread - // ailleurs... - } + context.closeContext(); } init = false; } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-07-05 14:31:15 UTC (rev 2739) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-07-05 15:01:09 UTC (rev 2740) @@ -26,14 +26,18 @@ package org.nuiton.topia.security.entities.authorization; -import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsString2Int; -import java.util.HashSet; -import java.util.List; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.security.entities.user.TopiaUserImpl; +import java.util.HashSet; +import java.util.List; + +import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsString2Int; + /** * Classe permettant les autorisations de type association. C'est à dire l'autorisation * permet de donné une autorisation par rapport à une association dans le modèle. @@ -45,6 +49,8 @@ public class TopiaAssociationAuthorizationImpl extends TopiaAssociationAuthorizationAbstract { + static private Log log = LogFactory.getLog(TopiaAssociationAuthorizationImpl.class); + private static final long serialVersionUID = 1L; /** @@ -71,7 +77,9 @@ "association", thatExpression); return (Long)find.get(0) >= 1; } catch (TopiaException e) { - e.printStackTrace(); + if (log.isDebugEnabled()) { + log.debug("", e); + } return false; } }

1 0

r2739 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: event framework generator
by echatellier＠users.nuiton.org 05 Jul '13

05 Jul '13

Author: echatellier Date: 2013-07-05 16:31:15 +0200 (Fri, 05 Jul 2013) New Revision: 2739 Url: http://nuiton.org/projects/topia/repository/revisions/2739 Log: refs #2736: Remove code deprecated before 3.0 Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -97,15 +97,6 @@ return (TopiaContext) super.getSource(); } - /** - * @return the source context that fires the event - * @deprecated since 2.3.4, prefer the overriden {@link #getSource()}. - */ - @Deprecated - public TopiaContext getTopiaContext() { - return getSource(); - } - @Override protected void finalize() throws Throwable { super.finalize(); 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 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -116,21 +116,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaContextImpl.class); - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_DIRECTORIES}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_DIRECTORIES = - TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES; - - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_CLASSES}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_CLASSES = - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES; - - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_PROPERTIES_FILE}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_PROPERTIES_FILE = - TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE; - /** Le pere de ce context, les contexts initaux n'ont pas de context pere */ protected TopiaContextImplementor parentContext; @@ -365,12 +350,6 @@ return result; } - @Override - public Collection<TopiaService> getAllServices() { - Collection<TopiaService> result = getServices().values(); - return result; - } - /* -------------------- CONTEXT HIERARCHY MANAGMENT ----------------------*/ /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -136,13 +136,6 @@ Map<String, TopiaService> getServices(); - /** - * @return a collection of {@link TopiaService} - * @deprecated since 2.3.4 : useless method, use {@link #getServices()} instead - */ - @Deprecated - Collection<TopiaService> getAllServices(); - List<Class<?>> getPersistenceClasses(); } //TopiaContextImplementor Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -62,15 +62,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaUtil.class); - /** @deprecated since 2.5.3, use now the constant {@link TopiaContextFactory#CONFIG_DEFAULT_SCHEMA}. */ - @Deprecated - public final static String HIBERNATE_DEFAULT_SCHEMA = - TopiaContextFactory.CONFIG_DEFAULT_SCHEMA; - - /** @deprecated since 2.5.3, use the already present {@link TopiaContextImpl#TOPIA_PERSISTENCE_CLASSES}. */ - @Deprecated - public final static String TOPIA_PERSISTENCE_CLASSES = TopiaContextImpl.TOPIA_PERSISTENCE_CLASSES; - /** * Permet de récupérer le fichier de propriété ayant le nom passé en * argument. @@ -319,7 +310,7 @@ try { connection = connectionProvider.getConnection(); - DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); + DatabaseMetadata meta = new DatabaseMetadata(connection, dialect, configuration); Iterator<?> itr = configuration.getClassMappings(); while (itr.hasNext()) { Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -1,127 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topia.generator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created: 14 déc. 2009 - * - * @author tchemit <chemit(a)codelutin.com> - * @version $Id$ - * @since 2.3.0 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOImplTransformer" - * @deprecated 2.5.4, prefer use the transformer {@link EntityDAOTransformer} - */ -@Deprecated -public class DAOImplTransformer extends ObjectModelTransformerToJava { - - /** Logger. */ - static Log log = LogFactory.getLog(DAOImplTransformer.class); - - /** - * Collection used to identify entities full qualified name that have - * a dependency for DAO extra operations. So no need to generate the - * DAOImpl in this case, it will be created by the developper. - */ - List<String> noGenerationNeeded = new ArrayList<String>(); - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { - return; - } - - /** - * EVO #636 : Manage extra operations for DAO from "dao" dependency - * between an interface with stereotype <<dao>> (dependency client) and - * a class with stereotype <<entity>> (dependency supplier). - */ - - ObjectModelDependency dependency = - interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); - - if (dependency == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find dependency " + - TopiaGeneratorUtil.DEPENDENCIES_DAO + - " but DAO stereotype was placed on the interface " + - interfacez.getName()); - - } - return; - } - ObjectModelClassifier classifier = dependency.getSupplier(); - - if (TopiaGeneratorUtil.isEntity(classifier)) { - noGenerationNeeded.add(classifier.getQualifiedName()); - } - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz) || hasDAOOperations(clazz)) { - return; - } - String clazzName = clazz.getName(); - String clazzFQN = clazz.getQualifiedName(); - ObjectModelClass result = createClass(clazzName + "DAOImpl<E extends " + clazzName + ">", clazz.getPackageName()); - setDocumentation(result, "/**\n" + - " Implantation du DAO pour l'entité " + clazzName + ".\n" + - " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + - " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + - " * écrasée\n" + - " */"); - setSuperClass(result, clazzFQN + "DAOAbstract<E>"); - } - - /** - * Detect if the class has DAO operations identified with <<dao>> stereotype. - * - * @param clazz The ObjectModelClass with operations (Corresponding to the Entity) - * @return true if the class has some dao operations, false if not - */ - public boolean hasDAOOperations(ObjectModelClass clazz) { - // This code will be deprecated - for (ObjectModelOperation op : clazz.getOperations()) { - if (TopiaGeneratorUtil.hasDaoStereotype(op)) { - return true; - } - } - // New method : interface dependency - return noGenerationNeeded.contains(clazz.getQualifiedName()); - } -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -1,63 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topia.generator; - -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/*{generator option: parentheses = false}*/ - -/*{generator option: writeString = +}*/ -/** - * Created: 13 déc. 2009 - * - * @author tchemit <chemit(a)codelutin.com> - * @version $Id$ - * @since 2.3.0 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOTransformer" - * @deprecated 2.5.4, prefer use the transformer {@link EntityDAOTransformer} - */ -@Deprecated -public class DAOTransformer extends ObjectModelTransformerToJava { - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz)) { - return; - } - String clazzName = clazz.getName(); - String clazzFQN = clazz.getQualifiedName(); - ObjectModelClass result = createClass(clazzName + "DAO", clazz.getPackageName()); - setDocumentation(result, "/**\n" + - " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + - " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + - " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + - " */"); - setSuperClass(result, clazzFQN + "DAOImpl<" + clazzName + ">"); - } - - -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -61,7 +61,6 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; /** - * FIXME-poussin-20060102 mettre les attributs node="..." sur tous les attributs * * @author poussin <poussin(a)codelutin.com> * @version $Id$ 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 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -152,23 +152,6 @@ } /** - * Renvoie le type de persistence pour l'élément donné. Si aucun n'est - * trouvé, le type par défaut est utilisé - * - * @param element l'élément à tester - * @return le type de persitence pour l'élément donné. - * @deprecated since 2.5, prefer use the method {@link #getPersistenceType(ObjectModelClassifier)} - */ - @Deprecated - public static String getPersistenceType(ObjectModelElement element) { - String tag = element.getTagValue(TopiaTagValues.TAG_PERSISTENCE_TYPE); - if (tag == null) { - tag = PERSISTENCE_TYPE_DEFAULT; - } - return tag; - } - - /** * Renvoie le type de persistence pour le classifier donné. Si aucun n'est * trouvé, le type par défaut est utilisé * @@ -218,20 +201,7 @@ * * @param element l'élément à tester * @return le nom de table - * @deprecated since 2.5, prefer use the method {@link #getDbName(ObjectModelElement)} */ - @Deprecated - public static String getDBName(ObjectModelElement element) { - return getDbName(element); - } - - /** - * Renvoie le nom BD de l'élement passé en paramètre. Elle se base sur le - * tag associé si il existe, sinon sur le nom de l'élément - * - * @param element l'élément à tester - * @return le nom de table - */ public static String getDbName(ObjectModelElement element) { if (element == null) { return null; @@ -244,60 +214,9 @@ } /** - * Cherche et renvoie le schema a utiliser sur cet element, sinon sur le - * model. - * - * @param element l'élément à tester - * @param model le modele utilisé - * @return le nom du schema ou null - * @deprecated since 2.5, prefer use the method {@link #getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel)} or {@link #getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel)} - */ - @Deprecated - public static String getSchemaName(ObjectModelElement element, - ObjectModel model) { - return findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, element, model); - } - - /** - * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur - * le model. - * - * @param element l'élément à tester - * @param model le modele utilisé - * @return le prefix i18n ou <code>null</code> si non spécifié - * @deprecated since 2.5, prefer use the {@link JavaGeneratorUtil#getI18nPrefixTagValue(ObjectModelElement, ObjectModel)} - */ - @Deprecated - public static String getI18nPrefix(ObjectModelElement element, - ObjectModel model) { - return JavaGeneratorUtil.getI18nPrefixTagValue(element, model); - } - - /** * Cherche si le tagvalue {@link TopiaTagValues#TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été * activé dans le model. * - * @param element l'élément à tester - * @param model le modele utilisé - * @return {@code true} si le tag value trouvé dans le modèle, {@code false} - * sinon. - * @deprecated since 2.5, use now the method {@link #shouldGenerateOperatorForDAOHelper(ObjectModel)} - */ - @Deprecated - public static boolean shouldgenerateOperatorForDAOHelper( - ObjectModelElement element, ObjectModel model) { - return shouldGenerateOperatorForDAOHelper(model); -// String tagValue = GeneratorUtil.findTagValue( -// TopiaTagValues.TAG_GENERATE_OPERATOR_FOR_DAO_HELPER, element, model); -// boolean generate = StringUtils.isNotEmpty(tagValue) && -// Boolean.valueOf(tagValue); -// return generate; - } - - /** - * Cherche si le tagvalue {@link TopiaTagValues#TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été - * activé dans le model. - * * @param model le modele utilisé * @return {@code true} si le tag value trouvé dans le modèle, {@code false} * sinon. @@ -1174,19 +1093,6 @@ /** * Check if the given classifier has the - * {@link TopiaStereoTypes#STEREOTYPE_FACADE} stereotype. - * - * @param classifier classifier to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaStereoTypes#STEREOTYPE_FACADE - * @since 2.5 - */ - public static boolean hasFacadeStereotype(ObjectModelClassifier classifier) { - return classifier.hasStereotype(TopiaStereoTypes.STEREOTYPE_FACADE); - } - - /** - * Check if the given classifier has the * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} stereotype. * * @param classifier classifier to test @@ -1326,21 +1232,6 @@ } /** - * Check if the given attribute has the - * {@link TopiaStereoTypes#STEREOTYPE_ARRAY} stereotype. - * - * @param attribute attribute to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaStereoTypes#STEREOTYPE_ARRAY - * @since 2.5 - * @deprecated since 2.5 , only BeanTransformer use it and it is a deprecated transformer, will be remove in version 3.0 - */ - @Deprecated - public static boolean hasArrayStereotype(ObjectModelAttribute attribute) { - return attribute.hasStereotype(TopiaStereoTypes.STEREOTYPE_ARRAY); - } - - /** * Obtain the value of the {@link TopiaTagValues#TAG_PERSISTENCE_TYPE} * tag value on the given classifier. * @@ -1830,24 +1721,6 @@ } /** - * Obtain the value of the {@link TopiaTagValues#TAG_NO_LOG_IN_SERVICE} - * tag value on the given classifier. - * - * - * @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_NO_LOG_IN_SERVICE - * @since 2.5 - * @deprecated since 2.5.4, no more use will be remove soon. - */ - @Deprecated - public static String getNoLogInServiceTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_NO_LOG_IN_SERVICE, classifier, model); - return value; - } - - /** * Obtains the value of the {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} * tag value on the given model. * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -40,25 +40,6 @@ public interface TopiaStereoTypes extends EugeneStereoTypes { /** - * Stéréotype pour les attributs considérés comme des tableaux. - * - * @see TopiaGeneratorUtil#hasArrayStereotype(ObjectModelAttribute) - * @deprecated since 2.5 : only BeanTransformer use it and it is a deprecated transformer, will be remove in version 3.0 - */ - @Deprecated - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "Deprecated! To specify that an attribute is an array") - String STEREOTYPE_ARRAY = "array"; - - /** - * Stéréotype pour les interfaces devant être générées sous forme de facades. - * - * @deprecated since 2.5 : nobydy use it, will be remove in version 3.0 - */ - @Deprecated - String STEREOTYPE_FACADE = "facade"; - - /** * Stéréotype pour les objets devant être générées sous forme d'entités * * @see TopiaGeneratorUtil#isEntity(ObjectModelClassifier) 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 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -435,24 +435,6 @@ String TAG_ERROR_ARGS = "errorArgs"; /** - * Tag to specify if we want to add logs in any method of service - * generated by {@link ServiceTransformer}. - * - * Note: To have no log just use this tag on services or gloabaly - * on model (for all services). - * - * @see ServiceTransformer - * @see TopiaGeneratorUtil#getNoLogInServiceTagValue(ObjectModelClassifier, ObjectModel) - * @since 2.5 - * @deprecated since 2.5.4, will not be replaced (no log are any longer - * generated in {@link ServiceTransformer} - */ - @Deprecated - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "This is deprecated since 2.5.4, no effect : no logs are generated in services.") - String TAG_NO_LOG_IN_SERVICE = "noLogInService"; - - /** * Stéréotype pour les attributs avec multiplicité nécessitant la création d'un index. * * @see TopiaGeneratorUtil#getIndexForeignKeys(ObjectModelAttribute, ObjectModel)

1 0

r2738 - in trunk: src/site/rst topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org 05 Jul '13

05 Jul '13

Author: echatellier Date: 2013-07-05 16:10:57 +0200 (Fri, 05 Jul 2013) New Revision: 2738 Url: http://nuiton.org/projects/topia/repository/revisions/2738 Log: refs #2734 : Restore delete code with deprecation Modified: trunk/src/site/rst/migrate_to_3.0.rst trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2013-07-05 13:52:24 UTC (rev 2737) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-07-05 14:10:57 UTC (rev 2738) @@ -1,9 +1,13 @@ Migrer depuis ToPIA 2.x vers 3.0 ================================ +Renommage de variables +---------------------- + + * Les constantes de TopiaEntity ont été renommé avec le prefix PROPERTY_ + Gestion des exceptions ---------------------- * TopiaRuntimeException est dépréciée. Il faut désormais déclarer TopiaException dans la clause catch ; - * TopiaException devient Runtime. Il n'est plus nécessaire de la gérer. \ No newline at end of file Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 13:52:24 UTC (rev 2737) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 14:10:57 UTC (rev 2738) @@ -69,10 +69,30 @@ String PROPERTY_TOPIA_ID = "topiaId"; + /** @deprecated since 3.0, will be removed in 3.1, use {@link TopiaEntity#PROPERTY_TOPIA_ID} instead */ + @Deprecated + String TOPIA_ID = PROPERTY_TOPIA_ID; + String PROPERTY_TOPIA_CREATE_DATE = "topiaCreateDate"; + /** @deprecated since 3.0, will be removed in 3.1, use {@link TopiaEntity#PROPERTY_TOPIA_CREATE_DATE} instead */ + @Deprecated + String TOPIA_CREATE_DATE = PROPERTY_TOPIA_CREATE_DATE; + String PROPERTY_TOPIA_VERSION = "topiaVersion"; + /** @deprecated since 3.0, will be removed in 3.1, use {@link TopiaEntity#PROPERTY_TOPIA_VERSION} instead */ + @Deprecated + String TOPIA_VERSION = PROPERTY_TOPIA_VERSION; + + /** @deprecated since 3.0, will be removed in 3.1, unused */ + @Deprecated + String COMPOSITE = "composite"; + + /** @deprecated since 3.0, will be removed in 3.1, unused */ + @Deprecated + String AGGREGATE = "aggregate"; + /** * Unique technical Id of the entity. This id contains the full qualified * name of the entity interface. This id has also an index and his used to

1 0

05 Jul '13

Author: echatellier Date: 2013-07-05 15:52:24 +0200 (Fri, 05 Jul 2013) New Revision: 2737 Url: http://nuiton.org/projects/topia/repository/revisions/2737 Log: fixes #2734 : Rename TopiaEntity property constants with PROPERTY_ prefix Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -1490,7 +1490,7 @@ TopiaContext transaction, Class<E> entityClass) throws TopiaException, ClassCastException { return executeToEntityMap(transaction, entityClass, - TopiaEntity.TOPIA_ID, String.class); + TopiaEntity.PROPERTY_TOPIA_ID, String.class); } /** @@ -1764,15 +1764,15 @@ } public String getPropertyId(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_ID); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_ID); } public String getPropertyCreateDate(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_CREATE_DATE); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_CREATE_DATE); } public String getPropertyVersion(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_VERSION); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_VERSION); } @Override Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -180,7 +180,7 @@ setOperationBody(topiaCreateDate, "" /*{ - return $property(TopiaEntity.TOPIA_CREATE_DATE); + return $property(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE); }*/ ); @@ -190,7 +190,7 @@ setOperationBody(topiaId, "" /*{ - return $property(TopiaEntity.TOPIA_ID); + return $property(TopiaEntity.PROPERTY_TOPIA_ID); }*/ ); @@ -200,7 +200,7 @@ setOperationBody(topiaVersion, "" /*{ - return $property(TopiaEntity.TOPIA_VERSION); + return $property(TopiaEntity.PROPERTY_TOPIA_VERSION); }*/ ); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -399,7 +399,7 @@ // Nothing to do if id is null, the result will still be null. E result = null; if (id != null) { - TopiaQuery query = createQuery().addEquals(TopiaEntity.TOPIA_ID, id); + TopiaQuery query = createQuery().addEquals(TopiaEntity.PROPERTY_TOPIA_ID, id); result = findByQuery(query); } return result; @@ -445,7 +445,7 @@ @Override public List<String> findAllIds() throws TopiaException { - TopiaQuery query = createQuery().setSelect(TopiaEntity.TOPIA_ID); + TopiaQuery query = createQuery().setSelect(TopiaEntity.PROPERTY_TOPIA_ID); List<String> results = getContext().findByQuery(query); return results; } @@ -528,7 +528,7 @@ @Override public boolean existByTopiaId(String id) throws TopiaException { - boolean result = existByProperties(TopiaEntity.TOPIA_ID, id); + boolean result = existByProperties(TopiaEntity.PROPERTY_TOPIA_ID, id); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -67,16 +67,12 @@ @SearchFields public interface TopiaEntity extends Serializable { - String TOPIA_ID = "topiaId"; + String PROPERTY_TOPIA_ID = "topiaId"; - String TOPIA_CREATE_DATE = "topiaCreateDate"; + String PROPERTY_TOPIA_CREATE_DATE = "topiaCreateDate"; - String TOPIA_VERSION = "topiaVersion"; + String PROPERTY_TOPIA_VERSION = "topiaVersion"; - String COMPOSITE = "composite"; - - String AGGREGATE = "aggregate"; - /** * Unique technical Id of the entity. This id contains the full qualified * name of the entity interface. This id has also an index and his used to Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -249,6 +249,6 @@ protected EntityCsvModel(char separator, TableMeta<T> tableMeta, String idHeader) { this(separator, tableMeta); - newColumnForImportExport(idHeader, TopiaEntity.TOPIA_ID); + newColumnForImportExport(idHeader, TopiaEntity.PROPERTY_TOPIA_ID); } } \ No newline at end of file Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -48,8 +48,8 @@ // topiaId <-> topiaId model.newMandatoryColumn( - TopiaEntity.TOPIA_ID, - TopiaCsvCommons.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaCsvCommons.<Map<String, Object>, String>newMapProperty(TopiaEntity.PROPERTY_TOPIA_ID) ); // add association -> target Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -400,7 +400,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -453,7 +453,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -507,7 +507,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -560,7 +560,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -48,7 +48,7 @@ meta); // topiaId <-> topiaId - model.newColumnForExport(TopiaEntity.TOPIA_ID); + model.newColumnForExport(TopiaEntity.PROPERTY_TOPIA_ID); model.newColumnForExport( meta.getName(), Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -179,7 +179,7 @@ String topiaId) { Map<String, Object> result = getOperator().getNaturalIsdAndNotNulls(bean); if (topiaId != null) { - result.put(TopiaEntity.TOPIA_ID, topiaId); + result.put(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -71,7 +71,7 @@ /** Le pattern d'une reference sur une association */ public static final String ASSOCIATION_PATTERN = - "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; + "%1$s[@" + TopiaEntity.PROPERTY_TOPIA_ID + "=\"%2$s\"]"; /** * Bind les valeurs techniques depuis une entitée vers une autre. 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 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -131,7 +131,7 @@ // Test 4 : add a subquery with its own parameters query = new TopiaQuery(QueriedEntity.class, "Q1"). - addEquals(QueriedEntity.TOPIA_ID, "ID1"); + addEquals(QueriedEntity.PROPERTY_TOPIA_ID, "ID1"); subquery = new TopiaQuery(QueriedEntity.class, "Q2"). addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value"); @@ -167,7 +167,7 @@ log.debug("Query : " + query); Assert.assertEquals("FROM " + QueriedEntity.class.getName() + - " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC", + " ORDER BY " + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE + " DESC", query.fullQuery()); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -95,7 +95,7 @@ BinderModelBuilder<Company, CompanyDTO> builder = BinderModelBuilder.newEmptyBuilder(Company.class, CompanyDTO.class); builder.addSimpleProperties(Company.PROPERTY_NAME, Company.PROPERTY_SIRET); - builder.addProperties(TopiaEntity.TOPIA_ID, "id"); + builder.addProperties(TopiaEntity.PROPERTY_TOPIA_ID, "id"); BinderFactory.registerBinderModel(builder); Binder<Company, CompanyDTO> binder =

1 0

r2736 - branches/topia-jpa/topia-persistence-hibernate/src/test/java/org/nuiton/topia
by athimel＠users.nuiton.org 05 Jul '13

05 Jul '13

Author: athimel Date: 2013-07-05 15:11:43 +0200 (Fri, 05 Jul 2013) New Revision: 2736 Url: http://nuiton.org/projects/topia/repository/revisions/2736 Log: Fix svn:externals URL Modified: branches/topia-jpa/topia-persistence-hibernate/src/test/java/org/nuiton/topia/ Property changes on: branches/topia-jpa/topia-persistence-hibernate/src/test/java/org/nuiton/topia ___________________________________________________________________ Modified: svn:externals - tck http://svn.nuiton.org/svn/topia/trunk/topia-persistence-tck/src/test/java/o… + tck http://svn.nuiton.org/svn/topia/branches/topia-jpa/topia-persistence-tck/sr…

1 0

r2735 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 04 Jul '13

04 Jul '13

Author: echatellier Date: 2013-07-04 11:38:55 +0200 (Thu, 04 Jul 2013) New Revision: 2735 Url: http://nuiton.org/projects/topia/repository/revisions/2735 Log: fixes #2729: Choose hibernate inheritance strategy fixes #2733: Use hibernate-mapping-4.0.xsd to validate hibernate mappings Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.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 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-03 10:04:24 UTC (rev 2734) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-04 09:38:55 UTC (rev 2735) @@ -114,8 +114,10 @@ return; } /*{<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "classpath://org/hibernate/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="<%=input.getPackageName()%>"> +<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping" + xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping classpath://org/hibernate/hibernate-mapping-4.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + default-access="field" auto-import="true" package="<%=input.getPackageName()%>"> }*/ boolean haveSuper = input.getSuperclasses().size() > 0; // la liste des attributs faisant parti de la clef metier @@ -140,6 +142,7 @@ optionalAttributes += "proxy=\"" + clazzFQN + "\" "; } + String inheritanceStrategy = null; if (haveSuper) { ObjectModelClass superClass = input.getSuperclasses().iterator().next(); String superClassname = superClass.getQualifiedName(); @@ -147,16 +150,33 @@ log.debug("superClass for " + input.getQualifiedName() + " is " + superClassname); } String superClassDOType = TopiaGeneratorUtil.getDOType(superClassname, model); - -/*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>> -  + inheritanceStrategy = TopiaGeneratorUtil.getInheritanceStrategyTagValue(superClass); + if ("joined-subclass".equals(inheritanceStrategy) || "union-subclass".equals(inheritanceStrategy)) { + optionalAttributes += "table=\"" + tableName + "\""; + } + if ("subclass".equals(inheritanceStrategy)) { + optionalAttributes += "discriminator-value=\"" + superClassDOType + "\""; + } +/*{ <<%=inheritanceStrategy%> name="<%=clazzDOType%>" extends="<%=superClassDOType%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>> }*/ + if ("joined-subclass".equals(inheritanceStrategy)) { +/*{ <key column="topiaId" /> +}*/ + } // FIXME mieux gerer le cas haveSuper noneNaturalAttributes.addAll(input.getAttributes()); } else { /*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>> <id name="topiaId" type="string" length="255" node="@topiaId"/> }*/ + // cas où on defini la super class, il faut un discriminator seulement dans le cas de + // la strategy subclass + String currentInheritanceStrategy = TopiaGeneratorUtil.getInheritanceStrategyTagValue(input); + if ("subclass".equals(currentInheritanceStrategy)) { +/*{ <discriminator column="topiaDiscriminator" type="string" /> +}*/ + } + // on detecte les attributs des clef metiers for (ObjectModelAttribute attr : input.getAttributes()) { if (TopiaGeneratorUtil.isNaturalId(attr)) { @@ -188,7 +208,7 @@ generateAttributes(output, input, noneNaturalAttributes, ""); if (haveSuper) { -/*{ </union-subclass> +/*{ </<%=inheritanceStrategy%>> }*/ } else { /*{ </class> 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 2013-07-03 10:04:24 UTC (rev 2734) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-07-04 09:38:55 UTC (rev 2735) @@ -98,6 +98,9 @@ /** Le package par défaut si aucun n'est spécifié */ public static final String DEFAULT_PACKAGE = "org.codelutin.malo"; + /** Stratégie d'heritage par defaut. */ + public static final String DEFAULT_INHERITANCE_STRATEGY = "union-subclass"; + /** * The Eugene provider of tag values and stereotypes. * @@ -1353,6 +1356,24 @@ } /** + * Obtain the value of the {@link TopiaTagValues#TAG_INHERITANCE_STRATEGY} + * tag value on the given classifier. + * + * + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see TopiaTagValues#TAG_INHERITANCE_STRATEGY + * @since 3.0 + */ + public static String getInheritanceStrategyTagValue(ObjectModelClassifier classifier) { + String value = findTagValue(TopiaTagValues.TAG_INHERITANCE_STRATEGY, classifier, null); + if (value == null) { + value = DEFAULT_INHERITANCE_STRATEGY; + } + return value; + } + + /** * Obtain the value of the {@link TopiaTagValues#TAG_DB_NAME} * tag value on the given classifier. * 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 2013-07-03 10:04:24 UTC (rev 2734) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2013-07-04 09:38:55 UTC (rev 2735) @@ -99,15 +99,6 @@ String TAG_SCHEMA_NAME = "dbSchema"; /** - * Tag pour spécifier la caractère embed-xml d'une association. - * - * @see TopiaGeneratorUtil#getPersistenceTypeTagValue(ObjectModelClassifier) - * @deprecated @since 2.5, use nowhere, will be remove soon - */ - @Deprecated - String TAG_EMBED_XML = "embedXml"; - - /** * Tag pour la taille du champ en BD. * * @see TopiaGeneratorUtil#getLengthTagValue(ObjectModelAttribute) @@ -237,6 +228,21 @@ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") String TAG_PROXY_INTERFACE = "hibernateProxyInterface"; + + /** + * Tag pour configurer la stategie d'heritage choisie. + * + * Par defaut : union-subclass : Table per class strategy + * Autre valeur : + * "subclass" > Single table per class hierarchy strategy + * "joined-subclass" > Joined subclass strategy + * + * @see TopiaGeneratorUtil#getPersistenceTypeTagValue(ObjectModelClassifier) + * @since 3.0 + */ + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") + String TAG_INHERITANCE_STRATEGY = "inheritanceStrategy"; /** * Tag pour spécifier le permissions à la création.

1 0

r2734 - in trunk: src/site/rst topia-persistence/src/main/java/org/nuiton/topia
by bleny＠users.nuiton.org 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 12:04:24 +0200 (Wed, 03 Jul 2013) New Revision: 2734 Url: http://nuiton.org/projects/topia/repository/revisions/2734 Log: refs #1945 introduce migration guide, TopiaException extends TopiaRuntimeException Added: trunk/src/site/rst/migrate_to_3.0.rst Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java Added: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst (rev 0) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-07-03 10:04:24 UTC (rev 2734) @@ -0,0 +1,9 @@ +Migrer depuis ToPIA 2.x vers 3.0 +================================ + +Gestion des exceptions +---------------------- + + * TopiaRuntimeException est dépréciée. Il faut désormais déclarer TopiaException dans la clause catch ; + + * TopiaException devient Runtime. Il n'est plus nécessaire de la gérer. \ No newline at end of file Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2013-07-03 08:16:14 UTC (rev 2733) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2013-07-03 10:04:24 UTC (rev 2734) @@ -33,7 +33,7 @@ * @author poussin <poussin(a)codelutin.com> * @version $Id$ */ -public class TopiaException extends RuntimeException { +public class TopiaException extends TopiaRuntimeException { /** Version UID */ private static final long serialVersionUID = -1251439453383121393L; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2013-07-03 08:16:14 UTC (rev 2733) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2013-07-03 10:04:24 UTC (rev 2734) @@ -30,7 +30,7 @@ * * @author chatellier <chatellier(a)codelutin.com> * @version $Id$ - * @deprecated to be replaced by TopiaException + * @deprecated since 3.0, to be replaced by TopiaException */ public class TopiaRuntimeException extends RuntimeException {

1 0

r2733 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by bleny＠users.nuiton.org 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 10:16:14 +0200 (Wed, 03 Jul 2013) New Revision: 2733 Url: http://nuiton.org/projects/topia/repository/revisions/2733 Log: refs #1945 now TopiaException is runtime Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2013-07-03 08:10:12 UTC (rev 2732) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2013-07-03 08:16:14 UTC (rev 2733) @@ -33,7 +33,7 @@ * @author poussin <poussin(a)codelutin.com> * @version $Id$ */ -public class TopiaException extends Exception { +public class TopiaException extends RuntimeException { /** Version UID */ private static final long serialVersionUID = -1251439453383121393L; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2013-07-03 08:10:12 UTC (rev 2732) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2013-07-03 08:16:14 UTC (rev 2733) @@ -26,10 +26,11 @@ package org.nuiton.topia; /** - * TODO-FD20100507 : Need javadoc. + * TODO bleny 03072013 remove this class and use TopiaException everywhere * * @author chatellier <chatellier(a)codelutin.com> * @version $Id$ + * @deprecated to be replaced by TopiaException */ public class TopiaRuntimeException extends RuntimeException {

1 0

r2732 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by bleny＠users.nuiton.org 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 10:10:12 +0200 (Wed, 03 Jul 2013) New Revision: 2732 Url: http://nuiton.org/projects/topia/repository/revisions/2732 Log: set pom version to 3.0-SNAPSHOT, according to roadmpa 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 2013-07-02 14:16:32 UTC (rev 2731) +++ trunk/pom.xml 2013-07-03 08:10:12 UTC (rev 2732) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) +++ trunk/topia-persistence/pom.xml 2013-07-03 08:10:12 UTC (rev 2732) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) +++ trunk/topia-service-migration/pom.xml 2013-07-03 08:10:12 UTC (rev 2732) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) +++ trunk/topia-service-replication/pom.xml 2013-07-03 08:10:12 UTC (rev 2732) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) +++ trunk/topia-service-security/pom.xml 2013-07-03 08:10:12 UTC (rev 2732) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2731 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 02 Jul '13

02 Jul '13

Author: maven-release Date: 2013-07-02 16:16:32 +0200 (Tue, 02 Jul 2013) New Revision: 2731 Url: http://nuiton.org/projects/topia/repository/revisions/2731 Log: [maven-release-plugin] prepare for next development iteration 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 2013-07-02 14:16:29 UTC (rev 2730) +++ trunk/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -79,9 +79,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.8.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.8.1</developerConnection> - <url>http://nuiton.org/projects/topia/repository/show/branches/tags/topia-2.8.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://nuiton.org/projects/topia/repository/show/branches/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-07-02 14:16:29 UTC (rev 2730) +++ trunk/topia-persistence/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-07-02 14:16:29 UTC (rev 2730) +++ trunk/topia-service-migration/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-07-02 14:16:29 UTC (rev 2730) +++ trunk/topia-service-replication/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-07-02 14:16:29 UTC (rev 2730) +++ trunk/topia-service-security/pom.xml 2013-07-02 14:16:32 UTC (rev 2731) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0