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

[Git][ultreiaio/ird-observe][develop-9] Ajout des données PS_LOCALMARKET - See #1810
by Tony CHEMIT 19 Mar '21

19 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d443832c by Tony Chemit at 2021-03-19T09:09:02+01:00 Ajout des données PS_LOCALMARKET - See #1810 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/PsTripActionHelper.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUITableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUITableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleListUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyListUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyPartUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUINavigationNode.scope The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d443832c6c56186383abaf778… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d443832c6c56186383abaf778… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Ajout des référentiels PS_LOCALMARKET - See #1806
by Tony CHEMIT 18 Mar '21

18 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: fcdfb18a by Tony Chemit at 2021-03-18T13:38:59+01:00 Ajout des référentiels PS_LOCALMARKET - See #1806 - - - - - dfb54369 by Tony Chemit at 2021-03-18T16:46:31+01:00 Ajout des données PS_LANDING - See #1809 - - - - - a50c0cc5 by Tony Chemit at 2021-03-18T18:29:57+01:00 Modification du formulaire Trip - See #1813 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/PsTripActionHelper.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/actions/TripUILogbookAvailability.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/actions/TripUIObservationsAvailability.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/landing/TripLanding_16x16.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/data/landing/TripLanding_24x24.png - client/datasource/editor/ps/src/main/resources/observe-ui-navigation-ps.properties - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - + models/dto/definition/src/main/models/Observe/dto/22-data-ps-landing.model - models/dto/definition/src/main/models/Observe/dto/25-data-ps-common.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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e40249f2ffd1decdbfd327d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e40249f2ffd1decdbfd327d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Remove BranchlineService - Closes #1811
by Tony CHEMIT 18 Mar '21

18 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 2e40249f by Tony Chemit at 2021-03-18T12:38:01+01:00 Remove BranchlineService - Closes #1811 - - - - - 1 changed file: - services/api/src/test/resources/fixtures/service.properties Changes: ===================================== services/api/src/test/resources/fixtures/service.properties ===================================== @@ -21,5 +21,5 @@ ### OPENABLE_SERVICE_COUNT=11 EDITABLE_SERVICE_COUNT=8 -SIMPLE_SERVICE_COUNT=4 +SIMPLE_SERVICE_COUNT=3 CONTAINER_SERVICE_COUNT=15 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2e40249f2ffd1decdbfd327d2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2e40249f2ffd1decdbfd327d2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Remove BranchlineService - Closes #1811
by Tony CHEMIT 18 Mar '21

18 Mar '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6cee2dbd by Tony Chemit at 2021-03-18T12:18:45+01:00 Remove BranchlineService - Closes #1811 - - - - - 3e744355 by Tony Chemit at 2021-03-18T12:21:32+01:00 Improve node tests (do not any longer hard code node count, but compute it from business modules) - - - - - 17 changed files: - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/branchline/SaveBranchline.java - client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java - models/dto/definition/src/main/models/Observe/dto/30-data-ll-observation.model - models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java - pom.xml - server/core/src/main/filtered-resources/mapping - − services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ll/observation/BranchlineService.properties - services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ll/observation/SetCatchService.properties - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/BranchlineServiceFixtures.java → services/api/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetCatchService.java - services/api/src/test/resources/fixtures/service.properties - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/BranchlineServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java Changes: ===================================== client/datasource/editor/api-test/pom.xml ===================================== @@ -42,12 +42,21 @@ <artifactId>client-datasource-editor-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>models-dto-java</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-lang</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java ===================================== @@ -39,6 +39,8 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationSco import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScopes; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.reference.DataDtoReference; +import fr.ird.observe.spi.module.ObserveBusinessModule; +import io.ultreia.java4all.lang.Objects2; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -55,22 +57,23 @@ import java.util.Set; public abstract class NavigationModelNodeTestSupport { private static final Logger log = LogManager.getLogger(NavigationModelNodeTestSupport.class); - protected final int expectedNodeCount; - protected final int expectedScopeCount; - protected final int expectedScopeBuilderCount = 8; + protected final int expectedCount; - protected NavigationModelNodeTestSupport(int expectedNodeCount) { - this.expectedNodeCount = expectedNodeCount; - this.expectedScopeCount = this.expectedNodeCount; + protected NavigationModelNodeTestSupport(ObserveBusinessModule... businessModule) { + int expectedCount = 1; // root node + for (ObserveBusinessModule module : businessModule) { + expectedCount += module.computeNodeCount(); + } + this.expectedCount = expectedCount; } @Test - public void loadNodes() throws IllegalAccessException, InstantiationException { + public void loadNodes() { Set<Class<? extends NavigationNode>> nodeTypes = NavigationNodes.get().getNodes(); log.info(String.format("Load %d node(s).", nodeTypes.size())); - Assert.assertEquals(expectedNodeCount, nodeTypes.size()); + Assert.assertEquals(expectedCount, nodeTypes.size()); for (Class<? extends NavigationNode> nodeType : nodeTypes) { - NavigationNode instance = nodeType.newInstance(); + NavigationNode instance = Objects2.newInstance(nodeType); Assert.assertNotNull(instance); } } @@ -79,7 +82,7 @@ public abstract class NavigationModelNodeTestSupport { public void loadScopes() { ImmutableMap<Class<? extends NavigationNode>, NavigationScope> scopes = NavigationScopes.get().getScopes(); log.info(String.format("Load %d scopes(s).", scopes.size())); - Assert.assertEquals(expectedScopeCount, scopes.size()); + Assert.assertEquals(expectedCount, scopes.size()); } protected void assertOpenableNode(ContentOpenableUINavigationNode node, Class<? extends DataDto> expectedDtoType, Class<? extends DataDtoReference> expectedReferenceType, Class<? extends ContentOpenableUI<?, ?>> expectedUiType) { @@ -105,8 +108,8 @@ public abstract class NavigationModelNodeTestSupport { Assert.assertEquals(node.getScope().getContentUiType(), expectedUiType); } - protected void assertTableNode(ContentTableUINavigationNode node, Class<? extends DataDto> expectedDtoDtpye, Class<? extends ContentTableUI<?, ?, ?>> expectedUiType) { - Assert.assertEquals(node.getScope().getNodeDataType(), expectedDtoDtpye); + protected void assertTableNode(ContentTableUINavigationNode node, Class<? extends DataDto> expectedDtoType, Class<? extends ContentTableUI<?, ?, ?>> expectedUiType) { + Assert.assertEquals(node.getScope().getNodeDataType(), expectedDtoType); Assert.assertEquals(node.getScope().getContentUiType(), expectedUiType); } } ===================================== client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.content; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.common.BusinessModule; /** * Created on 19/10/2020. @@ -33,7 +34,7 @@ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSuppor public class CommonNavigationModelNodeTest extends NavigationModelNodeTestSupport { public CommonNavigationModelNodeTest() { - super(28 + 1); + super(BusinessModule.get()); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -232,7 +232,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { String prefix = model.getPrefix(); log.info(String.format("%sSaved modified branchline", prefix)); BranchlineDto branchline = ui.getBranchlineBean(); - SaveResultDto saveResult = getServicesProvider().getLlObservationBranchlineService().save(branchline); + SaveResultDto saveResult = getServicesProvider().getLlObservationSetCatchService().saveBranchline(branchline); saveResult.toDto(branchline); // on recopie le last update car c'est le last update de Set qui est renvoyé. @@ -304,7 +304,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { } else { log.info(String.format("%s Use branchline: %s", prefix, newValue.getId())); - Form<BranchlineDto> form = getLlObservationBranchlineService().loadForm(newValue.getId()); + Form<BranchlineDto> form = getLlObservationSetCatchService().loadBranchlineForm(newValue.getId()); form.getObject().copy(branchlineBean); if (ui.getValidator().getBean() == null) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/branchline/SaveBranchline.java ===================================== @@ -39,10 +39,5 @@ public abstract class SaveBranchline<U extends ContentUI> extends ContentUIActio public SaveBranchline() { super(t("observe.data.ll.observation.Branchline.action.save"), t("observe.data.ll.observation.Branchline.action.save.tip"), "save", ObserveLLKeyStrokes.KEY_STROKE_SAVE_BRANCHLINE); } -// -// @Override -// protected void doActionPerformed(ActionEvent e, U ui) { -// ui.getHandler().doSaveBranchline(); -// } } ===================================== client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.ll.BusinessModule; import org.junit.Test; /** @@ -34,7 +35,7 @@ import org.junit.Test; public class LlNavigationModelNodeTest extends NavigationModelNodeTestSupport { public LlNavigationModelNodeTest() { - super(65 + 1); + super(BusinessModule.get()); } @Test ===================================== client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ps; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.ps.BusinessModule; import fr.ird.observe.client.datasource.editor.ps.data.common.TripGearUseFeaturesUINavigationNode; import fr.ird.observe.client.datasource.editor.ps.data.common.TripUINavigationNode; import fr.ird.observe.client.datasource.editor.ps.data.observation.ActivityListUINavigationNode; @@ -61,10 +62,8 @@ import org.junit.Test; */ public class PsNavigationTreeNodeTest extends NavigationModelNodeTestSupport { - // public static final int EXPECTED_NODE_COUNT = 41/*47*/; - public PsNavigationTreeNodeTest() { - super(41 + 1); + super(BusinessModule.get()); } @Test ===================================== client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java ===================================== @@ -33,7 +33,11 @@ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSuppor public class AllNavigationModelNodeTest extends NavigationModelNodeTestSupport { public AllNavigationModelNodeTest() { - super(1 + 28 + 41 + 65); + super( + fr.ird.observe.spi.module.common.BusinessModule.get(), + fr.ird.observe.spi.module.ps.BusinessModule.get(), + fr.ird.observe.spi.module.ll.BusinessModule.get() + ); } } ===================================== models/dto/definition/src/main/models/Observe/dto/30-data-ll-observation.model ===================================== @@ -44,7 +44,7 @@ branchline + {*} data.ll.observation.Branchline parentId + {*:1} String notUsed + {*:1} boolean -data.ll.observation.Branchline > data.Simple >> data.ll.observation.LonglineElementAware +data.ll.observation.Branchline > data.Data >> data.ll.observation.LonglineElementAware settingIdentifier + {*:1} Integer haulingIdentifier + {*:1} Integer depthRecorder + {*:1} Boolean ===================================== models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java ===================================== @@ -22,6 +22,8 @@ package fr.ird.observe.spi.module; * #L% */ +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.GearType; import fr.ird.observe.dto.referential.common.ProgramReference; @@ -46,4 +48,39 @@ public interface ObserveBusinessModule { default GearType getGearType() { return null; } + + default int computeNodeCount() { + int expectedNodeCount = 0; + for (BusinessSubModule subModule : ((BusinessModule) this).getSubModules()) { + ImmutableSet<Class<? extends ReferentialDto>> referentialTypes = subModule.getReferentialTypes(); + int tmp = expectedNodeCount; + int referentialSize = referentialTypes.size(); + if (referentialSize > 0) { + expectedNodeCount += 1 + referentialSize; // home referential + one for each referential type + } + int total=expectedNodeCount-tmp; + System.out.printf("Found %s-%s REFERENTIAL.... %d%n", ((BusinessModule) this).getName(), subModule.getName(), total); + tmp = expectedNodeCount; + + int openableSize = subModule.getOpenableDataTypes().size(); + int editableSize = subModule.getEditableDataTypes().size(); + int simpleSize = subModule.getSimpleDataTypes().size(); + int containerChildSize = subModule.getContainerChildDataTypes().size(); + System.out.printf("Found %s-%s OPEN........... %d%n", ((BusinessModule) this).getName(), subModule.getName(), openableSize); + System.out.printf("Found %s-%s OPEN_LIST...... %d%n", ((BusinessModule) this).getName(), subModule.getName(), openableSize); + System.out.printf("Found %s-%s EDIT........... %d%n", ((BusinessModule) this).getName(), subModule.getName(), editableSize); + System.out.printf("Found %s-%s SIMPLE......... %d%n", ((BusinessModule) this).getName(), subModule.getName(), simpleSize); + System.out.printf("Found %s-%s CONTAINER_CHILD %d%n", ((BusinessModule) this).getName(), subModule.getName(), containerChildSize); + expectedNodeCount += openableSize; // open form + expectedNodeCount += openableSize; // open list form + expectedNodeCount += editableSize; // edit form + expectedNodeCount += simpleSize; // simple form + expectedNodeCount += containerChildSize; // container form + System.out.printf("Found %s-%s DATA........... %d%n", ((BusinessModule) this).getName(), subModule.getName(), expectedNodeCount - tmp); + total+=expectedNodeCount-tmp; + System.out.printf("Found %s-%s ............... %d%n", ((BusinessModule) this).getName(), subModule.getName(), total); + } + System.out.printf("Found %s ...................... %d%n", ((BusinessModule) this).getName(), expectedNodeCount); + return expectedNodeCount; + } } ===================================== pom.xml ===================================== @@ -18,13 +18,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.17</version> + <version>2021.22</version> </parent> <groupId>fr.ird.observe</groupId> @@ -151,7 +151,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.10</toolkit.version> + <toolkit.version>5.0.12</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl>  @@ -207,6 +207,9 @@  <deployAtEnd>false</deployAtEnd> + <jgitflow.masterBranchName>master-9</jgitflow.masterBranchName> + <jgitflow.developBranchName>develop-9</jgitflow.developBranchName> + </properties> <dependencyManagement> @@ -735,11 +738,15 @@ <input>classpath:friend:/models/Observe/dto:01-referential-common.model</input> <input>classpath:friend:/models/Observe/dto:02-referential-ps-common.model</input> <input>classpath:friend:/models/Observe/dto:03-referential-ps-observation.model</input> + <input>classpath:friend:/models/Observe/dto:04-referential-ps-logbook.model</input> + <input>classpath:friend:/models/Observe/dto:05-referential-ps-landing.model</input> + <input>classpath:friend:/models/Observe/dto:06-referential-ps-localmarket.model</input> <input>classpath:friend:/models/Observe/dto:10-referential-ll-common.model</input> <input>classpath:friend:/models/Observe/dto:11-referential-ll-observation.model</input> <input>classpath:friend:/models/Observe/dto:12-referential-ll-logbook.model</input> <input>classpath:friend:/models/Observe/dto:13-referential-ll-landing.model</input> <input>classpath:friend:/models/Observe/dto:20-data-ps-observation.model</input> + <input>classpath:friend:/models/Observe/dto:21-data-ps-logbook.model</input> <input>classpath:friend:/models/Observe/dto:25-data-ps-common.model</input> <input>classpath:friend:/models/Observe/dto:30-data-ll-observation.model</input> <input>classpath:friend:/models/Observe/dto:31-data-ll-logbook.model</input> @@ -804,11 +811,15 @@ <input>classpath:friend:/models/Observe/persistence:01-referential-common.model</input> <input>classpath:friend:/models/Observe/persistence:02-referential-ps-common.model</input> <input>classpath:friend:/models/Observe/persistence:03-referential-ps-observation.model</input> + <input>classpath:friend:/models/Observe/persistence:04-referential-ps-logbook.model</input> + <input>classpath:friend:/models/Observe/persistence:05-referential-ps-landing.model</input> + <input>classpath:friend:/models/Observe/persistence:06-referential-ps-localmarket.model</input> <input>classpath:friend:/models/Observe/persistence:10-referential-ll-common.model</input> <input>classpath:friend:/models/Observe/persistence:11-referential-ll-observation.model</input> <input>classpath:friend:/models/Observe/persistence:12-referential-ll-logbook.model</input> <input>classpath:friend:/models/Observe/persistence:13-referential-ll-landing.model</input> <input>classpath:friend:/models/Observe/persistence:20-data-ps-observation.model</input> + <input>classpath:friend:/models/Observe/persistence:21-data-ps-logbook.model</input> <input>classpath:friend:/models/Observe/persistence:25-data-ps-common.model</input> <input>classpath:friend:/models/Observe/persistence:30-data-ll-observation.model</input> <input>classpath:friend:/models/Observe/persistence:31-data-ll-logbook.model</input> @@ -867,9 +878,9 @@ </activation> <properties> - <model.classifier /> - <model.defaultPackage /> - <model.fullPackagePath /> + <model.classifier/> + <model.defaultPackage/> + <model.fullPackagePath/> </properties> <build> <plugins> @@ -883,10 +894,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version" /> + <filter value="${observe.model.version}" token="observe.model.version"/> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="**/*" /> + <include name="**/*"/> </fileset> </copy> </target> @@ -902,12 +913,12 @@ <target> <delete includeEmptyDirs="true"> <fileset dir="${project.build.outputDirectory}/models/Observe/${model.classifier}"> - <include name="package/*" /> - <include name="package" /> - <include name="class/*" /> - <include name="class" /> - <include name="attribute/*" /> - <include name="attribute" /> + <include name="package/*"/> + <include name="package"/> + <include name="class/*"/> + <include name="class"/> + <include name="attribute/*"/> + <include name="attribute"/> </fileset> </delete> </target> ===================================== server/core/src/main/filtered-resources/mapping ===================================== @@ -176,10 +176,10 @@ GET /api/v1/data/ll/observation/ActivityService/loadForm POST /api/v1/data/ll/observation/ActivityService/move v1.data.ll.observation.ActivityServiceRestApi.move GET /api/v1/data/ll/observation/ActivityService/preCreate v1.data.ll.observation.ActivityServiceRestApi.preCreate POST /api/v1/data/ll/observation/ActivityService/save v1.data.ll.observation.ActivityServiceRestApi.save -GET /api/v1/data/ll/observation/BranchlineService/loadForm v1.data.ll.observation.BranchlineServiceRestApi.loadForm -POST /api/v1/data/ll/observation/BranchlineService/save v1.data.ll.observation.BranchlineServiceRestApi.save +GET /api/v1/data/ll/observation/SetCatchService/loadBranchlineForm v1.data.ll.observation.SetCatchServiceRestApi.loadBranchlineForm GET /api/v1/data/ll/observation/SetCatchService/loadForm v1.data.ll.observation.SetCatchServiceRestApi.loadForm POST /api/v1/data/ll/observation/SetCatchService/save v1.data.ll.observation.SetCatchServiceRestApi.save +GET /api/v1/data/ll/observation/SetCatchService/saveBranchline v1.data.ll.observation.SetCatchServiceRestApi.saveBranchline GET /api/v1/data/ll/observation/SetDetailCompositionService/loadForm v1.data.ll.observation.SetDetailCompositionServiceRestApi.loadForm POST /api/v1/data/ll/observation/SetDetailCompositionService/save v1.data.ll.observation.SetDetailCompositionServiceRestApi.save GET /api/v1/data/ll/observation/SetGlobalCompositionService/loadForm v1.data.ll.observation.SetGlobalCompositionServiceRestApi.loadForm ===================================== services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ll/observation/BranchlineService.properties deleted ===================================== @@ -1,23 +0,0 @@ -### -# #%L -# ObServe Services :: API Test -# %% -# 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% -### -defaultId=${LL_OBSERVATION_BRANCHLINE} -loadForm.id=${defaultId} ===================================== services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ll/observation/SetCatchService.properties ===================================== @@ -20,5 +20,6 @@ # #L% ### defaultId=${LL_OBSERVATION_SET} +loadBranchlineForm.id=${LL_OBSERVATION_BRANCHLINE} loadForm.count=9 loadForm.id=${defaultId} ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/BranchlineServiceFixtures.java → services/api/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetCatchService.java ===================================== @@ -2,7 +2,7 @@ package fr.ird.observe.services.service.data.ll.observation; /*- * #%L - * ObServe Services :: API Test + * ObServe Services :: API * %% * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io * %% @@ -22,24 +22,15 @@ package fr.ird.observe.services.service.data.ll.observation; * #L% */ +import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.SimpleDataServiceFixtures; +public interface SetCatchService extends GeneratedSetCatchService { -public class BranchlineServiceFixtures extends GeneratedBranchlineServiceFixtures { + Form<BranchlineDto> loadBranchlineForm(String id); - @Override - public void loadForm(BranchlineService service) { - SimpleDataServiceFixtures.loadForm(this, service); - } + SaveResultDto saveBranchline(BranchlineDto dto); - @Override - public void save(BranchlineService service) { - SimpleDataServiceFixtures.save( - this, - service, - d -> { - //FIXME:Test - }); - } } ===================================== services/api/src/test/resources/fixtures/service.properties ===================================== @@ -21,5 +21,5 @@ ### OPENABLE_SERVICE_COUNT=8 EDITABLE_SERVICE_COUNT=5 -SIMPLE_SERVICE_COUNT=4 +SIMPLE_SERVICE_COUNT=3 CONTAINER_SERVICE_COUNT=18 ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/BranchlineServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java ===================================== @@ -23,29 +23,34 @@ package fr.ird.observe.services.local.service.data.ll.observation; */ import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.dto.data.ll.observation.CatchDto; +import fr.ird.observe.dto.data.ll.observation.SetCatchDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.Entity; import fr.ird.observe.entities.data.ll.observation.Basket; import fr.ird.observe.entities.data.ll.observation.Branchline; +import fr.ird.observe.entities.data.ll.observation.Catch; import fr.ird.observe.entities.data.ll.observation.Section; import fr.ird.observe.entities.data.ll.observation.Set; -import fr.ird.observe.services.local.service.ObserveServiceLocal; -import fr.ird.observe.services.service.data.ll.observation.BranchlineService; +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport; +import fr.ird.observe.services.service.data.ll.observation.SetCatchService; + +public abstract class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, CatchDto, SetCatchDto, Catch> implements SetCatchService { + + public SetCatchServiceLocalSupport() { + super(Set.SPI, Set.SET_CATCH_SPI, Catch.SPI); + } -/** - * @author Tony Chemit - dev(a)tchemit.fr - */ -class BranchlineServiceLocalSupport extends ObserveServiceLocal implements BranchlineService { @Override - public Form<BranchlineDto> loadForm(String id) { + public Form<BranchlineDto> loadBranchlineForm(String id) { Branchline entity = Branchline.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), id); return Branchline.entityToForm(getReferentialLocale(), entity); } @Override - public SaveResultDto save(BranchlineDto dto) { + public SaveResultDto saveBranchline(BranchlineDto dto) { Set parent = getParent(dto); Branchline entity = Branchline.loadOrCreateEntityFromDto(getApplicationLocale(), getTopiaPersistenceContext(), dto); checkLastUpdateDate(entity, dto); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7483cd59bb1bfefb49bde345… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7483cd59bb1bfefb49bde345… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 5 commits: Improve node tests (do not any longer hard code node count, but compute it from business modules)
by Tony CHEMIT 18 Mar '21

18 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 35b160bc by Tony Chemit at 2021-03-18T11:46:59+01:00 Improve node tests (do not any longer hard code node count, but compute it from business modules) - - - - - 872462d0 by Tony Chemit at 2021-03-18T11:46:59+01:00 clean tag values - - - - - 6ac97e31 by Tony Chemit at 2021-03-18T11:46:59+01:00 update pom - - - - - 5e6fcae5 by Tony Chemit at 2021-03-18T11:48:12+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - 3ff777eb by Tony Chemit at 2021-03-18T12:09:48+01:00 Remove BranchlineService - Closes #1811 - - - - - 30 changed files: - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/branchline/SaveBranchline.java - client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/RouteUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/SetUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/RouteListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/RouteUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesSizeUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesSizeUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/529f80e28a910919aed8d5eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/529f80e28a910919aed8d5eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: Improve node tests (do not any longer hard code node count, but compute it from business modules)
by Tony CHEMIT 17 Mar '21

17 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: b2f727e2 by Tony Chemit at 2021-03-17T09:02:44+01:00 Improve node tests (do not any longer hard code node count, but compute it from business modules) - - - - - 529f80e2 by Tony Chemit at 2021-03-17T09:02:44+01:00 clean tag values - - - - - 12 changed files: - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java - client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java - models/dto/definition/src/main/models/Observe/dto/06-referential-ps-localmarket.model - models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java - models/persistence/definition/src/main/models/Observe/persistence/03-referential-ps-observation.model - models/persistence/definition/src/main/models/Observe/persistence/06-referential-ps-localmarket.model - models/persistence/definition/src/main/models/Observe/persistence/class/entity.properties - models/persistence/definition/src/main/models/Observe/persistence/package/entity.properties Changes: ===================================== client/datasource/editor/api-test/pom.xml ===================================== @@ -42,12 +42,21 @@ <artifactId>client-datasource-editor-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>models-dto-java</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-lang</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java ===================================== @@ -39,6 +39,8 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationSco import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScopes; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.reference.DataDtoReference; +import fr.ird.observe.spi.module.ObserveBusinessModule; +import io.ultreia.java4all.lang.Objects2; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -55,22 +57,23 @@ import java.util.Set; public abstract class NavigationModelNodeTestSupport { private static final Logger log = LogManager.getLogger(NavigationModelNodeTestSupport.class); - protected final int expectedNodeCount; - protected final int expectedScopeCount; - protected final int expectedScopeBuilderCount = 8; + protected final int expectedCount; - protected NavigationModelNodeTestSupport(int expectedNodeCount) { - this.expectedNodeCount = expectedNodeCount; - this.expectedScopeCount = this.expectedNodeCount; + protected NavigationModelNodeTestSupport(ObserveBusinessModule... businessModule) { + int expectedCount = 1; // root node + for (ObserveBusinessModule module : businessModule) { + expectedCount += module.computeNodeCount(); + } + this.expectedCount = expectedCount; } @Test - public void loadNodes() throws IllegalAccessException, InstantiationException { + public void loadNodes() { Set<Class<? extends NavigationNode>> nodeTypes = NavigationNodes.get().getNodes(); log.info(String.format("Load %d node(s).", nodeTypes.size())); - Assert.assertEquals(expectedNodeCount, nodeTypes.size()); + Assert.assertEquals(expectedCount, nodeTypes.size()); for (Class<? extends NavigationNode> nodeType : nodeTypes) { - NavigationNode instance = nodeType.newInstance(); + NavigationNode instance = Objects2.newInstance(nodeType); Assert.assertNotNull(instance); } } @@ -79,7 +82,7 @@ public abstract class NavigationModelNodeTestSupport { public void loadScopes() { ImmutableMap<Class<? extends NavigationNode>, NavigationScope> scopes = NavigationScopes.get().getScopes(); log.info(String.format("Load %d scopes(s).", scopes.size())); - Assert.assertEquals(expectedScopeCount, scopes.size()); + Assert.assertEquals(expectedCount, scopes.size()); } protected void assertOpenableNode(ContentOpenableUINavigationNode node, Class<? extends DataDto> expectedDtoType, Class<? extends DataDtoReference> expectedReferenceType, Class<? extends ContentOpenableUI<?, ?>> expectedUiType) { @@ -105,8 +108,8 @@ public abstract class NavigationModelNodeTestSupport { Assert.assertEquals(node.getScope().getContentUiType(), expectedUiType); } - protected void assertTableNode(ContentTableUINavigationNode node, Class<? extends DataDto> expectedDtoDtpye, Class<? extends ContentTableUI<?, ?, ?>> expectedUiType) { - Assert.assertEquals(node.getScope().getNodeDataType(), expectedDtoDtpye); + protected void assertTableNode(ContentTableUINavigationNode node, Class<? extends DataDto> expectedDtoType, Class<? extends ContentTableUI<?, ?, ?>> expectedUiType) { + Assert.assertEquals(node.getScope().getNodeDataType(), expectedDtoType); Assert.assertEquals(node.getScope().getContentUiType(), expectedUiType); } } ===================================== client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.content; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.common.BusinessModule; /** * Created on 19/10/2020. @@ -33,7 +34,7 @@ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSuppor public class CommonNavigationModelNodeTest extends NavigationModelNodeTestSupport { public CommonNavigationModelNodeTest() { - super(28 + 1); + super(BusinessModule.get()); } } ===================================== client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.ll.BusinessModule; import org.junit.Test; /** @@ -34,7 +35,7 @@ import org.junit.Test; public class LlNavigationModelNodeTest extends NavigationModelNodeTestSupport { public LlNavigationModelNodeTest() { - super(65 + 1); + super(BusinessModule.get()); } @Test ===================================== client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ps; */ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSupport; +import fr.ird.observe.spi.module.ps.BusinessModule; import org.junit.Test; /** @@ -34,7 +35,7 @@ import org.junit.Test; public class PsNavigationTreeNodeTest extends NavigationModelNodeTestSupport { public PsNavigationTreeNodeTest() { - super(51 + 1); + super(BusinessModule.get()); } @Test ===================================== client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java ===================================== @@ -33,7 +33,11 @@ import fr.ird.observe.client.datasource.editor.api.NavigationModelNodeTestSuppor public class AllNavigationModelNodeTest extends NavigationModelNodeTestSupport { public AllNavigationModelNodeTest() { - super(1 + 28 + 51 + 65); + super( + fr.ird.observe.spi.module.common.BusinessModule.get(), + fr.ird.observe.spi.module.ps.BusinessModule.get(), + fr.ird.observe.spi.module.ll.BusinessModule.get() + ); } } ===================================== models/dto/definition/src/main/models/Observe/dto/06-referential-ps-localmarket.model ===================================== @@ -1,13 +1,13 @@ -package fr.ird.observe.dto.referential.ps.localmarket | form=self packagePriority=7 +package fr.ird.observe.dto.referential.ps.localmarket referential.ps.localmarket.BatchComposition > referential.I18nReferential referential.ps.localmarket.BatchWeightType > referential.I18nReferential -referential.ps.localmarket.Packaging > referential.I18nReferential >> WithStartEndDate | references=uri,code,label,batchComposition,batchWeightType,harbour,startDate,endDate -batchComposition {*:1} fr.ird.observe.dto.referential.ps.localmarket.BatchCompositionReference | notNull -batchWeightType {*:1} fr.ird.observe.dto.referential.ps.localmarket.BatchWeightTypeReference | notNull +referential.ps.localmarket.Packaging > referential.I18nReferential >> WithStartEndDate +batchComposition {*:1} fr.ird.observe.dto.referential.ps.localmarket.BatchCompositionReference +batchWeightType {*:1} fr.ird.observe.dto.referential.ps.localmarket.BatchWeightTypeReference startDate + {*:1} Date endDate + {*:1} Date meanWeight + {*:1} Float -harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | notNull \ No newline at end of file +harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference \ No newline at end of file ===================================== models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java ===================================== @@ -22,10 +22,16 @@ package fr.ird.observe.spi.module; * #L% */ +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.GearType; import fr.ird.observe.dto.referential.common.ProgramReference; +import java.util.LinkedHashSet; import java.util.Objects; +import java.util.Set; /** * Created on 14/01/2021. @@ -46,4 +52,41 @@ public interface ObserveBusinessModule { default GearType getGearType() { return null; } + + default int computeNodeCount() { + int expectedNodeCount = 0; + for (BusinessSubModule subModule : ((BusinessModule)this).getSubModules()) { + ImmutableSet<Class<? extends ReferentialDto>> referentialTypes = subModule.getReferentialTypes(); + int tmp = expectedNodeCount; + int referentialSize = referentialTypes.size(); + if (referentialSize > 0) { + expectedNodeCount += 1 + referentialSize; // home referential + one for each referential type + } + tmp = expectedNodeCount; + Set<Class<? extends DataDto>> dataTypes = new LinkedHashSet<>(subModule.getDataTypes()); + + dataTypes.removeAll(subModule.getOpenableDataTypes()); + dataTypes.removeAll(subModule.getEditableDataTypes()); + dataTypes.removeAll(subModule.getSimpleDataTypes()); + dataTypes.removeAll(subModule.getContainerDataTypes()); + + dataTypes.removeIf(next -> !next.getSimpleName().endsWith("PartDto") && !next.getSimpleName().endsWith("CompositionDto")); + dataTypes.removeIf(next -> next.getSimpleName().endsWith("ObjectPartDto")); + int openableSize = subModule.getOpenableDataTypes().size(); + int editableSize = subModule.getEditableDataTypes().size(); + int simpleSize = subModule.getSimpleDataTypes().size(); + int containerSize = subModule.getContainerDataTypes().size(); + expectedNodeCount += 2 * openableSize; // list + open form + expectedNodeCount += editableSize; // edit form + expectedNodeCount += simpleSize; // simple form + expectedNodeCount += containerSize; // container form + expectedNodeCount += dataTypes.size(); // other forms + + if (subModule.getSimpleDataTypes().contains(BranchlineDto.class)) { + // the only simple data without form (should FIX this : dto should not be simple, but just normal...) + expectedNodeCount--; + } + } + return expectedNodeCount; + } } ===================================== models/persistence/definition/src/main/models/Observe/persistence/03-referential-ps-observation.model ===================================== @@ -4,7 +4,7 @@ enum !fr.ird.observe.dto.data.ps.NonTargetCatchReleaseStatus referential.ps.observation.DetectionMode > referential.I18nReferentialEntity -referential.ps.observation.InformationSource > referential.I18nReferentialEntity | entity +referential.ps.observation.InformationSource > referential.I18nReferentialEntity referential.ps.observation.NonTargetCatchReleaseConformity > referential.I18nReferentialEntity ===================================== models/persistence/definition/src/main/models/Observe/persistence/06-referential-ps-localmarket.model ===================================== @@ -1,14 +1,14 @@ -package fr.ird.observe.entities.referential.ps.localmarket | entity dbSchema=ps_localmarket +package fr.ird.observe.entities.referential.ps.localmarket -referential.ps.localmarket.BatchComposition > referential.I18nReferentialEntity | entity +referential.ps.localmarket.BatchComposition > referential.I18nReferentialEntity -referential.ps.localmarket.BatchWeightType > referential.I18nReferentialEntity | entity +referential.ps.localmarket.BatchWeightType > referential.I18nReferentialEntity -referential.ps.localmarket.Packaging > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate | entity +referential.ps.localmarket.Packaging > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate batchComposition {*:1} referential.ps.localmarket.BatchComposition batchWeightType {*:1} referential.ps.localmarket.BatchWeightType startDate + {*:1} Date endDate + {*:1} Date -meanWeight + {*:1} Float | sqlType=numeric digits=4 +meanWeight + {*:1} Float harbour {*:0..1} referential.common.Harbour acceptHarbour(harbour referential.common.Harbour) boolean \ No newline at end of file ===================================== models/persistence/definition/src/main/models/Observe/persistence/class/entity.properties ===================================== @@ -22,13 +22,3 @@ Entity=true LastUpdateDate=true data.DataEntity=true -referential.ps.landing.Fate=true -referential.ps.landing.WeightCategory=true -referential.ps.localmarket.BatchComposition=true -referential.ps.localmarket.BatchWeightType=true -referential.ps.localmarket.Packaging=true -referential.ps.logbook.SampleQuality=true -referential.ps.logbook.SampleType=true -referential.ps.logbook.WeightCategory=true -referential.ps.logbook.WellsState=true -referential.ps.observation.InformationSource=true ===================================== models/persistence/definition/src/main/models/Observe/persistence/package/entity.properties ===================================== @@ -22,5 +22,3 @@ data.ll=true data.ps=true referential=true -referential.ps.landing=true -referential.ps.localmarket=true View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcefee318552b4fe5c7f03ce… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcefee318552b4fe5c7f03ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Ajout des référentiels PS_LOCALMARKET - See #1806
by Tony CHEMIT 17 Mar '21

17 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 17de7c79 by Tony Chemit at 2021-03-16T17:42:59+01:00 Ajout des référentiels PS_LOCALMARKET - See #1806 - - - - - 15e8b185 by Tony Chemit at 2021-03-17T07:52:18+01:00 Ajout des référentiels PS_LOCALMARKET - See #1806 - - - - - fcefee31 by Tony Chemit at 2021-03-17T08:38:25+01:00 Improve node tests (do not any longer hard code node count, but compute it from business modules) - - - - - 30 changed files: - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/common/src/test/java/fr/ird/observe/client/datasource/editor/content/CommonNavigationModelNodeTest.java - client/datasource/editor/ll/src/test/java/fr/ird/observe/client/datasource/editor/ll/LlNavigationModelNodeTest.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/BatchCompositionUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/BatchWeightTypeUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/PackagingUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/observation/WeightCategoryUINavigationNode.scope → client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/BatchCompositionUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/observation/ObservedSystemUINavigationNode.scope → client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/BatchWeightTypeUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/ObservedSystemUINavigationNode.scope → client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/PackagingUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/ReferentialHomeUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/landing/Home_16x16.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/landing/Home_24x24.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/localmarket/Home_16x16.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/localmarket/Home_24x24.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/logbook/Home_16x16.png - + client/datasource/editor/ps/src/main/resources/icons/navigation/default/ps/referential/logbook/Home_24x24.png - client/datasource/editor/ps/src/main/resources/observe-ui-navigation-ps.properties - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java - + models/dto/definition/src/main/models/Observe/dto/06-referential-ps-localmarket.model - models/dto/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/dto/definition/src/main/models/Observe/dto/class/references.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/java/src/main/i18n/getters/eugene.getter - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/DecoratorServiceInitializer.java - + models/dto/java/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLocalmarketModelDecoratorInitializer.java - models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7a05390dfe7c98247fe84ef8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7a05390dfe7c98247fe84ef8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Ajout des référentiels PS_LOGBOOK - See #1803
by Tony CHEMIT 16 Mar '21

16 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 7a05390d by Tony Chemit at 2021-03-16T12:39:24+01:00 Ajout des référentiels PS_LOGBOOK - See #1803 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/logbook/WellSamplingConformityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/logbook/WellSamplingStatusUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/ReferentialHomeUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/WellSamplingConformityUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/WellSamplingStatusUINavigationNode.scope - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java - models/dto/definition/src/main/models/Observe/dto/04-referential-ps-logbook.model - models/dto/java/src/main/i18n/getters/eugene.getter - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java - models/dto/java/src/test/resources/fixtures/dto.properties - models/persistence/definition/src/main/models/Observe/persistence/04-referential-ps-logbook.model - models/persistence/java/src/test/resources/fixtures/persistence/replication_order/referential.list - models/persistence/java/src/test/resources/fixtures/persistence/selector_count/table/referential.properties - models/persistence/java/src/test/resources/fixtures/persistence/table_count/referential.properties - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_fill-schema-ps_logbook-common.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_finalize-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_finalize-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_finalize-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_finalize-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/DataSourceService.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7a05390dfe7c98247fe84ef85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7a05390dfe7c98247fe84ef85… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Ajout des référentiels PS_LANDING - See #1805
by Tony CHEMIT 16 Mar '21

16 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: f87c5196 by Tony Chemit at 2021-03-16T10:12:20+01:00 Ajout des référentiels PS_LANDING - See #1805 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/landing/FateUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/landing/WeightCategoryUI.jaxx - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/landing/FateUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/landing/ReferentialHomeUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/landing/WeightCategoryUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/observe-ui-navigation-ps.properties - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/content/AllNavigationModelNodeTest.java - + models/dto/definition/src/main/models/Observe/dto/05-referential-ps-landing.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/class/references.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/java/src/main/i18n/getters/eugene.getter - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/DecoratorServiceInitializer.java - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - + models/dto/java/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLandingModelDecoratorInitializer.java - models/dto/java/src/test/resources/fixtures/dto.properties - + models/persistence/definition/src/main/models/Observe/persistence/05-referential-ps-landing.model - models/persistence/definition/src/main/models/Observe/persistence/attribute/lazy.properties - models/persistence/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/persistence/definition/src/main/models/Observe/persistence/class/entity.properties - models/persistence/definition/src/main/models/Observe/persistence/package/dbSchema.properties - models/persistence/definition/src/main/models/Observe/persistence/package/entity.properties - models/persistence/java/src/test/resources/fixtures/persistence/replication_order/referential.list - models/persistence/java/src/test/resources/fixtures/persistence/selector_count/table/referential.properties - models/persistence/java/src/test/resources/fixtures/persistence/table_count/referential.properties - models/persistence/migration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f87c51962d26e64df8e2c11f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f87c51962d26e64df8e2c11f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 9 commits: Déplacement du référentiel **ObservedSystem** to **ps_common** - Closes #1804
by Tony CHEMIT 15 Mar '21

15 Mar '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d22e3e42 by Tony Chemit at 2021-03-15T15:51:51+01:00 Déplacement du référentiel **ObservedSystem** to **ps_common** - Closes #1804 - - - - - 6606d272 by Tony Chemit at 2021-03-15T16:14:28+01:00 update CHANGELOG [skip ci] - - - - - aa306a27 by Tony Chemit at 2021-03-15T16:18:14+01:00 [jgitflow-maven-plugin]updating poms for 8.0.9-SNAPSHOT development[skip ci] - - - - - e29f2ea1 by Tony Chemit at 2021-03-15T16:21:44+01:00 build ci on features - - - - - ce8c819c by Tony Chemit at 2021-03-15T16:22:23+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 6d741ccb by Tony Chemit at 2021-03-15T16:35:42+01:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - 95ae4f27 by Tony Chemit at 2021-03-15T16:35:43+01:00 Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - e460e02b by Tony Chemit at 2021-03-15T18:05:38+01:00 Ajout des référentiels PS_LOGBOOK - Closes #1803 - - - - - 3d5cb0ed by Tony Chemit at 2021-03-15T18:05:38+01:00 On v9 do migrate tck - - - - - 30 changed files: - .gitlab-ci.yml - .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/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.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/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - + 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/actions/src/main/i18n/getters/jaxx.getter - client/datasource/api/.mvn/pom.gitflow.develop - client/datasource/api/.mvn/pom.gitflow.master - client/datasource/api/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a26dcaa647c20730a8a69b16… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a26dcaa647c20730a8a69b16… You're receiving this email because of your account on gitlab.com.

1 0