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

Commits:

2 changed files:

Changes:

  • services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/TripLonglineServiceLocal.java
    ... ... @@ -25,8 +25,8 @@ package fr.ird.observe.services.local.service.data.longline;
    25 25 
     import com.google.common.base.Joiner;
    26 26 
     import com.google.common.collect.ImmutableList;
    27 27 
     import com.google.common.collect.ImmutableSet;
    28 
    -import fr.ird.observe.dto.data.TripMapPoint;
    29 28 
     import fr.ird.observe.dto.data.TripMapDto;
    29 
    +import fr.ird.observe.dto.data.TripMapPoint;
    30 30 
     import fr.ird.observe.dto.data.longline.TripLonglineDto;
    31 31 
     import fr.ird.observe.dto.data.longline.TripLonglineReference;
    32 32 
     import fr.ird.observe.dto.form.Form;
    ... ... @@ -42,18 +42,23 @@ import fr.ird.observe.entities.referentiel.Species;
    42 42 
     import fr.ird.observe.entities.referentiel.Species2;
    43 43 
     import fr.ird.observe.entities.referentiel.SpeciesList;
    44 44 
     import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
    45 
    +import fr.ird.observe.services.local.ObserveServiceContextLocal;
    45 46 
     import fr.ird.observe.services.local.service.ObserveServiceLocal;
    46 47 
     import fr.ird.observe.services.local.service.data.TripMapDtoFactory;
    47 48 
     import fr.ird.observe.services.service.data.longline.TripLonglineService;
    49 
    +import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest;
    50 
    +import fr.ird.observe.services.service.sql.SqlScriptProducerService;
    51 
    +import org.apache.logging.log4j.LogManager;
    52 
    +import org.apache.logging.log4j.Logger;
    53 
    +import org.nuiton.topia.persistence.script.SqlScriptConsumer;
    54 
    +import org.nuiton.topia.persistence.script.TopiaSqlScript;
    55 
    +import org.nuiton.util.DateUtil;
    56 
    +
    48 57 
     import java.util.ArrayList;
    49 
    -import java.util.Collections;
    50 58 
     import java.util.Comparator;
    51 59 
     import java.util.Date;
    52 60 
     import java.util.LinkedHashSet;
    53 61 
     import java.util.List;
    54 
    -import org.apache.logging.log4j.Logger;
    55 
    -import org.apache.logging.log4j.LogManager;
    56 
    -import org.nuiton.util.DateUtil;
    57 62
    58 63 
     /**
    59 64 
      * @author Tony Chemit - dev@tchemit.fr
    ... ... @@ -62,6 +67,14 @@ public class TripLonglineServiceLocal extends ObserveServiceLocal implements Tri
    62 67
    63 68 
         private static final Logger log = LogManager.getLogger(TripLonglineServiceLocal.class);
    64 69
    70 
    +    private SqlScriptProducerService sqlScriptProducerService;
    71 
    +
    72 
    +    @Override
    73 
    +    public void setServiceContext(ObserveServiceContextLocal serviceContext) {
    74 
    +        super.setServiceContext(serviceContext);
    75 
    +        sqlScriptProducerService = serviceContext.newService(SqlScriptProducerService.class);
    76 
    +    }
    77 
    +
    65 78 
         @Override
    66 79 
         public DataDtoReferenceSet<TripLonglineReference> getAllTripLongline() {
    67 80 
             if (log.isTraceEnabled()) {
    ... ... @@ -191,7 +204,12 @@ public class TripLonglineServiceLocal extends ObserveServiceLocal implements Tri
    191 204 
                 log.trace("delete(" + tripLonglineId + ")");
    192 205 
             }
    193 206
    194 
    -        TRIP_LONGLINE_SPI.deleteEntity(getTopiaPersistenceContext(), Collections.singleton(tripLonglineId), this::updateLastUpdateDate);
    207 
    +        DeleteSqlScriptProducerRequest sqlRequest = DeleteSqlScriptProducerRequest
    208 
    +                .builder()
    209 
    +                .dataIdsToDelete(ImmutableSet.of(tripLonglineId));
    210 
    +        TopiaSqlScript sqlScript = sqlScriptProducerService.produceDeleteSqlScript(sqlRequest);
    211 
    +
    212 
    +        getTopiaPersistenceContext().getSqlSupport().doSqlWork(SqlScriptConsumer.of(sqlScript));
    195 213 
         }
    196 214
    197 215 
         @Override

  • services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/TripSeineServiceLocal.java
    ... ... @@ -25,8 +25,8 @@ package fr.ird.observe.services.local.service.data.seine;
    25 25 
     import com.google.common.base.Joiner;
    26 26 
     import com.google.common.collect.ImmutableList;
    27 27 
     import com.google.common.collect.ImmutableSet;
    28 
    -import fr.ird.observe.dto.data.TripMapPoint;
    29 28 
     import fr.ird.observe.dto.data.TripMapDto;
    29 
    +import fr.ird.observe.dto.data.TripMapPoint;
    30 30 
     import fr.ird.observe.dto.data.seine.TripSeineDto;
    31 31 
     import fr.ird.observe.dto.data.seine.TripSeineReference;
    32 32 
     import fr.ird.observe.dto.form.Form;
    ... ... @@ -40,18 +40,23 @@ import fr.ird.observe.entities.referentiel.Species;
    40 40 
     import fr.ird.observe.entities.referentiel.Species2;
    41 41 
     import fr.ird.observe.entities.referentiel.SpeciesList;
    42 42 
     import fr.ird.observe.entities.seine.TripSeine;
    43 
    +import fr.ird.observe.services.local.ObserveServiceContextLocal;
    43 44 
     import fr.ird.observe.services.local.service.ObserveServiceLocal;
    44 45 
     import fr.ird.observe.services.local.service.data.TripMapDtoFactory;
    45 46 
     import fr.ird.observe.services.service.data.seine.TripSeineService;
    47 
    +import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest;
    48 
    +import fr.ird.observe.services.service.sql.SqlScriptProducerService;
    49 
    +import org.apache.logging.log4j.LogManager;
    50 
    +import org.apache.logging.log4j.Logger;
    51 
    +import org.nuiton.topia.persistence.script.SqlScriptConsumer;
    52 
    +import org.nuiton.topia.persistence.script.TopiaSqlScript;
    53 
    +import org.nuiton.util.DateUtil;
    54 
    +
    46 55 
     import java.util.ArrayList;
    47 
    -import java.util.Collections;
    48 56 
     import java.util.Comparator;
    49 57 
     import java.util.Date;
    50 58 
     import java.util.LinkedHashSet;
    51 59 
     import java.util.List;
    52 
    -import org.apache.logging.log4j.Logger;
    53 
    -import org.apache.logging.log4j.LogManager;
    54 
    -import org.nuiton.util.DateUtil;
    55 60
    56 61 
     /**
    57 62 
      * @author Tony Chemit - dev@tchemit.fr
    ... ... @@ -60,6 +65,14 @@ public class TripSeineServiceLocal extends ObserveServiceLocal implements TripSe
    60 65
    61 66 
         private static final Logger log = LogManager.getLogger(TripSeineServiceLocal.class);
    62 67
    68 
    +    private SqlScriptProducerService sqlScriptProducerService;
    69 
    +
    70 
    +    @Override
    71 
    +    public void setServiceContext(ObserveServiceContextLocal serviceContext) {
    72 
    +        super.setServiceContext(serviceContext);
    73 
    +        sqlScriptProducerService = serviceContext.newService(SqlScriptProducerService.class);
    74 
    +    }
    75 
    +
    63 76 
         @Override
    64 77 
         public DataDtoReferenceSet<TripSeineReference> getAllTripSeine() {
    65 78 
             if (log.isTraceEnabled()) {
    ... ... @@ -191,8 +204,12 @@ public class TripSeineServiceLocal extends ObserveServiceLocal implements TripSe
    191 204 
                 log.trace("delete(" + tripSeineId + ")");
    192 205 
             }
    193 206
    194 
    -        TRIP_SEINE_SPI.deleteEntity(getTopiaPersistenceContext(), Collections.singleton(tripSeineId), this::updateLastUpdateDate);
    207 
    +        DeleteSqlScriptProducerRequest sqlRequest = DeleteSqlScriptProducerRequest
    208 
    +                .builder()
    209 
    +                .dataIdsToDelete(ImmutableSet.of(tripSeineId));
    210 
    +        TopiaSqlScript sqlScript = sqlScriptProducerService.produceDeleteSqlScript(sqlRequest);
    195 211
    212 
    +        getTopiaPersistenceContext().getSqlSupport().doSqlWork(SqlScriptConsumer.of(sqlScript));
    196 213 
         }
    197 214
    198 215 
         @Override

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