[Observe-commits] [Git][ultreiaio/ird-observe][develop] 2 commits: Remove BranchlineService - Closes #1811

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> <!--can't use 1.4.197 (date has changed + blob also)--> @@ -207,6 +207,9 @@ <!-- Always deploy asap --> <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@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/7483cd59bb1bfefb49bde345f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7483cd59bb1bfefb49bde345f... You're receiving this email because of your account on gitlab.com.