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

[Git][ultreiaio/ird-t3] Pushed new tag v2.1
by Tony CHEMIT 25 Feb '18

25 Feb '18

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

1 0

[Git][ultreiaio/ird-t3][release/2.1] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions[skip ci]
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch release/2.1 at ultreiaio / ird-t3 Commits: 6e8d6571 by Tony CHEMIT at 2018-02-25T22:59:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions[skip ci] - - - - - bda4237b by Tony CHEMIT at 2018-02-25T23:10:48+01:00 fix version for release modules - - - - - 12 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-test/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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3-test</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.1-SNAPSHOT</version> + <version>2.1</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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f4f891b53206d5277ff7b0a2d83516b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f4f891b53206d5277ff7b0a2d83516b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][master] 61 commits: [jgitflow-maven-plugin]updating poms for 2.0.2-SNAPSHOT development
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: 406b7da3 by 166231 at 2017-05-11T00:24:49+00:00 [jgitflow-maven-plugin]updating poms for 2.0.2-SNAPSHOT development - - - - - f9528149 by 166231 at 2017-05-11T00:31:11+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - f37933a7 by 166231 at 2017-05-11T00:31:11+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - bafe0d71 by 166231 at 2017-05-11T00:31:12+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - fb633cf3 by 166231 at 2017-05-11T00:33:32+00:00 Update changelog after release of milestone 2.0.2 - - - - - cda2a47c by Tony CHEMIT at 2018-02-18T04:47:34+01:00 Update pom to use last ultreiaio pom + then use nearly updated libs (except for struts) - - - - - 02721df2 by Tony CHEMIT at 2018-02-18T07:07:25+01:00 use last pom + last data - - - - - a0fecb54 by Tony CHEMIT at 2018-02-18T07:37:00+01:00 Ajouter un lien entre ports et pays (See #253) - - - - - d9193bca by Tony CHEMIT at 2018-02-18T07:57:38+01:00 Supprimer localmarketpackaging.status (See #249) - - - - - 3d049b2d by Tony CHEMIT at 2018-02-18T08:09:53+01:00 Les topiaid de LocalMarketPackagingType sont mal préfixés (See #250) - - - - - c0965197 by Tony CHEMIT at 2018-02-18T09:09:54+01:00 [PERSISTENCE] Renommage de tables et champs (See #196) - - - - - 7768109b by Tony CHEMIT at 2018-02-21T00:23:45+01:00 [REFERENTIEL] Rajouter des champs de traduction (See #245) - - - - - 739d78af by Tony CHEMIT at 2018-02-21T00:23:47+01:00 L'importeur plante si les coordonnées d'un port sont à NULL (See #258) - - - - - d85f0d93 by Tony CHEMIT at 2018-02-21T00:23:47+01:00 generate bundle for main application - - - - - 7d705348 by Tony CHEMIT at 2018-02-21T00:23:47+01:00 move some pom conf - - - - - ef991d25 by Tony CHEMIT at 2018-02-21T00:23:47+01:00 Améliorations dans la gestion des profils utilisateurs (See #251) - - - - - db020e61 by Tony CHEMIT at 2018-02-21T00:23:47+01:00 [LOGS] Erreur d'affichage sur le log du RF1 (See #246) - - - - - 0d6eedfa by Tony CHEMIT at 2018-02-21T00:23:48+01:00 [N0.4][LOG] Calcul du nombre de calées et durée des calées - Petite erreur dans le log (See #160) - - - - - 87ba2424 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 [LOGS] Inversion de libellé dans le log d'import AVDTH (See #247) - - - - - 98f0052d by Tony CHEMIT at 2018-02-21T00:23:48+01:00 Ordonnacement du traitement de marées au 1.4 (distribution des échantillons sur les calées de l'échantillon) (See #259) - - - - - b1f3d41d by Tony CHEMIT at 2018-02-21T00:23:48+01:00 Erreur de libellé dans le log N0.1 (calcul des RF1) (See #270) - - - - - 389c4eb7 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 Amélioration du log du RF1 (N0.1) (See #2171) - - - - - 15bc0636 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 reformat code - - - - - 14ce5598 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 Probleme de calcul de rf1 (See #283) - - - - - 318b2b93 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 [WIN] Windows/Mauvais affichage des caractères accentués dans le navigateur (See #154) - - - - - 780318bf by Tony CHEMIT at 2018-02-21T00:23:48+01:00 use auto-service - - - - - aa86a809 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 Améliorations dans la gestion des profils utilisateurs (Pour la création on deamdne aussi une confirmation du mot de passe) (See #251) - - - - - 8c1d0a5e by Tony CHEMIT at 2018-02-21T00:23:48+01:00 improve configurations (for migration purpose) - - - - - 6f6dcf51 by Tony CHEMIT at 2018-02-21T00:23:48+01:00 fix migrations + add a test for migraiton - - - - - 6e537254 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 Let's go to version 2.1 - - - - - 893ac656 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 Use ird-t3-data 1.2 - - - - - 1266f890 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 [N0] Marée Echantillons seulement et gestion de l'UI du N0 (Closes #85) - - - - - 8f5d5139 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 let's use a password, otherwise can't open test db in IDEA, what a shame... - - - - - cafd70e9 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 Improve persistences tests - - - - - 8cea3365 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 [N0] Calcul des temps de pêche (See #240) - - - - - 9a005089 by Tony CHEMIT at 2018-02-21T00:23:49+01:00 [N0] Marée Echantillons seulement et gestion de l'UI du N0 (See #85) - - - - - e35842a5 by Tony CHEMIT at 2018-02-21T00:57:02+01:00 [N0] Calcul des temps de pêche (See #240) - - - - - 4072de7b by Tony CHEMIT at 2018-02-21T02:09:42+01:00 [N0.4] Calcul des durées de calées pour les activités avec setcount > 1 (Closes #241) - - - - - 676b259b by Tony CHEMIT at 2018-02-21T09:17:30+01:00 [N1][N2][N3] Permettre la sélection mutliple d'océans (See #260) N1 done - - - - - c6cd77c4 by Tony CHEMIT at 2018-02-21T10:50:19+01:00 Fill Harbour.ocean (See #260) - - - - - 92a44e1e by Tony CHEMIT at 2018-02-21T10:50:58+01:00 up data version - - - - - b2092129 by Tony CHEMIT at 2018-02-21T13:41:45+01:00 [N1][N2][N3] Permettre la sélection mutliple d'océans (See #260) N2 and N3 done (plus reformat and clean codes and those levels) - - - - - b1ffee7e by Tony CHEMIT at 2018-02-21T14:06:48+01:00 Revert removed method - - - - - 89e03ab7 by Tony CHEMIT at 2018-02-21T15:48:15+01:00 Sur la page 'Gérer les marées', la mise en page déborde de l'écran à droite. Voir la PJ. Cela génère un ascenseur horizontal, pourtant inutile. (Closes #232) - - - - - 5ce68d04 by Tony CHEMIT at 2018-02-21T15:50:10+01:00 [UI][N2][N3] Changer la sélection de la flotte d'une sélection unique vers une sélection multiple (Closes #243) - - - - - 19e6e2e5 by Tony CHEMIT at 2018-02-21T16:15:01+01:00 Fix loading trips with no ocean - - - - - 0ea4c85e by Tony CHEMIT at 2018-02-21T17:02:36+01:00 fix level 2 and 3 config code - - - - - 5b34b3ef by Tony CHEMIT at 2018-02-21T17:05:13+01:00 [N2][N3] Gestion des catégories de poids -10/+10kg dans la stratification N2 et N3 (Mise en place de la configuration) (See #263) - - - - - ea4a2e79 by Tony CHEMIT at 2018-02-21T20:14:49+01:00 [N2][N3] Gestion des catégories de poids -10/+10kg dans la stratification N2 et N3 (Mise en place du lancement d'une action (reste à gerer ça au sein des strates) (See #263) - - - - - dc65837f by Tony CHEMIT at 2018-02-22T15:32:40+01:00 improve test config - - - - - 3e1ae6d6 by Tony CHEMIT at 2018-02-22T22:04:44+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (Mise en place de la persistence) (See #244) - - - - - 4f2c864f by Tony CHEMIT at 2018-02-23T03:28:15+01:00 Ajouter un nouveau package avec des bases h2 (vide et avec le référentiel) (closes #285) - - - - - f6afe830 by Tony CHEMIT at 2018-02-23T03:41:19+01:00 use t3 data 1.3 - - - - - fcbee305 by Tony CHEMIT at 2018-02-23T03:59:47+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (deplacer l'ancien code dans un package legacy) (See #244) - - - - - 27a021ea by Tony CHEMIT at 2018-02-25T16:59:34+01:00 use new pom conf to deploy - - - - - 95ed5ffc by Tony CHEMIT at 2018-02-25T16:59:40+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en place d'un switch pour utiliser le nouveau mécanisme) (See #244) - - - - - 8ad6d17c by Tony CHEMIT at 2018-02-25T22:41:17+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en place de la nouvelle implantation) (See #244) - - - - - f4f891b5 by Tony CHEMIT at 2018-02-25T22:58:09+01:00 [jgitflow-maven-plugin]updating poms for 2.1 branch with snapshot versions[skip ci] - - - - - 6e8d6571 by Tony CHEMIT at 2018-02-25T22:59:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions[skip ci] - - - - - bda4237b by Tony CHEMIT at 2018-02-25T23:10:48+01:00 fix version for release modules - - - - - 11d713b9 by Tony CHEMIT at 2018-02-25T23:46:54+01:00 [jgitflow-maven-plugin]merging 'release/2.1' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/deploy - + .mvn/mono-module-site - + .mvn/pom.gitflow.develop - + .mvn/pom.gitflow.master - + .mvn/pom.organizationId - + .mvn/pom.projectId - + .mvn/pom.stageId - CHANGELOG.md - CONTRIBUTING.md - README.md - pom.xml - + t3-actions/.mvn/i18n-generate - + t3-actions/.mvn/i18n-parse-java - + t3-actions/.mvn/load-test-data - + t3-actions/.mvn/pom.gitflow.develop - + t3-actions/.mvn/pom.gitflow.master - + t3-actions/.mvn/pom.organizationId - + t3-actions/.mvn/pom.projectId - + t3-actions/.mvn/pom.stageId - t3-actions/pom.xml - t3-actions/src/license/THIRD-PARTY.properties - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/21d11ee3ccff60cb558b2ebb68b8c51… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/21d11ee3ccff60cb558b2ebb68b8c51… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 7 commits: [jgitflow-maven-plugin]updating poms for 2.1 branch with snapshot versions[skip ci]
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: f4f891b5 by Tony CHEMIT at 2018-02-25T22:58:09+01:00 [jgitflow-maven-plugin]updating poms for 2.1 branch with snapshot versions[skip ci] - - - - - 6e8d6571 by Tony CHEMIT at 2018-02-25T22:59:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions[skip ci] - - - - - bda4237b by Tony CHEMIT at 2018-02-25T23:10:48+01:00 fix version for release modules - - - - - 11d713b9 by Tony CHEMIT at 2018-02-25T23:46:54+01:00 [jgitflow-maven-plugin]merging 'release/2.1' into 'master' - - - - - 7817355e by Tony CHEMIT at 2018-02-25T23:46:56+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - c7c5f103 by Tony CHEMIT at 2018-02-25T23:46:56+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fe986192 by Tony CHEMIT at 2018-02-25T23:46:57+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 2 changed files: - t3-installer/pom.xml - t3/pom.xml Changes: ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3-installer</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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7e8c6347b1c9540542cf60a7b08ae64… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7e8c6347b1c9540542cf60a7b08ae64… 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.2-SNAPSHOT development[skip ci]
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7e8c6347 by Tony CHEMIT at 2018-02-25T22:58:10+01:00 [jgitflow-maven-plugin]updating poms for 2.2-SNAPSHOT development[skip ci] - - - - - 10 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-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/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.1-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> @@ -245,13 +245,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> ===================================== 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.1-SNAPSHOT</version> + <version>2.2-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.1-SNAPSHOT</version> + <version>2.2-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.1-SNAPSHOT</version> + <version>2.2-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.1-SNAPSHOT</version> + <version>2.2-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.1-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</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.1-SNAPSHOT</version> + <version>2.2-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.1-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>t3-test</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.1-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7e8c6347b1c9540542cf60a7b08ae646… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7e8c6347b1c9540542cf60a7b08ae646… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Pushed new branch release/2.1
by Tony CHEMIT 25 Feb '18

25 Feb '18

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

1 0

[Git][ultreiaio/ird-t3][develop] [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en…
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 8ad6d17c by Tony CHEMIT at 2018-02-25T22:41:17+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en place de la nouvelle implantation) (See #244) - - - - - 30 changed files: - pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - + t3-domain/src/main/java/fr/ird/t3/entities/conversion/DefaultWeightCategoryLogBookConverter.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverter.java - + t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverterProvider.java - − t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConverter.java - − t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBO.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategoryLogBookConversionSpeciesImpl.java - t3-domain/src/test/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProviderTest.java → t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverterProviderTest.java - t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java - t3-domain/src/test/resources/db/WeightCategoryLogBookConvertorProviderTest.sql → t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction.java - t3-web/src/main/resources/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction-validateConvertCatchesWeightCategories-validation.xml - t3-web/src/main/resources/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction-validation.xml - 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/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8ad6d17c437f241d56bc5e4125f20028… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/8ad6d17c437f241d56bc5e4125f20028… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: use new pom conf to deploy
by Tony CHEMIT 25 Feb '18

25 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 27a021ea by Tony CHEMIT at 2018-02-25T16:59:34+01:00 use new pom conf to deploy - - - - - 95ed5ffc by Tony CHEMIT at 2018-02-25T16:59:40+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en place d'un switch pour utiliser le nouveau mécanisme) (See #244) - - - - - 0983614a by Tony CHEMIT at 2018-02-25T22:26:32+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (mise en place de la nouvelle implantation) (See #244) - - - - - 30 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - + t3-domain/src/main/java/fr/ird/t3/entities/conversion/DefaultWeightCategoryLogBookConverter.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverter.java - + t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverterProvider.java - − t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConverter.java - − t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OABO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OIBO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConverterFOR_OPBO.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategoryLogBookConversionSpeciesImpl.java - t3-domain/src/test/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProviderTest.java → t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConverterProviderTest.java - t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java - t3-domain/src/test/resources/db/WeightCategoryLogBookConvertorProviderTest.sql → t3-domain/src/test/resources/db/WeightCategoryLogBookConverterProviderTest.sql - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction.java - t3-web/src/main/resources/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction-validateConvertCatchesWeightCategories-validation.xml - t3-web/src/main/resources/fr/ird/t3/web/actions/data/level0/ConvertCatchesWeightCategoriesConfigureAction-validation.xml - 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/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfigResume.jsp The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fcbee3056fb34ba8001e0f2ead801be… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fcbee3056fb34ba8001e0f2ead801be… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique…
by Tony CHEMIT 23 Feb '18

23 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: fcbee305 by Tony CHEMIT at 2018-02-23T03:59:47+01:00 [N0.3] Rendre la conversion des catégories de poids AVDTH->T3 générique (deplacer l'ancien code dans un package legacy) (See #244) - - - - - 15 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/AbstractWeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConvertor.java - + t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProvider.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBO.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBI.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBL.java - t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBO.java - t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java → t3-domain/src/test/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProviderTest.java - t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java @@ -20,11 +20,11 @@ */ package fr.ird.t3.actions.data.level0; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertor; import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorProvider; +import fr.ird.t3.entities.conversion.legacy.LegacyWeightCategoryLogBookConvertorProvider; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.CorrectedElementaryCatch; import fr.ird.t3.entities.data.CorrectedElementaryCatchTopiaDao; @@ -37,15 +37,16 @@ import fr.ird.t3.entities.reference.SpeciesTopiaDao; import fr.ird.t3.entities.reference.WeightCategoryLogBook; import fr.ird.t3.entities.reference.WeightCategoryTreatment; import fr.ird.t3.services.ioc.InjectDAO; -import java.util.Collection; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.l; @@ -59,16 +60,11 @@ import static org.nuiton.i18n.I18n.l; */ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<ConvertCatchesWeightCategoriesConfiguration> { - /** Logger. */ - private static final Log log = LogFactory.getLog( - ConvertCatchesWeightCategoriesAction.class); - + private static final Log log = LogFactory.getLog(ConvertCatchesWeightCategoriesAction.class); + Map<Species, CatchWeightResult> specieWeightResult; @InjectDAO(entityType = CorrectedElementaryCatch.class) - protected CorrectedElementaryCatchTopiaDao correctedElementaryCatchDAO; - - protected WeightCategoryLogBookConvertorProvider convertorProvider; - - protected Map<Species, CatchWeightResult> specieWeightResult; + private CorrectedElementaryCatchTopiaDao correctedElementaryCatchDAO; + private WeightCategoryLogBookConvertorProvider convertorProvider; public ConvertCatchesWeightCategoriesAction() { super(Level0Step.CONVERT_CATCHES_WEIGHT_CATEGORIES); @@ -82,7 +78,7 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C return specieWeightResult.get(species); } - protected CatchWeightResult getCatchWeithResult(Map<Species, CatchWeightResult> specieWeightResult, Species species) { + private CatchWeightResult getCatchWeithResult(Map<Species, CatchWeightResult> specieWeightResult, Species species) { CatchWeightResult result = specieWeightResult.get(species); if (result == null) { result = new CatchWeightResult(); @@ -96,8 +92,7 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C super.prepareAction(); - setConvertorProvider( - WeightCategoryLogBookConvertorProvider.newInstance(getT3TopiaPersistenceContext().get())); + setConvertorProvider(LegacyWeightCategoryLogBookConvertorProvider.newInstance(getT3TopiaPersistenceContext().get())); List<Trip> tripList = getUsableTrips(null, true); setTrips(tripList); @@ -130,7 +125,7 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C return result; } - protected boolean executeForTrip(Trip trip) throws TopiaException { + private boolean executeForTrip(Trip trip) throws TopiaException { incrementsProgression(); @@ -162,22 +157,19 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C } if (log.isInfoEnabled()) { - log.info("Treat activity " + activity.getDate() + - " with " + activity.sizeElementaryCatch()); + log.info(String.format("Treat activity %s with %d", activity.getDate(), activity.sizeElementaryCatch())); } Ocean currentOcean = activity.getOcean(); SchoolType schoolType = activity.getSchoolType(); // get converter for this ocean and school type - WeightCategoryLogBookConvertor converter = - convertorProvider.getConvertor(currentOcean, schoolType); + WeightCategoryLogBookConvertor converter = convertorProvider.getConvertor(currentOcean, schoolType); if (converter == null) { // can not redistribute if no weight categories found message = l(locale, "t3.level0.convertCatchesWeightCategories.warning.noconvertor.found", - currentOcean.getLabel1(), - schoolType.getLabel1()); + currentOcean.getLabel1(), schoolType.getLabel1()); if (log.isWarnEnabled()) { log.warn(message); } @@ -185,33 +177,24 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C continue; } - if (log.isDebugEnabled()) { - log.debug("Use converter " + converter); - } - // split catches by species - Multimap<Species, ElementaryCatch> catchesBySpecie = - SpeciesTopiaDao.groupBySpecies(activity.getElementaryCatch()); + Multimap<Species, ElementaryCatch> catchesBySpecie = SpeciesTopiaDao.groupBySpecies(activity.getElementaryCatch()); for (Species species : catchesBySpecie.keySet()) { - CatchWeightResult catchWeightResult = - getCatchWeithResult(tripResult, species); + CatchWeightResult catchWeightResult = getCatchWeithResult(tripResult, species); - Collection<ElementaryCatch> catches = - catchesBySpecie.get(species); + Collection<ElementaryCatch> catches = catchesBySpecie.get(species); catchWeightResult.addLogBookWeight(catches); if (log.isInfoEnabled()) { - log.info("Treat species " + species.getCode() + " with " + - catches.size() + " catches"); + log.info(String.format("Treat species %d with %d catches", species.getCode(), catches.size())); } // converts to weight category treatment for this species - Map<WeightCategoryTreatment, Float> distribution = - converter.distribute(species, catches); + Map<WeightCategoryTreatment, Float> distribution = converter.distribute(species, catches); if (MapUtils.isEmpty(distribution)) { @@ -219,20 +202,17 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C continue; } - Collection<CorrectedElementaryCatch> newCatches = - Lists.newArrayList(); + Collection<CorrectedElementaryCatch> newCatches = new ArrayList<>(); // create new catches - for (Map.Entry<WeightCategoryTreatment, Float> e2 : - distribution.entrySet()) { + for (Map.Entry<WeightCategoryTreatment, Float> e2 : distribution.entrySet()) { WeightCategoryTreatment weightCategoryTreatment = e2.getKey(); Float weight = e2.getValue(); CorrectedElementaryCatch correctedElementaryCatch = correctedElementaryCatchDAO.create( CorrectedElementaryCatch.PROPERTY_WEIGHT_CATEGORY_TREATMENT, weightCategoryTreatment, CorrectedElementaryCatch.PROPERTY_SPECIES, species, - CorrectedElementaryCatch.PROPERTY_CATCH_WEIGHT, weight - ); + CorrectedElementaryCatch.PROPERTY_CATCH_WEIGHT, weight); newCatches.add(correctedElementaryCatch); } @@ -272,15 +252,14 @@ public class ConvertCatchesWeightCategoriesAction extends AbstractLevel0Action<C return true; } - public void setConvertorProvider(WeightCategoryLogBookConvertorProvider convertorProvider) { + private void setConvertorProvider(WeightCategoryLogBookConvertorProvider convertorProvider) { this.convertorProvider = convertorProvider; } public static class CatchWeightResult { - protected float logBookTotalWeight; - - protected float treatmentTotalWeight; + float logBookTotalWeight; + float treatmentTotalWeight; public float getLogBookTotalWeight() { return logBookTotalWeight; ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProvider.java @@ -8,28 +8,27 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ird.t3.entities.conversion; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.SchoolType; import fr.ird.t3.entities.reference.WeightCategoryTreatment; import fr.ird.t3.entities.reference.WeightCategoryTreatmentTopiaDao; -import java.util.Collection; import org.nuiton.topia.persistence.TopiaException; +import java.util.Collection; +import java.util.Objects; + /** * To obtain a ll available wieght convertors. * @@ -38,157 +37,23 @@ import org.nuiton.topia.persistence.TopiaException; */ public class WeightCategoryLogBookConvertorProvider { - protected static final String OCEAN = - WeightCategoryTreatment.PROPERTY_OCEAN + "." + Ocean.PROPERTY_CODE; - - protected static final String SCHOOL_TYPE = - WeightCategoryTreatment.PROPERTY_SCHOOL_TYPE + "." + - SchoolType.PROPERTY_CODE; - - protected final Collection<WeightCategoryLogBookConvertor> convertors; - - public static final int OA = 1; - - public static final int OI = 2; - - public static final int OP = 5; - - public static final int BO = 1; - - public static final int BL = 2; - - public static final int BI = 3; - - public static WeightCategoryLogBookConvertorProvider newInstance(T3TopiaPersistenceContext transaction) throws TopiaException { - - WeightCategoryTreatmentTopiaDao dao = transaction.getWeightCategoryTreatmentDao(); - - Collection<WeightCategoryLogBookConvertor> converters = - Lists.newArrayList(); - - // BO = 1, BL = 2, BI = 3 - // OA = 1, OI = 2, OP = 5 - - prepareForOA(dao, converters); - prepareForOI(dao, converters); - prepareForOP(dao, converters); - - return new WeightCategoryLogBookConvertorProvider(converters); - } - - private static void prepareForOA(WeightCategoryTreatmentTopiaDao dao, - Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { - { - // BO Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OABO( - getCategory(dao, OA, BO, null, null), - getCategory(dao, OA, BO, 0, 10), - getCategory(dao, OA, BO, 10, null) - ); - converters.add(convertor); - } - { - // BL Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OABL( - getCategory(dao, OA, BL, null, null), - getCategory(dao, OA, BL, 0, 10), - getCategory(dao, OA, BL, 10, 30), - getCategory(dao, OA, BL, 30, null) - ); - converters.add(convertor); - } - { - // BI Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OABI( - getCategory(dao, OA, BI, null, null), - getCategory(dao, OA, BI, 0, 10), - getCategory(dao, OA, BI, 10, 30), - getCategory(dao, OA, BI, 30, null) - ); - converters.add(convertor); - } - - } - - private static void prepareForOI(WeightCategoryTreatmentTopiaDao dao, - Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { - - { - // BO Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OIBO( - getCategory(dao, OI, BO, null, null), - getCategory(dao, OI, BO, 0, 10), - getCategory(dao, OI, BO, 10, null) - ); - converters.add(convertor); - } - { - // BL Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OIBL( - getCategory(dao, OI, BL, null, null), - getCategory(dao, OI, BL, 0, 10), - getCategory(dao, OI, BL, 10, null) - ); - converters.add(convertor); - } - { - // BI Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OIBI( - getCategory(dao, OI, BI, null, null), - getCategory(dao, OI, BI, 0, 10), - getCategory(dao, OI, BI, 10, null) - ); - converters.add(convertor); - } - } - - private static void prepareForOP(WeightCategoryTreatmentTopiaDao dao, - Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { - - { - // BO Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OPBO( - getCategory(dao, OP, BO, null, null), - getCategory(dao, OP, BO, 0, 10), - getCategory(dao, OP, BO, 10, null) - ); - converters.add(convertor); - } - { - // BL Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OPBL( - getCategory(dao, OP, BL, null, null), - getCategory(dao, OP, BL, 0, 10), - getCategory(dao, OP, BL, 10, null) - ); - converters.add(convertor); - } - { - // BI Convertor - WeightCategoryLogBookConvertor convertor = - new WeightCategoryLogBookConvertorFOR_OPBI( - getCategory(dao, OP, BI, null, null), - getCategory(dao, OP, BI, 0, 10), - getCategory(dao, OP, BI, 10, null) - ); - converters.add(convertor); - } - } + private final Collection<WeightCategoryLogBookConvertor> convertors; protected WeightCategoryLogBookConvertorProvider(Collection<WeightCategoryLogBookConvertor> convertors) { this.convertors = convertors; } - public WeightCategoryLogBookConvertor getConvertor(Ocean ocean, - SchoolType schoolType) { + protected static WeightCategoryTreatment getCategory(WeightCategoryTreatmentTopiaDao dao, + int oceanCode, + int schoolTypeCode, + Integer min, + Integer max) throws TopiaException { + WeightCategoryTreatment result = dao.findByOceanSchoolTypeAndBound(oceanCode, schoolTypeCode, min, max); + return Objects.requireNonNull(result, + String.format("Could not find weight treatment category with parameters : [ocean:%d, schoolType:%d, min:%d, max:%d]", oceanCode, schoolTypeCode, min, max)); + } + + public WeightCategoryLogBookConvertor getConvertor(Ocean ocean, SchoolType schoolType) { WeightCategoryLogBookConvertor result = null; for (WeightCategoryLogBookConvertor converter : convertors) { if (converter.accept(ocean, schoolType)) { @@ -198,26 +63,4 @@ public class WeightCategoryLogBookConvertorProvider { } return result; } - - private static WeightCategoryTreatment getCategory(WeightCategoryTreatmentTopiaDao dao, - int oceanCode, - int schoolTypeCode, - Integer min, - Integer max) throws TopiaException { - - WeightCategoryTreatment result = dao.findByOceanSchoolTypeAndBound( - oceanCode, - schoolTypeCode, - min, - max - ); - - Preconditions.checkNotNull( - result, - "Could not find weight treatment category with " + - "parameters : [ocean:" + oceanCode + ", schoolType:" + - schoolTypeCode + ", min:" + min + ", max:" + max + "]" - ); - return result; - } } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/AbstractWeightCategoryLogBookConvertor.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConvertor.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/AbstractWeightCategoryLogBookConvertor.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/AbstractWeightCategoryLogBookConvertor.java @@ -18,8 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; +import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertor; import fr.ird.t3.entities.data.ElementaryCatch; import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.SchoolType; ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProvider.java ===================================== --- /dev/null +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProvider.java @@ -0,0 +1,176 @@ +/* + * #%L + * T3 :: Domain + * %% + * Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ird.t3.entities.conversion.legacy; + +import com.google.common.collect.Lists; +import fr.ird.t3.entities.T3TopiaPersistenceContext; +import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertor; +import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorProvider; +import fr.ird.t3.entities.reference.WeightCategoryTreatmentTopiaDao; +import org.nuiton.topia.persistence.TopiaException; + +import java.util.Collection; + +/** + * To obtain a ll available wieght convertors. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 1.0 + */ +public class LegacyWeightCategoryLogBookConvertorProvider extends WeightCategoryLogBookConvertorProvider { + + public static final int OA = 1; + public static final int OI = 2; + public static final int OP = 5; + public static final int BO = 1; + public static final int BL = 2; + public static final int BI = 3; + + private LegacyWeightCategoryLogBookConvertorProvider(Collection<WeightCategoryLogBookConvertor> convertors) { + super(convertors); + } + + public static WeightCategoryLogBookConvertorProvider newInstance(T3TopiaPersistenceContext transaction) throws TopiaException { + + WeightCategoryTreatmentTopiaDao dao = transaction.getWeightCategoryTreatmentDao(); + + Collection<WeightCategoryLogBookConvertor> converters = + Lists.newArrayList(); + + // BO = 1, BL = 2, BI = 3 + // OA = 1, OI = 2, OP = 5 + + prepareForOA(dao, converters); + prepareForOI(dao, converters); + prepareForOP(dao, converters); + + return new LegacyWeightCategoryLogBookConvertorProvider(converters); + } + + private static void prepareForOA(WeightCategoryTreatmentTopiaDao dao, + Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { + { + // BO Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OABO( + getCategory(dao, OA, BO, null, null), + getCategory(dao, OA, BO, 0, 10), + getCategory(dao, OA, BO, 10, null) + ); + converters.add(convertor); + } + { + // BL Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OABL( + getCategory(dao, OA, BL, null, null), + getCategory(dao, OA, BL, 0, 10), + getCategory(dao, OA, BL, 10, 30), + getCategory(dao, OA, BL, 30, null) + ); + converters.add(convertor); + } + { + // BI Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OABI( + getCategory(dao, OA, BI, null, null), + getCategory(dao, OA, BI, 0, 10), + getCategory(dao, OA, BI, 10, 30), + getCategory(dao, OA, BI, 30, null) + ); + converters.add(convertor); + } + + } + + private static void prepareForOI(WeightCategoryTreatmentTopiaDao dao, + Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { + + { + // BO Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OIBO( + getCategory(dao, OI, BO, null, null), + getCategory(dao, OI, BO, 0, 10), + getCategory(dao, OI, BO, 10, null) + ); + converters.add(convertor); + } + { + // BL Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OIBL( + getCategory(dao, OI, BL, null, null), + getCategory(dao, OI, BL, 0, 10), + getCategory(dao, OI, BL, 10, null) + ); + converters.add(convertor); + } + { + // BI Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OIBI( + getCategory(dao, OI, BI, null, null), + getCategory(dao, OI, BI, 0, 10), + getCategory(dao, OI, BI, 10, null) + ); + converters.add(convertor); + } + } + + private static void prepareForOP(WeightCategoryTreatmentTopiaDao dao, + Collection<WeightCategoryLogBookConvertor> converters) throws TopiaException { + + { + // BO Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OPBO( + getCategory(dao, OP, BO, null, null), + getCategory(dao, OP, BO, 0, 10), + getCategory(dao, OP, BO, 10, null) + ); + converters.add(convertor); + } + { + // BL Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OPBL( + getCategory(dao, OP, BL, null, null), + getCategory(dao, OP, BL, 0, 10), + getCategory(dao, OP, BL, 10, null) + ); + converters.add(convertor); + } + { + // BI Convertor + WeightCategoryLogBookConvertor convertor = + new WeightCategoryLogBookConvertorFOR_OPBI( + getCategory(dao, OP, BI, null, null), + getCategory(dao, OP, BI, 0, 10), + getCategory(dao, OP, BI, 10, null) + ); + converters.add(convertor); + } + } + + +} ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABI.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABI.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABI.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import fr.ird.t3.entities.data.ElementaryCatch; import fr.ird.t3.entities.reference.Species; @@ -47,7 +47,7 @@ public class WeightCategoryLogBookConvertorFOR_OABI extends AbstractWeightCatego WeightCategoryTreatment plus10Category, WeightCategoryTreatment plus30Category) { - super(WeightCategoryLogBookConvertorProvider.OA, WeightCategoryLogBookConvertorProvider.BI, minus10Category, unknownCategory); + super(LegacyWeightCategoryLogBookConvertorProvider.OA, LegacyWeightCategoryLogBookConvertorProvider.BI, minus10Category, unknownCategory); this.plus10Category = plus10Category; this.plus30Category = plus30Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABL.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABL.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABL.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -45,8 +45,8 @@ public class WeightCategoryLogBookConvertorFOR_OABL extends AbstractWeightCatego WeightCategoryTreatment plus10Category, WeightCategoryTreatment plus30Category) { - super(WeightCategoryLogBookConvertorProvider.OA, - WeightCategoryLogBookConvertorProvider.BL, + super(LegacyWeightCategoryLogBookConvertorProvider.OA, + LegacyWeightCategoryLogBookConvertorProvider.BL, minus10Category, unknownCategory); this.plus10Category = plus10Category; this.plus30Category = plus30Category; ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABO.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OABO.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OABO.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OABO extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OA, - WeightCategoryLogBookConvertorProvider.BO, + super(LegacyWeightCategoryLogBookConvertorProvider.OA, + LegacyWeightCategoryLogBookConvertorProvider.BO, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBI.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBI.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBI.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import fr.ird.t3.entities.data.ElementaryCatch; import fr.ird.t3.entities.reference.Species; @@ -44,8 +44,8 @@ public class WeightCategoryLogBookConvertorFOR_OIBI extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OI, - WeightCategoryLogBookConvertorProvider.BI, + super(LegacyWeightCategoryLogBookConvertorProvider.OI, + LegacyWeightCategoryLogBookConvertorProvider.BI, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBL.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBL.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBL.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OIBL extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OI, - WeightCategoryLogBookConvertorProvider.BL, + super(LegacyWeightCategoryLogBookConvertorProvider.OI, + LegacyWeightCategoryLogBookConvertorProvider.BL, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBO.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OIBO.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OIBO.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OIBO extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OI, - WeightCategoryLogBookConvertorProvider.BO, + super(LegacyWeightCategoryLogBookConvertorProvider.OI, + LegacyWeightCategoryLogBookConvertorProvider.BO, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBI.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBI.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBI.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBI.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OPBI extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OP, - WeightCategoryLogBookConvertorProvider.BI, + super(LegacyWeightCategoryLogBookConvertorProvider.OP, + LegacyWeightCategoryLogBookConvertorProvider.BI, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBL.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBL.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBL.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBL.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OPBL extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OP, - WeightCategoryLogBookConvertorProvider.BL, + super(LegacyWeightCategoryLogBookConvertorProvider.OP, + LegacyWeightCategoryLogBookConvertorProvider.BL, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBO.java → t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBO.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorFOR_OPBO.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/conversion/legacy/WeightCategoryLogBookConvertorFOR_OPBO.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import com.google.common.collect.Maps; import fr.ird.t3.entities.data.ElementaryCatch; @@ -42,8 +42,8 @@ public class WeightCategoryLogBookConvertorFOR_OPBO extends AbstractWeightCatego WeightCategoryTreatment minus10Category, WeightCategoryTreatment plus10Category) { - super(WeightCategoryLogBookConvertorProvider.OP, - WeightCategoryLogBookConvertorProvider.BO, + super(LegacyWeightCategoryLogBookConvertorProvider.OP, + LegacyWeightCategoryLogBookConvertorProvider.BO, minus10Category, unknownCategory); this.plus10Category = plus10Category; } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java → t3-domain/src/test/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProviderTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/conversion/legacy/LegacyWeightCategoryLogBookConvertorProviderTest.java @@ -18,10 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ird.t3.entities.conversion; +package fr.ird.t3.entities.conversion.legacy; import fr.ird.t3.entities.AbstractDatabaseTest; import fr.ird.t3.entities.T3TopiaPersistenceContext; +import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorProvider; import org.junit.Assert; import org.junit.Test; @@ -31,15 +32,15 @@ import org.junit.Test; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ -public class WeightCategoryLogBookConvertorProviderTest extends AbstractDatabaseTest { +public class LegacyWeightCategoryLogBookConvertorProviderTest extends AbstractDatabaseTest { @Test - public void newInstance() throws Exception { + public void newInstance() { db.loadClassPathScript("/db/WeightCategoryLogBookConvertorProviderTest.sql"); try (T3TopiaPersistenceContext tx = beginTransaction()) { - WeightCategoryLogBookConvertorProvider provider = WeightCategoryLogBookConvertorProvider.newInstance(tx); + WeightCategoryLogBookConvertorProvider provider = LegacyWeightCategoryLogBookConvertorProvider.newInstance(tx); Assert.assertNotNull(provider); } ===================================== t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java @@ -24,16 +24,17 @@ package fr.ird.t3.services.migration; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertor; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OABI; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OABL; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OABO; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OIBI; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OIBL; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OIBO; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OPBI; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OPBL; -import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorFOR_OPBO; import fr.ird.t3.entities.conversion.WeightCategoryLogBookConvertorProvider; +import fr.ird.t3.entities.conversion.legacy.LegacyWeightCategoryLogBookConvertorProvider; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OABI; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OABL; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OABO; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OIBI; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OIBL; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OIBO; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OPBI; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OPBL; +import fr.ird.t3.entities.conversion.legacy.WeightCategoryLogBookConvertorFOR_OPBO; import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.OceanTopiaDao; import fr.ird.t3.entities.reference.SchoolType; @@ -119,7 +120,7 @@ public class T3MigrationTest { try (T3TopiaPersistenceContext persistenceContext = rootContext.newPersistenceContext()) { - WeightCategoryLogBookConvertorProvider convertorProvider = WeightCategoryLogBookConvertorProvider.newInstance(persistenceContext); + WeightCategoryLogBookConvertorProvider convertorProvider = LegacyWeightCategoryLogBookConvertorProvider.newInstance(persistenceContext); OceanTopiaDao oceanDao = persistenceContext.getOceanDao(); speciesDao = persistenceContext.getSpeciesDao(); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fcbee3056fb34ba8001e0f2ead801be3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/fcbee3056fb34ba8001e0f2ead801be3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use t3 data 1.3
by Tony CHEMIT 23 Feb '18

23 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: f6afe830 by Tony CHEMIT at 2018-02-23T03:41:19+01:00 use t3 data 1.3 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <applicationName>t3</applicationName> - <t3-data.version>1.3-SNAPSHOT</t3-data.version> + <t3-data.version>1.3</t3-data.version> <env>dev</env> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f6afe830521894eb83279a0e94478804… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f6afe830521894eb83279a0e94478804… You're receiving this email because of your account on gitlab.com.

1 0