This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1f3119fd02fbf9d35ed25b3adb64f707deb4667b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 09:49:56 2016 +0100 Classement des marées dans l'arbre (fixes #8861) --- .../swing/ui/admin/config/SelectDataModel.java | 6 ++--- .../longline/TripLonglineServiceController.java | 6 ++--- .../v1/data/seine/TripSeineServiceController.java | 6 ++--- .../services/dto/gson/ObserveDtoGsonSupplier.java | 3 +++ ...tAdapter.java => DataReferenceListAdapter.java} | 16 ++++++++----- .../gson/reference/DataReferenceSetAdapter.java | 8 ++++++- ...java => ReferenceCollectionSupportAdapter.java} | 18 ++++++++------- .../reference/ReferentialReferenceSetAdapter.java | 8 ++++++- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++++++------- .../ird/observe/services/dto/DataReferenceSet.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 10 ++++----- .../dto/referential/ReferentialReferenceSet.java | 10 ++++----- .../seine/TripSeineGearUseServiceRestTest.java | 6 ++--- .../service/seine/TripSeineServiceRestTest.java | 6 ++--- .../services/topia/ObserveServiceTopia.java | 26 +++++++++++++++++++--- .../topia/service/data/NavigationServiceTopia.java | 13 +++++------ .../data/longline/TripLonglineServiceTopia.java | 21 ++++++++--------- .../service/data/seine/TripSeineServiceTopia.java | 15 +++++++------ .../referential/ReferentialServiceTopia.java | 8 +++---- .../data/TripManagementServiceTopiaTest.java | 6 ++--- .../data/seine/TripSeineServiceTopiaTest.java | 6 ++--- .../service/data/longline/TripLonglineService.java | 7 +++--- .../service/data/seine/TripSeineService.java | 7 +++--- 23 files changed, 138 insertions(+), 92 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java index c28d068..bae24c7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.ObserveModelType; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -106,11 +106,11 @@ public class SelectDataModel extends AdminActionModel { List<DataReference<?>> existingTrip = new ArrayList<>(); TripSeineService tripSeineService = safeCentralSource.newTripSeineService(); - DataReferenceSet<TripSeineDto> tripSeineSet = tripSeineService.getAllTripSeine(); + DataReferenceList<TripSeineDto> tripSeineSet = tripSeineService.getAllTripSeine(); existingTrip.addAll(tripSeineSet.getReferences()); TripLonglineService tripLonglineService = safeCentralSource.newTripLonglineService(); - DataReferenceSet<TripLonglineDto> tripLonglineSet = tripLonglineService.getAllTripLongline(); + DataReferenceList<TripLonglineDto> tripLonglineSet = tripLonglineService.getAllTripLongline(); existingTrip.addAll(tripLonglineSet.getReferences()); selectionDataModel.setExistingTrips(existingTrip); diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java index 44de008..046cab5 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -46,12 +46,12 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public DataReferenceSet<TripLonglineDto> getAllTripLongline() { + public DataReferenceList<TripLonglineDto> getAllTripLongline() { return service.getAllTripLongline(); } @Override - public DataReferenceSet<TripLonglineDto> getTripLonglineByProgram(String programId) { + public DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId) { return service.getTripLonglineByProgram(programId); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java index d1527e4..f36de46 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -46,12 +46,12 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public DataReferenceSet<TripSeineDto> getAllTripSeine() { + public DataReferenceList<TripSeineDto> getAllTripSeine() { return service.getAllTripSeine(); } @Override - public DataReferenceSet<TripSeineDto> getTripSeineByProgram(String programId) { + public DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java index 504afdd..a2ba40b 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java @@ -30,10 +30,12 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.dto.gson.reference.DataReferenceAdapter; +import fr.ird.observe.services.dto.gson.reference.DataReferenceListAdapter; import fr.ird.observe.services.dto.gson.reference.DataReferenceSetAdapter; import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceAdapter; import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceSetAdapter; @@ -105,6 +107,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(ReferentialReference.class, new ReferentialReferenceAdapter()); gsonBuilder.registerTypeAdapter(AbstractReference.class, new UnknownReferenceAdapter()); gsonBuilder.registerTypeAdapter(DataReferenceSet.class, new DataReferenceSetAdapter()); + gsonBuilder.registerTypeAdapter(DataReferenceList.class, new DataReferenceListAdapter<>()); gsonBuilder.registerTypeAdapter(ReferentialReferenceSet.class, new ReferentialReferenceSetAdapter()); gsonBuilder.registerTypeAdapter(Form.class, new FormAdapter()); diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java similarity index 71% copy from services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java copy to services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java index f8287d3..57b8baa 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java @@ -22,13 +22,14 @@ package fr.ird.observe.services.dto.gson.reference; * #L% */ -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; /** @@ -36,18 +37,23 @@ import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataReferenceSetAdapter<D extends DataDto> extends AbstractReferenceSetAdapter<D, DataReference<D>, DataReferenceSet<D>> { +public class DataReferenceListAdapter<D extends DataDto> extends ReferenceCollectionSupportAdapter<D, DataReference<D>, ImmutableList<DataReference<D>>, DataReferenceList<D>> { protected final DataReferenceAdapter<D> referenceAdapter = new DataReferenceAdapter<>(); @Override + protected ImmutableCollection.Builder<DataReference<D>> createCollectionBuilder() { + return ImmutableList.builder(); + } + + @Override protected ReferenceSetDefinition<D> getDefintion(Class<D> dtoType) { return referenceAdapter.getDefinition(dtoType); } @Override - protected DataReferenceSet<D> newReferenceSet(Class<D> dtoType, ImmutableSet<DataReference<D>> references, JsonObject jsonObject, JsonDeserializationContext context) { - return DataReferenceSet.of(dtoType, references); + protected DataReferenceList<D> newReferenceSet(Class<D> dtoType, ImmutableList<DataReference<D>> references, JsonObject jsonObject, JsonDeserializationContext context) { + return DataReferenceList.of(dtoType, references); } @Override diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java index f8287d3..d5727da 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto.gson.reference; * #L% */ +import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; @@ -36,11 +37,16 @@ import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataReferenceSetAdapter<D extends DataDto> extends AbstractReferenceSetAdapter<D, DataReference<D>, DataReferenceSet<D>> { +public class DataReferenceSetAdapter<D extends DataDto> extends ReferenceCollectionSupportAdapter<D, DataReference<D>, ImmutableSet<DataReference<D>>, DataReferenceSet<D>> { protected final DataReferenceAdapter<D> referenceAdapter = new DataReferenceAdapter<>(); @Override + protected ImmutableCollection.Builder<DataReference<D>> createCollectionBuilder() { + return ImmutableSet.builder(); + } + + @Override protected ReferenceSetDefinition<D> getDefintion(Class<D> dtoType) { return referenceAdapter.getDefinition(dtoType); } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java similarity index 73% rename from services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java rename to services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java index 15348c5..2d1edec 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.gson.reference; * #L% */ -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableCollection; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -30,8 +30,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.AbstractReferenceSet; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceCollectionSupport; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import java.lang.reflect.Type; @@ -42,25 +42,25 @@ import java.lang.reflect.Type; * * @author Tony Chemit - chemit@codelutin.com */ -public abstract class AbstractReferenceSetAdapter<D extends IdDto, R extends AbstractReference<D>, S extends AbstractReferenceSet<D, R>> implements JsonDeserializer<S> { +public abstract class ReferenceCollectionSupportAdapter<D extends IdDto, R extends AbstractReference<D>, C extends ImmutableCollection<R>, S extends ReferenceCollectionSupport<D, R, C>> implements JsonDeserializer<S> { @Override public final S deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { JsonObject jsonObject = json.getAsJsonObject(); - Class<D> dtoType = context.deserialize(jsonObject.get(AbstractReferenceSet.PROPERTY_TYPE), Class.class); + Class<D> dtoType = context.deserialize(jsonObject.get(ReferenceCollectionSupport.PROPERTY_TYPE), Class.class); ReferenceSetDefinition<D> definition = getDefintion(dtoType); String[] propertyNames = definition.getPropertyNames(); Class<?>[] propertyTypes = definition.getPropertyTypes(); - JsonArray jsonPropertyValues = jsonObject.get(AbstractReferenceSet.PROPERTY_REFERENCES).getAsJsonArray(); + JsonArray jsonPropertyValues = jsonObject.get(ReferenceCollectionSupport.PROPERTY_REFERENCES).getAsJsonArray(); int referencesSize = jsonPropertyValues.size(); - ImmutableSet.Builder<R> references = ImmutableSet.builder(); + C.Builder<R> references = createCollectionBuilder(); for (int i = 0; i < referencesSize; i++) { @@ -69,14 +69,16 @@ public abstract class AbstractReferenceSetAdapter<D extends IdDto, R extends Abs } - return newReferenceSet(dtoType, references.build(), jsonObject, context); + return newReferenceSet(dtoType, (C) references.build(), jsonObject, context); } + protected abstract C.Builder<R> createCollectionBuilder(); + protected abstract ReferenceSetDefinition<D> getDefintion(Class<D> dtoType); protected abstract R deserializeReference(JsonElement referenceJsonElement, JsonDeserializationContext context, Class<D> dtoType, String[] propertyNames, Class<?>... propertyTypes); - protected abstract S newReferenceSet(Class<D> dtoType, ImmutableSet<R> references, JsonObject jsonObject, JsonDeserializationContext context); + protected abstract S newReferenceSet(Class<D> dtoType, C references, JsonObject jsonObject, JsonDeserializationContext context); } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java index 40971ae..8493542 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto.gson.reference; * #L% */ +import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; @@ -38,11 +39,16 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialReferenceSetAdapter<D extends ReferentialDto> extends AbstractReferenceSetAdapter<D, ReferentialReference<D>, ReferentialReferenceSet<D>> { +public class ReferentialReferenceSetAdapter<D extends ReferentialDto> extends ReferenceCollectionSupportAdapter<D, ReferentialReference<D>, ImmutableSet<ReferentialReference<D>>, ReferentialReferenceSet<D>> { protected final ReferentialReferenceAdapter<D> referenceAdapter = new ReferentialReferenceAdapter<>(); @Override + protected ImmutableCollection.Builder<ReferentialReference<D>> createCollectionBuilder() { + return ImmutableSet.builder(); + } + + @Override protected ReferentialReferenceSet<D> newReferenceSet(Class<D> dtoType, ImmutableSet<ReferentialReference<D>> references, JsonObject jsonObject, JsonDeserializationContext context) { JsonElement lastUpdateElement = jsonObject.get(ReferentialReferenceSet.PROPERTY_LAST_UPDATE); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java similarity index 62% copy from services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java copy to services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java index 01e756c..88303b0 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java @@ -23,27 +23,27 @@ package fr.ird.observe.services.dto; */ import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; -public class DataReferenceSet<R extends DataDto> extends AbstractReferenceSet<R, DataReference<R>> { +public class DataReferenceList<R extends DataDto> extends ReferenceCollectionSupport<R, DataReference<R>, ImmutableList<DataReference<R>>> { private static final long serialVersionUID = 1L; - public static <R extends DataDto> DataReferenceSet<R> of(Class<R> type, - ImmutableSet<DataReference<R>> references) { + public static <R extends DataDto> DataReferenceList<R> of(Class<R> type, + ImmutableList<DataReference<R>> references) { - return new DataReferenceSet<>(type, references); + return new DataReferenceList<>(type, references); } @Override public String toString() { return MoreObjects.toStringHelper(this) - .add(PROPERTY_TYPE, type.getSimpleName()) - .toString(); + .add(PROPERTY_TYPE, type.getSimpleName()) + .toString(); } - protected DataReferenceSet(Class<R> type, ImmutableSet<DataReference<R>> references) { + protected DataReferenceList(Class<R> type, ImmutableList<DataReference<R>> references) { super(type, references); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java index 01e756c..eb852bd 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.dto; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; -public class DataReferenceSet<R extends DataDto> extends AbstractReferenceSet<R, DataReference<R>> { +public class DataReferenceSet<R extends DataDto> extends ReferenceCollectionSupport<R, DataReference<R>, ImmutableSet<DataReference<R>>> { private static final long serialVersionUID = 1L; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java similarity index 82% rename from services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java index 69a1bee..329e460 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java @@ -22,13 +22,13 @@ package fr.ird.observe.services.dto; * #L% */ -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableCollection; import com.google.common.collect.Iterables; import java.io.Serializable; import java.util.Optional; -public abstract class AbstractReferenceSet<D extends IdDto, R extends AbstractReference<D>> implements ObserveDto, Serializable { +public abstract class ReferenceCollectionSupport<D extends IdDto, R extends AbstractReference<D>, C extends ImmutableCollection<R>> implements ObserveDto, Serializable { public static final String PROPERTY_TYPE = "type"; @@ -38,9 +38,9 @@ public abstract class AbstractReferenceSet<D extends IdDto, R extends AbstractRe protected final Class<D> type; - protected final ImmutableSet<R> references; + protected final C references; - protected AbstractReferenceSet(Class<D> type, ImmutableSet<R> references) { + protected ReferenceCollectionSupport(Class<D> type, C references) { this.type = type; this.references = references; } @@ -65,7 +65,7 @@ public abstract class AbstractReferenceSet<D extends IdDto, R extends AbstractRe return references.size(); } - public ImmutableSet<R> getReferences() { + public C getReferences() { return references; } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java index ab51fea..3f84707 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java @@ -24,11 +24,11 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.AbstractReferenceSet; +import fr.ird.observe.services.dto.ReferenceCollectionSupport; import java.util.Date; -public class ReferentialReferenceSet<R extends ReferentialDto> extends AbstractReferenceSet<R, ReferentialReference<R>> { +public class ReferentialReferenceSet<R extends ReferentialDto> extends ReferenceCollectionSupport<R, ReferentialReference<R>, ImmutableSet<ReferentialReference<R>>> { public static final String PROPERTY_LAST_UPDATE = "lastUpdate"; @@ -60,8 +60,8 @@ public class ReferentialReferenceSet<R extends ReferentialDto> extends AbstractR @Override public String toString() { return MoreObjects.toStringHelper(this) - .add(PROPERTY_TYPE, type.getName()) - .add(PROPERTY_LAST_UPDATE, lastUpdate) - .toString(); + .add(PROPERTY_TYPE, type.getName()) + .add(PROPERTY_LAST_UPDATE, lastUpdate) + .toString(); } } diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java index 2bfc71d..fe64581 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.rest.service.seine; */ import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -59,7 +59,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { public void loadToReadTest() { - DataReferenceSet<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); + DataReferenceList<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); Map<String, DataReference<TripSeineDto>> tripIds = DataReference.splitById(allTripSeine.getReferences()); @@ -121,7 +121,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { @Test public void loadToEditTest() { - DataReferenceSet<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); + DataReferenceList<TripSeineDto> allTripSeine = newService(TripSeineService.class).getAllTripSeine(); Map<String, DataReference<TripSeineDto>> tripIds = DataReference.splitById(allTripSeine.getReferences()); diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java index a52827d..a1c6ffa 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.rest.service.seine; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; @@ -58,7 +58,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void getTripSeineByProgramTest() { - DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(stubDtos); @@ -216,7 +216,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java index ba7bfd2..a75e59b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java @@ -22,18 +22,17 @@ package fr.ird.observe.services.topia; * #L% */ +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; @@ -46,6 +45,9 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultHelper; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -319,6 +321,24 @@ public abstract class ObserveServiceTopia implements ObserveService { } + protected <D extends DataDto, E extends ObserveDataEntity> DataReferenceList<D> toDataReferenceList(Class<D> dtoType, List<E> allStubByTripId) { + + DataBinderSupport<E, D> binder = getDataBinder(dtoType); + + ReferentialLocale referentialLocale = getReferentialLocale(); + + ImmutableList.Builder<DataReference<D>> references = ImmutableList.builder(); + for (E activitySeine : allStubByTripId) { + + DataReference<D> reference = binder.toDataReference(referentialLocale, activitySeine); + references.add(reference); + + } + + return DataReferenceList.of(dtoType, references.build()); + + } + protected <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialReferenceSet<D> toReferentialReferenceSet(Class<D> dtoType, List<E> allStubByTripId, Date lastUpdate) { ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java index 61fb2c7..f2dbafc 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java @@ -22,13 +22,12 @@ package fr.ird.observe.services.topia.service.data; * #L% */ -import com.google.common.collect.HashMultimap; +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -63,12 +62,12 @@ public class NavigationServiceTopia extends ObserveServiceTopia implements Navig boolean loadSeine = request.isLoadSeine(); boolean loadEmptyProgram = request.isLoadEmptyProgram(); - Multimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram = HashMultimap.create(); - Multimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram = HashMultimap.create(); + ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram = ArrayListMultimap.create(); + ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram = ArrayListMultimap.create(); if (loadSeine) { TripSeineService service = serviceContext.newService(TripSeineService.class); - DataReferenceSet<TripSeineDto> trips = service.getAllTripSeine(); + DataReferenceList<TripSeineDto> trips = service.getAllTripSeine(); for (DataReference<TripSeineDto> reference : trips.getReferences()) { String programId = TripSeineHelper.getProgramId(reference); ReferentialReference<ProgramDto> program = programsById.get(programId); @@ -79,7 +78,7 @@ public class NavigationServiceTopia extends ObserveServiceTopia implements Navig if (loadLongline) { TripLonglineService service = serviceContext.newService(TripLonglineService.class); - DataReferenceSet<TripLonglineDto> trips = service.getAllTripLongline(); + DataReferenceList<TripLonglineDto> trips = service.getAllTripLongline(); for (DataReference<TripLonglineDto> reference : trips.getReferences()) { String programId = TripLonglineHelper.getProgramId(reference); ReferentialReference<ProgramDto> program = programsById.get(programId); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java index 09dbd0e..1deee60 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java @@ -33,11 +33,8 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.services.service.data.longline.TripLonglineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -48,6 +45,9 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.data.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -55,6 +55,7 @@ import org.nuiton.util.DateUtil; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; @@ -67,26 +68,26 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri private static final Log log = LogFactory.getLog(TripLonglineServiceTopia.class); @Override - public DataReferenceSet<TripLonglineDto> getAllTripLongline() { + public DataReferenceList<TripLonglineDto> getAllTripLongline() { if (log.isTraceEnabled()) { log.trace("getAllTripLongline()"); } List<TripLongline> tripLonglines = loadEntities(TripLongline.class); - - return toDataReferenceSet(TripLonglineDto.class, tripLonglines); + tripLonglines.sort(Comparator.comparing(TripLongline::getStartDate)); + return toDataReferenceList(TripLonglineDto.class, tripLonglines); } @Override - public DataReferenceSet<TripLonglineDto> getTripLonglineByProgram(String programId) { + public DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId) { if (log.isTraceEnabled()) { log.trace("getTripLonglineByProgram(" + programId + ")"); } List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, getReferentialLocale().ordinal()); - - return toDataReferenceSet(TripLonglineDto.class, tripLonglines); + tripLonglines.sort(Comparator.comparing(TripLongline::getStartDate)); + return toDataReferenceList(TripLonglineDto.class, tripLonglines); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java index e5c5791..8a23634 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java @@ -33,7 +33,7 @@ import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -54,6 +54,7 @@ import org.nuiton.util.DateUtil; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; @@ -70,19 +71,19 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public DataReferenceSet<TripSeineDto> getAllTripSeine() { + public DataReferenceList<TripSeineDto> getAllTripSeine() { if (log.isTraceEnabled()) { log.trace("getAllTripSeine()"); } List<TripSeine> tripSeines = loadEntities(TripSeine.class); - - return toDataReferenceSet(TripSeineDto.class, tripSeines); + tripSeines.sort(Comparator.comparing(TripSeine::getStartDate)); + return toDataReferenceList(TripSeineDto.class, tripSeines); } @Override - public DataReferenceSet<TripSeineDto> getTripSeineByProgram(String programId) { + public DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId) { if (log.isTraceEnabled()) { log.trace("getTripSeineByProgram(" + programId + ")"); } @@ -93,8 +94,8 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe loadEntity(ProgramDto.class, programId); List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale.ordinal()); - - return toDataReferenceSet(TripSeineDto.class, tripSeines); + tripSeines.sort(Comparator.comparing(TripSeine::getStartDate)); + return toDataReferenceList(TripSeineDto.class, tripSeines); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java index 6ae7ac5..1585de8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -50,12 +50,12 @@ import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.MissingReferentialResult; import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; @@ -269,12 +269,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe if (ObserveReferentialEntity.class.isAssignableFrom(type)) { Class<ReferentialDto> dtoType = BINDER_ENGINE.getReferentialDtoType((Class) type); - ReferentialReferenceSet referenceSet = toReferentialReferenceSet(dtoType, (List) entities, null); + ReferentialReferenceSet<?> referenceSet = toReferentialReferenceSet(dtoType, (List) entities, null); result.put(dtoType, referenceSet.getReferences()); } else { Class<DataDto> dtoType = BINDER_ENGINE.getDataDtoType((Class) type); - DataReferenceSet referenceSet = toDataReferenceSet(dtoType, (List) entities); + DataReferenceSet<?> referenceSet = toDataReferenceSet(dtoType, (List) entities); result.put(dtoType, referenceSet.getReferences()); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java index a46c850..36f2bbb 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.data; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; @@ -90,13 +90,13 @@ public class TripManagementServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void deleteTrip() { - DataReferenceSet<TripSeineDto> allTripSeineBefore = tripSeineService.getAllTripSeine(); + DataReferenceList<TripSeineDto> allTripSeineBefore = tripSeineService.getAllTripSeine(); DeleteTripRequest request = new DeleteTripRequest(ObserveFixtures.PROGRAM_ID, ObserveFixtures.TRIP_SEINE_ID_1); DeleteTripResult result = tripManagementService.deleteTrip(request); Assert.assertNotNull(result); - DataReferenceSet<TripSeineDto> allTripSeineAfter = tripSeineService.getAllTripSeine(); + DataReferenceList<TripSeineDto> allTripSeineAfter = tripSeineService.getAllTripSeine(); Assert.assertTrue(allTripSeineBefore.sizeReference() == allTripSeineAfter.sizeReference() + 1); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java index 796ee20..1b9829d 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.data.seine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; @@ -74,7 +74,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(stubDtos); @@ -324,7 +324,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java index 74e398a..f18f4eb 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.service.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -46,10 +46,11 @@ import java.util.List; public interface TripLonglineService extends ObserveService { @ReadDataPermission - DataReferenceSet<TripLonglineDto> getAllTripLongline(); + DataReferenceList<TripLonglineDto> getAllTripLongline(); + //FIXME Revoe this method (no more used) @ReadDataPermission - DataReferenceSet<TripLonglineDto> getTripLonglineByProgram(String programId); + DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId); @ReadDataPermission int getTripLonglinePositionInProgram(String programId, String tripLonglineId); diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java index 59b6a17..958767d 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.service.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.DataReferenceList; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -46,10 +46,11 @@ import java.util.List; public interface TripSeineService extends ObserveService { @ReadDataPermission - DataReferenceSet<TripSeineDto> getAllTripSeine(); + DataReferenceList<TripSeineDto> getAllTripSeine(); + //FIXME Revoe this method (no more used) @ReadDataPermission - DataReferenceSet<TripSeineDto> getTripSeineByProgram(String programId); + DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission int getTripSeinePositionInProgram(String programId, String tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.