[Observe-commits] [Git][ultreiaio/ird-observe][develop] Problème de sauvegarde libération espèce sensible - Closes #1771

22 Jan 2021


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
cf3e58bb by Tony Chemit at 2021-01-22T15:02:47+01:00
Problème de sauvegarde libération espèce sensible - Closes #1771

- - - - -


15 changed files:

- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/SimpleDataServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityEncounterServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivitySensorUsedServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetTdrServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectObservedSpeciesServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectSchoolEstimateServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetDiscardedTargetCatchServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetKeptTargetCatchServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchReleaseServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetSchoolEstimateServiceLocalSupport.java


Changes:

=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/SimpleDataServiceLocalSupport.java → services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java
=====================================
@@ -40,18 +40,18 @@ import java.util.function.BiConsumer;
  * @author Tony Chemit - dev@tchemit.fr
  * @since 8.0.1
  */
-public class SimpleDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> {
+public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> {
 
     protected final DataDtoEntityContext<?, ?, PE, ?> parentSpi;
     protected final DataDtoEntityContext<M, ?, PE, ?> mainSpi;
     protected final DataDtoEntityContext<D, ?, E, ?> spi;
     protected final BiConsumer<PE, Date> saveCallback;
 
-    protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) {
+    protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) {
         this(parentSpi, mainSpi, spi, null);
     }
 
-    protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) {
+    protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) {
         this.parentSpi = Objects.requireNonNull(parentSpi);
         this.mainSpi = Objects.requireNonNull(mainSpi);
         this.spi = Objects.requireNonNull(spi);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocalSupport.java
=====================================
@@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto;
 import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto;
 import fr.ird.observe.entities.data.ll.common.GearUseFeatures;
 import fr.ird.observe.entities.data.ll.common.Trip;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.common.TripGearUseFeaturesService;
 
 /**
  * @author Tony Chemit - dev@tchemit.fr
  */
-class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
+class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
 
     public TripGearUseFeaturesServiceLocalSupport() {
         super(Trip.SPI, Trip.TRIP_GEAR_USE_FEATURES_SPI, GearUseFeatures.SPI,


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocalSupport.java
=====================================
@@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ll.logbook.CatchDto;
 import fr.ird.observe.dto.data.ll.logbook.SetCatchDto;
 import fr.ird.observe.entities.data.ll.logbook.Catch;
 import fr.ird.observe.entities.data.ll.logbook.Set;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.logbook.SetCatchService;
 
 /**
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
+class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
 
     public SetCatchServiceLocalSupport() {
         super(Set.SPI, Set.SET_CATCH_SPI, Catch.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityEncounterServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivityEncounterDto;
 import fr.ird.observe.dto.data.ll.observation.EncounterDto;
 import fr.ird.observe.entities.data.ll.observation.Activity;
 import fr.ird.observe.entities.data.ll.observation.Encounter;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterServ
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class ActivityEncounterServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService {
+class ActivityEncounterServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService {
 
     public ActivityEncounterServiceLocalSupport() {
         super(Activity.SPI, Activity.ACTIVITY_ENCOUNTER_SPI, Encounter.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivitySensorUsedServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivitySensorUsedDto;
 import fr.ird.observe.dto.data.ll.observation.SensorUsedDto;
 import fr.ird.observe.entities.data.ll.observation.Activity;
 import fr.ird.observe.entities.data.ll.observation.SensorUsed;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedSer
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class ActivitySensorUsedServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService {
+class ActivitySensorUsedServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService {
 
     public ActivitySensorUsedServiceLocalSupport() {
         super(Activity.SPI, Activity.ACTIVITY_SENSOR_USED_SPI, SensorUsed.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetCatchServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.CatchDto;
 import fr.ird.observe.dto.data.ll.observation.SetCatchDto;
 import fr.ird.observe.entities.data.ll.observation.Catch;
 import fr.ird.observe.entities.data.ll.observation.Set;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.observation.SetCatchService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetCatchService;
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
+class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
 
     public SetCatchServiceLocalSupport() {
         super(Set.SPI, Set.SET_CATCH_SPI, Catch.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetTdrServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ll.observation.SetTdrDto;
 import fr.ird.observe.dto.data.ll.observation.TdrDto;
 import fr.ird.observe.entities.data.ll.observation.Set;
 import fr.ird.observe.entities.data.ll.observation.Tdr;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ll.observation.SetTdrService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetTdrService;
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetTdrServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService {
+class SetTdrServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService {
 
     public SetTdrServiceLocalSupport() {
         super(Set.SPI, Set.SET_TDR_SPI, Tdr.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocalSupport.java
=====================================
@@ -26,13 +26,13 @@ import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto;
 import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto;
 import fr.ird.observe.entities.data.ps.common.GearUseFeatures;
 import fr.ird.observe.entities.data.ps.common.Trip;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.common.TripGearUseFeaturesService;
 
 /**
  * @author Tony Chemit - dev@tchemit.fr
  */
-class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
+class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
 
     public TripGearUseFeaturesServiceLocalSupport() {
         super(Trip.SPI, Trip.TRIP_GEAR_USE_FEATURES_SPI, GearUseFeatures.SPI,


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectObservedSpeciesServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectObservedSpeciesDto;
 import fr.ird.observe.dto.data.ps.observation.ObjectObservedSpeciesDto;
 import fr.ird.observe.entities.data.ps.observation.FloatingObject;
 import fr.ird.observe.entities.data.ps.observation.ObjectObservedSpecies;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObservedSpeciesService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObserve
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class FloatingObjectObservedSpeciesServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService {
+class FloatingObjectObservedSpeciesServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService {
 
     public FloatingObjectObservedSpeciesServiceLocalSupport() {
         super(FloatingObject.SPI, FloatingObject.FLOATING_OBJECT_OBSERVED_SPECIES_SPI, ObjectObservedSpecies.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectSchoolEstimateServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectSchoolEstimateDto;
 import fr.ird.observe.dto.data.ps.observation.ObjectSchoolEstimateDto;
 import fr.ird.observe.entities.data.ps.observation.FloatingObject;
 import fr.ird.observe.entities.data.ps.observation.ObjectSchoolEstimate;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolEstimateService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolE
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class FloatingObjectSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService {
+class FloatingObjectSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService {
 
     public FloatingObjectSchoolEstimateServiceLocalSupport() {
         super(FloatingObject.SPI, FloatingObject.FLOATING_OBJECT_SCHOOL_ESTIMATE_SPI, ObjectSchoolEstimate.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetDiscardedTargetCatchServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.DiscardedTargetCatchDto;
 import fr.ird.observe.dto.data.ps.observation.SetDiscardedTargetCatchDto;
 import fr.ird.observe.entities.data.ps.observation.Set;
 import fr.ird.observe.entities.data.ps.observation.TargetCatch;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCatchService;
 
 /**
@@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCat
  * @author Tony Chemit - dev@tchemit.fr
  * @since 8.0.1
  */
-class SetDiscardedTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService {
+class SetDiscardedTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService {
 
     public SetDiscardedTargetCatchServiceLocalSupport() {
         super(Set.SPI, Set.SET_DISCARDED_TARGET_CATCH_SPI, TargetCatch.DISCARDED_TARGET_CATCH_SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetKeptTargetCatchServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.KeptTargetCatchDto;
 import fr.ird.observe.dto.data.ps.observation.SetKeptTargetCatchDto;
 import fr.ird.observe.entities.data.ps.observation.Set;
 import fr.ird.observe.entities.data.ps.observation.TargetCatch;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchService;
 
 /**
@@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchSer
  * @author Tony Chemit - dev@tchemit.fr
  * @since 8.0.1
  */
-class SetKeptTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService {
+class SetKeptTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService {
 
     public SetKeptTargetCatchServiceLocalSupport() {
         super(Set.SPI, Set.SET_KEPT_TARGET_CATCH_SPI, TargetCatch.KEPT_TARGET_CATCH_SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchReleaseServiceLocalSupport.java
=====================================
@@ -22,22 +22,19 @@ package fr.ird.observe.services.local.service.data.ps.observation;
  * #L%
  */
 
+import fr.ird.observe.dto.data.ps.observation.NonTargetCatchReleaseDto;
 import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto;
+import fr.ird.observe.entities.data.ps.observation.NonTargetCatchRelease;
 import fr.ird.observe.entities.data.ps.observation.Set;
-import fr.ird.observe.services.local.service.data.Simple4DataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchReleaseService;
 
 /**
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetNonTargetCatchReleaseServiceLocalSupport extends Simple4DataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, Set> implements SetNonTargetCatchReleaseService {
+class SetNonTargetCatchReleaseServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, NonTargetCatchRelease> implements SetNonTargetCatchReleaseService {
 
     public SetNonTargetCatchReleaseServiceLocalSupport() {
-        super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI);
-    }
-
-    @Override
-    protected Set loadFormEntity(Set parent) {
-        return parent;
+        super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI, NonTargetCatchRelease.SPI);
     }
 }


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.NonTargetCatchDto;
 import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchDto;
 import fr.ird.observe.entities.data.ps.observation.NonTargetCatch;
 import fr.ird.observe.entities.data.ps.observation.Set;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchServ
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetNonTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService {
+class SetNonTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService {
 
     public SetNonTargetCatchServiceLocalSupport() {
         super(Set.SPI, Set.SET_NON_TARGET_CATCH_SPI, NonTargetCatch.SPI);


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetSchoolEstimateServiceLocalSupport.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto;
 import fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto;
 import fr.ird.observe.entities.data.ps.observation.SchoolEstimate;
 import fr.ird.observe.entities.data.ps.observation.Set;
-import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
+import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
 import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateService;
 
 /**
@@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateServ
  *
  * @author Tony Chemit - dev@tchemit.fr
  */
-class SetSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService {
+class SetSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService {
 
     public SetSchoolEstimateServiceLocalSupport() {
         super(Set.SPI, Set.SET_SCHOOL_ESTIMATE_SPI, SchoolEstimate.SPI);



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf3e58bbff28dbc729c34fa719...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf3e58bbff28dbc729c34fa719...
You're receiving this email because of your account on gitlab.com.

    