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

Commits:

12 changed files:

Changes:

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java
    ... ... @@ -192,9 +192,7 @@ public abstract class ObserveServiceLocal implements ObserveService {
    192 192
    193 193 
         protected <E extends Entity> SaveResultDto saveEntity(DtoEntityContext<?, ?, E, ?> spi, E entity) {
    194 194 
             return newSaveHelper()
    195 
    -                .update(spi, entity)
    196 
    -                .updateLastUpdateDateField(spi, entity)
    197 
    -                .updateLastUpdateDateTable(spi)
    195 
    +                .update(spi, entity, true, true)
    198 196 
                     .build(entity);
    199 197 
     //        entity = spi.update(getTopiaPersistenceContext(), entity);
    200 198 
     //        getTopiaPersistenceContext().flush();

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ContainerDataServiceLocalSupport.java
    ... ... @@ -71,8 +71,7 @@ public class ContainerDataServiceLocalSupport<PE extends DataEntity<?, ?>, D ext
    71 71 
             checkLastUpdateDate(entity, dto);
    72 72 
             entity.fromDto(getReferentialLocale(), dto);
    73 73 
             return newSaveHelper()
    74 
    -                .update(parentSpi, entity, saveCallback)
    75 
    -                .updateLastUpdateDateField(parentSpi, entity)
    74 
    +                .update(parentSpi, entity, saveCallback, true, false)
    76 75 
                     .updateLastUpdateDateTable(spi)
    77 76 
                     .build(entity);
    78 77 
     //        if (saveCallback == null) {

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java
    ... ... @@ -45,7 +45,7 @@ import java.util.stream.Stream;
    45 45 
      * @author Tony Chemit - dev@tchemit.fr
    46 46 
      * @since 8.0.1
    47 47 
      */
    48 
    -public abstract class EditableDataServiceLocalSupport<PE extends Entity, D extends EditableDto, R extends DataDtoReference, E extends DataEntity<?, ?>, T extends TopiaDao<E>, S extends SaveResultDto> extends ObserveServiceLocal implements EditableDataService<D, R> {
    48 
    +public abstract class EditableDataServiceLocalSupport<PE extends Entity, D extends EditableDto, R extends DataDtoReference, E extends DataEntity<?, ?>, T extends TopiaDao<E>> extends ObserveServiceLocal implements EditableDataService<D, R> {
    49 49
    50 50 
         protected final DataDtoEntityContext<D, R, E, T> spi;
    51 51 
         protected final DtoEntityContext<?, ?, PE, ?> parentSpi;

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/SimpleDataServiceLocalSupport.java
    ... ... @@ -64,8 +64,7 @@ public class SimpleDataServiceLocalSupport<PE extends DataEntity<?, ?>, M extend
    64 64 
             checkLastUpdateDate(entity, dto);
    65 65 
             entity.fromDto(getReferentialLocale(), dto);
    66 66 
             return newSaveHelper()
    67 
    -                .update(parentSpi, entity, saveCallback)
    68 
    -                .updateLastUpdateDateField(parentSpi, entity)
    67 
    +                .update(parentSpi, entity, saveCallback, true, false)
    69 68 
                     .updateLastUpdateDateTable(spi)
    70 69 
                     .build(entity);
    71 70 
     //        if (saveCallback == null) {

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/TripServiceLocalSupport.java
    ... ... @@ -164,7 +164,7 @@ public abstract class TripServiceLocalSupport<D extends OpenableDto & fr.ird.obs
    164 164 
                 saveHelper.updateLastUpdateDateField(spi, entity);
    165 165 
     //            saveEntity(spi, entity);
    166 166 
             }
    167 
    -        saveHelper.build();
    167 
    +        saveHelper.updateLastUpdateDateTable(spi).build();
    168 168 
             return ids;
    169 169 
         }
    170 170

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivitySampleServiceLocalSupport.java
    ... ... @@ -31,7 +31,6 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet;
    31 31 
     import fr.ird.observe.dto.result.SaveResultDto;
    32 32 
     import fr.ird.observe.entities.DataNotFoundException;
    33 33 
     import fr.ird.observe.entities.Entity;
    34 
    -import fr.ird.observe.entities.ObserveTopiaPersistenceContext;
    35 34 
     import fr.ird.observe.entities.ReplicateDataEngine;
    36 35 
     import fr.ird.observe.entities.data.DataEntity;
    37 36 
     import fr.ird.observe.entities.data.TripAware;
    ... ... @@ -45,13 +44,12 @@ import fr.ird.observe.services.local.service.data.ll.common.TripServiceLocalSupp
    45 44 
     import fr.ird.observe.services.service.data.ll.logbook.ActivitySampleService;
    46 45 
     import fr.ird.observe.spi.context.DataDtoEntityContext;
    47 46
    48 
    -import java.util.Date;
    49 47 
     import java.util.stream.Stream;
    50 48
    51 49 
     /**
    52 50 
      * @author Tony Chemit - dev@tchemit.fr
    53 51 
      */
    54 
    -class ActivitySampleServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, ActivitySampleDto, ActivitySampleReference, Sample, SampleTopiaDao, SaveResultDto> implements ActivitySampleService {
    52 
    +class ActivitySampleServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, ActivitySampleDto, ActivitySampleReference, Sample, SampleTopiaDao> implements ActivitySampleService {
    55 53
    56 54 
         public ActivitySampleServiceLocalSupport() {
    57 55 
             super(Activity.SPI, Sample.ACTIVITY_SAMPLE_SPI, Activity.PROPERTY_SAMPLE);
    ... ... @@ -76,9 +74,8 @@ class ActivitySampleServiceLocalSupport extends EditableDataServiceLocalSupport<
    76 74 
             parent.setSample(entity);
    77 75 
             //FIXME Why we are using this ???
    78 76 
             return newSaveHelper()
    79 
    -                .update(spi, entity)
    77 
    +                .update(spi, entity, false, true)
    80 78 
                     .updateLastUpdateDateField(parentSpi, parent)
    81 
    -                .updateLastUpdateDateTable(spi)
    82 79 
                     .build(entity);
    83 80 
     //        return saveEntity(parent, entity);
    84 81 
         }
    ... ... @@ -123,14 +120,9 @@ class ActivitySampleServiceLocalSupport extends EditableDataServiceLocalSupport<
    123 120 
         }
    124 121
    125 122 
         protected <P extends DataEntity<?, ?>, E extends DataEntity<?, ?>> void saveEntity2(DataDtoEntityContext<?, ?, P, ?> parentSpi, DataDtoEntityContext<?, ?, E, ?> spi, P parenEntity, E entity) {
    126 
    -        parentSpi.update(getTopiaPersistenceContext(), parenEntity);
    127 
    -        spi.update(getTopiaPersistenceContext(), entity);
    128 
    -        Date lastUpdateDate = now();
    129 
    -        ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext();
    130 
    -        persistenceContext.flush();
    131 
    -        spi.updateLastUpdateDateField(persistenceContext, entity.getTopiaId(), lastUpdateDate);
    132 
    -        spi.updateLastUpdateDateTable(persistenceContext, lastUpdateDate);
    133 
    -        parentSpi.updateLastUpdateDateField(persistenceContext, parenEntity.getTopiaId(), lastUpdateDate);
    134 
    -        parentSpi.updateLastUpdateDateTable(persistenceContext, lastUpdateDate);
    123 
    +        newSaveHelper()
    124 
    +                .update(parentSpi, parenEntity, true, true)
    125 
    +                .update(spi, entity, true, true)
    126 
    +                .build();
    135 127 
         }
    136 128 
     }

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocalSupport.java
    ... ... @@ -45,7 +45,7 @@ import java.util.Objects;
    45 45 
     /**
    46 46 
      * @author Tony Chemit - dev@tchemit.fr
    47 47 
      */
    48 
    -class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao, SaveResultDto> implements SetService {
    48 
    +class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao> implements SetService {
    49 49
    50 50 
         public SetServiceLocalSupport() {
    51 51 
             super(Activity.SPI, Set.SPI, Activity.PROPERTY_SET);

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/BranchlineServiceLocalSupport.java
    ... ... @@ -50,9 +50,8 @@ class BranchlineServiceLocalSupport extends ObserveServiceLocal implements Branc
    50 50 
             checkLastUpdateDate(entity, dto);
    51 51 
             entity.fromDto(getReferentialLocale(), dto);
    52 52 
             return newSaveHelper()
    53 
    -                .update(Branchline.SPI, entity)
    53 
    +                .update(Branchline.SPI, entity, false, true)
    54 54 
                     .updateLastUpdateDateField(Set.SPI, parent)
    55 
    -                .updateLastUpdateDateTable(Branchline.SPI)
    56 55 
                     .build(entity);
    57 56 
     //        return saveEntity(Set.SPI, Branchline.SPI, parent, entity);
    58 57 
         }

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetServiceLocalSupport.java
    ... ... @@ -27,7 +27,6 @@ import fr.ird.observe.dto.data.ll.observation.SetDto;
    27 27 
     import fr.ird.observe.dto.data.ll.observation.SetReference;
    28 28 
     import fr.ird.observe.dto.data.ll.observation.SetStubDto;
    29 29 
     import fr.ird.observe.dto.form.Form;
    30 
    -import fr.ird.observe.dto.result.SaveResultDto;
    31 30 
     import fr.ird.observe.entities.data.ll.common.Trip;
    32 31 
     import fr.ird.observe.entities.data.ll.observation.Activity;
    33 32 
     import fr.ird.observe.entities.data.ll.observation.Set;
    ... ... @@ -43,7 +42,7 @@ import java.util.Objects;
    43 42 
     /**
    44 43 
      * @author Tony Chemit - dev@tchemit.fr
    45 44 
      */
    46 
    -class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao, SaveResultDto> implements SetService {
    45 
    +class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao> implements SetService {
    47 46
    48 47 
         public SetServiceLocalSupport() {
    49 48 
             super(Activity.SPI, Set.SPI, Activity.PROPERTY_SET);

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalSupport.java
    ... ... @@ -71,7 +71,7 @@ import java.util.stream.Collectors;
    71 71 
     /**
    72 72 
      * @author Tony Chemit - dev@tchemit.fr
    73 73 
      */
    74 
    -class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, FloatingObjectDto, FloatingObjectReference, FloatingObject, FloatingObjectTopiaDao, SaveResultDto> implements FloatingObjectService {
    74 
    +class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, FloatingObjectDto, FloatingObjectReference, FloatingObject, FloatingObjectTopiaDao> implements FloatingObjectService {
    75 75
    76 76 
         private static final Logger log = LogManager.getLogger(FloatingObjectServiceLocalSupport.class);
    77 77

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java
    ... ... @@ -75,9 +75,8 @@ public abstract class SampleDataServiceLocalSupport<C extends ContainerChildDto,
    75 75
    76 76 
         protected SaveResultDto onSave(Set parent, E entity, boolean notPersisted) {
    77 77 
             return newSaveHelper()
    78 
    -                .update(spi, entity)
    78 
    +                .update(spi, entity, false, true)
    79 79 
                     .updateLastUpdateDateField(Set.SPI, parent)
    80 
    -                .updateLastUpdateDateTable(spi)
    81 80 
                     .build(entity);
    82 81 
     //        return saveEntity(Set.SPI, spi, parent, entity);
    83 82 
         }

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetServiceLocalSupport.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.services.local.service.data.ps.observation;
    25 25 
     import fr.ird.observe.dto.data.ps.observation.SetDto;
    26 26 
     import fr.ird.observe.dto.data.ps.observation.SetReference;
    27 27 
     import fr.ird.observe.dto.form.Form;
    28 
    -import fr.ird.observe.dto.result.SaveResultDto;
    29 28 
     import fr.ird.observe.entities.data.ps.observation.Activity;
    30 29 
     import fr.ird.observe.entities.data.ps.observation.Route;
    31 30 
     import fr.ird.observe.entities.data.ps.observation.Set;
    ... ... @@ -40,7 +39,7 @@ import java.util.Date;
    40 39 
     /**
    41 40 
      * @author Tony Chemit - dev@tchemit.fr
    42 41 
      */
    43 
    -class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao, SaveResultDto> implements SetService {
    42 
    +class SetServiceLocalSupport extends EditableDataServiceLocalSupport<Activity, SetDto, SetReference, Set, SetTopiaDao> implements SetService {
    44 43
    45 44 
         public SetServiceLocalSupport() {
    46 45 
             super(Activity.SPI, Set.SPI, Activity.PROPERTY_SET);

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