- T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][release/2.8] [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch release/2.8 at ultreiaio / ird-t3 Commits: a2848f33 by Tony CHEMIT at 2018-05-04T14:25:08Z [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions[skip ci] - - - - - 11 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a2848f33c86971c406a41658932334b7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a2848f33c86971c406a41658932334b7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][master] 21 commits: [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: fc353123 by Tony CHEMIT at 2018-04-12T07:52:10Z [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development[skip ci] - - - - - cd5de65f by Tony CHEMIT at 2018-04-12T07:57:45Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 97f6579f by Tony CHEMIT at 2018-04-12T07:57:45Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 331a8234 by Tony CHEMIT at 2018-04-12T07:57:46Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f08bbaee by Tony CHEMIT at 2018-04-12T08:09:44Z Update changelog after release 2.7 [skip ci] - - - - - cad84436 by Tony CHEMIT at 2018-04-14T22:45:35Z use new java4all config lib + last pom - - - - - ab09e865 by Tony CHEMIT at 2018-04-15T12:44:23Z use last pom + improve configuration - - - - - bdbead0f by Tony CHEMIT at 2018-04-15T14:55:51Z [INSTALLEUR] Améliorer le lancement de l'installeur (ne plus éditer un fichier avant le démarrage) (Closes #315) - - - - - de2f1e0d by Tony CHEMIT at 2018-04-15T15:19:02Z [N2] Question sur le log N2 (closes #316) - - - - - 0b319d95 by Tony CHEMIT at 2018-04-15T15:20:29Z clean code - - - - - 48f2b301 by Tony CHEMIT at 2018-04-16T09:24:23Z [CONNEXION] Traiter l'exception lorsque la base PG accédée n'existe pas (closes #319) - - - - - eddf203a by Tony CHEMIT at 2018-04-16T09:24:54Z update config version - - - - - fec55645 by Tony CHEMIT at 2018-04-16T09:25:16Z Add more logs files - - - - - 5d8cb811 by Tony CHEMIT at 2018-04-18T10:02:53Z Améliorer les temps de traitement du N2 (See #324) - - - - - f6517ee6 by Tony CHEMIT at 2018-04-18T10:04:04Z [N2] A propos des résultats d'un traitement avec catégories de poids dans la stratification (Closes #317) - - - - - a7f1fc8b by Tony CHEMIT at 2018-05-04T10:07:52Z use last pom - - - - - 9d116e9a by Tony CHEMIT at 2018-05-04T12:39:17Z [N2] Des espèces accessoires ne sont pas recopiées de catchWeight vers correctedCatchWeight lors d'un N2 - Closes #322 - - - - - b1eda642 by Tony CHEMIT at 2018-05-04T13:56:55Z [N3] Exception multi-zone activity - Closes #318 - - - - - 94d71347 by Tony CHEMIT at 2018-05-04T14:24:05Z [jgitflow-maven-plugin]updating poms for 2.8 branch with snapshot versions[skip ci] - - - - - a2848f33 by Tony CHEMIT at 2018-05-04T14:25:08Z [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions[skip ci] - - - - - 19b45775 by Tony CHEMIT at 2018-05-04T14:55:10Z [jgitflow-maven-plugin]merging 'release/2.8' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - pom.xml - src/site/markdown/installer.md.vm - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java - t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java - t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java - t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java - t3-domain/src/main/resources/t3-log4j.conf - t3-input-avdthv33/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7e0ad51cade7db7f03ba65d383b7484… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7e0ad51cade7db7f03ba65d383b7484… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 2.8 branch with snapshot versions[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 94d71347 by Tony CHEMIT at 2018-05-04T14:24:05Z [jgitflow-maven-plugin]updating poms for 2.8 branch with snapshot versions[skip ci] - - - - - a2848f33 by Tony CHEMIT at 2018-05-04T14:25:08Z [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions[skip ci] - - - - - 19b45775 by Tony CHEMIT at 2018-05-04T14:55:10Z [jgitflow-maven-plugin]merging 'release/2.8' into 'master' - - - - - d202d42d by Tony CHEMIT at 2018-05-04T14:55:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 0ebc8295 by Tony CHEMIT at 2018-05-04T14:55:12Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 07893feb by Tony CHEMIT at 2018-05-04T14:55:12Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/bf17b0afcf6b72e8972a5c649d23761… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/bf17b0afcf6b72e8972a5c649d23761… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Pushed new branch release/2.8
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed new branch release/2.8 at ultreiaio / ird-t3 --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/tree/release/2.8 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: bf17b0af by Tony CHEMIT at 2018-05-04T14:24:06Z [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development[skip ci] - - - - - 11 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -29,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> @@ -296,13 +295,13 @@ <configuration>  <tasks> - <echo message="Copy model to site"/> + <echo message="Copy model to site" /> <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="${basedir}/doc/modelisation/t3"> - <include name="**/*.png"/> + <include name="**/*.png" /> </fileset> <fileset dir="${basedir}/t3-domain/src/main/xmi"> - <include name="t3-persistence.zargo"/> + <include name="t3-persistence.zargo" /> </fileset> </copy> </tasks> @@ -489,8 +488,8 @@ <configuration>  <tasks> - <echo message="Delete test data cache at ${test.cache.dir}"/> - <delete dir="${test.cache.dir}"/> + <echo message="Delete test data cache at ${test.cache.dir}" /> + <delete dir="${test.cache.dir}" /> </tasks> </configuration> <goals> @@ -519,8 +518,8 @@ <configuration>  <tasks> - <echo message="Delete installer data cache at ${installer.cache.dir}"/> - <delete dir="${installer.cache.dir}"/> + <echo message="Delete installer data cache at ${installer.cache.dir}" /> + <delete dir="${installer.cache.dir}" /> </tasks> </configuration> <goals> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.9-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/bf17b0afcf6b72e8972a5c649d237617… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/bf17b0afcf6b72e8972a5c649d237617… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N3] Exception multi-zone activity - Closes #318
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b1eda642 by Tony CHEMIT at 2018-05-04T13:56:55Z [N3] Exception multi-zone activity - Closes #318 - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -20,7 +20,6 @@ */ package fr.ird.t3.actions.data.level3; -import com.google.common.base.Preconditions; import fr.ird.t3.actions.T3Action; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.ActivityTopiaDao; @@ -219,9 +218,9 @@ public class Level3Action extends T3Action<Level3Configuration> { int nbZones = e.getValue(); // is activity was already treated ? boolean newActivity = outputContext.addActivityId(activity.getTopiaId()); - if (!newActivity) { - Preconditions.checkState(nbZones > 1, "Only a multi-zone activity can be seen more tha once!, problem with activity: " + activity.getTopiaId()); - } +// if (!newActivity) { +// Preconditions.checkState(nbZones > 1, "Only a multi-zone activity can be seen more tha once!, problem with activity: " + activity.getTopiaId()); +// } doExecuteActivityInCatchStratum( catchStratum, sampleStratum, @@ -287,12 +286,12 @@ public class Level3Action extends T3Action<Level3Configuration> { addInfoMessage(message); // to deal with multiple-zone activities (must keep a track of what was already done) boolean activityMultiZone = nbZones > 1; - Map<String, String> previousValues; - if (activityMultiZone) { - previousValues = inputContext.getActivityWithMultiZones(activity); - } else { - previousValues = null; - } + Map<String, String> previousValues = inputContext.getActivityWithMultiZones(activity); +// if (activityMultiZone) { +// previousValues = inputContext.getActivityWithMultiZones(activity); +// } else { +// previousValues = null; +// } if (deleteOldData) { // delete old data for this activity log.debug(String.format("Delete previous level3 data of %s :: %d", activity.getTopiaId(), activity.sizeExtrapolatedAllSetSpeciesFrequency())); @@ -303,7 +302,7 @@ public class Level3Action extends T3Action<Level3Configuration> { if (activityWithSample && !useAllSamplesOfStratum) { // need only to clone back data from SetSpeciesFrequency to new table message = l(locale, "t3.level3.message.activity.with.sample.useOwn.composition"); - log.info(message); + log.debug(message); addInfoMessage(message); for (SetSpeciesFrequency setSpeciesFrequency : activity.getSetSpeciesFrequency()) { Species aSpecies = setSpeciesFrequency.getSpecies(); @@ -322,7 +321,7 @@ public class Level3Action extends T3Action<Level3Configuration> { } else { message = l(locale, "t3.level3.message.activity.with.no.sample.useSampleStratum.composition", activityStr); } - log.info(message); + log.debug(message); addInfoMessage(message); Map<Species, LengthCompositionAggregateModel> compositionModels = sampleStratum.getCompositionModel(); // get all species found in catches View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b1eda642f9669f565d576d86a2b06240… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b1eda642f9669f565d576d86a2b06240… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N2] Des espèces accessoires ne sont pas recopiées de catchWeight vers…
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 9d116e9a by Tony CHEMIT at 2018-05-04T12:39:17Z [N2] Des espèces accessoires ne sont pas recopiées de catchWeight vers correctedCatchWeight lors d'un N2 - Closes #322 - - - - - 6 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java @@ -229,15 +229,4 @@ public class L2CatchStratum extends CatchStratum<Level2Configuration, Level2Acti return sampleWeightModelFroAllSpecies; } - public void resetCorrectedElementaryCatches() { - for (Activity activity : getActivities().keySet()) { - if (activity.isCorrectedElementaryCatchNotEmpty()) { - for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { - if (correctedElementaryCatch.getCorrectedCatchWeight()==null) { - correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); - } - } - } - } - } } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java @@ -23,6 +23,7 @@ package fr.ird.t3.actions.data.level2; import fr.ird.t3.actions.stratum.CatchStratumLoader; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.ActivityTopiaDao; +import fr.ird.t3.entities.data.CorrectedElementaryCatch; import fr.ird.t3.services.ioc.InjectDAO; import java.util.Map; @@ -60,4 +61,13 @@ public class L2CatchStratumLoader extends CatchStratumLoader<Level2Configuration // - maree.bateau dans la bonne flotte OK return filterActivities(configuration, activityIds); } + + @Override + protected void onActivityFound(Activity activity) { + if (activity.isCorrectedElementaryCatchNotEmpty()) { + for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { + correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); + } + } + } } \ No newline at end of file ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java @@ -174,8 +174,6 @@ public class Level2Action extends T3Action<Level2Configuration> { result.setSubstitutionLevel(0); incrementsProgression(); } else { - catchStratum.resetCorrectedElementaryCatches(); - //flushTransaction("clean stratum " + stratumConfiguration.getStratumIndex()); // compute sample stratum try (L2SampleStratum sampleStratum = L2SampleStratum.newSampleStratum(stratumConfiguration, catchStratum, weightCategories, species, this)) { ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java @@ -60,4 +60,9 @@ public class L3CatchStratumLoader extends CatchStratumLoader<Level3Configuration // - maree.bateau dans la bonne flotte OK return filterActivities(configuration, activityIds); } + + @Override + protected void onActivityFound(Activity activity) { + + } } ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java @@ -74,15 +74,19 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum String activityId = e.getKey(); // get activity Activity activity = configuration.getActivity(activityId); + onActivityFound(activity); // get his trip Trip trip = activity.getTrip(); if (!possibleVessels.contains(trip.getVessel())) { // not a matching boat continue; } +// if (activity.isCorrectedElementaryCatchEmpty()) { +// continue; +// } // recheck activity have some catches. - Preconditions.checkState(!activity.isCorrectedElementaryCatchEmpty(), - String.format("Can not accept an activity (%s) with no catch", activity.getTopiaId())); +// Preconditions.checkState(!activity.isCorrectedElementaryCatchEmpty(), +// String.format("Can not accept an activity (%s) with no catch", activity.getTopiaId())); // weight category is in stratum, check there is catch using this category if (weightCategoryTreatment != null && !activity.withCorrectedElementaryCatch(weightCategoryTreatment)) { // reject - the stratum weight category not found for this activity @@ -93,4 +97,6 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum } return result; } + + protected abstract void onActivityFound(Activity activity); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java @@ -151,8 +151,8 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv "AND a.expertflag != 0 " + "AND a.schooltype IN (" + schoolTypeParameters.substring(2) + ")" + "AND r.date::date >= ? " + - "AND r.date::date <= ? " + - "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0" + "AND r.date::date <= ? " +// + "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0" ); int index = 0; View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9d116e9a0813e0e3ba37843ca0b30f3e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9d116e9a0813e0e3ba37843ca0b30f3e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use last pom
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a7f1fc8b by Tony CHEMIT at 2018-05-04T10:07:52Z use last pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.31</version> + <version>2018.33</version> </parent> <groupId>fr.ird.t3</groupId> @@ -101,8 +101,8 @@ <stageId>frirdt3</stageId> <applicationName>t3</applicationName> <t3-data.version>1.9</t3-data.version> - <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> - <lib.version.java4all.config>1.0.2</lib.version.java4all.config> +  +  <env>dev</env> <skipITs>true</skipITs> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a7f1fc8be1ee6d3a8faf6ffd2214b3e1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a7f1fc8be1ee6d3a8faf6ffd2214b3e1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: Améliorer les temps de traitement du N2 (See #324)
by Tony CHEMIT 18 Apr '18

18 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 5d8cb811 by Tony CHEMIT at 2018-04-18T10:02:53Z Améliorer les temps de traitement du N2 (See #324) - - - - - f6517ee6 by Tony CHEMIT at 2018-04-18T10:04:04Z [N2] A propos des résultats d'un traitement avec catégories de poids dans la stratification (Closes #317) - - - - - 9 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java - t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java @@ -229,4 +229,15 @@ public class L2CatchStratum extends CatchStratum<Level2Configuration, Level2Acti return sampleWeightModelFroAllSpecies; } + public void resetCorrectedElementaryCatches() { + for (Activity activity : getActivities().keySet()) { + if (activity.isCorrectedElementaryCatchNotEmpty()) { + for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { + if (correctedElementaryCatch.getCorrectedCatchWeight()==null) { + correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); + } + } + } + } + } } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java @@ -155,8 +155,9 @@ public class Level2Action extends T3Action<Level2Configuration> { Collections.singleton(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID), stratumConfiguration.getBeginDate(), stratumConfiguration.getEndDate()).keySet(); + inputContext.loadActivities(activityIds); for (String activityId : activityIds) { - for (CorrectedElementaryCatch correctedElementaryCatch : inputContext.getCorrectedElementaryCatch(activityId)) { + for (CorrectedElementaryCatch correctedElementaryCatch : inputContext.getActivityCache().forId(activityId).getCorrectedElementaryCatch()) { correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); } } @@ -173,6 +174,9 @@ public class Level2Action extends T3Action<Level2Configuration> { result.setSubstitutionLevel(0); incrementsProgression(); } else { + catchStratum.resetCorrectedElementaryCatches(); + //flushTransaction("clean stratum " + stratumConfiguration.getStratumIndex()); + // compute sample stratum try (L2SampleStratum sampleStratum = L2SampleStratum.newSampleStratum(stratumConfiguration, catchStratum, weightCategories, species, this)) { incrementsProgression(); @@ -187,6 +191,8 @@ public class Level2Action extends T3Action<Level2Configuration> { addWarningMessage(message); // mark it as 999 level to make it appear at top of a reverse list result.setSubstitutionLevel(999); + result.addNbActivities(catchStratum.getNbActivities()); + result.addNbActivitiesWithSample(catchStratum.getNbActivitiesWithSample()); // Fill back CorrectedElementaryCatch.CatchWeight to CorrectedElementaryCatch.CorrectedCatchWeight int activityIndex = 1; int nbActivities = catchStratum.getNbActivities(); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -196,6 +196,8 @@ public class Level3Action extends T3Action<Level3Configuration> { addWarningMessage(message); // mark it as 999 level to make it appear at top of a reverse list result.setSubstitutionLevel(999); + result.addNbActivities(catchStratum.getNbActivities()); + result.addNbActivitiesWithSample(catchStratum.getNbActivitiesWithSample()); // FIXME-269 Should we fill at least stratumLevelN3? } else { // can use this sampleStratum ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java @@ -67,6 +67,7 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum protected Map<Activity, Integer> filterActivities(S configuration, Map<String, Integer> activityIds) { Map<Activity, Integer> result = new HashMap<>(); if (activityIds != null && activityIds.size() > 0) { + configuration.loadActivities(activityIds.keySet()); Set<Vessel> possibleVessels = configuration.getPossibleCatchVessels(); WeightCategoryTreatment weightCategoryTreatment = configuration.getWeightCategoryTreatment(); for (Map.Entry<String, Integer> e : activityIds.entrySet()) { ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java @@ -274,4 +274,8 @@ public abstract class LevelInputContext<C extends LevelConfigurationWithStratum, public void clear() { activityCache.clear(); } + + public void loadActivities(Set<String> activityIds) { + activityCache.load(activityIds); + } } ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java @@ -163,6 +163,7 @@ public abstract class SampleStratumLoader<C extends LevelConfigurationWithStratu Set<Activity> result = new HashSet<>(); T configuration = getSampleStratum().getConfiguration(); Set<Vessel> possibleVessels = configuration.getPossibleSampleVessels(); + configuration.loadActivities(activityIds); WeightCategoryTreatment weightCategoryTreatment = configuration.getWeightCategoryTreatment(); for (String activityId : activityIds) { Activity activity = configuration.getActivity(activityId); ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java @@ -187,6 +187,10 @@ public class StratumConfiguration<C extends LevelConfigurationWithStratum, A ext return inputContext.getActivityCache().forId(activityId); } + public void loadActivities(Set<String> activityIds) { + inputContext.getActivityCache().load(activityIds); + } + @Override public String toString() { return String.format("%s [schoolType: %s, zone: %s, startDate:%s, endDate:%s, weightCategory: %s]", super.toString(), schoolType.getLabel1(), zone.getTopiaId(), beginDate, endDate, weightCategoryTreatment); ===================================== t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java @@ -25,8 +25,11 @@ import fr.ird.t3.entities.data.ActivityTopiaDao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; import java.util.TreeMap; +import java.util.TreeSet; /** * Created by tchemit on 23/03/2018. @@ -47,13 +50,32 @@ public class ActivityCache { public Activity forId(String activityId) { Activity result = cache.get(activityId); if (result == null) { - log.info(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); + log.debug(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); cache.put(activityId, result = activityDAO.forTopiaIdEquals(activityId).findUnique()); + if (cache.size() % 100 == 0) { + log.info(String.format("Cache Activity [%d]", cache.size())); + } } return result; } + public void load(Set<String> ids) { + Set<String> result = new LinkedHashSet<>(ids); + result.removeAll(cache.keySet()); + if (!result.isEmpty()) { + for (Activity activity : activityDAO.forTopiaIdIn(result).findAll()) { + String activityId = activity.getTopiaId(); + log.debug(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); + cache.put(activityId, activity); + if (cache.size() % 100 == 0) { + log.info(String.format("Cache Activity [%d]", cache.size())); + } + } + } + } + public void clear() { + log.info(String.format("Clear Cache Activity [%d]", cache.size())); cache.clear(); } } ===================================== t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java @@ -190,14 +190,16 @@ public final class WeightCompositionModelHelper { inResume ); } - WeightCompositionModelHelper.decorateModel( - header, - decoratorService, - model, - subModel, - null, - inResume - ); + if (model.getWeightCategories().size() > 1) { + WeightCompositionModelHelper.decorateModel( + header, + decoratorService, + model, + subModel, + null, + inResume + ); + } return inResume.toString(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fec55645f64315b5ef79ed2a98fed58… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fec55645f64315b5ef79ed2a98fed58… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 4 commits: clean code
by Tony CHEMIT 16 Apr '18

16 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 0b319d95 by Tony CHEMIT at 2018-04-15T15:20:29Z clean code - - - - - 48f2b301 by Tony CHEMIT at 2018-04-16T09:24:23Z [CONNEXION] Traiter l'exception lorsque la base PG accédée n'existe pas (closes #319) - - - - - eddf203a by Tony CHEMIT at 2018-04-16T09:24:54Z update config version - - - - - fec55645 by Tony CHEMIT at 2018-04-16T09:25:16Z Add more logs files - - - - - 12 changed files: - pom.xml - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java - t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java - t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java - t3-domain/src/main/resources/t3-log4j.conf - t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/css/screen.css Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ <applicationName>t3</applicationName> <t3-data.version>1.9</t3-data.version> <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> - <lib.version.java4all.config>1.0.2-SNAPSHOT</lib.version.java4all.config> + <lib.version.java4all.config>1.0.2</lib.version.java4all.config> <env>dev</env> <skipITs>true</skipITs> ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java @@ -110,7 +110,7 @@ public abstract class LevelOutputContext<C extends LevelConfigurationWithStratum } List<Integer> result = new ArrayList<>(levels); Collections.reverse(result); - return result.toArray(new Integer[result.size()]); + return result.toArray(new Integer[0]); } public long getTotalCatchActivitiesWithSample() { ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java @@ -108,12 +108,12 @@ public abstract class AbstractT3InputMSAccess implements T3Input { @Override public String[] getAnalyzeErrors() { - return errors.toArray(new String[errors.size()]); + return errors.toArray(new String[0]); } @Override public String[] getAnalyzeWarnings() { - return warnings.toArray(new String[warnings.size()]); + return warnings.toArray(new String[0]); } @Override ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java @@ -51,7 +51,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T @Override protected T3AccessEntityMeta[] newMetaArray(Collection<T3AccessEntityMeta> table) { - return table.toArray(new T3AccessEntityMeta[table.size()]); + return table.toArray(new T3AccessEntityMeta[0]); } @Override @@ -84,7 +84,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T Collections.addAll(buffer, meta.getErrors()); } } - return buffer.toArray(new String[buffer.size()]); + return buffer.toArray(new String[0]); } public String[] getWarnings() { @@ -94,7 +94,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T Collections.addAll(buffer, meta.getWarnings()); } } - return buffer.toArray(new String[buffer.size()]); + return buffer.toArray(new String[0]); } public void analyzeDb(T3AccessHitModel hits) throws Exception { ===================================== t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java @@ -115,7 +115,7 @@ public class SpeciesCountModelHelper { header.setHeader( String.format( lineFormat.toString(), - (Object[]) headerParams.toArray(new Object[headerParams.size()]))); + (Object[]) headerParams.toArray(new Object[0]))); header.setCategoryFormat("| %1$-" + (totalLength) + "s |\n"); @@ -158,7 +158,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); } @@ -176,7 +176,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); } @@ -192,7 +192,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); inResume.append(header.getBottomSeparatorFormat()); return inResume.toString(); ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java @@ -42,7 +42,7 @@ public class T3InputService extends T3ServiceSupport implements T3ServiceSinglet for (T3InputProvider provider : ServiceLoader.load(T3InputProvider.class)) { result.add(provider); } - providers = result.toArray(new T3InputProvider[result.size()]); + providers = result.toArray(new T3InputProvider[0]); } return providers; } ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java @@ -44,7 +44,7 @@ public class T3OutputService extends T3ServiceSupport implements T3ServiceSingle for (T3OutputProvider<?, ?> provider : ServiceLoader.load(T3OutputProvider.class)) { result.add(provider); } - providers = result.toArray(new T3OutputProvider[result.size()]); + providers = result.toArray(new T3OutputProvider[0]); } return providers; } ===================================== t3-domain/src/main/resources/t3-log4j.conf ===================================== --- a/t3-domain/src/main/resources/t3-log4j.conf +++ b/t3-domain/src/main/resources/t3-log4j.conf @@ -11,7 +11,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.File=${user.log.directory}/t3.log log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.MaxBackupIndex=30 log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%c:%L) %M - %m%n ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java @@ -21,6 +21,7 @@ package fr.ird.t3.web.actions; import com.opensymphony.xwork2.Preparable; +import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.user.JdbcConfiguration; import fr.ird.t3.entities.user.T3User; import fr.ird.t3.entities.user.UserDatabase; @@ -28,6 +29,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.sql.SQLException; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -83,6 +85,12 @@ public class SelectUserInputDatabaseAction extends T3ActionSupport implements Pr @Override public String execute() { // set the selected database in session + try { + T3EntityHelper.checkJDBCConnection(getDatabase()); + } catch (SQLException e) { + addActionError(t("t3.message.error.open.database", getDatabase().getUrl(), e.getMessage())); + return ERROR; + } getT3Session().initDatabaseConfiguration(getDatabase()); return SUCCESS; } ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -376,6 +376,7 @@ t3.menu.treatment.level3.launch=Start a level 3 treatment t3.message.discovered.trip.to.insert=La marée %s peut être importée dans T3 t3.message.discovered.trip.to.replace=La marée %s existe déjà dans T3 et peut être importée t3.message.discovered.unsafe.trip=La marée %s ne peut pas être importée dans T3 +t3.message.error.open.database=Could not open selected database [%s]\: %s t3.message.missingActionContext=Action could not be done (no action context found), start it from the beginning t3.message.missingLevel1Configuration=No configuration registred for level 1 treatment. t3.message.missingLevel2Configuration=No configuration registred for level 2 treatment. ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -376,6 +376,7 @@ t3.menu.treatment.level3.launch=Lancer un traitement de niveau 3 t3.message.discovered.trip.to.insert=La marée %s peut être importée dans T3 t3.message.discovered.trip.to.replace=La marée %s existe déjà dans T3 et peut être importée t3.message.discovered.unsafe.trip=La marée %s ne peut pas être importée dans T3 +t3.message.error.open.database=Impossible d'ouvrir la base sélectionnée [%s] \: %s t3.message.missingActionContext=L'action ne peut pas être réalisée, veuillez la reprendre depuis le début. t3.message.missingLevel1Configuration=Aucune configuration enregistrée pour les traitements du niveau 1. t3.message.missingLevel2Configuration=Aucune configuration enregistrée pour les traitements du niveau 2. ===================================== t3-web/src/main/webapp/css/screen.css ===================================== --- a/t3-web/src/main/webapp/css/screen.css +++ b/t3-web/src/main/webapp/css/screen.css @@ -79,7 +79,7 @@ font-size: 11px; .info_error { background: no-repeat scroll 8px 5px #FFE3E3; border: 2px solid #DD0000; - width: 800px; + /*width: 1000px;*/ margin-bottom: 5px; } .info_error ul{ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/de2f1e0d68db496af6af2b589e9a791… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/de2f1e0d68db496af6af2b589e9a791… You're receiving this email because of your account on gitlab.com.

1 0