- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.12
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT deleted branch release/7.6.12 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.6.12
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

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

1 0

[Git][ultreiaio/ird-observe][release/7.6.12] [jgitflow-maven-plugin]updating poms for branch'release/7.6.12' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch release/7.6.12 at ultreiaio / ird-observe Commits: b8685c31 by Tony Chemit at 2022-04-30T15:09:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.12' with non-snapshot versions[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.12</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b8685c3106b422e2f7aa758e4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b8685c3106b422e2f7aa758e4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 14 commits: [jgitflow-maven-plugin]updating poms for 7.6.12-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: c2ffd236 by Tony Chemit at 2022-01-06T17:24:49+01:00 [jgitflow-maven-plugin]updating poms for 7.6.12-SNAPSHOT development[skip ci] - - - - - 85b2fb01 by Tony Chemit at 2022-01-06T17:31:06+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - cd32b791 by Tony Chemit at 2022-01-06T17:31:06+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - fab778cc by Tony Chemit at 2022-01-06T17:31:07+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 75d64c9f by Tony Chemit at 2022-03-12T09:56:41+01:00 Référentiel / Systèmes Observés / 'Voir toutes les utilisations de ce référentiel' ne fonctionne plus - Closes #2177 - - - - - 186510ca by Tony Chemit at 2022-03-12T10:12:45+01:00 Petit défaut de mise en page sur 7.6.11 - Closes #2200 - - - - - 78ccbf3a by Tony Chemit at 2022-04-30T12:53:02+02:00 last dependencies update Mise à jour de dépendences - Closes #2209 * nuiton.topia → 3.8.1 * nuiton.version → 1.0 * log4j2 → 2.17.2 * slf4j → 1.7.31 * javassist → 3.28.0-GA * mockito → 4.4.0 * google.guava → 31.1-jre * google.gson → 2.9.0 * google.auto-service → 1.0.1 * postgresql → 42.3.4 * freemarker → 2.3.31 * jboss-logging → 3.4.3.Final * hibernate → 5.6.8.Final * hikariCP → 4.0.3 * bytebuddy → 1.12.8 * junit → 4.13.2 * checker-qual → 3.21.3 * httpmime → 4.5.13 * httpcore → 4.4.15 * httpclient → 4.5.13 * commons-lang3 → 3.12.0 * commons-validator → 1.7 * commons-io → 2.11.0 - - - - - f32f45b3 by Tony Chemit at 2022-04-30T12:53:02+02:00 Boutons de cadrage sur la carte 7.6.11 - Closes #2152 - - - - - b36df46d by Tony Chemit at 2022-04-30T12:53:02+02:00 Amélioration de la synchronisation simple de référentiel - See #2306 Souci d'import de la base AZTI dans cette base centrale - Closes #2305 - - - - - 89a4ed2b by Tony Chemit at 2022-04-30T12:53:02+02:00 Low consolidate service logs - - - - - 3f2ade36 by Tony Chemit at 2022-04-30T14:47:45+02:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See #2214 - - - - - 09f4f198 by Tony Chemit at 2022-04-30T14:58:16+02:00 Impossible d'exporter toutes les marées d'une centrale en local en 7.6.11 - Closes #2307 - - - - - b8685c31 by Tony Chemit at 2022-04-30T15:09:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.12' with non-snapshot versions[skip ci] - - - - - 63b8d828 by Tony Chemit at 2022-04-30T15:31:54+02:00 [jgitflow-maven-plugin]merging 'release/7.6.12' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/SetLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java - client-runner/pom.xml - common-dto/pom.xml - common-dto/src/main/java/fr/ird/observe/dto/IdHelper.java - common-persistence/pom.xml - common-service/pom.xml - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateConfigurationDto.java - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - observe/pom.xml - persistence/pom.xml - persistence/src/main/models/Observe.model - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-core/src/main/filtered-resources/mapping - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java - server-runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1e2a9570fccfc778b039adfd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1e2a9570fccfc778b039adfd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.12' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b8685c31 by Tony Chemit at 2022-04-30T15:09:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.12' with non-snapshot versions[skip ci] - - - - - 63b8d828 by Tony Chemit at 2022-04-30T15:31:54+02:00 [jgitflow-maven-plugin]merging 'release/7.6.12' into 'master-7.x' - - - - - 19d141ff by Tony Chemit at 2022-04-30T15:31:56+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 79329741 by Tony Chemit at 2022-04-30T15:31:56+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 894d5d0c by Tony Chemit at 2022-04-30T15:31:56+02:00 [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-observe/-/compare/abebcff168ac54d93c9c7fe8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abebcff168ac54d93c9c7fe8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.13-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: abebcff1 by Tony Chemit at 2022-04-30T15:08:54+02:00 [jgitflow-maven-plugin]updating poms for 7.6.13-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12-SNAPSHOT</version> + <version>7.6.13-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/abebcff168ac54d93c9c7fe8c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/abebcff168ac54d93c9c7fe8c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.12
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Impossible d'exporter toutes les marées d'une centrale en local en 7.6.11 - Closes #2307
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 09f4f198 by Tony Chemit at 2022-04-30T14:58:16+02:00 Impossible d'exporter toutes les marées d'une centrale en local en 7.6.11 - Closes #2307 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java ===================================== @@ -118,7 +118,8 @@ public class StorageBackupUILauncher extends StorageUILauncher { SelectionTreeModel dataModel = storageModel.getSelectDataModel(); int stepsCount = 1; - if (!dataModel.isDataFull()) { + boolean needCopyDataToTemporaryDatasource = !dataModel.isDataFull() || !localSource.isLocal(); + if (needCopyDataToTemporaryDatasource) { Map<ProgramReference, List<DataDtoReference<?, ?>>> tripsByProgram = dataModel.getSelectedDataByProgram(); for (List<DataDtoReference<?, ?>> programDtoReferentialReference : tripsByProgram.values()) { stepsCount += 2 * programDtoReferentialReference.size(); @@ -128,7 +129,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { progressModel.setStepsCount(stepsCount + 1); try { - if (!dataModel.isDataFull()) { + if (needCopyDataToTemporaryDatasource) { // on renseigne les marees a exporter uniquement si // on en a selectionner, de plus si on a selectionne @@ -153,7 +154,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { for (Map.Entry<ProgramReference, List<DataDtoReference<?, ?>>> entry : tripsByProgram.entrySet()) { - for (DataDtoReference trip : entry.getValue()) { + for (DataDtoReference<?, ?> trip : entry.getValue()) { ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId()); ExportTripResult exportTripResult = managementService.exportTrip(exportRequest); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/09f4f19862dd584706b3350e8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/09f4f19862dd584706b3350e8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: last dependencies update
by Tony CHEMIT (＠tchemit) April 30, 2022

April 30, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 78ccbf3a by Tony Chemit at 2022-04-30T12:53:02+02:00 last dependencies update Mise à jour de dépendences - Closes #2209 * nuiton.topia → 3.8.1 * nuiton.version → 1.0 * log4j2 → 2.17.2 * slf4j → 1.7.31 * javassist → 3.28.0-GA * mockito → 4.4.0 * google.guava → 31.1-jre * google.gson → 2.9.0 * google.auto-service → 1.0.1 * postgresql → 42.3.4 * freemarker → 2.3.31 * jboss-logging → 3.4.3.Final * hibernate → 5.6.8.Final * hikariCP → 4.0.3 * bytebuddy → 1.12.8 * junit → 4.13.2 * checker-qual → 3.21.3 * httpmime → 4.5.13 * httpcore → 4.4.15 * httpclient → 4.5.13 * commons-lang3 → 3.12.0 * commons-validator → 1.7 * commons-io → 2.11.0 - - - - - f32f45b3 by Tony Chemit at 2022-04-30T12:53:02+02:00 Boutons de cadrage sur la carte 7.6.11 - Closes #2152 - - - - - b36df46d by Tony Chemit at 2022-04-30T12:53:02+02:00 Amélioration de la synchronisation simple de référentiel - See #2306 Souci d'import de la base AZTI dans cette base centrale - Closes #2305 - - - - - 89a4ed2b by Tony Chemit at 2022-04-30T12:53:02+02:00 Low consolidate service logs - - - - - 3f2ade36 by Tony Chemit at 2022-04-30T14:47:45+02:00 Impossible de créer une base centrale vierge, quelque soit la méthode appliquée - See #2214 - - - - - 14 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateConfigurationDto.java - persistence/src/main/models/Observe.model - pom.xml - server-core/src/main/filtered-resources/mapping - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java - services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/DataSourceService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java - services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.client.ui.util.BooleanEditor; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor; import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; import fr.ird.observe.client.validation.ObserveSwingValidator; import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.dto.IdDto; @@ -633,16 +634,15 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected void init(JComponent editor, Set<String> notBlockingComponents) { final Boolean propertyName = (Boolean) editor.getClientProperty(CLIENT_PROPERTY_NOT_BLOCKING); if (propertyName != null) { - if (editor instanceof FilterableDoubleList) { - notBlockingComponents.add("universeListPane"); notBlockingComponents.add("selectedListPane"); - + } else if (editor instanceof TripMapUI) { + notBlockingComponents.add("zoomIt"); + notBlockingComponents.add("zoomOut"); + notBlockingComponents.add("zoomPlus"); } else { - notBlockingComponents.add(editor.getName()); - } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -102,6 +102,10 @@ enabled:{!model.isCreatingMode()} } +#tripMap { + _notBlocking: true; +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -147,6 +147,10 @@ NumberEditor { enabled:{!model.isCreatingMode()} } +#tripMap { + _notBlocking: true; +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java ===================================== @@ -37,9 +37,12 @@ import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfiguratio import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import org.apache.logging.log4j.Logger; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import java.awt.Window; @@ -65,7 +68,7 @@ public enum ObstunaAdminAction { CREATE() { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame, boolean serverMode) { - return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this),serverMode ) { + return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this), serverMode) { DataSourceCreateConfigurationDto createConfigurationDto; ObserveSwingDataSource dataSource; @@ -148,6 +151,29 @@ public enum ObstunaAdminAction { log.info("Create db..."); } + ObserveDataSourceConfiguration importReferentialConfig = createConfigurationDto.getImportReferentialDataSourceConfiguration(); + + ObserveDataSourceConfiguration importDataDataSourceConfiguration = createConfigurationDto.getImportDataDataSourceConfiguration(); + + if (importReferentialConfig != null && importDataDataSourceConfiguration == null) { + + // simple referential import, prepare dump here + + Version dbVersion = dataSource.getVersion(); + AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres(dbVersion).addSchema().addReferential(); + + TopiaSqlScript referentialDump; + + try (ObserveSwingDataSource importDataSource = Objects.requireNonNull(ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(importReferentialConfig))) { + importDataSource.open(); + + SqlScriptProducerService dumpProducerService = importDataSource.getSqlScriptProducerService(); + referentialDump = dumpProducerService.produceAddSqlScript(request); + createConfigurationDto.setImportDatabase(referentialDump); + } + } + + try { dataSource.create(createConfigurationDto); @@ -161,6 +187,11 @@ public enum ObstunaAdminAction { } } } + /* + INSERT INTO observe_common.vessel(topiaid, + topiaversion, + topiacreatedate, lastupdatedate, code, uri, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, vesselsizecategory, vesseltype, flagcountry, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, comment, iattcid, ctoiid, nationalid, comid, tuviid, imoid, radiocallsignid, shipowner) VALUES ('fr.ird.observe.entities.referentiel.Vessel#1239832677818#0.8965634485687902', 23, '2009-04-15 00:00:00.1', '2022-03-25 10:22:37.082', '225', NULL, false, 1, 'PERE BRIANT', 'PERE BRIANT', 'PERE BRIANT', NULL, NULL, NULL, NULL, NULL, 'fr.ird.observe.entities.referentiel.VesselSizeCategory#1239832675542#0.750774668545597', 'fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.307197212385357', 'fr.ird.observe.entities.referentiel.Country#1239832675583#0.9493110781716075', 209, 1, NULL, 1975, 64.65, 1575, 4000, 12, clob3: STRINGDECODE('Coul\u00e9 le 22/09/2011 au large du Gabon (20/09/2012 plus de positionnement VMS)'), 'ATEU0FRA00054', NULL, 'CC243864', NULL, NULL, '7363035', NULL, NULL) + */ @Override protected void applySecurity() { @@ -180,7 +211,7 @@ public enum ObstunaAdminAction { UPDATE() { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame, boolean serverMode) { - return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this),serverMode ) { + return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this), serverMode) { ObserveSwingDataSource dataSource; ObserveDataSourceInformation dataSourceInformation; @@ -239,7 +270,7 @@ public enum ObstunaAdminAction { SECURITY() { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame, boolean serverMode) { - return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this),serverMode ) { + return new RemoteUILauncher(this, context, frame, I18nEnumHelper.getLabel(this), serverMode) { ObserveSwingDataSource dataSource; ImmutableSet<ObserveDbUserDto> users; @@ -269,7 +300,10 @@ public enum ObstunaAdminAction { public String getLabel() { return I18nEnumHelper.getLabel(this); } - /** Logger */ + + /** + * Logger + */ private static final Logger log = LogManager.getLogger(ObstunaAdminAction.class); public static ObstunaAdminAction valueOfIgnoreCase(String value) { ===================================== common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateConfigurationDto.java ===================================== @@ -111,6 +111,9 @@ public class DataSourceCreateConfigurationDto extends AbstractObserveDto { public void setImportDatabase(TopiaSqlScript importDatabase) { Objects.requireNonNull(importDatabase, "'importDatabase' can't be null."); this.optionalImportDatabase = importDatabase; + if (optionalImportReferentialDataSourceConfiguration != null && optionalImportDataDataSourceConfiguration == null) { + optionalImportReferentialDataSourceConfiguration = null; + } } public void setImportReferentialDataSourceConfiguration(ObserveDataSourceConfiguration importReferentialDataSourceConfiguration) { ===================================== persistence/src/main/models/Observe.model ===================================== @@ -387,7 +387,7 @@ startDate + {*:1} Date endDate + {*:1} Date referentiel.Gear > referentiel.I18nReferentialEntity | entity -gearCaracteristic {*:*} referentiel.GearCaracteristic | lazy=false +gearCaracteristic {*:*} referentiel.GearCaracteristic | lazy=false orderBy=code referentiel.GearCaracteristic > referentiel.I18nReferentialEntity | entity unit + {*:1} String @@ -485,7 +485,7 @@ referentiel.SizeMeasureType > referentiel.I18nReferentialEntity | entity referentiel.Species > referentiel.I18nReferentialEntity | entity speciesGroup {*:0..1} referentiel.SpeciesGroup | lazy=false -ocean {*:*} referentiel.Ocean | lazy=false +ocean {*:*} referentiel.Ocean | lazy=false orderBy=code faoCode + {*:1} String scientificLabel + {*:1} String homeId + {*:1} String @@ -497,7 +497,7 @@ maxWeight + {*:1} Float | sqlType=numeric sizeMeasureType {*:0..1} referentiel.SizeMeasureType referentiel.SpeciesGroup > referentiel.I18nReferentialEntity | entity -speciesGroupReleaseMode {*:*} referentiel.SpeciesGroupReleaseMode | unique lazy=false +speciesGroupReleaseMode {*:*} referentiel.SpeciesGroupReleaseMode | unique lazy=false orderBy=code referentiel.SpeciesGroupReleaseMode > referentiel.I18nReferentialEntity | entity ===================================== pom.xml ===================================== @@ -160,7 +160,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <maven.version>3.8.4</maven.version> + <maven.version>3.8.5</maven.version>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> @@ -170,17 +170,25 @@ <lib.version.java4all.topia>1.1.17</lib.version.java4all.topia> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils> <lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx> - - <lib.version.log4j2>2.17.1</lib.version.log4j2> - + <lib.version.hibernate>5.6.8.Final</lib.version.hibernate> + <lib.version.hikariCP>4.0.3</lib.version.hikariCP>  - - <lib.version.postgresql>42.3.1</lib.version.postgresql> + <lib.version.bytebuddy>1.12.9</lib.version.bytebuddy> + <lib.version.nuiton.topia>3.8.1</lib.version.nuiton.topia> + <lib.version.nuiton.version>1.0</lib.version.nuiton.version> + <lib.version.log4j2>2.17.2</lib.version.log4j2> + <lib.version.slf4j>1.7.32</lib.version.slf4j> + <lib.version.javassist>3.28.0-GA</lib.version.javassist> + <lib.version.jackson>2.12.0</lib.version.jackson> + <lib.version.mockito>4.4.0</lib.version.mockito> + <lib.version.google.guava>31.1-jre</lib.version.google.guava> + <lib.version.google.gson>2.9.0</lib.version.google.gson> + <lib.version.google.auto-service>1.0.1</lib.version.google.auto-service> + <lib.version.postgresql>42.3.4</lib.version.postgresql> <lib.version.commons-io>2.11.0</lib.version.commons-io> <lib.version.commons-lang3>3.12.0</lib.version.commons-lang3> - <lib.version.checker-qual>3.20.0</lib.version.checker-qual> + <lib.version.checker-qual>3.21.4</lib.version.checker-qual> <lib.version.sisu.plexus>0.3.5</lib.version.sisu.plexus> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -221,6 +229,52 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.11.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.12.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.13</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.4.15</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.5.13</version> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.4.3.Final</version> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.31</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.eclipse.sisu</groupId> <artifactId>org.eclipse.sisu.inject</artifactId> ===================================== server-core/src/main/filtered-resources/mapping ===================================== @@ -58,7 +58,7 @@ GET /api/v1/DataSourceService/backup GET /api/v1/DataSourceService/checkCanConnect v1.DataSourceServiceRestApi.checkCanConnect GET /api/v1/DataSourceService/checkCanConnectOrBeEmpty v1.DataSourceServiceRestApi.checkCanConnectOrBeEmpty GET /api/v1/DataSourceService/close v1.DataSourceServiceRestApi.close -GET /api/v1/DataSourceService/create v1.DataSourceServiceRestApi.create +POST /api/v1/DataSourceService/create v1.DataSourceServiceRestApi.create GET /api/v1/DataSourceService/destroy v1.DataSourceServiceRestApi.destroy GET /api/v1/DataSourceService/getReferentialTypesInShell v1.DataSourceServiceRestApi.getReferentialTypesInShell GET /api/v1/DataSourceService/getUsers v1.DataSourceServiceRestApi.getUsers ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -53,6 +53,12 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi /** Logger. */ private static final Logger log = LogManager.getLogger(DataSourceServiceRestApi.class); + @Override + public ObserveDataSourceInformation checkCanConnectOrBeEmpty(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException { + ObserveDataSourceConfiguration dataSourceConfigurationTopia = getTopiaDataSourceConfiguration(dataSourceConfiguration); + return getAnonymousService(dataSourceConfigurationTopia).checkCanConnectOrBeEmpty(dataSourceConfigurationTopia); + } + @Override public ObserveDataSourceInformation checkCanConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java ===================================== @@ -68,8 +68,6 @@ import org.nuiton.version.Version; import org.nuiton.version.Versions; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Optional; @@ -290,6 +288,7 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS dataSourceCreateConfiguration.validateConfiguration(); Path temporaryDirectory = getTemporaryDirectory(dataSourceConfiguration); + log.debug("Will use temporary directory: " + temporaryDirectory); boolean initSchema = !dataSourceCreateConfiguration.isImportDatabase(); ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.createTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, initSchema); @@ -301,41 +300,45 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS log.info("Create new database from a script."); TopiaSqlScript importDatabase = dataSourceCreateConfiguration.getImportDatabase(); - if (((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration).isH2Database()) { - topiaApplicationContext.executeSqlStatements(importDatabase); - topiaApplicationContext.getMigrationService().createSchemaIfNotExist(); - topiaApplicationContext.getMigrationService().runSchemaMigration(); - } else { // base postgres - - // on realise les import dans un base H2 temporaire - File tmpDir; - try { - tmpDir = Files.createTempDirectory(temporaryDirectory, "obstuna").toFile(); - } catch (IOException e) { - throw new IllegalStateException("could not create temporary directory ", e); - } - - ObserveDataSourceConfigurationTopiaH2 temporaryConfiguration = createTemporaryConfiguration(tmpDir, dataSourceConfiguration.getModelVersion()); - - ObserveTopiaApplicationContext temporaryTopiaApplicationContext = ObserveTopiaApplicationContextFactory.createTopiaApplicationContext(temporaryConfiguration, false); - temporaryTopiaApplicationContext.executeSqlStatements(importDatabase); - temporaryTopiaApplicationContext.getMigrationService().createSchemaIfNotExist(); - temporaryTopiaApplicationContext.getMigrationService().runSchemaMigration(); - - SqlScriptProducerService dumpProducerService = serviceContext.newService(temporaryConfiguration, SqlScriptProducerService.class); - AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres(dataSourceConfiguration.getModelVersion()).addSchema().addReferential().addAllData(); - TopiaSqlScript dump = dumpProducerService.produceAddSqlScript(request); - topiaApplicationContext.executeSqlStatements(dump); - topiaApplicationContext.getMigrationService().createSchemaIfNotExist(); - topiaApplicationContext.getMigrationService().runSchemaMigration(); - - temporaryTopiaApplicationContext.close(); - File databaseFile = temporaryConfiguration.getDatabaseFile(); - - if (!databaseFile.delete()) { - throw new IllegalStateException("could not delete " + databaseFile); - } - } + topiaApplicationContext.executeSqlStatements(importDatabase); + topiaApplicationContext.getMigrationService().createSchemaIfNotExist(); + topiaApplicationContext.getMigrationService().runSchemaMigration(); + +// if (((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration).isH2Database()) { +// topiaApplicationContext.executeSqlStatements(importDatabase); +// topiaApplicationContext.getMigrationService().createSchemaIfNotExist(); +// topiaApplicationContext.getMigrationService().runSchemaMigration(); +// } else { // base postgres +// +// // on realise les import dans un base H2 temporaire +// File tmpDir; +// try { +// tmpDir = Files.createTempDirectory(temporaryDirectory, "obstuna").toFile(); +// } catch (IOException e) { +// throw new IllegalStateException("could not create temporary directory ", e); +// } +// +// ObserveDataSourceConfigurationTopiaH2 temporaryConfiguration = createTemporaryConfiguration(tmpDir, dataSourceConfiguration.getModelVersion()); +// temporaryConfiguration.setTemporaryDirectory(temporaryDirectory); +// ObserveTopiaApplicationContext temporaryTopiaApplicationContext = ObserveTopiaApplicationContextFactory.createTopiaApplicationContext(temporaryConfiguration, false); +// temporaryTopiaApplicationContext.executeSqlStatements(importDatabase); +// temporaryTopiaApplicationContext.getMigrationService().createSchemaIfNotExist(); +// temporaryTopiaApplicationContext.getMigrationService().runSchemaMigration(); +// +// SqlScriptProducerService dumpProducerService = serviceContext.newService(temporaryConfiguration, SqlScriptProducerService.class); +// AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres(dataSourceConfiguration.getModelVersion()).addSchema().addReferential().addAllData(); +// TopiaSqlScript dump = dumpProducerService.produceAddSqlScript(request); +// topiaApplicationContext.executeSqlStatements(dump); +// topiaApplicationContext.getMigrationService().createSchemaIfNotExist(); +// topiaApplicationContext.getMigrationService().runSchemaMigration(); +// +// temporaryTopiaApplicationContext.close(); +// File databaseFile = temporaryConfiguration.getDatabaseFile(); +// +// if (!databaseFile.delete()) { +// throw new IllegalStateException("could not delete " + databaseFile); +// } +// } } else { @@ -539,7 +542,10 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS @Override public Set<ObserveDbUserDto> getUsers(ObserveDataSourceConfiguration dataSourceConfiguration) { - + // Make sure temporary directory set in configuration + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2214 + Path temporaryDirectory = getTemporaryDirectory(dataSourceConfiguration); + log.debug("Will use temporary directory: " + temporaryDirectory); Set<ObserveDbUserDto> users = new LinkedHashSet<>(); // pas d'user pour les bases autres que postgresql ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -226,7 +226,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements for (Route route : tripSeine.getRoute()) { String routePrefix = String.format("Route [%s/%s] ", ++routeIndex, routeMax); - log.info(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId())); + log.debug(String.format("%s Start consolidate route: %s", routePrefix, route.getTopiaId())); int activityIndex = 0; int activityMax = route.sizeActivitySeine(); for (ActivitySeine activitySeine : route.getActivitySeine()) { @@ -235,7 +235,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements boolean floatingObjectEmpty = activitySeine.isFloatingObjectEmpty(); if (!activitySeine.isSetOperation() && floatingObjectEmpty) { - log.info(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activitySeine.getTopiaId())); + log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activitySeine.getTopiaId())); continue; } @@ -300,7 +300,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements ActivitySeine activity = activityContext.activity; - log.info(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId())); + log.debug(String.format("%s Start consolidate activity: %s", activityContext.activityPrefix, activity.getTopiaId())); if (activity.isFloatingObjectNotEmpty()) { ===================================== services/src/main/java/fr/ird/observe/services/service/DataSourceService.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import io.ultreia.java4all.http.spi.Get; +import io.ultreia.java4all.http.spi.Post; import java.io.Closeable; import java.io.File; @@ -50,7 +51,7 @@ public interface DataSourceService extends ObserveService, Closeable { @Get(addAuthtoken = false) ObserveDataSourceInformation checkCanConnectOrBeEmpty(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException; - @Get(addAuthtoken = false) + @Post(addAuthtoken = false, useMultiPartForm = true) ObserveDataSourceConnection create(ObserveDataSourceConfiguration dataSourceConfiguration, DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException; ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java ===================================== @@ -40,6 +40,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; @@ -110,7 +111,7 @@ public class UnidirectionalReferentialSynchronizeEngine { Set<String> insertAssociationSqlRequests = new LinkedHashSet<>(); Set<String> deleteAssociationSqlRequests = new LinkedHashSet<>(); Set<String> updateSqlRequests = new LinkedHashSet<>(); - Set<String> deleteSqlRequests = new LinkedHashSet<>(); + List<String> deleteSqlRequests = new LinkedList<>(); Set<String> sqlRequests = new LinkedHashSet<>(); @@ -142,7 +143,6 @@ public class UnidirectionalReferentialSynchronizeEngine { Set<String> generatedSqlRequests = localService.generateSqlRequests(referentialSynchronizeRequest); for (String sqlStatement : generatedSqlRequests) { - if (sqlStatement.startsWith("INSERT")) { insertSqlRequests.add(sqlStatement); } else if (sqlStatement.startsWith("$$_INSERT")) { @@ -155,12 +155,13 @@ public class UnidirectionalReferentialSynchronizeEngine { deleteSqlRequests.add(sqlStatement); } } - } sqlRequests.addAll(deleteAssociationSqlRequests); sqlRequests.addAll(insertSqlRequests); sqlRequests.addAll(insertAssociationSqlRequests); sqlRequests.addAll(updateSqlRequests); + // always reverse delete order - See 2306 + Collections.reverse(deleteSqlRequests); sqlRequests.addAll(deleteSqlRequests); context.setSqlRequests(sqlRequests); @@ -187,12 +188,18 @@ public class UnidirectionalReferentialSynchronizeEngine { UnidirectionalReferentialSynchronizeRequest.Builder<D> builder = UnidirectionalReferentialSynchronizeRequest.builder(dtoType); List<D> leftAddDifferentials = new LinkedList<>(); + List<D> leftUpdateDifferentials = new LinkedList<>(); DifferentialList leftDifferentials = leftDiffStates.get(dtoType); if (leftDifferentials != null) { - leftDifferentials.getStates().stream().filter(f -> f.getDifferentialType() == DifferentialType.ADDED).forEach(d -> { - @SuppressWarnings("unchecked") D thisSourceDto = (D) d.getThisSourceDto(); - leftAddDifferentials.add(thisSourceDto); - }); + for (Differential differential : leftDifferentials.getStates()) { + @SuppressWarnings("unchecked") D thisSourceDto = (D) differential.getThisSourceDto(); + if (differential.getDifferentialType() == DifferentialType.ADDED) { + leftAddDifferentials.add(thisSourceDto); + } else { + @SuppressWarnings("unchecked") D rightDto = (D) differential.getOptionalOtherSideDto().orElse(null); + leftUpdateDifferentials.add(rightDto); + } + } } DifferentialList rightDifferentials = rightDiffStates.get(dtoType); @@ -219,6 +226,11 @@ public class UnidirectionalReferentialSynchronizeEngine { rightUpdateDifferentials.forEach(builder::entityToUpdate); } + // Tous les référentiels mises à jour dans la base local doivent être mis à jour depuis la base centrale + if (!leftUpdateDifferentials.isEmpty()) { + leftUpdateDifferentials.forEach(builder::entityToUpdate); + } + // Tous les référentiels non présents dans la base centrale doivent être supprimés en local if (!leftAddDifferentials.isEmpty()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java ===================================== @@ -179,9 +179,11 @@ public class DifferentialModel { D rightSideDto = rightSideDtoMap.get(id); int compareLastUpdateDate = compareTo(leftSideDto, rightSideDto); - if (0 == compareLastUpdateDate) { - continue; - } + // always compare properties to be sure to have all modifications + // See 2306 +// if (0 == compareLastUpdateDate) { +// continue; +// } // something may be modified View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/886d303e90ebe10ab2fa6582… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/886d303e90ebe10ab2fa6582… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][features/one-to-one] 4 commits: Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302
by Tony CHEMIT (＠tchemit) April 28, 2022

April 28, 2022

Tony CHEMIT pushed to branch features/one-to-one at ultreiaio / ird-observe Commits: ca91748d by Tony Chemit at 2022-04-28T18:46:12+02:00 Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302 - - - - - 1a1b8b8e by Tony Chemit at 2022-04-28T18:46:23+02:00 Sur échantillons PS, un contrôle de validation imparfait - Closes #2295 - - - - - 6549af9a by Tony Chemit at 2022-04-28T18:46:33+02:00 Libellés français dans l'arbre à corriger - Closes #2297 - - - - - ceb3720d by Tony Chemit at 2022-04-28T18:47:05+02:00 Liste des relations FK à inverser - See ultreiaio/ird-observe#2247 - - - - - 13 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIHandler.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ll/common/TripService.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripMapBuilder.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/ToolkitEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abd22a268abb2016cef5512b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abd22a268abb2016cef5512b… You're receiving this email because of your account on gitlab.com.

1 0