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

Commits:

15 changed files:

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;
    40 40 
      * @author Tony Chemit - dev@tchemit.fr
    41 41 
      * @since 8.0.1
    42 42 
      */
    43 
    -public class SimpleDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> {
    43 
    +public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extends DataDto, D extends DataDto, E extends DataEntity<?, ?>> extends ObserveServiceLocal implements SimpleDataService<M> {
    44 44
    45 45 
         protected final DataDtoEntityContext<?, ?, PE, ?> parentSpi;
    46 46 
         protected final DataDtoEntityContext<M, ?, PE, ?> mainSpi;
    47 47 
         protected final DataDtoEntityContext<D, ?, E, ?> spi;
    48 48 
         protected final BiConsumer<PE, Date> saveCallback;
    49 49
    50 
    -    protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) {
    50 
    +    protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi) {
    51 51 
             this(parentSpi, mainSpi, spi, null);
    52 52 
         }
    53 53
    54 
    -    protected SimpleDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) {
    54 
    +    protected ContainerDataServiceLocalSupport(DataDtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<M, ?, PE, ?> mainSpi, DataDtoEntityContext<D, ?, E, ?> spi, BiConsumer<PE, Date> saveCallback) {
    55 55 
             this.parentSpi = Objects.requireNonNull(parentSpi);
    56 56 
             this.mainSpi = Objects.requireNonNull(mainSpi);
    57 57 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto;
    27 27 
     import fr.ird.observe.entities.data.ll.common.GearUseFeatures;
    28 28 
     import fr.ird.observe.entities.data.ll.common.Trip;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.common.TripGearUseFeaturesService;
    31 31
    32 32 
     /**
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      */
    35 
    -class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
    35 
    +class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
    36 36
    37 37 
         public TripGearUseFeaturesServiceLocalSupport() {
    38 38 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.logbook.SetCatchDto;
    27 27 
     import fr.ird.observe.entities.data.ll.logbook.Catch;
    28 28 
     import fr.ird.observe.entities.data.ll.logbook.Set;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.logbook.SetCatchService;
    31 31
    32 32 
     /**
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      */
    35 
    -class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
    35 
    +class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
    36 36
    37 37 
         public SetCatchServiceLocalSupport() {
    38 38 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.EncounterDto;
    27 27 
     import fr.ird.observe.entities.data.ll.observation.Activity;
    28 28 
     import fr.ird.observe.entities.data.ll.observation.Encounter;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivityEncounterServ
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class ActivityEncounterServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService {
    37 
    +class ActivityEncounterServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivityEncounterDto, EncounterDto, Encounter> implements ActivityEncounterService {
    38 38
    39 39 
         public ActivityEncounterServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.SensorUsedDto;
    27 27 
     import fr.ird.observe.entities.data.ll.observation.Activity;
    28 28 
     import fr.ird.observe.entities.data.ll.observation.SensorUsed;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.ActivitySensorUsedSer
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class ActivitySensorUsedServiceLocalSupport extends SimpleDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService {
    37 
    +class ActivitySensorUsedServiceLocalSupport extends ContainerDataServiceLocalSupport<Activity, ActivitySensorUsedDto, SensorUsedDto, SensorUsed> implements ActivitySensorUsedService {
    38 38
    39 39 
         public ActivitySensorUsedServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.SetCatchDto;
    27 27 
     import fr.ird.observe.entities.data.ll.observation.Catch;
    28 28 
     import fr.ird.observe.entities.data.ll.observation.Set;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.observation.SetCatchService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetCatchService;
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class SetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
    37 
    +class SetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetCatchDto, CatchDto, Catch> implements SetCatchService {
    38 38
    39 39 
         public SetCatchServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.TdrDto;
    27 27 
     import fr.ird.observe.entities.data.ll.observation.Set;
    28 28 
     import fr.ird.observe.entities.data.ll.observation.Tdr;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ll.observation.SetTdrService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ll.observation.SetTdrService;
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class SetTdrServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService {
    37 
    +class SetTdrServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetTdrDto, TdrDto, Tdr> implements SetTdrService {
    38 38
    39 39 
         public SetTdrServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto;
    27 27 
     import fr.ird.observe.entities.data.ps.common.GearUseFeatures;
    28 28 
     import fr.ird.observe.entities.data.ps.common.Trip;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.common.TripGearUseFeaturesService;
    31 31
    32 32 
     /**
    33 33 
      * @author Tony Chemit - dev@tchemit.fr
    34 34 
      */
    35 
    -class TripGearUseFeaturesServiceLocalSupport extends SimpleDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
    35 
    +class TripGearUseFeaturesServiceLocalSupport extends ContainerDataServiceLocalSupport<Trip, TripGearUseFeaturesDto, GearUseFeaturesDto, GearUseFeatures> implements TripGearUseFeaturesService {
    36 36
    37 37 
         public TripGearUseFeaturesServiceLocalSupport() {
    38 38 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.ObjectObservedSpeciesDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.FloatingObject;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.ObjectObservedSpecies;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObservedSpeciesService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectObserve
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class FloatingObjectObservedSpeciesServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService {
    37 
    +class FloatingObjectObservedSpeciesServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpecies> implements FloatingObjectObservedSpeciesService {
    38 38
    39 39 
         public FloatingObjectObservedSpeciesServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.ObjectSchoolEstimateDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.FloatingObject;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.ObjectSchoolEstimate;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolEstimateService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.FloatingObjectSchoolE
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class FloatingObjectSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService {
    37 
    +class FloatingObjectSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<FloatingObject, FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimate> implements FloatingObjectSchoolEstimateService {
    38 38
    39 39 
         public FloatingObjectSchoolEstimateServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetDiscardedTargetCatchDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.Set;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.TargetCatch;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCatchService;
    31 31
    32 32 
     /**
    ... ... @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetDiscardedTargetCat
    36 36 
      * @author Tony Chemit - dev@tchemit.fr
    37 37 
      * @since 8.0.1
    38 38 
      */
    39 
    -class SetDiscardedTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService {
    39 
    +class SetDiscardedTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetDiscardedTargetCatchDto, DiscardedTargetCatchDto, TargetCatch> implements SetDiscardedTargetCatchService {
    40 40
    41 41 
         public SetDiscardedTargetCatchServiceLocalSupport() {
    42 42 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetKeptTargetCatchDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.Set;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.TargetCatch;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchService;
    31 31
    32 32 
     /**
    ... ... @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetKeptTargetCatchSer
    36 36 
      * @author Tony Chemit - dev@tchemit.fr
    37 37 
      * @since 8.0.1
    38 38 
      */
    39 
    -class SetKeptTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService {
    39 
    +class SetKeptTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetKeptTargetCatchDto, KeptTargetCatchDto, TargetCatch> implements SetKeptTargetCatchService {
    40 40
    41 41 
         public SetKeptTargetCatchServiceLocalSupport() {
    42 42 
             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;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.dto.data.ps.observation.NonTargetCatchReleaseDto;
    25 26 
     import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto;
    27 
    +import fr.ird.observe.entities.data.ps.observation.NonTargetCatchRelease;
    26 28 
     import fr.ird.observe.entities.data.ps.observation.Set;
    27 
    -import fr.ird.observe.services.local.service.data.Simple4DataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    28 30 
     import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchReleaseService;
    29 31
    30 32 
     /**
    31 33 
      * @author Tony Chemit - dev@tchemit.fr
    32 34 
      */
    33 
    -class SetNonTargetCatchReleaseServiceLocalSupport extends Simple4DataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, Set> implements SetNonTargetCatchReleaseService {
    35 
    +class SetNonTargetCatchReleaseServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchReleaseDto, NonTargetCatchReleaseDto, NonTargetCatchRelease> implements SetNonTargetCatchReleaseService {
    34 36
    35 37 
         public SetNonTargetCatchReleaseServiceLocalSupport() {
    36 
    -        super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI);
    37 
    -    }
    38 
    -
    39 
    -    @Override
    40 
    -    protected Set loadFormEntity(Set parent) {
    41 
    -        return parent;
    38 
    +        super(Set.SPI, Set.SET_NON_TARGET_CATCH_RELEASE_SPI, NonTargetCatchRelease.SPI);
    42 39 
         }
    43 40 
     }

  • 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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.NonTargetCatch;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.Set;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetNonTargetCatchServ
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class SetNonTargetCatchServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService {
    37 
    +class SetNonTargetCatchServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetNonTargetCatchDto, NonTargetCatchDto, NonTargetCatch> implements SetNonTargetCatchService {
    38 38
    39 39 
         public SetNonTargetCatchServiceLocalSupport() {
    40 40 
             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;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto;
    27 27 
     import fr.ird.observe.entities.data.ps.observation.SchoolEstimate;
    28 28 
     import fr.ird.observe.entities.data.ps.observation.Set;
    29 
    -import fr.ird.observe.services.local.service.data.SimpleDataServiceLocalSupport;
    29 
    +import fr.ird.observe.services.local.service.data.ContainerDataServiceLocalSupport;
    30 30 
     import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateService;
    31 31
    32 32 
     /**
    ... ... @@ -34,7 +34,7 @@ import fr.ird.observe.services.service.data.ps.observation.SetSchoolEstimateServ
    34 34 
      *
    35 35 
      * @author Tony Chemit - dev@tchemit.fr
    36 36 
      */
    37 
    -class SetSchoolEstimateServiceLocalSupport extends SimpleDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService {
    37 
    +class SetSchoolEstimateServiceLocalSupport extends ContainerDataServiceLocalSupport<Set, SetSchoolEstimateDto, SchoolEstimateDto, SchoolEstimate> implements SetSchoolEstimateService {
    38 38
    39 39 
         public SetSchoolEstimateServiceLocalSupport() {
    40 40 
             super(Set.SPI, Set.SET_SCHOOL_ESTIMATE_SPI, SchoolEstimate.SPI);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.