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

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Remove toolkit from project (the very same on v8 and v9)
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 1d872089 by Tony Chemit at 2021-01-30T19:56:39+01:00 Remove toolkit from project (the very same on v8 and v9) - - - - - 9c9e4d54 by Tony Chemit at 2021-01-30T19:59:41+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 4cd6cf45 by Tony Chemit at 2021-01-30T19:59:41+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - toolkit/.mvn/pom.organizationId → client/datasource/.mvn/pom.organizationId - toolkit/.mvn/pom.projectId → client/datasource/.mvn/pom.projectId - toolkit/.mvn/pom.stageId → client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - toolkit/dto/.mvn/pom.organizationId → client/datasource/editor/.mvn/pom.organizationId - toolkit/dto/.mvn/pom.projectId → client/datasource/editor/.mvn/pom.projectId - toolkit/dto/.mvn/pom.stageId → client/datasource/editor/.mvn/pom.stageId - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/api/pom.xml - client/datasource/editor/common/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d5094d0e8a73a598ac44e96f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d5094d0e8a73a598ac44e96f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove toolkit from project (the very same on v8 and v9)
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d872089 by Tony Chemit at 2021-01-30T19:56:39+01:00 Remove toolkit from project (the very same on v8 and v9) - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/i18n/pom.xml - client/runner/pom.xml - models/dto/java/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/local-impl/pom.xml - services/provider/pom.xml - services/validation-spi/pom.xml - services/validation/pom.xml - tests/test-config/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1d872089d1a82d398b78db6a3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1d872089d1a82d398b78db6a3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Move to 9.0.0-RC-1 and go to 9 baseline
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d5094d0e by Tony Chemit at 2021-01-30T15:47:51+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 5 changed files: - + tests/test/src/main/resources/db/9.0/dataForTestLongline.sql.gz - + tests/test/src/main/resources/db/9.0/dataForTestSeine.sql.gz - + tests/test/src/main/resources/db/9.0/empty_h2.sql.gz - + tests/test/src/main/resources/db/9.0/empty_pg.sql.gz - + tests/test/src/main/resources/db/9.0/referentiel.sql.gz Changes: ===================================== tests/test/src/main/resources/db/9.0/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/tests/test/src/main/resources/db/9.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/9.0/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/tests/test/src/main/resources/db/9.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/9.0/empty_h2.sql.gz ===================================== Binary files /dev/null and b/tests/test/src/main/resources/db/9.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/9.0/empty_pg.sql.gz ===================================== Binary files /dev/null and b/tests/test/src/main/resources/db/9.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/9.0/referentiel.sql.gz ===================================== Binary files /dev/null and b/tests/test/src/main/resources/db/9.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d5094d0e8a73a598ac44e96f6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d5094d0e8a73a598ac44e96f6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: update pom
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: eaf1f9da by Tony Chemit at 2021-01-30T12:48:47+01:00 update pom - - - - - 53ec0d69 by Tony Chemit at 2021-01-30T12:57:01+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId - + client/datasource/editor/.mvn/pom.stageId - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/api/pom.xml - client/datasource/editor/common/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2365ce0597dafe6f8d9a604… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2365ce0597dafe6f8d9a604… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eaf1f9da by Tony Chemit at 2021-01-30T12:48:47+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.3</version> + <version>2021.4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -154,7 +154,7 @@ <lib.version.h2>1.4.196</lib.version.h2> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils> - <lib.version.java4all.topia>1.40</lib.version.java4all.topia> +     View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaf1f9da8dae459ed9d4e1844… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaf1f9da8dae459ed9d4e1844… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 43 commits: Problème de digit TargetLength.weight à 1 au lieu de 3 - Closes #1762
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: c0297045 by Tony Chemit at 2021-01-19T10:44:24+01:00 Problème de digit TargetLength.weight à 1 au lieu de 3 - Closes #1762 - - - - - 25332936 by Tony Chemit at 2021-01-19T11:20:38+01:00 [jgitflow-maven-plugin]updating poms for 8.0.5-SNAPSHOT development[skip ci] - - - - - 1c9cd2dd by Tony Chemit at 2021-01-19T11:21:15+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.4' with non-snapshot versions[skip ci] - - - - - 7123ab14 by Tony Chemit at 2021-01-19T11:32:01+01:00 [jgitflow-maven-plugin]merging 'release/8.0.4' into 'master' - - - - - cb6473d6 by Tony Chemit at 2021-01-19T11:32:04+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 0c465330 by Tony Chemit at 2021-01-19T11:32:05+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 332a6e99 by Tony Chemit at 2021-01-19T11:32:05+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 72e4976e by Tony Chemit at 2021-01-20T15:51:02+01:00 update CHANGELOG [skip ci] - - - - - 9135411f by Tony Chemit at 2021-01-20T20:23:08+01:00 Dysfonctionnement de l'arbre - Closes #1763 - - - - - 064d69ff by Tony Chemit at 2021-01-20T21:13:20+01:00 Introduce a way to extract schema or table from generated schema (help to create new safe migration for v9) - - - - - 5fc94916 by Tony Chemit at 2021-01-20T22:45:21+01:00 Improve ExtraTable and ExtractSchema - - - - - 429a3949 by Tony Chemit at 2021-01-21T13:09:18+01:00 Fix NPE if no species on NonTargetReleaseUI - - - - - a27ecc60 by Tony Chemit at 2021-01-21T13:09:57+01:00 Fix ReferentialCache to be able to use the incoming form object to filter - - - - - f09a98fb by Tony Chemit at 2021-01-21T13:10:47+01:00 Review ContentTableUI delete extra message (this should be always specialized, and no using a default message for all the form). - - - - - 605b4b11 by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade des captures conservées - Closes #1765 - - - - - bced957e by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade des captures rejetées - Closes #1766 - - - - - 4c1ca99d by Tony Chemit at 2021-01-21T16:44:52+01:00 Suppression en cascade de la faune accessoire - Closes #1767 - - - - - e8ee529f by Tony Chemit at 2021-01-21T18:19:47+01:00 Suppression en cade des libérations de capture accessoire - Closes #1768 - - - - - 69257b76 by Tony Chemit at 2021-01-22T09:38:55+01:00 Micro bizarrerie sur le modèle 8.0 - Closes #1764 - - - - - e473bd86 by Tony Chemit at 2021-01-22T10:35:05+01:00 Disponibilité du sélecteur DMS / DMD / DD - Closes #1717 - - - - - f3977cee by Tony Chemit at 2021-01-22T10:54:34+01:00 Petit défaut d'affichage d'une liste à choix multiple - Closes #1770 - - - - - 65848f2e by Tony Chemit at 2021-01-22T10:54:54+01:00 Tailles d'icônes différentes sur le même niveau de hiérarchie - Closes #1769 - - - - - cf3e58bb by Tony Chemit at 2021-01-22T15:02:47+01:00 Problème de sauvegarde libération espèce sensible - Closes #1771 - - - - - 54ba847a by Tony Chemit at 2021-01-23T09:46:55+01:00 Use now containerDto (make us remove a lots of code we now generate) - - - - - 77caeba3 by Tony Chemit at 2021-01-23T16:44:16+01:00 * Sanitize service API and Local API * Align it to DataDto type * Make neutral ObserveServiceLocal - - - - - 20c9f26c by Tony Chemit at 2021-01-23T16:44:16+01:00 * Align UI to DataDto type * Simplify UI code (add more method final) - - - - - 71d00f50 by Tony Chemit at 2021-01-23T16:44:16+01:00 Put config color in UIManager - - - - - 1e6f7ff2 by Tony Chemit at 2021-01-23T16:44:16+01:00 Use now config color in navigation tree - - - - - 8d709c05 by Tony Chemit at 2021-01-24T18:44:30+01:00 Introduce DtoMetaTransformer to augments dto model (this is a first step, we will later improve it to minimize as much as possible stuff to write in models) Rename FloatingObect sub dto to respect convention over configuration on ContainerDto. - - - - - 0d7934bb by Tony Chemit at 2021-01-25T10:08:56+01:00 augments reference in dto model - - - - - e6807f21 by Tony Chemit at 2021-01-25T17:06:32+01:00 make observe tag values available in eugene :) - - - - - 44fc8be6 by Tony Chemit at 2021-01-25T17:39:25+01:00 introduce tag values extractor - - - - - 96b19535 by Tony Chemit at 2021-01-27T11:54:24+01:00 fix tag value by adding a basic space after tag value section - - - - - 0c798c03 by Tony Chemit at 2021-01-27T11:55:03+01:00 remove bad tag value usage - - - - - 26b984f7 by Tony Chemit at 2021-01-27T11:55:28+01:00 add tag values in toolkit store (and remove unused one) - - - - - 035bef8f by Tony Chemit at 2021-01-27T11:56:42+01:00 * introduce tag values extractor and use it on dto model * need now to remove any tag value from models files - - - - - 30c6c515 by Tony Chemit at 2021-01-27T19:00:07+01:00 Use new models maven layout (two models by domain + one new for migration) - - - - - bf6cbc8b by Tony Chemit at 2021-01-28T19:11:52+01:00 Improve tag-values code and apply it also for packages - - - - - 1d55e100 by Tony Chemit at 2021-01-29T12:36:29+01:00 Use last Topia extension API : * generate flat-layout for hibernate mapping * do no generate stuff for abstract entities * stop generating dao bad design code * reuse natural ids \o/ - - - - - b655220d by Tony Chemit at 2021-01-30T10:24:15+01:00 Rename containerDto.getSize to ContainerDto.getChildrenSize (in v9 we got a Sample.size property (and Sample is containerDto...) - - - - - 6fcc22f0 by Tony Chemit at 2021-01-30T11:03:31+01:00 Remove for the moment any natural id (since we do not want to change database model) - - - - - 64f4e17c by Tony Chemit at 2021-01-30T11:03:31+01:00 Fix tag values extractor (for new keys on package) - - - - - d2365ce0 by Tony Chemit at 2021-01-30T11:11:22+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilter.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - models/dto-definition/.mvn/pom.organizationId → client/datasource/.mvn/pom.organizationId - models/dto-definition/.mvn/pom.projectId → client/datasource/.mvn/pom.projectId - models/dto-definition/.mvn/pom.stageId → client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/acf42c76e3adf9ed8e8c0b9c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/acf42c76e3adf9ed8e8c0b9c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Rename containerDto.getSize to ContainerDto.getChildrenSize (in v9 we got a...
by Tony CHEMIT 30 Jan '21

30 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b655220d by Tony Chemit at 2021-01-30T10:24:15+01:00 Rename containerDto.getSize to ContainerDto.getChildrenSize (in v9 we got a Sample.size property (and Sample is containerDto...) - - - - - 6fcc22f0 by Tony Chemit at 2021-01-30T11:03:31+01:00 Remove for the moment any natural id (since we do not want to change database model) - - - - - 64f4e17c by Tony Chemit at 2021-01-30T11:03:31+01:00 Fix tag values extractor (for new keys on package) - - - - - 16 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveContentTableUIAdapter.java - models/persistence/definition/pom.xml - − models/persistence/definition/src/main/models/Observe/persistence/attribute/naturalId.properties - − models/persistence/definition/src/main/models/Observe/persistence/class/naturalIdMutable.properties - models/persistence/migration/src/main/resources/db/migration/8.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/8.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/8.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/8.0/observe_full-schema-PG.sql - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - toolkit/dto/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/io/TagValuesExtractor.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java ===================================== @@ -75,7 +75,7 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends Container log.info(String.format("Load Form from id: %s", selectedId)); Form<D> form = loadForm(servicesProvider, selectedId); if (form.getObject() instanceof ContainerDto) { - getSource().updateCount(((ContainerDto<?>) form.getObject()).getSize()); + getSource().updateCount(((ContainerDto<?>) form.getObject()).getChildrenSize()); } getStates().openForm(form); return form; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveContentTableUIAdapter.java ===================================== @@ -43,7 +43,7 @@ public class SaveContentTableUIAdapter<D extends DataDto, U extends ContentTable ui.getHandler().getResetAction().doReset(); ContentTableUINavigationNode node = ui.getModel().getSource(); if (savedBean instanceof ContainerDto) { - node.updateCount(((ContainerDto<?>) savedBean).getSize()); + node.updateCount(((ContainerDto<?>) savedBean).getChildrenSize()); } NavigationNode parent = node.getParent(); //FIXME We should not have to do this: parent data should only be on parent, children should not have to recompute parent data??? ===================================== models/persistence/definition/pom.xml ===================================== @@ -33,4 +33,35 @@ <model.defaultPackage>fr.ird.observe.entities</model.defaultPackage> <model.fullPackagePath>fr.ird.observe</model.fullPackagePath> </properties> +  </project> ===================================== models/persistence/definition/src/main/models/Observe/persistence/attribute/naturalId.properties deleted ===================================== @@ -1,39 +0,0 @@ -### -# #%L -# ObServe Models :: Persistence :: Definition -# %% -# Copyright (C) 2008 - 2021 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% -### -referential.common.LengthLengthParameter.attribute.endDate=true -referential.common.LengthLengthParameter.attribute.ocean=true -referential.common.LengthLengthParameter.attribute.sex=true -referential.common.LengthLengthParameter.attribute.species=true -referential.common.LengthLengthParameter.attribute.startDate=true -referential.common.LengthWeightParameter.attribute.endDate=true -referential.common.LengthWeightParameter.attribute.ocean=true -referential.common.LengthWeightParameter.attribute.sex=true -referential.common.LengthWeightParameter.attribute.species=true -referential.common.LengthWeightParameter.attribute.startDate=true -referential.common.Person.attribute.firstName=true -referential.common.Person.attribute.lastName=true -referential.common.ShipOwner.attribute.endDate=true -referential.common.ShipOwner.attribute.label=true -referential.common.ShipOwner.attribute.startDate=true -referential.common.Species.attribute.faoCode=true -referential.common.VesselSizeCategory.attribute.capacityLabel=true -referential.common.VesselSizeCategory.attribute.gaugeLabel=true ===================================== models/persistence/definition/src/main/models/Observe/persistence/class/naturalIdMutable.properties deleted ===================================== @@ -1,27 +0,0 @@ -### -# #%L -# ObServe Models :: Persistence :: Definition -# %% -# Copyright (C) 2008 - 2021 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% -### -referential.common.LengthLengthParameter=true -referential.common.LengthWeightParameter=true -referential.common.Person=true -referential.common.ShipOwner=true -referential.common.Species=true -referential.common.VesselSizeCategory=true ===================================== models/persistence/migration/src/main/resources/db/migration/8.0/observe_create-schema-H2.sql ===================================== @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -CREATE SCHEMA ps_common; CREATE SCHEMA common; +CREATE SCHEMA ps_common; CREATE SCHEMA ll_observation; CREATE SCHEMA ll_common; CREATE SCHEMA ps_observation; ===================================== models/persistence/migration/src/main/resources/db/migration/8.0/observe_create-schema-PG.sql ===================================== @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -CREATE SCHEMA ps_common; CREATE SCHEMA common; +CREATE SCHEMA ps_common; CREATE SCHEMA ll_observation; CREATE SCHEMA ll_common; CREATE SCHEMA ps_observation; ===================================== models/persistence/migration/src/main/resources/db/migration/8.0/observe_full-schema-H2.sql ===================================== @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -CREATE SCHEMA ps_common; CREATE SCHEMA common; +CREATE SCHEMA ps_common; CREATE SCHEMA ll_observation; CREATE SCHEMA ll_common; CREATE SCHEMA ps_observation; ===================================== models/persistence/migration/src/main/resources/db/migration/8.0/observe_full-schema-PG.sql ===================================== @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -CREATE SCHEMA ps_common; CREATE SCHEMA common; +CREATE SCHEMA ps_common; CREATE SCHEMA ll_observation; CREATE SCHEMA ll_common; CREATE SCHEMA ps_observation; ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== toolkit/dto/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -67,7 +67,7 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto return !isEmpty(); } - public int getSize() { + public int getChildrenSize() { return getChildren() == null ? 0 : getChildren().size(); } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/io/TagValuesExtractor.java ===================================== @@ -110,23 +110,44 @@ public class TagValuesExtractor { public Map<String, String> loadFromModel(String tagValuesKey) { String[] tagParts = tagValuesKey.split("-"); String tagType = tagParts[0]; - String tagToReplace = "." + tagParts[1] + "." + tagParts[2]; + String middle = tagParts[1]; int beginIndex = packageName.length() + 1; Map<String, String> currentTagValues = new TreeMap<>(); for (String k : tagValueKeysByTagValue.get(tagValuesKey)) { String value = allTagValues.get(k); - String key = k.replace(tagType + ".", ""); - key = key.substring(beginIndex); - if (key.equals(tagToReplace.substring(1))) { - key = "@@"; - } else { - key = key.replace(tagToReplace, ""); + String key; + switch (tagType) { + case "package": + // package.fr.ird.observe.dto.data.ll.common.tagValue.xxx → data.ll.common + // package.fr.ird.observe.dto.tagValue.xxx → @@ + key = k.substring(tagType.length() + beginIndex, k.indexOf(middle) - 1); + // package.fr.ird.observe.dto.data.ll.common.tagValue.xxx → .data.ll.common + // package.fr.ird.observe.dto.tagValue.xxx → . + if (key.equals("")) { + // empty → @@ + key = "@@"; + } else { + // .data.ll.common → data.ll.common + key = key.substring(1); + } + break; + case "class": + // fr.ird.observe.dto.result.SaveResult.class.tagValue.skip=true → result.SaveResult + key = k.substring(beginIndex, k.indexOf(tagType) - 1); + break; + case "attribute": + // fr.ird.observe.dto.result.SaveResult.attribute.test.tagValue.skip=true → result.SaveResult.attribute.test + key = k.substring(beginIndex, k.indexOf(middle) - 1); + break; + default: + throw new IllegalStateException("Can't manage value of type: " + tagType); } + currentTagValues.put(key, value); properties.setProperty(k, value); } - String index = tagValuesKey.replace("-tagValue", "").replaceAll("-", "."); + String index = tagValuesKey.replace("-" + middle, "").replaceAll("-", "."); list.add(index); return currentTagValues; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1d55e10088a6e574196202e8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1d55e10088a6e574196202e8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use last Topia extension API :
by Tony CHEMIT 29 Jan '21

29 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d55e100 by Tony Chemit at 2021-01-29T12:36:29+01:00 Use last Topia extension API : * generate flat-layout for hibernate mapping * do no generate stuff for abstract entities * stop generating dao bad design code * reuse natural ids \o/ - - - - - 3 changed files: - + models/persistence/definition/src/main/models/Observe/persistence/class/naturalIdMutable.properties - pom.xml - toolkit/persistence/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java Changes: ===================================== models/persistence/definition/src/main/models/Observe/persistence/class/naturalIdMutable.properties ===================================== @@ -0,0 +1,27 @@ +### +# #%L +# ObServe Models :: Persistence :: Definition +# %% +# Copyright (C) 2008 - 2021 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% +### +referential.common.LengthLengthParameter=true +referential.common.LengthWeightParameter=true +referential.common.Person=true +referential.common.ShipOwner=true +referential.common.Species=true +referential.common.VesselSizeCategory=true ===================================== pom.xml ===================================== @@ -154,7 +154,7 @@ <lib.version.h2>1.4.196</lib.version.h2> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils> - <lib.version.java4all.topia>1.39</lib.version.java4all.topia> + <lib.version.java4all.topia>1.40</lib.version.java4all.topia>    ===================================== toolkit/persistence/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.entities; import fr.ird.observe.dto.IdDto; import org.nuiton.topia.persistence.HqlAndParametersBuilder; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; @@ -77,4 +78,28 @@ public abstract class AbstractObserveTopiaDao<E extends Entity> extends Abstract } }); } + + @Override + public <R extends TopiaEntity> List<R> findUsages(Class<R> type, E entity) { + // No more used by us, prefer use the TopiaUsageService which is more performant + return null; + } + + @Override + public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity) { + // No more used by us, prefer use the TopiaUsageService which is more performant + return null; + } + + @Override + public List<TopiaEntity> getComposite(E entity) { + // Never wants to use this, prefer use TopiaMetadataModel + return null; + } + + @Override + public List<TopiaEntity> getAggregate(E entity) { + // Never wants to use this, prefer use TopiaMetadataModel + return null; + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1d55e10088a6e574196202e8e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1d55e10088a6e574196202e8e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve tag-values code and apply it also for packages
by Tony CHEMIT 28 Jan '21

28 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf6cbc8b by Tony Chemit at 2021-01-28T19:11:52+01:00 Improve tag-values code and apply it also for packages - - - - - 30 changed files: - models/dto/definition/src/main/models/Observe/dto/00-common.model - models/dto/definition/src/main/models/Observe/dto/01-referential-common.model - models/dto/definition/src/main/models/Observe/dto/02-referential-ps-common.model - models/dto/definition/src/main/models/Observe/dto/03-referential-ps-observation.model - models/dto/definition/src/main/models/Observe/dto/10-referential-ll-common.model - models/dto/definition/src/main/models/Observe/dto/11-referential-ll-observation.model - models/dto/definition/src/main/models/Observe/dto/12-referential-ll-logbook.model - models/dto/definition/src/main/models/Observe/dto/13-referential-ll-landing.model - models/dto/definition/src/main/models/Observe/dto/20-data-ps-observation.model - models/dto/definition/src/main/models/Observe/dto/25-data-ps-common.model - models/dto/definition/src/main/models/Observe/dto/30-data-ll-observation.model - models/dto/definition/src/main/models/Observe/dto/31-data-ll-logbook.model - models/dto/definition/src/main/models/Observe/dto/32-data-ll-landing.model - models/dto/definition/src/main/models/Observe/dto/35-data-ll-common.model - models/dto/definition/src/main/models/Observe/dto/class/comparator.properties - models/dto/definition/src/main/models/Observe/dto/class/constants.properties - models/dto/definition/src/main/models/Observe/dto/class/form.properties - models/dto/definition/src/main/models/Observe/dto/class/mainDto.properties - models/dto/definition/src/main/models/Observe/dto/class/navigationEntryPoint.properties - models/dto/definition/src/main/models/Observe/dto/class/navigationParent.properties - models/dto/definition/src/main/models/Observe/dto/class/references.properties - models/dto/definition/src/main/models/Observe/dto/class/skip.properties - + models/dto/definition/src/main/models/Observe/dto/package/bean.properties - + models/dto/definition/src/main/models/Observe/dto/package/form.properties - + models/dto/definition/src/main/models/Observe/dto/package/packagePriority.properties - − models/dto/definition/src/main/models/Observe/dto/tagValues.list - models/persistence/definition/src/main/models/Observe/persistence/00-common.model - models/persistence/definition/src/main/models/Observe/persistence/01-referential-common.model - models/persistence/definition/src/main/models/Observe/persistence/02-referential-ps-common.model - models/persistence/definition/src/main/models/Observe/persistence/03-referential-ps-observation.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf6cbc8baa179e9039fb6f7da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf6cbc8baa179e9039fb6f7da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use new models maven layout (two models by domain + one new for migration)
by Tony CHEMIT 27 Jan '21

27 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 30c6c515 by Tony Chemit at 2021-01-27T19:00:07+01:00 Use new models maven layout (two models by domain + one new for migration) - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/runner/pom.xml - − models/dto-definition/pom.xml - − models/dto-definition/src/main/models/Observe-00-common.model - − models/dto-definition/src/main/models/Observe-01-referential-common.model - − models/dto-definition/src/main/models/Observe-02-referential-ps-common.model - − models/dto-definition/src/main/models/Observe-03-referential-ps-observation.model - − models/dto-definition/src/main/models/Observe-11-referential-ll-observation.model - − models/dto-definition/src/main/models/Observe-20-data-ps-observation.model - − models/dto-definition/src/main/models/Observe-25-data-ps.model - − models/dto-definition/src/main/models/Observe-30-data-ll-observation.model - − models/dto-definition/src/main/models/Observe-31-data-ll-logbook.model - − models/dto-definition/src/main/models/Observe-32-data-ll-landing.model - − models/dto-definition/src/main/models/Observe-35-data-ll.model - − models/dto-definition/src/main/models/Observe/dto/attribute/mayNotNull.properties - − models/dto-definition/src/main/models/Observe/dto/attribute/notNull.properties - − models/dto-definition/src/main/models/Observe/dto/attribute/ordered.properties - − models/dto-definition/src/main/models/Observe/dto/attribute/positiveNumber.properties - − models/dto-definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - − models/dto-definition/src/main/models/Observe/dto/attribute/unique.properties - − models/dto-definition/src/main/models/Observe/dto/class/comparator.properties - − models/dto-definition/src/main/models/Observe/dto/class/constants.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30c6c515ef3e04a680ec16ca0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30c6c515ef3e04a680ec16ca0… You're receiving this email because of your account on gitlab.com.

1 0