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

[Git][ultreiaio/ird-observe][master-7.x] 11 commits: [jgitflow-maven-plugin]updating poms for 7.5.3-SNAPSHOT development[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 68a3f618 by Tony Chemit at 2020-05-13T17:09:57+02:00 [jgitflow-maven-plugin]updating poms for 7.5.3-SNAPSHOT development[skip ci] - - - - - 3b3ec569 by Tony Chemit at 2020-05-13T17:42:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b083928d by Tony Chemit at 2020-05-13T17:42:21+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - e9dd77a3 by Tony Chemit at 2020-05-13T17:42:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - dd59aa48 by Tony Chemit at 2020-05-18T11:36:59+02:00 Prepare version 7.6.0 (Version de base dans tms_version - Closes #1485) - - - - - 5ad12da3 by Tony Chemit at 2020-05-18T12:41:05+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Do not take account of referential usages) - See #1432 - - - - - 4b175471 by Tony Chemit at 2020-05-18T12:41:21+02:00 Ne pas sauvegarder automatiquement la base locale lors d'une action longue - Close #1487 - - - - - a0611f51 by Tony Chemit at 2020-05-18T12:56:36+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Improve generator code) - See #1432 - - - - - f2769f7e by Tony Chemit at 2020-05-21T08:15:49+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - c0bbdbdc by Tony Chemit at 2020-05-21T08:34:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci] - - - - - 6493aec8 by Tony Chemit at 2020-05-21T08:48:17+02:00 [jgitflow-maven-plugin]merging 'release/7.6.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - 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/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.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/content/open/ContentOpenableUI.jcss - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2869f823a567158b0c84966b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2869f823a567158b0c84966b… 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.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c0bbdbdc by Tony Chemit at 2020-05-21T08:34:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci] - - - - - 6493aec8 by Tony Chemit at 2020-05-21T08:48:17+02:00 [jgitflow-maven-plugin]merging 'release/7.6.0' into 'master-7.x' - - - - - 3b51a25e by Tony Chemit at 2020-05-21T08:48:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 8f14e0ba by Tony Chemit at 2020-05-21T08:48:21+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 5100ddfc by Tony Chemit at 2020-05-21T08:48:21+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/a6259aaa0fcad4b19f1f97f5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6259aaa0fcad4b19f1f97f5… 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.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a6259aaa by Tony Chemit at 2020-05-21T08:32:16+02:00 [jgitflow-maven-plugin]updating poms for 7.6.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/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 - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -119,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6259aaa0fcad4b19f1f97f5b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6259aaa0fcad4b19f1f97f5b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.0
by Tony CHEMIT 21 May '20

21 May '20

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

1 0

[Git][ultreiaio/ird-observe][develop] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 30d8a319 by Tony Chemit at 2020-05-21T08:11:32+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 3 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss ===================================== @@ -46,4 +46,5 @@ #delete { visible:{model.isUpdatingMode()}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss ===================================== @@ -45,7 +45,7 @@ #delete { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #open { @@ -54,12 +54,12 @@ #close { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #create { visible:{!model.isCreatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #extraActions { @@ -68,5 +68,5 @@ #move { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss ===================================== @@ -53,12 +53,10 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.close.tip")}; } #create { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.data.ll.logbook.TripSampleList.action.create")}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.create.tip")}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167de… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167de… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f2769f7e by Tony Chemit at 2020-05-21T08:15:49+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - 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/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.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/content/open/ContentOpenableUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -75,5 +75,5 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isValid()}; + enabled:{!model.isModified()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss ===================================== @@ -73,13 +73,13 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { + enabled:{!model.isModified()}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -107,12 +107,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss ===================================== @@ -156,12 +156,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss ===================================== @@ -273,7 +273,6 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; _toolTipText:{t("observe.action.delete.floatingObject.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss ===================================== @@ -51,12 +51,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.RouteDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.RouteDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.RouteDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -152,12 +152,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss ===================================== @@ -41,7 +41,6 @@ #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; } #openActions { @@ -52,19 +51,16 @@ _observeAction:{ReOpenUIAction.ACTION_NAME}; _globalAction:{OpenDataGlobalUIAction.ACTION_NAME}; visible:{model.isReadingMode() && model.isCanReopen()}; - enabled:{model.isReadingMode() && model.isCanReopen()}; } #close { _observeAction:{CloseOpenUIAction.ACTION_NAME}; _globalAction:{CloseDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } #closeAndCreate { _observeAction:{CloseAndCreateUIAction.ACTION_NAME}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f2769f7e57e52bb10600d5592… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f2769f7e57e52bb10600d5592… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 42a1c9ab by Tony Chemit at 2020-05-21T07:51:45+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - 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/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.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/content/open/ContentOpenableUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -75,5 +75,5 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isValid()}; + enabled:{!model.isModified()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss ===================================== @@ -73,13 +73,13 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { + enabled:{!model.isModified()}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -107,12 +107,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss ===================================== @@ -156,12 +156,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss ===================================== @@ -273,7 +273,6 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; _toolTipText:{t("observe.action.delete.floatingObject.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss ===================================== @@ -51,12 +51,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.RouteDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.RouteDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.RouteDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -152,12 +152,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss ===================================== @@ -41,7 +41,6 @@ #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; } #openActions { @@ -52,19 +51,16 @@ _observeAction:{ReOpenUIAction.ACTION_NAME}; _globalAction:{OpenDataGlobalUIAction.ACTION_NAME}; visible:{model.isReadingMode() && model.isCanReopen()}; - enabled:{model.isReadingMode() && model.isCanReopen()}; } #close { _observeAction:{CloseOpenUIAction.ACTION_NAME}; _globalAction:{CloseDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } #closeAndCreate { _observeAction:{CloseAndCreateUIAction.ACTION_NAME}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/42a1c9abf84f94873eb0fdf2f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/42a1c9abf84f94873eb0fdf2f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si...
by Tony CHEMIT 18 May '20

18 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5ad12da3 by Tony Chemit at 2020-05-18T12:41:05+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Do not take account of referential usages) - See #1432 - - - - - 4b175471 by Tony Chemit at 2020-05-18T12:41:21+02:00 Ne pas sauvegarder automatiquement la base locale lors d'une action longue - Close #1487 - - - - - a0611f51 by Tony Chemit at 2020-05-18T12:56:36+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Improve generator code) - See #1432 - - - - - 10 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java - + services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/WithCascadeStatementGenerator.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== @@ -45,6 +45,7 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JComponent; +import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import java.awt.Component; import java.util.Arrays; @@ -281,7 +282,9 @@ public class AdminUIHandler implements UIHandler<AdminUI> { if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) { SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); - tabUI.getStartAction().doClick(); + if (!tabUI.getStepModel().isLocalSourceNeedSave()) { + SwingUtilities.invokeLater(tabUI.getContinueAction()::doClick); + } } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java ===================================== @@ -110,7 +110,7 @@ public class UnidirectionalReferentialSynchronizeLocalServiceLocal extends Obser TopiaMetadataEntity metadataEntity = metadataModel.getEntity(referentielName); if (request.withReferentialToAdd()) { - InsertSqlStatementGenerator<D> sqlStatementGenerator = new InsertSqlStatementGenerator<>(metadataModel, metadataEntity, dtoType); + InsertSqlStatementGenerator sqlStatementGenerator = new InsertSqlStatementGenerator(metadataModel, metadataEntity); ImmutableSet<D> referentialToAdd = request.getReferentialToAdd(); if (ObjectMaterialDto.class.equals(dtoType)) { @@ -127,7 +127,7 @@ public class UnidirectionalReferentialSynchronizeLocalServiceLocal extends Obser if (request.withReferentialToUpdate()) { - UpdateSqlStatementGenerator<D> sqlStatementGenerator = new UpdateSqlStatementGenerator<>(metadataModel, metadataEntity, dtoType); + UpdateSqlStatementGenerator sqlStatementGenerator = new UpdateSqlStatementGenerator(metadataModel, metadataEntity); for (D referentialDto : request.getReferentialToUpdate()) { ImmutableList<String> sql = sqlStatementGenerator.generateSql(referentialDto, null, null); result.addAll(sql); @@ -169,8 +169,11 @@ public class UnidirectionalReferentialSynchronizeLocalServiceLocal extends Obser E e = dao.forTopiaIdEquals(id).findUnique(); Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> allUsages = dao.findAllUsages(e); int count = 0; - for (List<? extends TopiaEntity> entities : allUsages.values()) { - count += entities.size(); + for (Map.Entry<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> entry : allUsages.entrySet()) { + if (ObserveReferentialEntity.class.isAssignableFrom(entry.getKey())) { + continue; + } + count+=entry.getValue().size(); } return count; ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java ===================================== @@ -144,20 +144,13 @@ public class ReferentialSynchronizeSqlListRequestBuilder { Class<E> entityType = binder.getEntityType(); Class<D> dtoType = binder.getDtoType(); List<E> insertEntities = loadEntities(entityType, tasks); - InsertSqlGenerator<D> insertGenerator; + InsertSqlGenerator insertGenerator; if (metadata.withEntities()) { Multimap<Class<? extends ReferentialDto>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); allIds.putAll(newIds); - insertGenerator = new InsertSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, allIds) { - - @Override - protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) { - ReferentialDtoEntityContext<DD, ?, ?> modelContext = DbModelHelper.fromReferentialDto(referentialType); - return addExtraInsertStatement(id, modelContext.toEntityBinder()); - } - }; + insertGenerator = new InsertSqlWithCascadeStatementGenerator(service, metadataModel, metadata, dtoType, allIds); } else { - insertGenerator = new InsertSqlStatementGenerator<>(metadataModel, metadata, dtoType); + insertGenerator = new InsertSqlStatementGenerator(metadataModel, metadata); } for (E entity : insertEntities) { @@ -173,24 +166,13 @@ public class ReferentialSynchronizeSqlListRequestBuilder { private <D extends ReferentialDto, E extends ObserveReferentialEntity> void onUpdate(TopiaMetadataEntity metadata, Set<ReferentialSynchronizeTask> tasks, ReferentialEntityDtoBinderSupport<D, E> binder, Multimap<Class<? extends ReferentialDto>, String> newIds) { - Class<D> dtoType = binder.getDtoType(); - UpdateSqlGenerator<D> updateGenerator; - + UpdateSqlGenerator updateGenerator; if (metadata.withEntities()) { - Multimap<Class<? extends ReferentialDto>, String> allIds = ArrayListMultimap.create(request.getIdsOnlyExistingOnThisSide()); allIds.putAll(newIds); - - updateGenerator = new UpdateSqlWithCascadeStatementGenerator<D>(metadataModel, metadata, dtoType, request.getIdsOnlyExistingOnThisSide()) { - @Override - protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) { - ReferentialEntityDtoBinderSupport<DD, ObserveReferentialEntity> binder = DbModelHelper.fromReferentialDto(referentialType).toEntityBinder(); - return addExtraInsertStatement(id, binder); - } - }; - + updateGenerator = new UpdateSqlWithCascadeStatementGenerator(service, metadataModel, metadata, request.getIdsOnlyExistingOnThisSide()); } else { - updateGenerator = new UpdateSqlStatementGenerator<>(metadataModel, metadata, dtoType); + updateGenerator = new UpdateSqlStatementGenerator(metadataModel, metadata); } for (ReferentialSynchronizeTask task : tasks) { @@ -208,7 +190,7 @@ public class ReferentialSynchronizeSqlListRequestBuilder { private <D extends ReferentialDto, E extends ObserveReferentialEntity> void onRevert(TopiaMetadataEntity metadata, Set<ReferentialSynchronizeTask> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { - UpdateSqlStatementGenerator<D> updateGenerator = new UpdateSqlStatementGenerator<>(metadataModel, metadata, binder.getDtoType()); + UpdateSqlStatementGenerator updateGenerator = new UpdateSqlStatementGenerator(metadataModel, metadata); for (ReferentialSynchronizeTask task : tasks) { E entity = loadEntity(task); D referential = binder.toDto(referentialLocale, entity); @@ -279,20 +261,6 @@ public class ReferentialSynchronizeSqlListRequestBuilder { } - private <D extends ReferentialDto, E extends ObserveReferentialEntity> ImmutableList<String> addExtraInsertStatement(String id, ReferentialEntityDtoBinderSupport<D, E> binder) { - - Class<E> entityType = binder.getEntityType(); - Class<D> dtoType = binder.getDtoType(); - String referentialName = ObserveEntityEnum.valueOf(entityType).name(); - TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); - - InsertSqlStatementGenerator<D> insertGenerator = new InsertSqlStatementGenerator<>(metadataModel, metadata, dtoType); - D referential = service.loadEntityToReferentialDto(binder, id); - - return insertGenerator.generateSql(referential); - - } - private <E extends ObserveReferentialEntity> List<E> loadEntities(Class<E> entityType, Set<ReferentialSynchronizeTask> tasks) { Set<String> ids = tasks.stream().map(ReferentialSynchronizeTask::getReferentialId).collect(Collectors.toSet()); return service.getTopiaPersistenceContext().loadEntities(entityType, ids); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlGenerator.java ===================================== @@ -29,7 +29,7 @@ import fr.ird.observe.dto.referential.ReferentialDto; * @author Tony Chemit - dev(a)tchemit.fr * @since ? */ -public interface InsertSqlGenerator<D extends ReferentialDto> { +public interface InsertSqlGenerator { - ImmutableList<String> generateSql(D referentialDto); + ImmutableList<String> generateSql(ReferentialDto referentialDto); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java ===================================== @@ -48,7 +48,7 @@ import java.util.Set; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class InsertSqlStatementGenerator<D extends ReferentialDto> implements InsertSqlGenerator<D> { +public class InsertSqlStatementGenerator implements InsertSqlGenerator { private final TopiaMetadataEntity metadataEntity; private final Set<TopiaMetadataComposition> compositions; @@ -61,7 +61,7 @@ public class InsertSqlStatementGenerator<D extends ReferentialDto> implements In private final Set<String> primitiveLongPropertyNames; private final Set<String> primitiveFloatPropertyNames; - public InsertSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity, Class<D> dtoType) { + public InsertSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) { this.metadataEntity = Objects.requireNonNull(metadataEntity); this.compositions = topiaMetadataModel.getCompositions(this.metadataEntity); this.associations = topiaMetadataModel.getAssociations(this.metadataEntity); @@ -79,7 +79,7 @@ public class InsertSqlStatementGenerator<D extends ReferentialDto> implements In @SuppressWarnings("unchecked") @Override - public ImmutableList<String> generateSql(D referentialDto) { + public ImmutableList<String> generateSql(ReferentialDto referentialDto) { ImmutableList.Builder<String> result = ImmutableList.builder(); @@ -153,9 +153,8 @@ public class InsertSqlStatementGenerator<D extends ReferentialDto> implements In for (TopiaMetadataAssociation association : associations) { Collection<ReferentialDtoReference<?, ?>> associationValues = referentialDto.get(association.getTargetPropertyName()); - for (ReferentialDtoReference<?, ?> associationValue : associationValues) { - String insertAssocationSql = TopiaSqlStatements.generateAssociationInsertStatement(association, id, associationValue.getId()); - result.add(TopiaSqlStatements.boxAssociationStatement(insertAssocationSql)); + for (@SuppressWarnings("rawtypes") ReferentialDtoReference associationValue : associationValues) { + addAssociation(association, id, associationValue, result); } } return result.build(); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java ===================================== @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal; import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -40,16 +41,17 @@ import java.util.List; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -public abstract class InsertSqlWithCascadeStatementGenerator<D extends ReferentialDto> implements InsertSqlGenerator<D>{ +public class InsertSqlWithCascadeStatementGenerator extends WithCascadeStatementGenerator implements InsertSqlGenerator { - private final InsertSqlStatementGenerator<D> delegateGenerator; - private final Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide; + private final InsertSqlStatementGenerator delegateGenerator; - protected InsertSqlWithCascadeStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity, - Class<D> dtoType, + public InsertSqlWithCascadeStatementGenerator(ReferentialSynchronizeServiceLocal service, + TopiaMetadataModel topiaMetadataModel, + TopiaMetadataEntity metadataEntity, + Class<? extends ReferentialDto> dtoType, Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { - this.idsOnlyExistingOnThisSide = idsOnlyExistingOnThisSide; - this.delegateGenerator = new InsertSqlStatementGenerator<D>(topiaMetadataModel, metadataEntity, dtoType) { + super(service, topiaMetadataModel); + this.delegateGenerator = new InsertSqlStatementGenerator(topiaMetadataModel, metadataEntity) { @Override <DD extends ReferentialDto, RR extends ReferentialDtoReference<DD, RR>> void addAssociation(TopiaMetadataAssociation association, @@ -57,45 +59,26 @@ public abstract class InsertSqlWithCascadeStatementGenerator<D extends Referenti RR associationValue, ImmutableList.Builder<String> builder) { super.addAssociation(association, sourceId, associationValue, builder); - addMissingReferentialIfNecessary(associationValue.getDtoType(), associationValue.getId(), builder); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, associationValue.getDtoType(), associationValue.getId(), builder); } @Override protected <DD extends ReferentialDto, RR extends ReferentialDtoReference<DD, RR>> void addReferentialReferenceParameter(RR parameter, List<String> parameters, ImmutableList.Builder<String> result) { super.addReferentialReferenceParameter(parameter, parameters, result); - addMissingReferentialIfNecessary(parameter.getDtoType(), parameter.getId(), result); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, parameter.getDtoType(), parameter.getId(), result); } @Override protected <DD extends ReferentialDto> void addReferentialDtoParameter(DD parameter, List<String> parameters, ImmutableList.Builder<String> result) { super.addReferentialDtoParameter(parameter, parameters, result); - addMissingReferentialIfNecessary(dtoType, parameter.getId(), result); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, dtoType, parameter.getId(), result); } }; } - protected abstract <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id); - @Override - public ImmutableList<String> generateSql(D referentialDto) { - + public ImmutableList<String> generateSql(ReferentialDto referentialDto) { return delegateGenerator.generateSql(referentialDto); - - } - - private <DD extends ReferentialDto> void addMissingReferentialIfNecessary(Class<DD> associationType, String associationId, ImmutableList.Builder<String> builder) { - - if (idsOnlyExistingOnThisSide.containsEntry(associationType, associationId)) { - - // il faut insérer aussi ce référentiel - ImmutableList<String> sql = insertMissingReferential(associationType, associationId); - - builder.addAll(sql); - - // ce référentiel est désormais présent dans les deux sources - idsOnlyExistingOnThisSide.remove(associationType, associationId); - - } } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlGenerator.java ===================================== @@ -32,7 +32,7 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 5 */ -public interface UpdateSqlGenerator<D extends ReferentialDto> { +public interface UpdateSqlGenerator { /** * Generate update sql requests for the given{@code referentialDto}. ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== @@ -55,7 +55,7 @@ import java.util.stream.Collectors; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class UpdateSqlStatementGenerator<D extends ReferentialDto>implements UpdateSqlGenerator<D> { +public class UpdateSqlStatementGenerator implements UpdateSqlGenerator { private static final Logger log = LogManager.getLogger(UpdateSqlStatementGenerator.class); private final Map<String, String> columnNames; @@ -69,7 +69,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto>implements Upd private final Set<String> primitiveFloatPropertyNames; private final Set<String> primitiveDoublePropertyNames; - public UpdateSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity, Class<D> dtoType) { + public UpdateSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) { this.metadataEntity = Objects.requireNonNull(metadataEntity); this.compositions = topiaMetadataModel.getCompositions(metadataEntity); this.associations = topiaMetadataModel.getAssociations(metadataEntity); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java ===================================== @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal; import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -41,17 +42,16 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -public abstract class UpdateSqlWithCascadeStatementGenerator<D extends ReferentialDto> implements UpdateSqlGenerator<D> { +public class UpdateSqlWithCascadeStatementGenerator extends WithCascadeStatementGenerator implements UpdateSqlGenerator { - private final UpdateSqlStatementGenerator<D> delegateGenerator; - private final Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide; + private final UpdateSqlStatementGenerator delegateGenerator; - protected UpdateSqlWithCascadeStatementGenerator(TopiaMetadataModel topiaMetadataModel, + public UpdateSqlWithCascadeStatementGenerator(ReferentialSynchronizeServiceLocal service, + TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity, - Class<D> dtoType, Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { - this.idsOnlyExistingOnThisSide = idsOnlyExistingOnThisSide; - this.delegateGenerator = new UpdateSqlStatementGenerator<D>(topiaMetadataModel, metadataEntity, dtoType) { + super(service, topiaMetadataModel); + this.delegateGenerator = new UpdateSqlStatementGenerator(topiaMetadataModel, metadataEntity) { <DD extends ReferentialDto, RR extends ReferentialDtoReference<DD, RR>> void addAssociation(TopiaMetadataAssociation association, @@ -59,41 +59,25 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<D extends Referenti RR associationValue, ImmutableList.Builder<String> builder) { super.addAssociation(association, sourceId, associationValue, builder); - addMissingReferentialIfNecessary(associationValue.getDtoType(), associationValue.getId(), builder); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, associationValue.getDtoType(), associationValue.getId(), builder); } @Override protected <DD extends ReferentialDto, RR extends ReferentialDtoReference<DD, RR>> void addReferentialReferenceParameter(String columnName, RR parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { super.addReferentialReferenceParameter(columnName, parameter, parameters, result); - addMissingReferentialIfNecessary(parameter.getDtoType(), parameter.getId(), result); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, parameter.getDtoType(), parameter.getId(), result); } @Override protected <DD extends ReferentialDto> void addReferentialDtoParameter(String columnName, DD parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { super.addReferentialDtoParameter(columnName, parameter, parameters, result); - addMissingReferentialIfNecessary(parameter.getClass(), parameter.getId(), result); + addMissingReferentialIfNecessary(idsOnlyExistingOnThisSide, parameter.getClass(), parameter.getId(), result); } }; } - protected abstract <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id); - @Override - public ImmutableList<String> generateSql(ReferentialDto referentialDto, ImmutableSet<String> properties, Date addLastUpdateDate) { - return delegateGenerator.generateSql(referentialDto, properties, addLastUpdateDate); + public ImmutableList<String> generateSql(ReferentialDto referentialDto, ImmutableSet<String> properties, Date lastUpdateDate) { + return delegateGenerator.generateSql(referentialDto, properties, lastUpdateDate); } - - private <DD extends ReferentialDto> void addMissingReferentialIfNecessary(Class<DD> associationType, String associationId, ImmutableList.Builder<String> result) { - - if (idsOnlyExistingOnThisSide.containsEntry(associationType, associationId)) { - - // il faut insérer aussi ce référentiel - ImmutableList<String> sqlList = insertMissingReferential(associationType, associationId); - result.addAll(sqlList); - // ce référentiel est désormais présent dans les deux sources - idsOnlyExistingOnThisSide.remove(associationType, associationId); - - } - } - } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/WithCascadeStatementGenerator.java ===================================== @@ -0,0 +1,77 @@ +package fr.ird.observe.services.local.service.actions.synchro.referential.sql; + +/*- + * #%L + * ObServe :: Services local + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Multimap; +import fr.ird.observe.dto.reference.ReferentialDtoReference; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.services.local.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceLocal; +import fr.ird.observe.spi.DbModelHelper; +import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; + +/** + * Support statement generator when a cascade can be done on adding new referential. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0 + */ +public abstract class WithCascadeStatementGenerator { + + private final ReferentialSynchronizeServiceLocal service; + private final TopiaMetadataModel metadataModel; + + protected WithCascadeStatementGenerator(ReferentialSynchronizeServiceLocal service, TopiaMetadataModel metadataModel) { + this.service = service; + this.metadataModel = metadataModel; + } + + public <D extends ReferentialDto> void addMissingReferentialIfNecessary(Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide, Class<D> associationType, String associationId, ImmutableList.Builder<String> builder) { + + if (idsOnlyExistingOnThisSide.containsEntry(associationType, associationId)) { + // need to add this referential on this other side + ImmutableList<String> sqlList = insertMissingReferential(associationType, associationId); + builder.addAll(sqlList); + // now this referential is on both side + idsOnlyExistingOnThisSide.remove(associationType, associationId); + } + } + + protected <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> ImmutableList<String> insertMissingReferential(Class<D> referentialType, String id) { + ReferentialDtoEntityContext<D, R, E> modelContext = DbModelHelper.fromReferentialDto(referentialType); + + Class<E> entityType = modelContext.toEntityType(); + String referentialName = ObserveEntityEnum.valueOf(entityType).name(); + TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); + + InsertSqlStatementGenerator insertGenerator = new InsertSqlStatementGenerator(metadataModel, metadata); + D referential = service.loadEntityToReferentialDto(modelContext.toEntityBinder(), id); + return insertGenerator.generateSql(referential); + } + + +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dd59aa482ecb044c43b38dc3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dd59aa482ecb044c43b38dc3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Version de base dans tms_version - Closes #1485
by Tony CHEMIT 18 May '20

18 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8e064dac by Tony Chemit at 2020-05-18T11:44:45+02:00 Version de base dans tms_version - Closes #1485 - - - - - 12 changed files: - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_6.java - − test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz - − test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz - − test/src/main/resources/db/7.5.1/referentiel.sql.gz - + test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz - + test/src/main/resources/db/7.6/referentiel.sql.gz - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_7_6.java ===================================== @@ -40,10 +40,10 @@ import java.util.Set; * @since 7.5.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_7_5_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource { - public DataSourceMigrationForVersion_7_5_1() { - super(Versions.valueOf("7.5.1")); + public DataSourceMigrationForVersion_7_6() { + super(Versions.valueOf("7.6")); } @Override ===================================== test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/referentiel.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/referentiel.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== ===================================== test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/referentiel.sql.gz and b/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e064dac8ff2ed3dfb6e7594e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e064dac8ff2ed3dfb6e7594e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Prepare version 7.6.0 (Version de base dans tms_version - Closes #1485)
by Tony CHEMIT 18 May '20

18 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dd59aa48 by Tony Chemit at 2020-05-18T11:36:59+02:00 Prepare version 7.6.0 (Version de base dans tms_version - Closes #1485) - - - - - 25 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java - 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 - test/pom.xml - − test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz - − test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz - − test/src/main/resources/db/7.5.1/referentiel.sql.gz - + test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz - + test/src/main/resources/db/7.6/referentiel.sql.gz - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> @@ -90,7 +90,10 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> @@ -488,6 +488,10 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency>  <dependency> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> @@ -107,6 +107,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> @@ -37,7 +37,10 @@ <i18n.artifactId>observe</i18n.artifactId> </properties> <dependencies> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -113,6 +113,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java ===================================== @@ -40,10 +40,10 @@ import java.util.Set; * @since 7.5.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_7_5_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource { - public DataSourceMigrationForVersion_7_5_1() { - super(Versions.valueOf("7.5.1")); + public DataSourceMigrationForVersion_7_6() { + super(Versions.valueOf("7.6")); } @Override ===================================== pom.xml ===================================== @@ -26,12 +26,12 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.25</version> + <version>2020.27</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.5.1</observe.model.version> + <observe.model.version>7.6</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -75,6 +75,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency>  <dependency> @@ -115,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> @@ -101,10 +101,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - </dependency>  -  -  -  + </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> @@ -117,7 +114,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> @@ -112,7 +112,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/referentiel.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/referentiel.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== ===================================== test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> @@ -75,6 +75,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency>  <dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dd59aa482ecb044c43b38dc39… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dd59aa482ecb044c43b38dc39… You're receiving this email because of your account on gitlab.com.

1 0