branch feature/7464 updated (5cb71fc -> faf26bd)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git from 5cb71fc Dependance vers topia 3.0 new d8a88aa Modification de la configuration du plugin eugene new faf26bd Suppression TopiaException The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit faf26bd7150fc2f7407b3f00e77883f59149a8f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:08:41 2015 +0200 Suppression TopiaException commit d8a88aadc65bb4d9be75b328d58abb7252dd39c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:06:54 2015 +0200 Modification de la configuration du plugin eugene Summary of changes: .../src/main/java/fr/ird/observe/DataService.java | 6 +- .../main/java/fr/ird/observe/db/DataSource.java | 2 +- .../java/fr/ird/observe/db/ReplicationService.java | 8 +-- .../fr/ird/observe/db/impl/AbstractDataSource.java | 8 +-- .../java/fr/ird/observe/db/impl/H2DataSource.java | 4 +- .../java/fr/ird/observe/db/impl/PGDataSource.java | 4 +- .../java/fr/ird/observe/db/util/TopiaExecutor.java | 2 +- .../fr/ird/observe/db/util/TopiaExecutor2.java | 2 +- .../fr/ird/observe/report/model/ReportExecute.java | 2 +- .../ird/observe/report/model/ReportOperation.java | 4 +- .../fr/ird/observe/report/model/ReportRequest.java | 6 +- .../report/model/operations/ExecuteRequests.java | 4 +- .../report/model/operations/GroupByLength.java | 4 +- .../observe/report/model/operations/SumColumn.java | 4 +- .../report/model/operations/SumIntColumn.java | 4 +- .../observe/report/model/operations/SumIntRow.java | 4 +- .../observe/report/model/operations/SumRow.java | 4 +- .../validation/ValidationMessageDetector.java | 2 +- .../ird/observe/validation/ValidationService.java | 2 +- .../test/java/fr/ird/observe/db/DBTestHelper.java | 4 +- .../fr/ird/observe/db/ReplicationServiceTest.java | 2 +- .../its/replication/AbstractReplicateDataTest.java | 6 +- .../AbstractReplicateReferentielTest.java | 6 +- .../its/replication/H2ReplicateDataTest.java | 8 +-- .../its/replication/ReplicationDataModel.java | 8 +-- observe-entities/pom.xml | 6 +- .../fr/ird/observe/entities/OpenableEntities.java | 6 +- .../entities/longline/ActivityLonglineDAOImpl.java | 10 ++-- .../entities/longline/TripLonglineDAOImpl.java | 20 +++---- .../AbstractObserveMigrationCallBack.java | 4 +- .../entities/migration/H2DataSourceMigration.java | 22 ++++---- .../entities/migration/PGDataSourceMigration.java | 22 ++++---- .../DataSourceMigrationForVersion_3_1.java | 6 +- .../DataSourceMigrationForVersion_3_10.java | 4 +- .../DataSourceMigrationForVersion_3_11.java | 4 +- .../DataSourceMigrationForVersion_3_12.java | 4 +- .../DataSourceMigrationForVersion_3_14.java | 4 +- .../DataSourceMigrationForVersion_3_15.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 8 +-- .../DataSourceMigrationForVersion_3_5.java | 14 ++--- .../DataSourceMigrationForVersion_3_7.java | 4 +- .../DataSourceMigrationForVersion_3_8.java | 4 +- .../DataSourceMigrationForVersion_3_9.java | 4 +- .../DataSourceMigrationForVersion_4_0.java | 4 +- .../DataSourceMigrationForVersion_4_0_1.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 8 +-- .../DataSourceMigrationForVersion_4_0_RC4.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 4 +- .../referentiel/LengthWeightParemeterHelper.java | 4 +- .../entities/referentiel/ProgramDAOImpl.java | 10 ++-- .../entities/seine/ActivitySeineDAOImpl.java | 10 ++-- .../entities/seine/FloatingObjectDAOImpl.java | 10 ++-- .../ird/observe/entities/seine/RouteDAOImpl.java | 14 ++--- .../observe/entities/seine/TripSeineDAOImpl.java | 20 +++---- .../main/java/fr/ird/observe/util/DBHelper.java | 2 +- .../operation/ObsoleteReferenceToReplace.java | 2 +- .../observe/services/AbstractObserveService.java | 4 +- .../observe/services/ReplicationServiceImpl.java | 8 +-- .../LonglineDetailCompositionServiceImpl.java | 8 +-- .../data/seine/NonTargetCatchServiceImpl.java | 4 +- .../data/seine/TargetCatchServiceImpl.java | 4 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/ObserveServiceContextTopia.java | 29 ++++++---- .../services/ObserveServiceFactoryTopia.java | 65 +++++++++++----------- .../ird/observe/services/ObserveServiceTopia.java | 10 ++-- .../services/ObserveServiceFactoryTopiaTaiste.java | 2 +- pom.xml | 10 ++-- 69 files changed, 259 insertions(+), 253 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git commit d8a88aadc65bb4d9be75b328d58abb7252dd39c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:06:54 2015 +0200 Modification de la configuration du plugin eugene --- observe-entities/pom.xml | 6 +++--- pom.xml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 819541d..1695e9d 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -163,8 +163,8 @@ </inputs> <!--org.nuiton.eugene.java.JavaInterfaceTransformer,--> <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.BinderHelperTransformer + org.nuiton.topia.templates.TopiaMetaTransformer, + org.nuiton.topia.templates.BinderHelperTransformer </templates> <!-- Using some unsafe tag values --> @@ -178,7 +178,7 @@ <dependencies> <dependency> <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <artifactId>topia-templates</artifactId> <version>${topiaVersion}</version> <scope>compile</scope> </dependency> diff --git a/pom.xml b/pom.xml index f56a336..13180f4 100644 --- a/pom.xml +++ b/pom.xml @@ -88,11 +88,11 @@ <module>observe-validation</module> <module>observe-services-configuration-topia</module> <module>observe-services-topia</module> - <module>observe-services-configuration-rest</module> - <module>observe-services-rest</module> - <module>observe-services-runner</module> - <module>observe-application-web</module> - <module>observe-application-swing</module> + <!--<module>observe-services-configuration-rest</module>--> + <!--<module>observe-services-rest</module>--> + <!--<module>observe-services-runner</module>--> + <!--<module>observe-application-web</module>--> + <!--<module>observe-application-swing</module>--> </modules> <!--scm> <url>https://svn.mpl.ird.fr/osiris/observe/trunk</url> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git commit faf26bd7150fc2f7407b3f00e77883f59149a8f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 11:08:41 2015 +0200 Suppression TopiaException --- .../src/main/java/fr/ird/observe/DataService.java | 6 +- .../main/java/fr/ird/observe/db/DataSource.java | 2 +- .../java/fr/ird/observe/db/ReplicationService.java | 8 +-- .../fr/ird/observe/db/impl/AbstractDataSource.java | 8 +-- .../java/fr/ird/observe/db/impl/H2DataSource.java | 4 +- .../java/fr/ird/observe/db/impl/PGDataSource.java | 4 +- .../java/fr/ird/observe/db/util/TopiaExecutor.java | 2 +- .../fr/ird/observe/db/util/TopiaExecutor2.java | 2 +- .../fr/ird/observe/report/model/ReportExecute.java | 2 +- .../ird/observe/report/model/ReportOperation.java | 4 +- .../fr/ird/observe/report/model/ReportRequest.java | 6 +- .../report/model/operations/ExecuteRequests.java | 4 +- .../report/model/operations/GroupByLength.java | 4 +- .../observe/report/model/operations/SumColumn.java | 4 +- .../report/model/operations/SumIntColumn.java | 4 +- .../observe/report/model/operations/SumIntRow.java | 4 +- .../observe/report/model/operations/SumRow.java | 4 +- .../validation/ValidationMessageDetector.java | 2 +- .../ird/observe/validation/ValidationService.java | 2 +- .../test/java/fr/ird/observe/db/DBTestHelper.java | 4 +- .../fr/ird/observe/db/ReplicationServiceTest.java | 2 +- .../its/replication/AbstractReplicateDataTest.java | 6 +- .../AbstractReplicateReferentielTest.java | 6 +- .../its/replication/H2ReplicateDataTest.java | 8 +-- .../its/replication/ReplicationDataModel.java | 8 +-- .../fr/ird/observe/entities/OpenableEntities.java | 6 +- .../entities/longline/ActivityLonglineDAOImpl.java | 10 ++-- .../entities/longline/TripLonglineDAOImpl.java | 20 +++---- .../AbstractObserveMigrationCallBack.java | 4 +- .../entities/migration/H2DataSourceMigration.java | 22 ++++---- .../entities/migration/PGDataSourceMigration.java | 22 ++++---- .../DataSourceMigrationForVersion_3_1.java | 6 +- .../DataSourceMigrationForVersion_3_10.java | 4 +- .../DataSourceMigrationForVersion_3_11.java | 4 +- .../DataSourceMigrationForVersion_3_12.java | 4 +- .../DataSourceMigrationForVersion_3_14.java | 4 +- .../DataSourceMigrationForVersion_3_15.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 8 +-- .../DataSourceMigrationForVersion_3_5.java | 14 ++--- .../DataSourceMigrationForVersion_3_7.java | 4 +- .../DataSourceMigrationForVersion_3_8.java | 4 +- .../DataSourceMigrationForVersion_3_9.java | 4 +- .../DataSourceMigrationForVersion_4_0.java | 4 +- .../DataSourceMigrationForVersion_4_0_1.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 8 +-- .../DataSourceMigrationForVersion_4_0_RC4.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 4 +- .../referentiel/LengthWeightParemeterHelper.java | 4 +- .../entities/referentiel/ProgramDAOImpl.java | 10 ++-- .../entities/seine/ActivitySeineDAOImpl.java | 10 ++-- .../entities/seine/FloatingObjectDAOImpl.java | 10 ++-- .../ird/observe/entities/seine/RouteDAOImpl.java | 14 ++--- .../observe/entities/seine/TripSeineDAOImpl.java | 20 +++---- .../main/java/fr/ird/observe/util/DBHelper.java | 2 +- .../operation/ObsoleteReferenceToReplace.java | 2 +- .../observe/services/AbstractObserveService.java | 4 +- .../observe/services/ReplicationServiceImpl.java | 8 +-- .../LonglineDetailCompositionServiceImpl.java | 8 +-- .../data/seine/NonTargetCatchServiceImpl.java | 4 +- .../data/seine/TargetCatchServiceImpl.java | 4 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/ObserveServiceContextTopia.java | 29 ++++++---- .../services/ObserveServiceFactoryTopia.java | 65 +++++++++++----------- .../ird/observe/services/ObserveServiceTopia.java | 10 ++-- .../services/ObserveServiceFactoryTopiaTaiste.java | 2 +- 67 files changed, 251 insertions(+), 245 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index 1588771..98a5512 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -95,7 +95,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -999,7 +999,7 @@ public class DataService { } } - protected Sex getUnknownSex(TopiaContext tx) throws TopiaException { + protected Sex getUnknownSex(TopiaContext tx) { return ObserveDAOHelper.getSexDAO(tx).findByCode("0"); } @@ -1856,7 +1856,7 @@ public class DataService { String propertyName, E source, E target, - TopiaContext targetTx) throws TopiaException { + TopiaContext targetTx) { EntityOperator<E> operator = ObserveDAOHelper.getOperator(entityType); diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataSource.java b/observe-business/src/main/java/fr/ird/observe/db/DataSource.java index a99ea23..b82ba72 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataSource.java @@ -27,7 +27,7 @@ import fr.ird.observe.db.event.DataSourceListener; import fr.ird.observe.entities.OpenableEntity; import org.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; diff --git a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java index c531527..a0ad902 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java +++ b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java @@ -35,7 +35,7 @@ import org.apache.commons.lang3.tuple.Pair; 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.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.persistence.TopiaEntity; @@ -297,7 +297,7 @@ public class ReplicationService { } - private void applyTdrAssociationFix(TopiaContext dstCtxt, List<Pair<String, String>> tdrAssociation) throws TopiaException { + private void applyTdrAssociationFix(TopiaContext dstCtxt, List<Pair<String, String>> tdrAssociation) { String request = "\nUPDATE OBSERVE_LONGLINE.TDR SET SET = '%s' WHERE topiaid = '%s';"; @@ -313,7 +313,7 @@ public class ReplicationService { } - private List<Pair<String, String>> getTdrAssociationIds(TopiaContext srcCtxt, TripLongline e) throws TopiaException { + private List<Pair<String, String>> getTdrAssociationIds(TopiaContext srcCtxt, TripLongline e) { List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); @@ -340,7 +340,7 @@ public class ReplicationService { private String setId; - public List<Pair<String, String>> execute(TopiaContextImplementor tx, String setId) throws TopiaException { + public List<Pair<String, String>> execute(TopiaContextImplementor tx, String setId) { try { this.setId = setId; diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java index 0ee2567..c729bb3 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java @@ -53,7 +53,7 @@ import org.nuiton.config.ApplicationConfig; import org.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaService; @@ -247,7 +247,7 @@ public abstract class AbstractDataSource implements DataSource { } @Override - public <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext tx, Class<P> entityType) throws TopiaException { + public <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext tx, Class<P> entityType) { TopiaContextImplementor ci = (TopiaContextImplementor) tx; TopiaDAO<P> dao = ci.getDAO(entityType); @@ -256,7 +256,7 @@ public abstract class AbstractDataSource implements DataSource { @SuppressWarnings({"unchecked"}) @Override - public <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext tx, P entity) throws TopiaException { + public <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext tx, P entity) { ObserveEntityEnum constant = ObserveEntityEnum.valueOf(entity); return getDAO(tx, (Class<P>) constant.getContract()); @@ -571,7 +571,7 @@ public abstract class AbstractDataSource implements DataSource { } @Override - public <E> E findByTopiaId(TopiaContext tx, String entityId) throws TopiaException { + public <E> E findByTopiaId(TopiaContext tx, String entityId) { return (E) tx.findByTopiaId(entityId); } diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/H2DataSource.java b/observe-business/src/main/java/fr/ird/observe/db/impl/H2DataSource.java index bba2e4d..806fde4 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/H2DataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/H2DataSource.java @@ -28,7 +28,7 @@ import fr.ird.observe.db.constants.DataSourceState; 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.util.TopiaEntityHelper; import java.io.File; @@ -124,7 +124,7 @@ public class H2DataSource extends AbstractDataSource { } @Override - protected void createSchema(String schemaName) throws TopiaException { + protected void createSchema(String schemaName) { TopiaContext tx = rootCtxt.beginTransaction(); try { tx.executeSQL("CREATE SCHEMA IF NOT EXISTS " + schemaName + ";"); diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSource.java b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSource.java index abf0d77..d282922 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSource.java @@ -28,7 +28,7 @@ import fr.ird.observe.db.constants.DataSourceState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.io.File; import java.util.Properties; @@ -158,7 +158,7 @@ public class PGDataSource extends AbstractDataSource { } @Override - protected void createSchema(String schemaName) throws TopiaException { + protected void createSchema(String schemaName) { TopiaContext tx = rootCtxt.beginTransaction(); try { tx.executeSQL("CREATE SCHEMA " + schemaName + ";"); diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java b/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java index b7be0bf..a318a38 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java @@ -22,7 +22,7 @@ package fr.ird.observe.db.util; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaEntity; /** diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor2.java b/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor2.java index 6836e57..4f34477 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor2.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor2.java @@ -22,7 +22,7 @@ package fr.ird.observe.db.util; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaEntity; /** diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java index 94500ef..8d15eec 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java @@ -31,7 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.util.List; import java.util.Map; diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/ReportOperation.java b/observe-business/src/main/java/fr/ird/observe/report/model/ReportOperation.java index 24041f3..284e01b 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/ReportOperation.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/ReportOperation.java @@ -24,7 +24,7 @@ package fr.ird.observe.report.model; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -76,7 +76,7 @@ public abstract class ReportOperation implements Serializable { * @param variables le dictionnaire de variables utilisées dans le report * @param repeatVariablesUniverse le dictionnaire des variables de répétition * @return la matrice sortante - * @throws TopiaException pour toute erreur de manipulation de base + * @pour toute erreur de manipulation de base */ public abstract DataMatrix execute(TopiaContext tx, Report model, diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/ReportRequest.java b/observe-business/src/main/java/fr/ird/observe/report/model/ReportRequest.java index 705daa6..056a424 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/ReportRequest.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/ReportRequest.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -136,7 +136,7 @@ public class ReportRequest implements Serializable { public DataMatrix execute(TopiaContext tx, Map<String, Object> params, - List<?> repeatValues) throws TopiaException { + List<?> repeatValues) { DataMatrix result = new DataMatrix(); for (Object repeatValue : repeatValues) { @@ -178,7 +178,7 @@ public class ReportRequest implements Serializable { } public DataMatrix execute(TopiaContext tx, - Map<String, Object> params) throws TopiaException { + Map<String, Object> params) { // création des paramètres : couples (key, value) Object[] datas = getParams(request, params); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/ExecuteRequests.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/ExecuteRequests.java index 07bb21d..4f59a6e 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/ExecuteRequests.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/ExecuteRequests.java @@ -28,7 +28,7 @@ import fr.ird.observe.report.model.ReportRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -65,7 +65,7 @@ public class ExecuteRequests extends ReportOperation { Report report, DataMatrix incoming, Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + Map<String, List<?>> repeatVariablesUniverse) { if (log.isDebugEnabled()) { log.debug("Launch " + this); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java index cb7c7de..bf27e69 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java @@ -27,7 +27,7 @@ import fr.ird.observe.report.model.Report; import fr.ird.observe.report.model.ReportOperation; import org.apache.commons.lang3.mutable.MutableInt; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -75,7 +75,7 @@ public class GroupByLength extends ReportOperation { } @Override - public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + public DataMatrix execute(TopiaContext tx, Report model, DataMatrix incoming, Map<String, Object> variables, Map<String, List<?>> repeatVariablesUniverse) { // Première passe pour grouper par classe de taille Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java index 1995f67..eeea099 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumColumn.java @@ -27,7 +27,7 @@ import fr.ird.observe.report.model.ReportOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -67,7 +67,7 @@ public class SumColumn extends ReportOperation { Report model, DataMatrix incoming, Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + Map<String, List<?>> repeatVariablesUniverse) { if (log.isDebugEnabled()) { log.debug("Launch " + this); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java index 0cc7514..a0e79ec 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntColumn.java @@ -27,7 +27,7 @@ import fr.ird.observe.report.model.ReportOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -67,7 +67,7 @@ public class SumIntColumn extends ReportOperation { Report model, DataMatrix incoming, Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + Map<String, List<?>> repeatVariablesUniverse) { if (log.isDebugEnabled()) { log.debug("Launch " + this); diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java index d9e274e..243aec2 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumIntRow.java @@ -27,7 +27,7 @@ import fr.ird.observe.report.model.ReportOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -65,7 +65,7 @@ public class SumIntRow extends ReportOperation { Report model, DataMatrix incoming, Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + Map<String, List<?>> repeatVariablesUniverse) { if (log.isDebugEnabled()) { log.debug("Launch " + this); } diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java index ecc3cb1..6480afc 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/operations/SumRow.java @@ -27,7 +27,7 @@ import fr.ird.observe.report.model.ReportOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import java.awt.Dimension; import java.awt.Point; @@ -65,7 +65,7 @@ public class SumRow extends ReportOperation { Report model, DataMatrix incoming, Map<String, Object> variables, - Map<String, List<?>> repeatVariablesUniverse) throws TopiaException { + Map<String, List<?>> repeatVariablesUniverse) { if (log.isDebugEnabled()) { log.debug("Launch " + this); } diff --git a/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java b/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java index 9cdbe6c..ad0974b 100644 --- a/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java +++ b/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java @@ -30,7 +30,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityRef; diff --git a/observe-business/src/main/java/fr/ird/observe/validation/ValidationService.java b/observe-business/src/main/java/fr/ird/observe/validation/ValidationService.java index 768e47d..84a71e8 100644 --- a/observe-business/src/main/java/fr/ird/observe/validation/ValidationService.java +++ b/observe-business/src/main/java/fr/ird/observe/validation/ValidationService.java @@ -24,7 +24,7 @@ package fr.ird.observe.validation; import fr.ird.observe.ObserveEntityEnum; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityHelper; import org.nuiton.validator.NuitonValidatorScope; diff --git a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java index 983b894..6c03398 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java +++ b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java @@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; import org.junit.Assert; import org.junit.Assume; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.version.Version; @@ -230,7 +230,7 @@ public class DBTestHelper { } public static void loadScript(DataSource service, - final String script) throws TopiaException { + final String script) { TopiaContextImplementor tx = null; diff --git a/observe-business/src/test/java/fr/ird/observe/db/ReplicationServiceTest.java b/observe-business/src/test/java/fr/ird/observe/db/ReplicationServiceTest.java index f5b8341..013a560 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/ReplicationServiceTest.java +++ b/observe-business/src/test/java/fr/ird/observe/db/ReplicationServiceTest.java @@ -48,7 +48,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaEntity; import java.io.File; diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java index 4e8eabc..2ad5fe7 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java @@ -40,7 +40,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -106,7 +106,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { } @Override - protected final void createModel(TopiaEntity entity) throws TopiaException { + protected final void createModel(TopiaEntity entity) { model = getModelBuilder().createModel( context, getContracts(), @@ -116,7 +116,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { } @Override - protected final void prepareModel(String... ids) throws TopiaException { + protected final void prepareModel(String... ids) { prepareModelWithComputedOrder(ids); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateReferentielTest.java b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateReferentielTest.java index f6ddda5..bf82b89 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateReferentielTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateReferentielTest.java @@ -35,7 +35,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -72,12 +72,12 @@ public abstract class AbstractReplicateReferentielTest extends AbstractReplicate } @Override - protected final void createModel(TopiaEntity entity) throws TopiaException { + protected final void createModel(TopiaEntity entity) { model = service.getModelBuilder().createModelForAll(getContracts()); } @Override - protected final void prepareModel(String... ids) throws TopiaException { + protected final void prepareModel(String... ids) { model = service.prepareForAll(getContracts()); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/H2ReplicateDataTest.java b/observe-business/src/test/java/fr/ird/observe/its/replication/H2ReplicateDataTest.java index 9e1dbbc..96bdcfb 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/H2ReplicateDataTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/H2ReplicateDataTest.java @@ -46,7 +46,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; @@ -207,7 +207,7 @@ public class H2ReplicateDataTest { } - protected static void assertNbEntitiesForSeine(TopiaContext rootTx, EnumMap<ObserveEntityEnum, Long> counts, String tripId) throws TopiaException { + protected static void assertNbEntitiesForSeine(TopiaContext rootTx, EnumMap<ObserveEntityEnum, Long> counts, String tripId) { TopiaContext tx = rootTx.beginTransaction(); @@ -310,7 +310,7 @@ public class H2ReplicateDataTest { } - protected static void assertNbEntitiesForLongline(TopiaContext rootTx, EnumMap<ObserveEntityEnum, Long> counts, String tripId) throws TopiaException { + protected static void assertNbEntitiesForLongline(TopiaContext rootTx, EnumMap<ObserveEntityEnum, Long> counts, String tripId) { TopiaContext tx = rootTx.beginTransaction(); @@ -352,7 +352,7 @@ public class H2ReplicateDataTest { } - protected static void assertNbEntities(TopiaContextImplementor tx, EnumMap<ObserveEntityEnum, Long> counts) throws TopiaException { + protected static void assertNbEntities(TopiaContextImplementor tx, EnumMap<ObserveEntityEnum, Long> counts) { for (ObserveEntityEnum dataEntity : Entities.DATA_ENTITIES) { diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java b/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java index 7c241e8..6ceeff8 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java @@ -44,7 +44,7 @@ import fr.ird.observe.entities.seine.TripSeine; 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.TopiaEntity; import java.util.Date; @@ -102,7 +102,7 @@ public class ReplicationDataModel { protected Vessel vessel; - public void createModel(DataSource service, TopiaContext tx) throws TopiaException { + public void createModel(DataSource service, TopiaContext tx) { programSeine = service.getDAO(tx, Program.class).create(Program.PROPERTY_CODE, "9999", Program.PROPERTY_LABEL2, "program-1-Seine"); programLongline = service.getDAO(tx, Program.class).create(Program.PROPERTY_CODE, "9998", Program.PROPERTY_LABEL2, "program-1-Longline"); @@ -146,7 +146,7 @@ public class ReplicationDataModel { } - public void update(TopiaContext ctxt) throws TopiaException { + public void update(TopiaContext ctxt) { programSeine = (Program) ctxt.findByTopiaId(programSeine.getTopiaId()); setSeine = update(ctxt, setSeine); @@ -164,7 +164,7 @@ public class ReplicationDataModel { } - protected <E extends TopiaEntity> E update(TopiaContext ctxt, E e) throws TopiaException { + protected <E extends TopiaEntity> E update(TopiaContext ctxt, E e) { return (E) ctxt.findByTopiaId(e.getTopiaId()); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java index a3cb922..b84b82a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java @@ -25,7 +25,7 @@ package fr.ird.observe.entities; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.entities.seine.TripSeine; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.TopiaRuntimeException; import java.util.Collection; @@ -60,9 +60,9 @@ public class OpenableEntities { * //FIXME Should use also a getOpenTrip for Longline model. * @param ctxt le topia context * @return la marée ouverte, ou <code>null</code> si pas de marée ouverte - * @throws TopiaException if any pb + * @if any pb */ - public static TripSeine getOpenTrip(TopiaContext ctxt) throws TopiaException { + public static TripSeine getOpenTrip(TopiaContext ctxt) { if (ctxt == null) { throw new TopiaRuntimeException("could not find a local topia" + " context"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java index b3877f7..49b9114 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java @@ -25,7 +25,7 @@ package fr.ird.observe.entities.longline; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLonglineImpl; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -37,14 +37,14 @@ import java.util.List; public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends ActivityLonglineDAOAbstract<E> { - public List<E> findAllStubByTripId(String tripId, ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStubByTripId(String tripId, ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, tripId, referenceLocale); return result; } - public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) throws TopiaException { + public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { E result = StubSqlQuery.find(context, activityId, referenceLocale); return result; @@ -59,7 +59,7 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit private final ReferenceLocale referenceLocale; - public static <E extends ActivityLongline> List<E> findAll(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) throws TopiaException { + public static <E extends ActivityLongline> List<E> findAll(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -78,7 +78,7 @@ public class ActivityLonglineDAOImpl<E extends ActivityLongline> extends Activit } - public static <E extends ActivityLongline> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) throws TopiaException { + public static <E extends ActivityLongline> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java index f8bee26..ef80115 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java @@ -31,7 +31,7 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.util.DateUtil; @@ -49,7 +49,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO public static final String ACTIVITY_INTERACTION_ID = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4"; public static final String ACTIVITY_STATION_ID = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3"; - public int findPositionByProgramId(String programId, String tripId) throws TopiaException { + public int findPositionByProgramId(String programId, String tripId) { int result = 0; List<E> list = findAllStubByProgramId(programId, ReferenceLocale.FR); for (E e : list) { @@ -63,21 +63,21 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO return -1; } - public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); return result; } - public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) throws TopiaException { + public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { E result = StubSqlQuery.find(context, tripId, referenceLocale); return result; } - public List<TripMapPoint> extractTripMapActivityPoints(String tripId) throws TopiaException { + public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = findByTopiaId(tripId); @@ -245,7 +245,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO this.referenceLocale = referenceLocale; } - public static <E extends TripLongline> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) throws TopiaException { + public static <E extends TripLongline> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -268,7 +268,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - public static <E extends TripLongline> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) throws TopiaException { + public static <E extends TripLongline> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -327,7 +327,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - public boolean updateEndDate(E trip) throws TopiaException { + public boolean updateEndDate(E trip) { boolean wasUpdated = false; @@ -349,7 +349,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO } - public Date getTheoricalEndDate(E trip) throws TopiaException { + public Date getTheoricalEndDate(E trip) { Date d; @@ -384,7 +384,7 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO this.tripId = tripId; } - public static Timestamp find(TopiaContextImplementor context, String tripId) throws TopiaException { + public static Timestamp find(TopiaContextImplementor context, String tripId) { String sql = "SELECT max(a.timestamp)" + " FROM observe_longline.activity a" + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index d309854..cc8cb32 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; @@ -84,7 +84,7 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal } - protected Set<String> getTopiaIds(TopiaContextImplementor tx, final String tableName) throws TopiaException { + protected Set<String> getTopiaIds(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java index a3d92ae..234ab60 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.sql.Connection; @@ -54,7 +54,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { super(new ObserveMigrationCallBackForVersionResolver(TYPE)); } - protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) throws TopiaException { + protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) { // recherche du nom de la constrainte final List<String> result = new ArrayList<String>(); @@ -92,7 +92,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) { // recherche du nom de la constrainte //(); @@ -129,7 +129,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -156,7 +156,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -183,7 +183,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) throws TopiaException { + public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { final List<String> result = new ArrayList<String>(); @@ -232,7 +232,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -259,7 +259,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { return result; } - public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { // Get fk constraints Set<String> fkNames = getForeignKeyConstraintNames(tx, tableName); @@ -271,7 +271,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) throws TopiaException { + public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); @@ -281,7 +281,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) throws TopiaException { + public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); @@ -296,7 +296,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { } - public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { // Get uk constraints Set<String> uKNames = getUniqueKeyConstraintNames(tx, tableName); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java index 6d0ce20..8c04605 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.sql.Connection; @@ -54,7 +54,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { super(new ObserveMigrationCallBackForVersionResolver(TYPE)); } - protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) throws TopiaException { + protected static String getUniqueConstraintName(TopiaContextImplementor tx, final String tableName, final String columnName) { // recherche du nom de la constrainte final List<String> result = new ArrayList<String>(); @@ -135,7 +135,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static String getFirstTableUniqueConstraintName(TopiaContextImplementor tx, final String tableName) { // recherche du nom de la constrainte //(); @@ -172,7 +172,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return constraintName; } - public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -199,7 +199,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result; } - public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getForeignKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -227,7 +227,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) throws TopiaException { + public static String getForeignKeyConstraintName(TopiaContextImplementor tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { final List<String> result = new ArrayList<String>(); @@ -318,7 +318,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) throws TopiaException { + public static Set<String> getUniqueKeyConstraintNames(TopiaContextImplementor tx, final String tableName) { final Set<String> result = new HashSet<String>(); @@ -345,7 +345,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { return result; } - public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + public static void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { // Get fk constraints Set<String> fkNames = getForeignKeyConstraintNames(tx, tableName); @@ -357,7 +357,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) throws TopiaException { + public static void removeFK(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, true); @@ -367,7 +367,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) throws TopiaException { + public static void removeFKIfExists(TopiaContextImplementor tx, String schemaName, String tableName, String columnName, List<String> queries) { // Get fk constraints String contrainstName = getForeignKeyConstraintName(tx, schemaName, tableName, columnName, false); @@ -381,7 +381,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { } - public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + public static void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { // Get uk constraints Set<String> uKNames = getUniqueKeyConstraintNames(tx, tableName); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java index 9e6e1b9..8580455 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java @@ -25,9 +25,9 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.TopiaException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -53,7 +53,7 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // Doublons et absence de clé primaire dans especefaune_ocean et especethon_ocean // (see http://forge.codelutin.com/issues/3398) @@ -62,7 +62,7 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC } protected void updateReferentielEspece(String speciesType, TopiaContextImplementor tx, - List<String> queries) throws TopiaException { + List<String> queries) { GetAllEspeceOceanDoublonQuery request = new GetAllEspeceOceanDoublonQuery(speciesType); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java index 2d5bd51..371bd78 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("remove-person", queries); addScript("add-missing-fk", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java index 5b16f13..ffb735e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("remove-speciesGroup-obsolete-fields", queries); addScript("add-country-on-transmitting-buoy", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java index a463399..1663e5d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("add-missing-boat", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java index 06da46c..5bce4e5 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("remove-hooksPerBasketCount-field", queries); addScript("fix-targetsample-discarded-value", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java index 4def476..57b5c95 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("change-tdr-integer-field-to-float", queries); addScript("remove-set-longline-length-fields", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index b3bc42c..6837359 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -29,7 +29,7 @@ import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.sql.Connection; @@ -59,7 +59,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("add-gear-referential", queries); addScript("add-gear-data", queries); @@ -68,7 +68,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } - private void migrateTripSenneData(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + private void migrateTripSenneData(TopiaContextImplementor tx, List<String> queries) { String gearUseFeaturesIdPrefix = "fr.ird.observe.entities.seine.GearUseFeatures#1427183650941#"; @@ -111,7 +111,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration Integer seineBallastWeight; } - protected Set<SenneData> getSenneData(TopiaContextImplementor tx) throws TopiaException { + protected Set<SenneData> getSenneData(TopiaContextImplementor tx) { final Set<SenneData> result = new HashSet<SenneData>(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java index c653e7e..645d30a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -103,7 +103,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // Get all especeThon (to migrate them into a speciesList later) Set<String> speciesThonIds = getTopiaIds(tx, "especethon"); @@ -146,7 +146,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM queries.addAll(Lists.newArrayList(migrationQueries)); } - protected void translateModel(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + protected void translateModel(TopiaContextImplementor tx, List<String> queries) { for (String oldTableName : TABLES) { @@ -204,14 +204,14 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM } @Override - protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { H2DataSourceMigration.removeFK(tx, tableName, queries); } @Override - protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { H2DataSourceMigration.removeUK(tx, tableName, queries); @@ -226,14 +226,14 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM } @Override - protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + protected void removeFK(TopiaContextImplementor tx, String tableName, List<String> queries) { PGDataSourceMigration.removeFK(tx, tableName, queries); } @Override - protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) throws TopiaException { + protected void removeUK(TopiaContextImplementor tx, String tableName, List<String> queries) { PGDataSourceMigration.removeUK(tx, tableName, queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java index 115b45a..97109c4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -48,7 +48,7 @@ public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveM protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { { String[] migrationQueries = loadScript("rename-seine-model"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java index 736fa55..afdec16 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationC protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("fix-person", queries); addScript("fix-branchelinecomposition", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java index 5bea0fa..c892b8f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationC protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { addScript("add-dataFilename-attribute", queries); addScript("fill-sensorDataFormat", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java index 5b0f431..6d78971 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigration protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/7013 addScript("empty", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index f15ec4b..6ba88c8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -31,7 +31,7 @@ import fr.ird.observe.entities.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaId; @@ -62,7 +62,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/7226 addScript("remove-gender-column", queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index f3c6437..c6c4a98 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.sql.Connection; @@ -54,7 +54,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // recherche du nom de la constrainte diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index 80dd421..20bcfa8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -29,7 +29,7 @@ import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.sql.Connection; @@ -61,7 +61,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/6964 @@ -95,7 +95,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } @Override - protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) { removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "gear_gearcaracteristic", "gear"); removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "ocean_species", "species"); @@ -148,7 +148,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse } - private void removeForeignKeyIndex(TopiaContextImplementor tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) throws TopiaException { + private void removeForeignKeyIndex(TopiaContextImplementor tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) { tx.getHibernate().doWork(new Work() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java index f7424d4..d6c1a8e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrat protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/7013 diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java index 9b23014..40c6a2f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -49,7 +49,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/7145 removeForeignKeyOnGearFseFeaturesMeasurementSeine(tx, queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java index eb8b9c7..b40aa09 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.List; @@ -47,7 +47,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObse protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, - boolean showProgression) throws TopiaException { + boolean showProgression) { // See https://forge.codelutin.com/issues/6983 diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java index c4bc8ec..f95777d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java @@ -25,7 +25,7 @@ import fr.ird.observe.util.Numbers; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; @@ -166,7 +166,7 @@ public class LengthWeightParemeterHelper { @SuppressWarnings({"unchecked"}) public static <P extends LengthWeightParameter> List<P> findBySpecies(TopiaContextImplementor tx, - Species taillePoidsAble) throws TopiaException { + Species taillePoidsAble) { // le type de resultat recherche Class<P> entityClass = (Class<P>) LengthWeightParameter.class; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java index ace56aa..66ec481 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceLocale; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -36,13 +36,13 @@ import java.util.List; public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { - public List<E> findAllStub(ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStub(ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, referenceLocale); return result; } - public Program findStubByTopiaId(String programId, ReferenceLocale referentielLocale) throws TopiaException { + public Program findStubByTopiaId(String programId, ReferenceLocale referentielLocale) { return StubSqlQuery.find(context, programId, referentielLocale); } @@ -55,7 +55,7 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { private final ReferenceLocale referenceLocale; - static <E extends Program> List<E> findAll(TopiaContextImplementor context, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends Program> List<E> findAll(TopiaContextImplementor context, ReferenceLocale referenceLocale) { String sql = "SELECT" + " p.topiaId," + @@ -69,7 +69,7 @@ public class ProgramDAOImpl<E extends Program> extends ProgramDAOAbstract<E> { } - static <E extends Program> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends Program> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " p.topiaId," + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java index 0d81ecf..d633187 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java @@ -25,7 +25,7 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeineImpl; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -37,14 +37,14 @@ import java.util.List; public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeineDAOAbstract<E> { - public List<E> findAllStubByRouteId(String routeId, ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStubByRouteId(String routeId, ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, routeId, referenceLocale); return result; } - public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) throws TopiaException { + public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { E result = StubSqlQuery.find(context, activityId, referenceLocale); return result; @@ -59,7 +59,7 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine private final ReferenceLocale referenceLocale; - static <E extends ActivitySeine> List<E> findAll(TopiaContextImplementor context, String routeId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends ActivitySeine> List<E> findAll(TopiaContextImplementor context, String routeId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -78,7 +78,7 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine } - static <E extends ActivitySeine> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends ActivitySeine> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java index 2b19ca0..5b9ac60 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java @@ -25,7 +25,7 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.referentiel.seine.ObjectTypeImpl; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -37,14 +37,14 @@ import java.util.List; public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObjectDAOAbstract<E> { - public List<E> findAllStubByActivityId(String activityId, ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStubByActivityId(String activityId, ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, activityId, referenceLocale); return result; } - public E findStubByTopiaId(String floatingObjectId, ReferenceLocale referenceLocale) throws TopiaException { + public E findStubByTopiaId(String floatingObjectId, ReferenceLocale referenceLocale) { E result = StubSqlQuery.find(context, floatingObjectId, referenceLocale); return result; @@ -59,7 +59,7 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj private final ReferenceLocale referenceLocale; - static <E extends FloatingObject> List<E> findAll(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends FloatingObject> List<E> findAll(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " fo.topiaId," + @@ -75,7 +75,7 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj } - static <E extends FloatingObject> E find(TopiaContextImplementor context, String floatingObjectId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends FloatingObject> E find(TopiaContextImplementor context, String floatingObjectId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " fo.topiaId," + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java index 9b15ae3..499a25d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.seine; import com.google.common.base.Preconditions; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -37,14 +37,14 @@ import java.util.List; public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { - public List<E> findAllStubByTripId(String tripSeineId) throws TopiaException { + public List<E> findAllStubByTripId(String tripSeineId) { List<E> result = StubSqlQuery.findAll(context, tripSeineId); return result; } - public E findStubByTopiaId(String routeId) throws TopiaException { + public E findStubByTopiaId(String routeId) { E result = StubSqlQuery.find(context, routeId); return result; @@ -58,7 +58,7 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { private final String id; - static <E extends Route> List<E> findAll(TopiaContextImplementor context, String tripSeineId) throws TopiaException { + static <E extends Route> List<E> findAll(TopiaContextImplementor context, String tripSeineId) { String sql = "SELECT" + " r.topiaId," + @@ -74,7 +74,7 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { } - static <E extends Route> E find(TopiaContextImplementor context, String routeId) throws TopiaException { + static <E extends Route> E find(TopiaContextImplementor context, String routeId) { String sql = "SELECT" + " r.topiaId," + @@ -120,10 +120,10 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { * the day date of the route. * * @param routeId id of the route to use - * @throws TopiaException if nay topia error + * @if nay topia error * @since 4.0 */ - public void updateActivitiesDate(final String routeId) throws TopiaException { + public void updateActivitiesDate(final String routeId) { Preconditions.checkNotNull(routeId,"routeId can't be null"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index 685d261..4846027 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -31,7 +31,7 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.util.DateUtil; @@ -53,7 +53,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< public static final String ACTIVITY_HARBOUR_ID = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675349#0.363119635949572"; - public int findPositionByProgramId(String programId, String tripId) throws TopiaException { + public int findPositionByProgramId(String programId, String tripId) { int result = 0; List<E> list = findAllStubByProgramId(programId, ReferenceLocale.FR); for (E e : list) { @@ -67,21 +67,21 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< return -1; } - public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) throws TopiaException { + public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); return result; } - public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) throws TopiaException { + public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { E result = StubSqlQuery.find(context, tripId, referenceLocale); return result; } - public List<TripMapPoint> extractTripMapActivityPoints(String tripId) throws TopiaException { + public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = findByTopiaId(tripId); @@ -186,7 +186,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< private final ReferenceLocale referenceLocale; - static <E extends TripSeine> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends TripSeine> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -209,7 +209,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - static <E extends TripSeine> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) throws TopiaException { + static <E extends TripSeine> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -275,7 +275,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - public boolean updateEndDate(E trip) throws TopiaException { + public boolean updateEndDate(E trip) { boolean wasUpdated = false; @@ -298,7 +298,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - public Date getTheoricalEndDate(E trip) throws TopiaException { + public Date getTheoricalEndDate(E trip) { Date d; @@ -333,7 +333,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< this.tripId = tripId; } - public static Date find(TopiaContextImplementor context, String tripId) throws TopiaException { + public static Date find(TopiaContextImplementor context, String tripId) { String sql = "SELECT max(r.date)" + " FROM observe_seine.route r" + diff --git a/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java b/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java index 0d24f58..4a36f15 100644 --- a/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java @@ -25,7 +25,7 @@ import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; diff --git a/observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ObsoleteReferenceToReplace.java b/observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ObsoleteReferenceToReplace.java index 08234a6..caca04e 100644 --- a/observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ObsoleteReferenceToReplace.java +++ b/observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ObsoleteReferenceToReplace.java @@ -44,7 +44,7 @@ public class ObsoleteReferenceToReplace { return obsoleteId; } -// public void doAction(TopiaContext tx) throws TopiaException { +// public void doAction(TopiaContext tx) { // // if (log.isInfoEnabled()) { // log.info("load obsolete object " + obsoleteId); diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java index 8b088e4..721f992 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityListUpdator; @@ -426,7 +426,7 @@ public abstract class AbstractObserveService implements ObserveService { // par defaut, rien de specifique a faire avant de faire la sauvegarde } - public void onUpdateFinalize(P parentSaved, Collection<E> oldChilds) throws TopiaException { + public void onUpdateFinalize(P parentSaved, Collection<E> oldChilds) { // par défaut, rien à faire après la sauvegarde de la liste } diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java index d64ddc3..6d51013 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java @@ -17,7 +17,7 @@ import org.apache.commons.lang3.tuple.Pair; 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.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.persistence.TopiaEntity; @@ -345,7 +345,7 @@ public class ReplicationServiceImpl extends AbstractObserveService implements Re } - private void applyTdrAssociationFix(TopiaContext dstCtxt, List<Pair<String, String>> tdrAssociation) throws TopiaException { + private void applyTdrAssociationFix(TopiaContext dstCtxt, List<Pair<String, String>> tdrAssociation) { String request = "\nUPDATE OBSERVE_LONGLINE.TDR SET SET = '%s' WHERE topiaid = '%s';"; @@ -361,7 +361,7 @@ public class ReplicationServiceImpl extends AbstractObserveService implements Re } - private List<Pair<String, String>> getTdrAssociationIds(TopiaContext srcCtxt, TripLongline e) throws TopiaException { + private List<Pair<String, String>> getTdrAssociationIds(TopiaContext srcCtxt, TripLongline e) { List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); @@ -388,7 +388,7 @@ public class ReplicationServiceImpl extends AbstractObserveService implements Re private String setId; - public List<Pair<String, String>> execute(TopiaContextImplementor tx, String setId) throws TopiaException { + public List<Pair<String, String>> execute(TopiaContextImplementor tx, String setId) { try { this.setId = setId; diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java index b256d17..04e5bf4 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java @@ -8,7 +8,7 @@ import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SectionWithTemplate; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.util.TopiaEntityBinder; @@ -78,7 +78,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService TopiaDAO<Section> sectionsDao, TopiaDAO<Basket> basketDao, TopiaDAO<Branchline> branchlineDao, - Section section) throws TopiaException { + Section section) { Section sectionToSave; @@ -123,7 +123,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService TopiaDAO<Basket> basketDao, TopiaDAO<Branchline> branchlineDao, Map<String, Basket> existingBasketsByTopiaId, - Basket basket) throws TopiaException { + Basket basket) { Basket basketToSave; @@ -165,7 +165,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService protected Branchline persistBranchline(TopiaEntityBinder<Branchline> branchlineBinder, TopiaDAO<Branchline> branchlineDao, Map<String, Branchline> existingBranchlinesByTopiaId, - Branchline branchline) throws TopiaException { + Branchline branchline) { Branchline branchlineToSave; diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java index af19eee..b169e92 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java @@ -9,7 +9,7 @@ import fr.ird.observe.services.AbstractObserveService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; @@ -83,7 +83,7 @@ public class NonTargetCatchServiceImpl extends AbstractObserveService implements } @Override - public void onUpdateFinalize(SetSeine parentSaved, Collection<NonTargetCatch> oldChilds) throws TopiaException { + public void onUpdateFinalize(SetSeine parentSaved, Collection<NonTargetCatch> oldChilds) { if (CollectionUtils.isNotEmpty(nonTargetLengthsToDelete)) { diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java index 39d45bf..a92fc37 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java @@ -13,7 +13,7 @@ import fr.ird.observe.services.referential.ReferentialService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.util.EntityListUpdator; import org.nuiton.topia.persistence.util.TopiaEntityBinder; @@ -114,7 +114,7 @@ public class TargetCatchServiceImpl extends AbstractObserveService implements Ta SetSeine.class, TargetCatch.class, getListUpdator(), parentBinder, childBinder, predicate) { @Override - public void onUpdateFinalize(SetSeine parentSaved, Collection<TargetCatch> oldChilds) throws TopiaException { + public void onUpdateFinalize(SetSeine parentSaved, Collection<TargetCatch> oldChilds) { if (CollectionUtils.isNotEmpty(oldChilds)) { diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java index ad59453..52921a2 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java @@ -17,7 +17,7 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; -import org.nuiton.topia.TopiaException; + import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.DiffState; @@ -183,7 +183,7 @@ public class SynchronizeServiceImpl extends AbstractObserveService implements Sy private static final String UPDATE_VERSION_PATTERN = "UPDATE %1$s SET topiaversion = %2$d WHERE topiaid='%3$s';\n"; - protected void patchTopiaVersions(Map<TopiaEntity, Long> versionsToUpdate) throws TopiaException { + protected void patchTopiaVersions(Map<TopiaEntity, Long> versionsToUpdate) { final StringBuilder buffer = new StringBuilder(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index cd76d41..d6bad44 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -1,9 +1,9 @@ package fr.ird.observe.services; -import fr.ird.observe.db.DataSource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaContextImplementor; import java.util.Date; @@ -18,21 +18,20 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { protected ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration; - protected TopiaContext transaction; + protected TopiaContext topiaPersistenceContext; - //TODO A supprimer -> utiliser une TopiaApplicationContext - protected DataSource dataSource; + protected TopiaContextImplementor topiaApplicationContext; - public DataSource getDataSource() { - return dataSource; + public TopiaContextImplementor getTopiaApplicationContext() { + return topiaApplicationContext; } - public TopiaContext getTransaction() { - return transaction; + public TopiaContext getTopiaPersistenceContext() { + return topiaPersistenceContext; } - public void setTransaction(TopiaContext transaction) { - this.transaction = transaction; + public void setTopiaPersistenceContext(TopiaContext topiaPersistenceContext) { + this.topiaPersistenceContext = topiaPersistenceContext; } @Override @@ -53,7 +52,13 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { this.dataSourceConfiguration = dataSourceConfiguration; } - public void setDataSource(DataSource dataSource) { - this.dataSource = dataSource; + public void setTopiaApplicationContext(TopiaContextImplementor topiaApplicationContext) { + this.topiaApplicationContext = topiaApplicationContext; } + + public void closeTopiaPersistenceContext() { + topiaPersistenceContext.closeContext(); + topiaPersistenceContext = null; + } + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index 16a0a9c..13bc86b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -5,9 +5,8 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; +import com.google.common.reflect.Reflection; import fr.ird.observe.ObserveTechnicalException; -import fr.ird.observe.db.DataSource; -import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.db.constants.CommonDataSourceConfigParam; import fr.ird.observe.db.impl.H2DataSourceConfig; @@ -23,12 +22,12 @@ import fr.ird.observe.services.spi.Write; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaContextImplementor; import java.io.Closeable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -46,14 +45,14 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp protected static final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newServiceImplementationTypesCache("Topia"); - protected final LoadingCache<ObserveDataSourceConfigurationTopiaSupport, DataSource> dataSourceCache = CacheBuilder + protected final LoadingCache<ObserveDataSourceConfigurationTopiaSupport, TopiaContextImplementor> topiaApplicationContextCache = CacheBuilder .newBuilder() - .build(new CacheLoader<ObserveDataSourceConfigurationTopiaSupport, DataSource>() { + .build(new CacheLoader<ObserveDataSourceConfigurationTopiaSupport, TopiaContextImplementor>() { @Override - public DataSource load(ObserveDataSourceConfigurationTopiaSupport key) throws Exception { + public TopiaContextImplementor load(ObserveDataSourceConfigurationTopiaSupport key) throws Exception { - DataSource dataSource = null; + TopiaContextImplementor dataSource = null; if (key instanceof ObserveDataSourceConfigurationTopiaH2) { dataSource = createH2DataSource((ObserveDataSourceConfigurationTopiaH2) key); } @@ -103,13 +102,13 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp serviceContext.setDataSourceConfiguration(dataSourceConfigurationTopia); - DataSource dataSource = getDataSource(dataSourceConfigurationTopia); - serviceContext.setDataSource(dataSource); + TopiaContextImplementor dataSource = getDataSource(dataSourceConfigurationTopia); + serviceContext.setTopiaApplicationContext(dataSource); return serviceContext; } - protected DataSource createPGDataSource(ObserveDataSourceConfigurationTopiaPG key) { + protected TopiaContextImplementor createPGDataSource(ObserveDataSourceConfigurationTopiaPG key) { PGDataSourceConfig result = DataSourceFactory.newPGConfig( key.getLabel(), @@ -121,11 +120,14 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp PGDataSourceConfigParam.URL, key.getJdbcUrl(), PGDataSourceConfigParam.USE_SSL, key.isUseSsl() ); - return DataSourceFactory.newService(result); + + //TODO + TopiaContextImplementor topiaApplicationContext = null; + return topiaApplicationContext; } - protected DataSource createH2DataSource(ObserveDataSourceConfigurationTopiaH2 key) { + protected TopiaContextImplementor createH2DataSource(ObserveDataSourceConfigurationTopiaH2 key) { H2DataSourceConfig result = DataSourceFactory.newH2Config( key.getLabel(), @@ -136,14 +138,17 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp CommonDataSourceConfigParam.SHOW_MIGRATION_SQL, key.isShowMigrationSql(), H2DataSourceConfigParam.DIRECTORY, key.getDirectory() ); - return DataSourceFactory.newService(result); + + //TODO + TopiaContextImplementor topiaApplicationContext = null; + return topiaApplicationContext; } - protected DataSource getDataSource(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { + protected TopiaContextImplementor getDataSource(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { try { - DataSource dataSource = dataSourceCache.get(dataSourceConfiguration); + TopiaContextImplementor dataSource = topiaApplicationContextCache.get(dataSourceConfiguration); return dataSource; } catch (ExecutionException e) { throw new ObserveTechnicalException("Could not get dataSource for configuration: " + dataSourceConfiguration, e); @@ -154,20 +159,20 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp protected <S extends ObserveService> S newServiceTransactionalProxy(Class<S> serviceType, S service, ObserveServiceContextTopia serviceContext) { ObserveServiceInvocationHandler invocationHandler = new ObserveServiceInvocationHandler(serviceContext, service); - Object proxyService = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{serviceType}, invocationHandler); - return (S) proxyService; + S proxyService = Reflection.newProxy(serviceType, invocationHandler); + return proxyService; } @Override public void close() { - for (DataSource dataSource : dataSourceCache.asMap().values()) { + for (TopiaContextImplementor dataSource : topiaApplicationContextCache.asMap().values()) { - if (dataSource.isOpen()) { + if (!dataSource.isClosed()) { try { - dataSource.doClose(false); - } catch (DataSourceException e) { + dataSource.closeContext(); + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not close data source: " + dataSource, e); } @@ -175,8 +180,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp } } - dataSourceCache.invalidateAll(); - + topiaApplicationContextCache.invalidateAll(); } @@ -237,22 +241,20 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp protected Object invokeMethodWithTransaction(Method method, Object... args) throws Throwable { - String methodName = method.getName(); - - DataSource source = serviceContext.getDataSource(); + TopiaContextImplementor source = serviceContext.getTopiaApplicationContext(); - TopiaContext tx = source.beginTransaction(methodName); + TopiaContext topiaPersistenceContext = source.beginTransaction(); try { - serviceContext.setTransaction(tx); + serviceContext.setTopiaPersistenceContext(topiaPersistenceContext); Object invoke = invokeMethod(method, args); if (method.isAnnotationPresent(Write.class)) { // do commit - source.commitTransaction(tx, methodName); + topiaPersistenceContext.commitTransaction(); } @@ -263,12 +265,11 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport imp try { // always rollback transaction to avoid dirty transactions - source.rollbackTransaction(tx, methodName); + topiaPersistenceContext.rollbackTransaction(); } finally { - serviceContext.setTransaction(null); - source.closeTransaction(tx, methodName); + serviceContext.closeTopiaPersistenceContext(); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 51cb177..b17e2b5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -74,14 +74,14 @@ public class ObserveServiceTopia implements ObserveService { } protected <E extends TopiaEntity> List<E> loadEntities(Class<E> entityType) { - TopiaContext transaction = serviceContext.getTransaction(); + TopiaContext transaction = serviceContext.getTopiaPersistenceContext(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); List<E> entities = dao.findAll(); return entities; } protected <D extends ReferentialDto, E extends TopiaEntity> E loadEntity(Class<D> dtoType, Class<E> entityType, String id) { - TopiaContext transaction = serviceContext.getTransaction(); + TopiaContext transaction = serviceContext.getTopiaPersistenceContext(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); E entity = dao.findByTopiaId(id); if (entity == null) { @@ -91,21 +91,21 @@ public class ObserveServiceTopia implements ObserveService { } public <E extends TopiaEntity> E newEntity(Class<E> entityType) { - TopiaContext transaction = serviceContext.getTransaction(); + TopiaContext transaction = serviceContext.getTopiaPersistenceContext(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); E entity = dao.newInstance(); return entity; } protected <E extends TopiaEntity> E saveEntity(Class<E> entityType, E entity) { - TopiaContext transaction = serviceContext.getTransaction(); + TopiaContext transaction = serviceContext.getTopiaPersistenceContext(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); entity = dao.update(entity); return entity; } protected <D extends ReferentialDto, E extends TopiaEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { - TopiaContext transaction = serviceContext.getTransaction(); + TopiaContext transaction = serviceContext.getTopiaPersistenceContext(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); for (String id : ids) { E entity = dao.findByTopiaId(id); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java index 2b22b88..6781edb 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java @@ -15,7 +15,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia public class ObserveServiceFactoryTopiaTaiste extends ObserveServiceFactoryTopia { public H2DataSource getExistingDataSource(ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration) { - H2DataSource dataSource = (H2DataSource) dataSourceCache.getIfPresent(dataSourceConfiguration); + H2DataSource dataSource = (H2DataSource) topiaApplicationContextCache.getIfPresent(dataSourceConfiguration); return dataSource; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm