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

Commits:

4 changed files:

Changes:

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripGearUseFeaturesSpi.java
    ... ... @@ -23,17 +23,14 @@ package fr.ird.observe.entities.data.ll.common;
    23 23 
      */
    24 24
    25 25 
     import java.util.Date;
    26 
    -import java.util.function.BiConsumer;
    27 26
    28 27 
     public class TripGearUseFeaturesSpi extends GeneratedTripGearUseFeaturesSpi {
    29 28
    30 29 
         @Override
    31 
    -    public BiConsumer<Trip, Date> saveCallback() {
    32 
    -        return (e, lastUpdateDate) -> {
    33 
    -            for (GearUseFeatures features : e.getGearUseFeatures()) {
    34 
    -                features.setLastUpdateDate(lastUpdateDate);
    35 
    -                features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate));
    36 
    -            }
    37 
    -        };
    30 
    +    public void saveCallback(Trip entity, Date lastUpdateDate) {
    31 
    +        for (GearUseFeatures features : entity.getGearUseFeatures()) {
    32 
    +            features.setLastUpdateDate(lastUpdateDate);
    33 
    +            features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate));
    34 
    +        }
    38 35 
         }
    39 36 
     }

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java
    ... ... @@ -31,7 +31,6 @@ import fr.ird.observe.spi.service.ServiceContext;
    31 31
    32 32 
     import java.util.Date;
    33 33 
     import java.util.LinkedHashSet;
    34 
    -import java.util.function.BiConsumer;
    35 34 
     import java.util.stream.Collectors;
    36 35
    37 36 
     public class TripBatchSpi extends GeneratedTripBatchSpi {
    ... ... @@ -42,11 +41,6 @@ public class TripBatchSpi extends GeneratedTripBatchSpi {
    42 41 
             form.getObject().setAvailablePackagings(availablePackaging);
    43 42 
         }
    44 43
    45 
    -    @Override
    46 
    -    public BiConsumer<Trip, Date> saveCallback() {
    47 
    -        return (e, lastUpdateDate) -> e.getLocalmarketBatch().forEach(c -> c.setLastUpdateDate(lastUpdateDate));
    48 
    -    }
    49 
    -
    50 44 
         protected LinkedHashSet<PackagingReference> getPackaging(ServiceContext context, Trip trip) {
    51 45 
             Harbour landingHarbour = trip.getLandingHarbour();
    52 46 
             Date date = trip.getEndDate();

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGearUseFeaturesSpi.java
    ... ... @@ -23,17 +23,14 @@ package fr.ird.observe.entities.data.ps.common;
    23 23 
      */
    24 24
    25 25 
     import java.util.Date;
    26 
    -import java.util.function.BiConsumer;
    27 26
    28 27 
     public class TripGearUseFeaturesSpi extends GeneratedTripGearUseFeaturesSpi {
    29 28
    30 29 
         @Override
    31 
    -    public BiConsumer<Trip, Date> saveCallback() {
    32 
    -        return (e, lastUpdateDate) -> {
    33 
    -            for (GearUseFeatures features : e.getGearUseFeatures()) {
    34 
    -                features.setLastUpdateDate(lastUpdateDate);
    35 
    -                features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate));
    36 
    -            }
    37 
    -        };
    30 
    +    public void saveCallback(Trip entity, Date lastUpdateDate) {
    31 
    +        for (GearUseFeatures features : entity.getGearUseFeatures()) {
    32 
    +            features.setLastUpdateDate(lastUpdateDate);
    33 
    +            features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate));
    34 
    +        }
    38 35 
         }
    39 36 
     }

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.entities.referential.common.Species;
    29 29 
     import fr.ird.observe.entities.referential.ps.common.SpeciesFate;
    30 30 
     import fr.ird.observe.spi.service.ServiceContext;
    31 31
    32 
    +import java.util.Date;
    32 33 
     import java.util.Objects;
    33 34 
     import java.util.stream.Collectors;
    34 35
    ... ... @@ -48,6 +49,11 @@ public class SampleSpi extends GeneratedSampleSpi {
    48 49 
             return form;
    49 50 
         }
    50 51
    52 
    +    @Override
    53 
    +    public void saveCallback(Sample entity, Date lastUpdateDate) {
    54 
    +        entity.getSampleMeasure().forEach(c -> c.setLastUpdateDate(lastUpdateDate));
    55 
    +    }
    56 
    +
    51 57 
         @Override
    52 58 
         public SaveResultDto save(ServiceContext context, SampleDto dto) {
    53 59 
             // this is a trick we always use id as parent id...

    • —
    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.