Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80aa87df by Tony Chemit at 2021-02-18T19:51:05+01:00 Remove OpenableDataService.loadReferenceToRead Remove EditableDataService.loadReferenceToRead - - - - - 3507d254 by Tony Chemit at 2021-02-18T21:18:49+01:00 Use new toolkit APIs - - - - - 23 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java - pom.xml - server/core/src/main/filtered-resources/mapping - services/api-test/src/main/java/fr/ird/observe/services/service/data/EditableDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java - services/api/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityPairingEngine.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/ActivityPairingServiceLocalSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java ===================================== @@ -25,13 +25,11 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUII18nHelper; import fr.ird.observe.dto.IdDto; -import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.spi.map.ImmutableTypedMap; import fr.ird.observe.spi.module.BusinessProjectMapping; import fr.ird.observe.spi.module.ObserveBusinessProject; @@ -194,11 +192,11 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U ButtonGroup buttonGroup = new ButtonGroup(); ImmutableTypedMap<Long> usages = usagesGetter.getCount(); - @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<? extends DtoReference>> types = (Collection) usages.types(); - for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDto.filterReferentialReference(types)) { + @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<?>> types = (Collection) usages.types(); + for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDtoReference.filterReferentialReference(types)) { buildUsagePanel(buttonGroup, dtoType, usagesGetter); } - for (Class<? extends DataDtoReference> dtoType : DataDto.filterDataReference(types)) { + for (Class<? extends DataDtoReference> dtoType : DataDtoReference.filterDataReference(types)) { buildUsagePanel(buttonGroup, dtoType, usagesGetter); } JToggleButton component = (JToggleButton) getUsages().getUsagesCount().getComponent(0); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java ===================================== @@ -67,7 +67,7 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates { } updateActivityObsCandidates(); }); - pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getLlCommonTripService(), getReferenceCache().getDataSource().getLlLogbookActivityService()); + pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getReferenceService(), getReferenceCache().getDataSource().getLlLogbookActivityService()); } @Override ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.4</toolkit.version> + <toolkit.version>5.0.5-SNAPSHOT</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl> <!--can't use 1.4.197 (date has changed + blob also)--> ===================================== server/core/src/main/filtered-resources/mapping ===================================== @@ -110,7 +110,6 @@ GET /api/v1/data/ll/common/TripService/getSpeciesByListAndTrip GET /api/v1/data/ll/common/TripService/getTripMap v1.data.ll.common.TripServiceRestApi.getTripMap GET /api/v1/data/ll/common/TripService/loadDto v1.data.ll.common.TripServiceRestApi.loadDto GET /api/v1/data/ll/common/TripService/loadForm v1.data.ll.common.TripServiceRestApi.loadForm -GET /api/v1/data/ll/common/TripService/loadReferenceToRead v1.data.ll.common.TripServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/common/TripService/move v1.data.ll.common.TripServiceRestApi.move GET /api/v1/data/ll/common/TripService/preCreate v1.data.ll.common.TripServiceRestApi.preCreate POST /api/v1/data/ll/common/TripService/save v1.data.ll.common.TripServiceRestApi.save @@ -121,7 +120,6 @@ GET /api/v1/data/ll/landing/LandingService/getChildren GET /api/v1/data/ll/landing/LandingService/getChildrenUpdate v1.data.ll.landing.LandingServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/landing/LandingService/loadDto v1.data.ll.landing.LandingServiceRestApi.loadDto GET /api/v1/data/ll/landing/LandingService/loadForm v1.data.ll.landing.LandingServiceRestApi.loadForm -GET /api/v1/data/ll/landing/LandingService/loadReferenceToRead v1.data.ll.landing.LandingServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/landing/LandingService/move v1.data.ll.landing.LandingServiceRestApi.move GET /api/v1/data/ll/landing/LandingService/preCreate v1.data.ll.landing.LandingServiceRestApi.preCreate POST /api/v1/data/ll/landing/LandingService/save v1.data.ll.landing.LandingServiceRestApi.save @@ -130,7 +128,6 @@ GET /api/v1/data/ll/logbook/ActivitySampleService/exists GET /api/v1/data/ll/logbook/ActivitySampleService/getParents v1.data.ll.logbook.ActivitySampleServiceRestApi.getParents GET /api/v1/data/ll/logbook/ActivitySampleService/loadDto v1.data.ll.logbook.ActivitySampleServiceRestApi.loadDto GET /api/v1/data/ll/logbook/ActivitySampleService/loadForm v1.data.ll.logbook.ActivitySampleServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/ActivitySampleService/loadReferenceToRead v1.data.ll.logbook.ActivitySampleServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/ActivitySampleService/move v1.data.ll.logbook.ActivitySampleServiceRestApi.move GET /api/v1/data/ll/logbook/ActivitySampleService/preCreate v1.data.ll.logbook.ActivitySampleServiceRestApi.preCreate POST /api/v1/data/ll/logbook/ActivitySampleService/save v1.data.ll.logbook.ActivitySampleServiceRestApi.save @@ -141,7 +138,6 @@ GET /api/v1/data/ll/logbook/ActivityService/getChildren GET /api/v1/data/ll/logbook/ActivityService/getChildrenUpdate v1.data.ll.logbook.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/logbook/ActivityService/loadDto v1.data.ll.logbook.ActivityServiceRestApi.loadDto GET /api/v1/data/ll/logbook/ActivityService/loadForm v1.data.ll.logbook.ActivityServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/ActivityService/loadReferenceToRead v1.data.ll.logbook.ActivityServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/ActivityService/move v1.data.ll.logbook.ActivityServiceRestApi.move GET /api/v1/data/ll/logbook/ActivityService/preCreate v1.data.ll.logbook.ActivityServiceRestApi.preCreate POST /api/v1/data/ll/logbook/ActivityService/save v1.data.ll.logbook.ActivityServiceRestApi.save @@ -152,7 +148,6 @@ GET /api/v1/data/ll/logbook/SampleService/getChildren GET /api/v1/data/ll/logbook/SampleService/getChildrenUpdate v1.data.ll.logbook.SampleServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/logbook/SampleService/loadDto v1.data.ll.logbook.SampleServiceRestApi.loadDto GET /api/v1/data/ll/logbook/SampleService/loadForm v1.data.ll.logbook.SampleServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/SampleService/loadReferenceToRead v1.data.ll.logbook.SampleServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/SampleService/move v1.data.ll.logbook.SampleServiceRestApi.move GET /api/v1/data/ll/logbook/SampleService/preCreate v1.data.ll.logbook.SampleServiceRestApi.preCreate POST /api/v1/data/ll/logbook/SampleService/save v1.data.ll.logbook.SampleServiceRestApi.save @@ -164,7 +159,6 @@ DELETE /api/v1/data/ll/logbook/SetService/delete GET /api/v1/data/ll/logbook/SetService/exists v1.data.ll.logbook.SetServiceRestApi.exists GET /api/v1/data/ll/logbook/SetService/loadDto v1.data.ll.logbook.SetServiceRestApi.loadDto GET /api/v1/data/ll/logbook/SetService/loadForm v1.data.ll.logbook.SetServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/SetService/loadReferenceToRead v1.data.ll.logbook.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ll/logbook/SetService/preCreate v1.data.ll.logbook.SetServiceRestApi.preCreate POST /api/v1/data/ll/logbook/SetService/save v1.data.ll.logbook.SetServiceRestApi.save POST /api/v1/data/ll/logbook/SetService/saveAndCopyProperties v1.data.ll.logbook.SetServiceRestApi.saveAndCopyProperties @@ -179,7 +173,6 @@ GET /api/v1/data/ll/observation/ActivityService/getChildren GET /api/v1/data/ll/observation/ActivityService/getChildrenUpdate v1.data.ll.observation.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/observation/ActivityService/loadDto v1.data.ll.observation.ActivityServiceRestApi.loadDto GET /api/v1/data/ll/observation/ActivityService/loadForm v1.data.ll.observation.ActivityServiceRestApi.loadForm -GET /api/v1/data/ll/observation/ActivityService/loadReferenceToRead v1.data.ll.observation.ActivityServiceRestApi.loadReferenceToRead 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 @@ -195,7 +188,6 @@ DELETE /api/v1/data/ll/observation/SetService/delete GET /api/v1/data/ll/observation/SetService/exists v1.data.ll.observation.SetServiceRestApi.exists GET /api/v1/data/ll/observation/SetService/loadDto v1.data.ll.observation.SetServiceRestApi.loadDto GET /api/v1/data/ll/observation/SetService/loadForm v1.data.ll.observation.SetServiceRestApi.loadForm -GET /api/v1/data/ll/observation/SetService/loadReferenceToRead v1.data.ll.observation.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ll/observation/SetService/preCreate v1.data.ll.observation.SetServiceRestApi.preCreate POST /api/v1/data/ll/observation/SetService/save v1.data.ll.observation.SetServiceRestApi.save GET /api/v1/data/ll/observation/SetTdrService/loadForm v1.data.ll.observation.SetTdrServiceRestApi.loadForm @@ -217,7 +209,6 @@ GET /api/v1/data/ps/common/TripService/getSpeciesByListAndTrip GET /api/v1/data/ps/common/TripService/getTripMap v1.data.ps.common.TripServiceRestApi.getTripMap GET /api/v1/data/ps/common/TripService/loadDto v1.data.ps.common.TripServiceRestApi.loadDto GET /api/v1/data/ps/common/TripService/loadForm v1.data.ps.common.TripServiceRestApi.loadForm -GET /api/v1/data/ps/common/TripService/loadReferenceToRead v1.data.ps.common.TripServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/common/TripService/move v1.data.ps.common.TripServiceRestApi.move GET /api/v1/data/ps/common/TripService/preCreate v1.data.ps.common.TripServiceRestApi.preCreate POST /api/v1/data/ps/common/TripService/save v1.data.ps.common.TripServiceRestApi.save @@ -228,7 +219,6 @@ GET /api/v1/data/ps/observation/ActivityService/getChildren GET /api/v1/data/ps/observation/ActivityService/getChildrenUpdate v1.data.ps.observation.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ps/observation/ActivityService/loadDto v1.data.ps.observation.ActivityServiceRestApi.loadDto GET /api/v1/data/ps/observation/ActivityService/loadForm v1.data.ps.observation.ActivityServiceRestApi.loadForm -GET /api/v1/data/ps/observation/ActivityService/loadReferenceToRead v1.data.ps.observation.ActivityServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/observation/ActivityService/move v1.data.ps.observation.ActivityServiceRestApi.move GET /api/v1/data/ps/observation/ActivityService/preCreate v1.data.ps.observation.ActivityServiceRestApi.preCreate POST /api/v1/data/ps/observation/ActivityService/save v1.data.ps.observation.ActivityServiceRestApi.save @@ -244,7 +234,6 @@ GET /api/v1/data/ps/observation/FloatingObjectService/getChildren GET /api/v1/data/ps/observation/FloatingObjectService/getObjectMaterialHierarchy v1.data.ps.observation.FloatingObjectServiceRestApi.getObjectMaterialHierarchy GET /api/v1/data/ps/observation/FloatingObjectService/loadDto v1.data.ps.observation.FloatingObjectServiceRestApi.loadDto GET /api/v1/data/ps/observation/FloatingObjectService/loadForm v1.data.ps.observation.FloatingObjectServiceRestApi.loadForm -GET /api/v1/data/ps/observation/FloatingObjectService/loadReferenceToRead v1.data.ps.observation.FloatingObjectServiceRestApi.loadReferenceToRead GET /api/v1/data/ps/observation/FloatingObjectService/preCreate v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate GET /api/v1/data/ps/observation/FloatingObjectService/preCreate2 v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate2 POST /api/v1/data/ps/observation/FloatingObjectService/save v1.data.ps.observation.FloatingObjectServiceRestApi.save @@ -260,7 +249,6 @@ GET /api/v1/data/ps/observation/RouteService/getChildrenUpdate GET /api/v1/data/ps/observation/RouteService/isActivityEndOfSearchFound v1.data.ps.observation.RouteServiceRestApi.isActivityEndOfSearchFound GET /api/v1/data/ps/observation/RouteService/loadDto v1.data.ps.observation.RouteServiceRestApi.loadDto GET /api/v1/data/ps/observation/RouteService/loadForm v1.data.ps.observation.RouteServiceRestApi.loadForm -GET /api/v1/data/ps/observation/RouteService/loadReferenceToRead v1.data.ps.observation.RouteServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/observation/RouteService/move v1.data.ps.observation.RouteServiceRestApi.move GET /api/v1/data/ps/observation/RouteService/preCreate v1.data.ps.observation.RouteServiceRestApi.preCreate POST /api/v1/data/ps/observation/RouteService/save v1.data.ps.observation.RouteServiceRestApi.save @@ -278,7 +266,6 @@ DELETE /api/v1/data/ps/observation/SetService/delete GET /api/v1/data/ps/observation/SetService/exists v1.data.ps.observation.SetServiceRestApi.exists GET /api/v1/data/ps/observation/SetService/loadDto v1.data.ps.observation.SetServiceRestApi.loadDto GET /api/v1/data/ps/observation/SetService/loadForm v1.data.ps.observation.SetServiceRestApi.loadForm -GET /api/v1/data/ps/observation/SetService/loadReferenceToRead v1.data.ps.observation.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ps/observation/SetService/preCreate v1.data.ps.observation.SetServiceRestApi.preCreate POST /api/v1/data/ps/observation/SetService/save v1.data.ps.observation.SetServiceRestApi.save POST /api/v1/referential/ReferentialService/changeId v1.referential.ReferentialServiceRestApi.changeId ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/EditableDataServiceFixtures.java ===================================== @@ -112,14 +112,6 @@ public class EditableDataServiceFixtures { return dto; } - public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) { - String id = fixtures.getProperty("loadReferenceToRead.id"); - R reference = service.loadReferenceToRead(id); - Assert.assertNotNull(reference); - Assert.assertEquals(id, reference.getId()); - return reference; - } - public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) { String id = fixtures.getProperty("exists.id"); Assert.assertTrue(service.exists(id)); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java ===================================== @@ -138,14 +138,6 @@ public class OpenableDataServiceFixtures { return dto; } - public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) { - String id = fixtures.getProperty("loadReferenceToRead.id"); - R reference = service.loadReferenceToRead(id); - Assert.assertNotNull(reference); - Assert.assertEquals(id, reference.getId()); - return reference; - } - public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) { String id = fixtures.getProperty("exists.id"); Assert.assertTrue(service.exists(id)); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.TripMapDto; import fr.ird.observe.dto.data.ll.common.TripReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.services.service.data.OpenableDataServiceFixtures; @@ -72,11 +73,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(TripService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(TripService service) { OpenableDataServiceFixtures.move(this, service); @@ -109,7 +105,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { @Override public void getMatchingTripsVesselWithinDateRange(TripService service) { - TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service); + TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR); String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId"); String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId"); ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate()); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class LandingServiceFixtures extends GeneratedLandingServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(LandingService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(LandingService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java ===================================== @@ -51,11 +51,6 @@ public class ActivitySampleServiceFixtures extends GeneratedActivitySampleServic EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivitySampleService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(ActivitySampleService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class SampleServiceFixtures extends GeneratedSampleServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SampleService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(SampleService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java ===================================== @@ -51,11 +51,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SetService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(SetService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetServiceFixtures.java ===================================== @@ -47,11 +47,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SetService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(SetService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java ===================================== @@ -31,6 +31,7 @@ import fr.ird.observe.dto.data.ps.common.TripReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.services.service.ObserveServiceFixtures; @@ -75,11 +76,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(TripService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(TripService service) { OpenableDataServiceFixtures.move(this, service); @@ -129,7 +125,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { @Override public void getMatchingTripsVesselWithinDateRange(TripService service) { - TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service); + TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR); String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId"); String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId"); ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate()); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java ===================================== @@ -97,9 +97,4 @@ public class FloatingObjectServiceFixtures extends GeneratedFloatingObjectServic public void loadForm(FloatingObjectService service) { EditableDataServiceFixtures.loadForm(this, service); } - - @Override - public void loadReferenceToRead(FloatingObjectService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } -} +} \ No newline at end of file ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java ===================================== @@ -72,11 +72,6 @@ public class RouteServiceFixtures extends GeneratedRouteServiceFixtures { Assert.assertEquals(14, dto.getActivitySize()); } - @Override - public void loadReferenceToRead(RouteService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(RouteService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.services.service.data.ps.observation; import fr.ird.observe.dto.data.ps.observation.SetDto; -import fr.ird.observe.dto.data.ps.observation.SetReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.service.data.EditableDataServiceFixtures; import org.junit.Assert; @@ -73,15 +72,4 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { //FIXME:Test }); } - - @Override - public void loadReferenceToRead(SetService service) { - SetReference reference = EditableDataServiceFixtures.loadReferenceToRead(this, service); - Assert.assertNotNull(reference); - Assert.assertTrue(reference.isKeptTargetSampleEnabled()); - Assert.assertTrue(reference.isDiscardedTargetSampleEnabled()); - Assert.assertTrue(reference.isNonTargetSampleEnabled()); - Assert.assertTrue(reference.isSetNonTargetCatchReleaseEnabled()); - } - } ===================================== services/api/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityPairingEngine.java ===================================== @@ -32,7 +32,7 @@ import fr.ird.observe.dto.data.ll.pairing.ActivityPairingResultItem; import fr.ird.observe.dto.data.ll.pairing.TripPairingContext; import fr.ird.observe.dto.data.ll.pairing.TripPairingResult; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.services.service.data.ll.common.TripService; +import fr.ird.observe.services.service.ReferenceService; import fr.ird.observe.services.service.data.ll.logbook.ActivityService; import java.util.ArrayList; @@ -48,12 +48,12 @@ import java.util.Set; public class ActivityPairingEngine { private final ReferentialLocale referentialLocale; - private final TripService tripService; + private final ReferenceService referenceService; private final ActivityService activitService; - public ActivityPairingEngine(ReferentialLocale referentialLocale, TripService tripService, ActivityService activitService) { + public ActivityPairingEngine(ReferentialLocale referentialLocale, ReferenceService referenceService, ActivityService activitService) { this.referentialLocale = referentialLocale; - this.tripService = tripService; + this.referenceService = referenceService; this.activitService = activitService; } @@ -68,7 +68,7 @@ public class ActivityPairingEngine { ActivityPairingResult activityPairingResult = computeForActivityLogbook(context, activityLogbook); resultBuilder.add(activityPairingResult); } - TripReference reference = tripService.loadReferenceToRead(context.getTripId()); + TripReference reference = referenceService.loadData(TripReference.class, context.getTripId()); return new TripPairingResult(reference, resultBuilder.build()); } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java ===================================== @@ -70,12 +70,6 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten return loadEntityToDto(id); } - @Override - public R loadReferenceToRead(String id) { - D dto = loadDto(id); - return spi.toReference(getReferentialLocale(), dto); - } - @Override public boolean exists(String id) { return spi.existsEntity(getTopiaPersistenceContext(), id); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableDataServiceLocalSupport.java ===================================== @@ -97,11 +97,6 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten return loadEntityToDto(id); } - @Override - public R loadReferenceToRead(String id) { - return spi.loadEntityToReferenceDto(getReferentialLocale(), getTopiaPersistenceContext(), id); - } - @Override public boolean exists(String id) { return spi.existsEntity(getTopiaPersistenceContext(), id); @@ -119,9 +114,10 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten @Override public void move(String newParentId, ImmutableSet<String> ids) { - if (ids.isEmpty()){ + if (ids.isEmpty()) { return; } + Date now = now(); PE newParent = loadParentEntity(newParentId); Collection<E> collection = getChildren0(newParent, null); List<E> moved = new LinkedList<>(); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/ActivityPairingServiceLocalSupport.java ===================================== @@ -30,8 +30,8 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.entities.data.ll.logbook.Activity; import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; +import fr.ird.observe.services.service.ReferenceService; import fr.ird.observe.services.service.data.ll.ActivityPairingService; -import fr.ird.observe.services.service.data.ll.common.TripService; import fr.ird.observe.services.service.data.ll.pairing.ActivityPairingEngine; import org.nuiton.topia.persistence.script.SqlScriptReader; @@ -49,20 +49,20 @@ import java.util.Map; class ActivityPairingServiceLocalSupport extends ObserveServiceLocal implements ActivityPairingService { private fr.ird.observe.services.service.data.ll.observation.ActivityService activityObsService; - private TripService tripService; private fr.ird.observe.services.service.data.ll.logbook.ActivityService activityLogbookService; + private ReferenceService referenceService; @Override public void setServiceContext(ObserveServiceContextLocal serviceContext) { super.setServiceContext(serviceContext); activityObsService = serviceContext.newService(fr.ird.observe.services.service.data.ll.observation.ActivityService.class); activityLogbookService = serviceContext.newService(fr.ird.observe.services.service.data.ll.logbook.ActivityService.class); - tripService = serviceContext.newService(TripService.class); + referenceService = serviceContext.newService(ReferenceService.class); } @Override public TripPairingResult computePairing(String tripId) { - ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), tripService, activityLogbookService); + ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), referenceService, activityLogbookService); DataDtoReferenceSet<ActivityReference> activityObsSet = activityObsService.getChildren(tripId); TripPairingContext pairingContext = engine.newTripContext(tripId, activityObsSet.toSet()); return engine.computeForTrip(pairingContext); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/926e652aa03ba19ab11bc75aa... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/926e652aa03ba19ab11bc75aa... You're receiving this email because of your account on gitlab.com.