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 1d5a09cfb674c05f1c9f0c92a2f39ccf56ae5101 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 11:59:03 2016 +0100 Ajout d'un objet pour détecter les référentiels manquants --- .../topia/service/ReferentialsShellBuilder.java | 116 +++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java new file mode 100644 index 0000000..a2c919f --- /dev/null +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java @@ -0,0 +1,116 @@ +package fr.ird.observe.services.topia.service; + +import com.google.common.cache.AbstractLoadingCache; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimaps; +import com.google.common.collect.SetMultimap; +import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.topia.binder.BinderEngine; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityVisitor; + +import java.util.Set; +import java.util.TreeSet; + +/** + * Created on 07/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class ReferentialsShellBuilder { + + public static ReferentialsShellBuilder builder(SetMultimap<Class<? extends ReferentialDto>, String> incomingReferentialIds) { + return new ReferentialsShellBuilder(incomingReferentialIds); + } + + private final GetEntityReferentialsShellVisitor visitor; + + public ReferentialsShellBuilder scan(TopiaEntity entity) { + entity.accept(visitor); + return this; + } + + public SetMultimap<Class<? extends ReferentialDto>, String> build() { + return Multimaps.unmodifiableSetMultimap(visitor.missingreferentialIds); + } + + private ReferentialsShellBuilder(SetMultimap<Class<? extends ReferentialDto>, String> incomingReferentialIds) { + visitor = new GetEntityReferentialsShellVisitor(incomingReferentialIds); + } + + private static class GetEntityReferentialsShellVisitor implements TopiaEntityVisitor { + + private final Set<String> hitIds; + private final SetMultimap<Class<? extends ReferentialDto>, String> incomingReferentialIds; + private final SetMultimap<Class<? extends ReferentialDto>, String> missingreferentialIds; + private final LoadingCache<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> typeCache; + + public GetEntityReferentialsShellVisitor(SetMultimap<Class<? extends ReferentialDto>, String> incomingReferentialIds) { + this.incomingReferentialIds = incomingReferentialIds; + this.typeCache = new AbstractLoadingCache<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>>() { + @Override + public Class<? extends ReferentialDto> get(Class<? extends ObserveReferentialEntity> key) { + Class<? extends TopiaEntity> entityType = ObserveEntityEnum.getContractClass(key); + return BinderEngine.get().getReferentialDtoType((Class) entityType); + } + + @Override + public Class<? extends ReferentialDto> getIfPresent(Object key) { + return get((Class) key); + } + }; + this.hitIds = new TreeSet<>(); + this.missingreferentialIds = HashMultimap.create(); + } + + @Override + public void start(TopiaEntity entity) { + if (entity instanceof ObserveReferentialEntity) { + String topiaId = entity.getTopiaId(); + if (hitIds.contains(topiaId)) { + return; + } + hitIds.add(topiaId); + Class<? extends ReferentialDto> dtoType = typeCache.getUnchecked(((ObserveReferentialEntity) entity).getClass()); + if (!incomingReferentialIds.containsEntry(dtoType, topiaId)) { + missingreferentialIds.put(dtoType, topiaId); + } + } + } + + @Override + public void end(TopiaEntity entity) { + + } + + @Override + public void visit(TopiaEntity entity, String propertyName, Class<?> type, Object value) { + if (value instanceof TopiaEntity) { + ((TopiaEntity) value).accept(this); + } + } + + @Override + public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) { + + } + + @Override + public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, int index, Object value) { + if (value instanceof TopiaEntity) { + ((TopiaEntity) value).accept(this); + } + } + + @Override + public void clear() { + hitIds.clear(); + typeCache.invalidateAll(); + } + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 97d47806defd6973595b2a0ee6c793e83af99c6e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 12:01:16 2016 +0100 Ajout de la possibilité d'inserer les référentiels manquants lors d'un import en base centrale --- .../swing/ui/admin/export/ExportModel.java | 10 ++++++ .../swing/ui/admin/export/ExportUI.jaxx | 3 ++ .../swing/ui/admin/export/ExportUI.jcss | 5 +++ .../swing/ui/admin/export/ExportUIHandler.java | 36 ++++++++++++++++++++++ .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + 7 files changed, 57 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java index 49cd5a6..86064d3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java @@ -67,6 +67,8 @@ public class ExportModel extends AdminActionModel { protected ObserveSwingDataSource centralSource; + protected boolean insertMissingReferentials; + public ExportModel() { super(AdminStep.EXPORT_DATA); } @@ -176,4 +178,12 @@ public class ExportModel extends AdminActionModel { } + public boolean isInsertMissingReferentials() { + return insertMissingReferentials; + } + + public void setInsertMissingReferentials(boolean insertMissingReferentials) { + this.insertMissingReferentials = insertMissingReferentials; + firePropertyChange("insertMissingReferentials", null, insertMissingReferentials); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx index 14d61f1..f55dea5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx @@ -76,6 +76,9 @@ public void updateState(WizardState newState) { <JPanel id='NEED_FIX_content'> + <JCheckBox id="insertMissingReferentials" constraints='BorderLayout.NORTH' + onStateChanged='getStepModel().setInsertMissingReferentials(((JCheckBox)event.getSource()).isSelected())'/> + <!-- la liste des trips --> <JScrollPane id='tripPane' constraints='BorderLayout.CENTER'> <JTable id='trips'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss index 9f36e0a..db6f799 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss @@ -44,3 +44,8 @@ columnHeaderView:{trips.getTableHeader()}; verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } + +#insertMissingReferentials { + text:"observe.content.export.requiredinsertMissingReferentials"; + selected:{stepModel.isInsertMissingReferentials()}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index b850983..dd3fd61 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.admin.export; import com.google.common.base.Preconditions; +import com.google.common.collect.SetMultimap; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; @@ -38,7 +39,9 @@ import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.trip.ExportTripRequest; import fr.ird.observe.services.service.trip.ExportTripResult; import fr.ird.observe.services.service.trip.ImportTripRequest; @@ -56,6 +59,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -238,6 +242,8 @@ public class ExportUIHandler extends AdminTabUIHandler { ExportModel stepModel = model.getExportModel(); + boolean insertMissingReferentials = stepModel.isInsertMissingReferentials(); + // on filtre les marées sélectionnées pour export List<TripEntry> tripEntries = stepModel.getSelectedTrips(); @@ -254,6 +260,36 @@ public class ExportUIHandler extends AdminTabUIHandler { TripManagementService centralTripManagementService = centralDataSource.newTripManagementService(); + if (insertMissingReferentials) { + + ReferentialService centraltReferentialService = centralDataSource.newReferentialService(); + + // chargement du référentiel de la base centrale + if (log.isInfoEnabled()) { + log.info("Chargement du réferentiel de la base centrale."); + } + SetMultimap<Class<? extends ReferentialDto>, String> centralSourceReferential = + centraltReferentialService.getReferentialIds(); + + List<String> tripIds = tripEntries.stream().map(TripEntry::getTripId).collect(Collectors.toList()); + + // génération du code sql pour les référentiels manquants + if (log.isInfoEnabled()) { + log.info("Chargement de l'enveloppe de référentiels pour les " + tripIds.size() + " marée(s)."); + } + byte[] referentialsShellSqlContent = + localDataSource.newReferentialService().computeMissingReferentials(centralSourceReferential, tripIds.toArray(new String[tripIds.size()])); + + if (referentialsShellSqlContent != null) { + // insertion des référentiels manquants dans la base centrale + if (log.isInfoEnabled()) { + log.info("Insertion dans la base centrale des référentiels manquants."); + } + centraltReferentialService.insertMissingReferentials(referentialsShellSqlContent); + } + + } + for (TripEntry tripEntry : tripEntries) { ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 3fafe10..f2e1f89 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -820,6 +820,7 @@ observe.content.encounter.table.encouterType.tip=Type observe.content.encounter.table.species=Species observe.content.encounter.table.species.tip=Species observe.content.encounter.title=Encounters +observe.content.export.requiredinsertMissingReferentials=Insert into central source missing referentials observe.content.floatingObject.message.creating=Creating a floating object observe.content.floatingObject.message.updating=updating a floating object observe.content.floatingObject.title=DCP diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 4424ee0..c20ccf1 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -820,6 +820,7 @@ observe.content.encounter.table.encouterType.tip=Tipo del encuentro observe.content.encounter.table.species=Especie observe.content.encounter.table.species.tip=Especie encuentrada observe.content.encounter.title=Encuentros +observe.content.export.requiredinsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. \#TODO observe.content.floatingObject.message.creating=Objeto en proceso de creación. observe.content.floatingObject.message.updating=Se está modificando el objeto flotante actual. observe.content.floatingObject.title=Objeto flotante diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 2e7dc31..b96a1e1 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -820,6 +820,7 @@ observe.content.encounter.table.encouterType.tip=Type de la rencontre observe.content.encounter.table.species=Espèce observe.content.encounter.table.species.tip=Espèce rencontrée observe.content.encounter.title=Rencontres +observe.content.export.requiredinsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. observe.content.floatingObject.message.creating=L'objet flottant est en cours de création. observe.content.floatingObject.message.updating=L'objet flottant est en cours de modification. observe.content.floatingObject.title=Objet flottant -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 2d7829358e31aae401723a81e4114bf67d87a0d2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 12:47:56 2016 +0100 change modules order --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7b883ee..94bdc44 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,9 @@ <module>toolbox-maven-plugin</module> <module>topia-extension</module> <module>topia-templates-extension</module> + <module>test</module> + <module>entities</module> + <module>entities-migration</module> <module>services-configuration</module> <module>services-configuration-topia</module> <module>services-configuration-rest</module> @@ -122,9 +125,6 @@ <module>services-dto-reference</module> <module>services-dto-gson</module> <module>services</module> - <module>test</module> - <module>entities</module> - <module>entities-migration</module> <module>services-topia-validators</module> <module>services-topia-validation</module> <module>services-topia-binder</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 a43675fec9c9805e725d2a3e8220185e7a35430d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 13:18:08 2016 +0100 amélioration des paquetages de services --- .../swing/db/ObserveSwingDataSource.java | 58 ++--- .../shared/MoveActivityLonglinesUIAction.java | 2 +- .../actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../actions/shared/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 6 +- .../application/swing/ui/admin/AdminUIModel.java | 4 +- .../swing/ui/admin/export/ExportUIHandler.java | 14 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 4 +- .../synchronize/data/DataSynchroUIHandler.java | 14 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 6 +- .../table/impl/longline/EncounterUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 4 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 8 +- .../swing/ui/storage/StorageUIHandler.java | 4 +- .../swing/ui/storage/StorageUIModel.java | 4 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 4 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 4 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 2 +- .../swing/ui/tree/node/ActivityLonglineNode.java | 2 +- .../swing/ui/tree/node/ActivitySeineNode.java | 2 +- .../ui/tree/node/FloatingObjectSeineNode.java | 2 +- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 +- .../swing/ui/tree/node/ProgramSeineNode.java | 2 +- .../swing/ui/tree/node/RouteSeineNode.java | 2 +- .../swing/ui/tree/node/SetLonglineNode.java | 2 +- .../swing/ui/tree/node/SetSeineNode.java | 2 +- .../swing/ui/tree/node/TripLonglineNode.java | 2 +- .../swing/ui/tree/node/TripSeineNode.java | 2 +- .../swing/validation/ValidationContext.java | 18 +- .../TripManagementServiceController.java | 16 +- ...ActivityLongLineEncounterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../longline/BranchlineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../longline/SetLonglineServiceController.java | 4 +- .../{ => data}/longline/TdrServiceController.java | 4 +- .../TripLonglineGearUseServiceController.java | 4 +- .../longline/TripLonglineServiceController.java | 4 +- .../seine/ActivitySeineServiceController.java | 4 +- .../seine/FloatingObjectServiceController.java | 4 +- .../seine/NonTargetCatchServiceController.java | 4 +- .../seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../{ => data}/seine/RouteServiceController.java | 4 +- .../seine/SchoolEstimateServiceController.java | 4 +- .../seine/SetSeineServiceController.java | 4 +- .../seine/TargetCatchServiceController.java | 4 +- .../seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../seine/TripSeineGearUseServiceController.java | 4 +- .../seine/TripSeineServiceController.java | 4 +- .../ReferentialServiceController.java | 9 +- .../SqlScriptProducerServiceController.java | 11 +- .../ObserveReferenceSetRequestInjector.java | 2 +- .../injector/SqlScriptProducerRequestInjector.java | 2 +- application-web/src/main/resources/mapping | 290 ++++++++++----------- .../service/ReferenceValuesSetServiceRestTest.java | 4 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 4 +- .../service/seine/TripSeineServiceRestTest.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../{ => data}/ImportTripScriptTopiaSqlWork.java | 4 +- .../{ => data}/TripManagementServiceTopia.java | 26 +- .../ActivityLongLineEncounterServiceTopia.java | 4 +- .../ActivityLongLineSensorUsedServiceTopia.java | 4 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../longline/BranchlineServiceTopia.java | 4 +- .../longline/LonglinePositionSetDtoHelper.java | 2 +- .../longline/SetLonglineCatchServiceTopia.java | 4 +- .../SetLonglineDetailCompositionServiceTopia.java | 4 +- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../longline/SetLonglineServiceTopia.java | 4 +- .../{ => data}/longline/TdrServiceTopia.java | 4 +- .../longline/TripLonglineGearUseServiceTopia.java | 4 +- .../longline/TripLonglineServiceTopia.java | 4 +- .../seine/ActivitySeineServiceTopia.java | 4 +- .../seine/FloatingObjectServiceTopia.java | 4 +- .../seine/NonTargetCatchServiceTopia.java | 4 +- .../seine/NonTargetSampleServiceTopia.java | 5 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 4 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/RouteServiceTopia.java | 4 +- .../seine/SchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/SetSeineServiceTopia.java | 4 +- .../{ => data}/seine/TargetCatchServiceTopia.java | 4 +- .../{ => data}/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../seine/TripSeineGearUseServiceTopia.java | 4 +- .../{ => data}/seine/TripSeineServiceTopia.java | 4 +- .../{ => referential}/ReferentialServiceTopia.java | 15 +- .../ReferentialsShellBuilder.java | 2 +- .../{ => sql}/SqlScriptProducerServiceTopia.java | 12 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 3 +- .../observe/services/topia/service/RigthTest.java | 4 +- .../service/TripManagementServiceTopiaTest.java | 16 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 2 +- .../topia/service/seine/RouteServiceTopiaTest.java | 2 +- .../seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 4 +- .../service/{ => sql}/MigrateTestsDatabases.java | 9 +- .../SqlScriptProducerServiceTopiaTest.java | 8 +- .../observe/services/ObserveServicesProvider.java | 56 ++-- .../service/{trip => data}/DeleteTripRequest.java | 2 +- .../service/{trip => data}/DeleteTripResult.java | 2 +- .../service/{trip => data}/ExportTripRequest.java | 2 +- .../service/{trip => data}/ExportTripResult.java | 4 +- .../service/{trip => data}/ImportTripRequest.java | 4 +- .../service/{trip => data}/ImportTripResult.java | 2 +- .../{trip => data}/TripManagementService.java | 2 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../longline/ActivityLonglineService.java | 2 +- .../{ => data}/longline/BranchlineService.java | 2 +- .../longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../{ => data}/longline/SetLonglineService.java | 2 +- .../service/{ => data}/longline/TdrService.java | 2 +- .../longline/TripLonglineGearUseService.java | 2 +- .../{ => data}/longline/TripLonglineService.java | 2 +- .../{ => data}/seine/ActivitySeineService.java | 2 +- .../{ => data}/seine/FloatingObjectService.java | 2 +- .../{ => data}/seine/NonTargetCatchService.java | 2 +- .../{ => data}/seine/NonTargetSampleService.java | 2 +- .../seine/ObjectObservedSpeciesService.java | 2 +- .../seine/ObjectSchoolEstimateService.java | 2 +- .../service/{ => data}/seine/RouteService.java | 2 +- .../{ => data}/seine/SchoolEstimateService.java | 2 +- .../service/{ => data}/seine/SetSeineService.java | 2 +- .../{ => data}/seine/TargetCatchService.java | 2 +- .../{ => data}/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../{ => data}/seine/TripSeineGearUseService.java | 2 +- .../service/{ => data}/seine/TripSeineService.java | 2 +- .../MissingReferentialResult.java | 2 +- .../{ => referential}/ObserveReferentialCache.java | 2 +- .../{ => referential}/ReferenceSetsRequest.java | 2 +- .../{ => referential}/ReferentialService.java | 3 +- .../{ => sql}/AddSqlScriptProducerRequest.java | 2 +- .../{ => sql}/AddSqlScriptProducerResult.java | 2 +- .../{ => sql}/DeleteSqlScriptProducerRequest.java | 2 +- .../service/{ => sql}/ObserveBlobsContainer.java | 2 +- .../{ => sql}/SqlScriptProducerService.java | 2 +- 190 files changed, 548 insertions(+), 544 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index 6b2ea22..526da30 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -58,42 +58,42 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.LastUpdateDateService; -import fr.ird.observe.services.service.ObserveReferentialCache; +import fr.ird.observe.services.service.referential.ObserveReferentialCache; import fr.ird.observe.services.service.PingService; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; -import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; -import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.service.longline.BranchlineService; -import fr.ird.observe.services.service.longline.SetLonglineCatchService; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; -import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; -import fr.ird.observe.services.service.longline.SetLonglineService; -import fr.ird.observe.services.service.longline.TdrService; -import fr.ird.observe.services.service.longline.TripLonglineGearUseService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.service.seine.FloatingObjectService; -import fr.ird.observe.services.service.seine.NonTargetCatchService; -import fr.ird.observe.services.service.seine.NonTargetSampleService; -import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; -import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; -import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.SchoolEstimateService; -import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.services.service.seine.TargetCatchService; -import fr.ird.observe.services.service.seine.TargetSampleService; -import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; -import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.data.TripManagementService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java index ee1c3f9..8b43a71 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java @@ -35,7 +35,7 @@ import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java index 0c65963..0e14b48 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java index c5d0166..c5179be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java @@ -35,7 +35,7 @@ import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java index b30d31c..c70731d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java index bccd472..5b19f83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java index 573c554..c7497de 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java @@ -38,9 +38,9 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripResult; +import fr.ird.observe.services.service.data.DeleteTripResult; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripResult; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index b0d8635..aace2ea 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -54,8 +54,8 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import jaxx.runtime.swing.wizard.ext.WizardExtModel; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.lang3.StringUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 90d8d87..c54b578 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -43,13 +43,13 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.MissingReferentialResult; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.referential.MissingReferentialResult; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.ImportTripResult; +import fr.ird.observe.services.service.data.TripManagementService; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.collections4.CollectionUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java index 25b0f8e..f4484d0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java @@ -27,8 +27,8 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.io.IOUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 10e09c5..cc16fb5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -42,13 +42,13 @@ import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfiguratio import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.DeleteTripRequest; +import fr.ird.observe.services.service.data.DeleteTripResult; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.ImportTripResult; +import fr.ird.observe.services.service.data.TripManagementService; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 1ef2b6c..d4f6dfa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.longline.SectionWithTemplateHelper; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index ab94675..4d2ced8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.table.impl.longline.BaitsCompositionUI; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 6085778..71569ed 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 9737660..ad7d3b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -41,7 +41,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper; -import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index b82d0fb..b219958 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectHelper; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 9532ecb..4a1e41c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -39,8 +39,8 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineHelper; -import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SetSeineService; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 86608db..650c3e5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 3b218a7..f3899d5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 0815b3e..e20e302 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java index 1090dd2..f17564b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java index da678a2..044424b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 12725bb..17682ad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index f36d806..3c0a539 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index a3dbd68..db40d22 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index d63e3c9..d17062e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -38,14 +38,13 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; import java.util.Date; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index 0ad58fe..84f2885 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index 573d6c8..62ccbc2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -45,7 +45,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.swing.editor.bean.BeanListHeader; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index a9cbccf..2cf0545 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -58,9 +58,9 @@ import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.BranchlineService; -import fr.ird.observe.services.service.longline.SetLonglineCatchService; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java index a0d32be..00d6bb7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java @@ -35,8 +35,8 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index bdb15e8..097b2ae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -45,8 +45,8 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java index 9b41284..0b3bb08 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.JaxxFileChooser; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java index 24e45ff..1d4a545 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java @@ -40,8 +40,8 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.TdrService; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 288a7e7..565fd94 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -45,8 +45,8 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index ee6c93f..a2f5278 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -43,8 +43,8 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; -import fr.ird.observe.services.service.seine.NonTargetCatchService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index d3799a8..1ec4207 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index d769d8f..54ac0f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -35,8 +35,8 @@ import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index afe8608..c2d6ccd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -33,8 +33,8 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 199da9d..ea130a4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -33,8 +33,8 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; -import fr.ird.observe.services.service.seine.SchoolEstimateService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index ecc1328..4a72373 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -38,8 +38,8 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.seine.TargetCatchService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 98e16ad..830f600 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -42,8 +42,8 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.seine.TargetCatchService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 55a6081..9b3d01d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; -import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java index 6e66bdb..099a2d8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java @@ -35,10 +35,10 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.TripManagementService; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 2843e8e..ec9eaeb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -51,8 +51,8 @@ import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfiguratio import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.io.FileUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index a4a0abb..108d5dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -48,12 +48,12 @@ import fr.ird.observe.services.security.UnknownObserveWebUserException; import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; import fr.ird.observe.services.security.UserLoginNotFoundException; import fr.ird.observe.services.security.UserPasswordNotFoundException; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.PingService; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.wizard.WizardModel; import jaxx.runtime.swing.wizard.WizardUILancher; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java index 98763ac..c1c5841 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java @@ -36,8 +36,8 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java index 9fa4da6..737c048 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java index 88e8d2b..488b3f4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java index c889c88..f0c0cad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java index 38be94a..79ac357 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java @@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.IdHelper; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index ca8cf82..09dd4e2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java index c674071..fd2013d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index caaa84f..4a4c104 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index ee9ba41..92d9715 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 69a2579..92e14d7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java index 8945f90..a8264de 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java index 00950ca..6b53ef2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglineNodeChildLoador; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java index 8d5734c..69690d5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeineNodeChildLoador; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java index ed9ac1e..8531d6b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; import fr.ird.observe.application.swing.ui.tree.loadors.FloatingObjectNodeChildLoador; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index f8472e7..16066b4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -33,7 +33,7 @@ import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; /** * Created on 4/9/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java index ff47be8..44187fc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java @@ -33,7 +33,7 @@ import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; /** * Created on 4/9/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java index 3dd806b..e061765 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; /** * Created on 4/9/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java index af2dbed..50ea200 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; import fr.ird.observe.application.swing.ui.tree.loadors.SetLonglineNodeChildLoador; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java index 014724f..7ebf830 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.SetSeineService; import fr.ird.observe.application.swing.ui.tree.loadors.SetSeineNodeChildLoador; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java index 41901d5..5046386 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; /** * Created on 4/9/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java index 8ada114..9b99304 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; /** * Created on 4/9/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java index 917fe00..befbd89 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java @@ -37,15 +37,15 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.service.longline.SetLonglineService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.service.seine.FloatingObjectService; -import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/TripManagementServiceController.java similarity index 76% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/TripManagementServiceController.java index 92ce182..09fc55e 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/TripManagementServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.trip; +package fr.ird.observe.application.web.controller.v1.data; /*- * #%L @@ -23,13 +23,13 @@ package fr.ird.observe.application.web.controller.v1.trip; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.DeleteTripRequest; +import fr.ird.observe.services.service.data.DeleteTripResult; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.ImportTripResult; +import fr.ird.observe.services.service.data.TripManagementService; /** * Created on 20/07/16. diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java similarity index 91% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java index d81aa9e..90d871a 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java index c8b5bff..3e4a8f8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java similarity index 95% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java index 5d6a362..d264bac 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import java.util.List; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java index 0a4d2a1..4421e90 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /*- * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java similarity index 91% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java index 6b5999f..72171a8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java similarity index 93% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java index b54b312..e38b634 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java similarity index 91% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java index 86d483c..81ae25a 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java similarity index 94% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java index f260ad0..6a79201 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java index 22c3157..d1f127d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TdrService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java similarity index 91% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java index 580a9d8..e00e39b 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java similarity index 96% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java index 537db1a..44de008 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.longline; +package fr.ird.observe.application.web.controller.v1.data.longline; /* * #%L @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.util.List; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java similarity index 95% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java index 4b7e468..019ea0d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import java.util.List; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java similarity index 95% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java index 72d0d6a..83b8a8c 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java index 49d4804..5ca5939 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import fr.ird.observe.services.service.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java similarity index 93% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java index c802e81..2030c7f 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; -import fr.ird.observe.services.service.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import java.util.Collection; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java index 17147a2..a4ee3f9 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java index 287ce1c..bf64f66 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; -import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java similarity index 95% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java index c00187f..38807b8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import java.util.List; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java index f30cabb..97b806b 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; -import fr.ird.observe.services.service.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java similarity index 94% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java index 1cb39b6..8076cd0 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.SetSeineService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java index 12bb8c1..95607e1 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; -import fr.ird.observe.services.service.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java similarity index 94% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java index 8a7a574..8f7951f 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java index 2a46202..7b89022 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java similarity index 92% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java index 9c723de..393c8ab 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java similarity index 96% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java index ed9e27d..d1527e4 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1.seine; +package fr.ird.observe.application.web.controller.v1.data.seine; /* * #%L @@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; 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.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.List; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java similarity index 91% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java index ab1d48f..9031561 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1; +package fr.ird.observe.application.web.controller.v1.referential; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.application.web.controller.v1; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; +import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.ReferenceMap; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -32,9 +33,9 @@ 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.service.DataNotFoundException; -import fr.ird.observe.services.service.MissingReferentialResult; -import fr.ird.observe.services.service.ReferenceSetsRequest; -import fr.ird.observe.services.service.ReferentialService; +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 java.util.Collection; import java.util.Date; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java similarity index 76% rename from application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java rename to application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java index a1cdbb6..540d807 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/SqlScriptProducerServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/sql/SqlScriptProducerServiceController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.controller.v1; +package fr.ird.observe.application.web.controller.v1.sql; /*- * #%L @@ -22,10 +22,11 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ -import fr.ird.observe.services.service.AddSqlScriptProducerResult; -import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java index fe942c8..39853a7 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.injector; */ import com.google.gson.Gson; -import fr.ird.observe.services.service.ReferenceSetsRequest; +import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java index 5ea8a2c..565de49 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.injector; */ import com.google.gson.Gson; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; diff --git a/application-web/src/main/resources/mapping b/application-web/src/main/resources/mapping index b51d7ec..637a4ac 100644 --- a/application-web/src/main/resources/mapping +++ b/application-web/src/main/resources/mapping @@ -55,15 +55,15 @@ POST /admin/configuration/resetAuthenticationTokens ConfigurationCo # Do not modify below lines, they are generated at each maven build. -DELETE /api/v1/ReferentialService/delete v1.ReferentialServiceController.delete -DELETE /api/v1/longline/ActivityLonglineService/delete v1.longline.ActivityLonglineServiceController.delete -DELETE /api/v1/longline/SetLonglineService/delete v1.longline.SetLonglineServiceController.delete -DELETE /api/v1/longline/TripLonglineService/delete v1.longline.TripLonglineServiceController.delete -DELETE /api/v1/seine/ActivitySeineService/delete v1.seine.ActivitySeineServiceController.delete -DELETE /api/v1/seine/FloatingObjectService/delete v1.seine.FloatingObjectServiceController.delete -DELETE /api/v1/seine/RouteService/delete v1.seine.RouteServiceController.delete -DELETE /api/v1/seine/SetSeineService/delete v1.seine.SetSeineServiceController.delete -DELETE /api/v1/seine/TripSeineService/delete v1.seine.TripSeineServiceController.delete +DELETE /api/v1/data/longline/ActivityLonglineService/delete v1.data.longline.ActivityLonglineServiceController.delete +DELETE /api/v1/data/longline/SetLonglineService/delete v1.data.longline.SetLonglineServiceController.delete +DELETE /api/v1/data/longline/TripLonglineService/delete v1.data.longline.TripLonglineServiceController.delete +DELETE /api/v1/data/seine/ActivitySeineService/delete v1.data.seine.ActivitySeineServiceController.delete +DELETE /api/v1/data/seine/FloatingObjectService/delete v1.data.seine.FloatingObjectServiceController.delete +DELETE /api/v1/data/seine/RouteService/delete v1.data.seine.RouteServiceController.delete +DELETE /api/v1/data/seine/SetSeineService/delete v1.data.seine.SetSeineServiceController.delete +DELETE /api/v1/data/seine/TripSeineService/delete v1.data.seine.TripSeineServiceController.delete +DELETE /api/v1/referential/ReferentialService/delete v1.referential.ReferentialServiceController.delete GET /api/v1/DataSourceService/applySecurity v1.DataSourceServiceController.applySecurity GET /api/v1/DataSourceService/backup v1.DataSourceServiceController.backup GET /api/v1/DataSourceService/checkCanConnect v1.DataSourceServiceController.checkCanConnect @@ -77,109 +77,105 @@ GET /api/v1/DataSourceService/open GET /api/v1/LastUpdateDateService/updateDataLastUpdateDates v1.LastUpdateDateServiceController.updateDataLastUpdateDates GET /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceController.updateReferentialLastUpdateDates GET /api/v1/PingService/ping v1.PingServiceController.ping -GET /api/v1/ReferentialService/exists v1.ReferentialServiceController.exists -GET /api/v1/ReferentialService/findAllUsages v1.ReferentialServiceController.findAllUsages -GET /api/v1/ReferentialService/getReferenceSet v1.ReferentialServiceController.getReferenceSet -GET /api/v1/ReferentialService/getReferentialReferenceSets v1.ReferentialServiceController.getReferentialReferenceSets -GET /api/v1/ReferentialService/loadForm v1.ReferentialServiceController.loadForm -GET /api/v1/ReferentialService/loadReference v1.ReferentialServiceController.loadReference -GET /api/v1/ReferentialService/loadSpecies v1.ReferentialServiceController.loadSpecies -GET /api/v1/ReferentialService/preCreate v1.ReferentialServiceController.preCreate -GET /api/v1/ReferentialService/replaceReference v1.ReferentialServiceController.replaceReference -GET /api/v1/SqlScriptProducerService/produceAddSqlScript v1.SqlScriptProducerServiceController.produceAddSqlScript -GET /api/v1/SqlScriptProducerService/produceDeleteSqlScript v1.SqlScriptProducerServiceController.produceDeleteSqlScript GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getEnabledReferentialReferenceSet GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getSourceReferentialStates GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/filterIdsUsedInLocalSource v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceController.filterIdsUsedInLocalSource GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/generateSqlRequests v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceController.generateSqlRequests GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/getLocalSourceReferentialToDelete v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceController.getLocalSourceReferentialToDelete -GET /api/v1/longline/ActivityLongLineEncounterService/loadForm v1.longline.ActivityLongLineEncounterServiceController.loadForm -GET /api/v1/longline/ActivityLongLineSensorUsedService/getDataFile v1.longline.ActivityLongLineSensorUsedServiceController.getDataFile -GET /api/v1/longline/ActivityLongLineSensorUsedService/loadForm v1.longline.ActivityLongLineSensorUsedServiceController.loadForm -GET /api/v1/longline/ActivityLonglineService/exists v1.longline.ActivityLonglineServiceController.exists -GET /api/v1/longline/ActivityLonglineService/getActivityLonglineByTripLongline v1.longline.ActivityLonglineServiceController.getActivityLonglineByTripLongline -GET /api/v1/longline/ActivityLonglineService/getActivityLonglinePositionInTripLongline v1.longline.ActivityLonglineServiceController.getActivityLonglinePositionInTripLongline -GET /api/v1/longline/ActivityLonglineService/loadDto v1.longline.ActivityLonglineServiceController.loadDto -GET /api/v1/longline/ActivityLonglineService/loadForm v1.longline.ActivityLonglineServiceController.loadForm -GET /api/v1/longline/ActivityLonglineService/loadReferenceToRead v1.longline.ActivityLonglineServiceController.loadReferenceToRead -GET /api/v1/longline/ActivityLonglineService/preCreate v1.longline.ActivityLonglineServiceController.preCreate -GET /api/v1/longline/BranchlineService/loadForm v1.longline.BranchlineServiceController.loadForm -GET /api/v1/longline/SetLonglineCatchService/loadForm v1.longline.SetLonglineCatchServiceController.loadForm -GET /api/v1/longline/SetLonglineDetailCompositionService/canDeleteBasket v1.longline.SetLonglineDetailCompositionServiceController.canDeleteBasket -GET /api/v1/longline/SetLonglineDetailCompositionService/canDeleteBranchline v1.longline.SetLonglineDetailCompositionServiceController.canDeleteBranchline -GET /api/v1/longline/SetLonglineDetailCompositionService/canDeleteSection v1.longline.SetLonglineDetailCompositionServiceController.canDeleteSection -GET /api/v1/longline/SetLonglineDetailCompositionService/loadForm v1.longline.SetLonglineDetailCompositionServiceController.loadForm -GET /api/v1/longline/SetLonglineGlobalCompositionService/loadForm v1.longline.SetLonglineGlobalCompositionServiceController.loadForm -GET /api/v1/longline/SetLonglineService/exists v1.longline.SetLonglineServiceController.exists -GET /api/v1/longline/SetLonglineService/loadDto v1.longline.SetLonglineServiceController.loadDto -GET /api/v1/longline/SetLonglineService/loadForm v1.longline.SetLonglineServiceController.loadForm -GET /api/v1/longline/SetLonglineService/loadReferenceToRead v1.longline.SetLonglineServiceController.loadReferenceToRead -GET /api/v1/longline/SetLonglineService/preCreate v1.longline.SetLonglineServiceController.preCreate -GET /api/v1/longline/TdrService/getDataFile v1.longline.TdrServiceController.getDataFile -GET /api/v1/longline/TdrService/loadForm v1.longline.TdrServiceController.loadForm -GET /api/v1/longline/TripLonglineGearUseService/loadForm v1.longline.TripLonglineGearUseServiceController.loadForm -GET /api/v1/longline/TripLonglineService/exists v1.longline.TripLonglineServiceController.exists -GET /api/v1/longline/TripLonglineService/getAllTripLongline v1.longline.TripLonglineServiceController.getAllTripLongline -GET /api/v1/longline/TripLonglineService/getSpeciesByListAndTrip v1.longline.TripLonglineServiceController.getSpeciesByListAndTrip -GET /api/v1/longline/TripLonglineService/getTripLonglineByProgram v1.longline.TripLonglineServiceController.getTripLonglineByProgram -GET /api/v1/longline/TripLonglineService/getTripLonglineMap v1.longline.TripLonglineServiceController.getTripLonglineMap -GET /api/v1/longline/TripLonglineService/getTripLonglinePositionInProgram v1.longline.TripLonglineServiceController.getTripLonglinePositionInProgram -GET /api/v1/longline/TripLonglineService/loadDto v1.longline.TripLonglineServiceController.loadDto -GET /api/v1/longline/TripLonglineService/loadForm v1.longline.TripLonglineServiceController.loadForm -GET /api/v1/longline/TripLonglineService/loadReferenceToRead v1.longline.TripLonglineServiceController.loadReferenceToRead -GET /api/v1/longline/TripLonglineService/preCreate v1.longline.TripLonglineServiceController.preCreate -GET /api/v1/seine/ActivitySeineService/exists v1.seine.ActivitySeineServiceController.exists -GET /api/v1/seine/ActivitySeineService/getActivitySeineByRoute v1.seine.ActivitySeineServiceController.getActivitySeineByRoute -GET /api/v1/seine/ActivitySeineService/getActivitySeinePositionInRoute v1.seine.ActivitySeineServiceController.getActivitySeinePositionInRoute -GET /api/v1/seine/ActivitySeineService/loadDto v1.seine.ActivitySeineServiceController.loadDto -GET /api/v1/seine/ActivitySeineService/loadForm v1.seine.ActivitySeineServiceController.loadForm -GET /api/v1/seine/ActivitySeineService/loadReferenceToRead v1.seine.ActivitySeineServiceController.loadReferenceToRead -GET /api/v1/seine/ActivitySeineService/preCreate v1.seine.ActivitySeineServiceController.preCreate -GET /api/v1/seine/FloatingObjectService/exists v1.seine.FloatingObjectServiceController.exists -GET /api/v1/seine/FloatingObjectService/getFloatingObjectByActivitySeine v1.seine.FloatingObjectServiceController.getFloatingObjectByActivitySeine -GET /api/v1/seine/FloatingObjectService/loadDto v1.seine.FloatingObjectServiceController.loadDto -GET /api/v1/seine/FloatingObjectService/loadForm v1.seine.FloatingObjectServiceController.loadForm -GET /api/v1/seine/FloatingObjectService/loadReferenceToRead v1.seine.FloatingObjectServiceController.loadReferenceToRead -GET /api/v1/seine/FloatingObjectService/preCreate v1.seine.FloatingObjectServiceController.preCreate -GET /api/v1/seine/NonTargetCatchService/loadForm v1.seine.NonTargetCatchServiceController.loadForm -GET /api/v1/seine/NonTargetSampleService/canUseNonTargetSample v1.seine.NonTargetSampleServiceController.canUseNonTargetSample -GET /api/v1/seine/NonTargetSampleService/getSampleSpecies v1.seine.NonTargetSampleServiceController.getSampleSpecies -GET /api/v1/seine/NonTargetSampleService/loadForm v1.seine.NonTargetSampleServiceController.loadForm -GET /api/v1/seine/ObjectObservedSpeciesService/loadForm v1.seine.ObjectObservedSpeciesServiceController.loadForm -GET /api/v1/seine/ObjectSchoolEstimateService/loadForm v1.seine.ObjectSchoolEstimateServiceController.loadForm -GET /api/v1/seine/RouteService/exists v1.seine.RouteServiceController.exists -GET /api/v1/seine/RouteService/getRouteByTripSeine v1.seine.RouteServiceController.getRouteByTripSeine -GET /api/v1/seine/RouteService/getRoutePositionInTripSeine v1.seine.RouteServiceController.getRoutePositionInTripSeine -GET /api/v1/seine/RouteService/loadDto v1.seine.RouteServiceController.loadDto -GET /api/v1/seine/RouteService/loadForm v1.seine.RouteServiceController.loadForm -GET /api/v1/seine/RouteService/loadReferenceToRead v1.seine.RouteServiceController.loadReferenceToRead -GET /api/v1/seine/RouteService/preCreate v1.seine.RouteServiceController.preCreate -GET /api/v1/seine/SchoolEstimateService/loadForm v1.seine.SchoolEstimateServiceController.loadForm -GET /api/v1/seine/SetSeineService/exists v1.seine.SetSeineServiceController.exists -GET /api/v1/seine/SetSeineService/loadDto v1.seine.SetSeineServiceController.loadDto -GET /api/v1/seine/SetSeineService/loadForm v1.seine.SetSeineServiceController.loadForm -GET /api/v1/seine/SetSeineService/loadReferenceToRead v1.seine.SetSeineServiceController.loadReferenceToRead -GET /api/v1/seine/SetSeineService/preCreate v1.seine.SetSeineServiceController.preCreate -GET /api/v1/seine/TargetCatchService/loadForm v1.seine.TargetCatchServiceController.loadForm -GET /api/v1/seine/TargetSampleService/canUseTargetSample v1.seine.TargetSampleServiceController.canUseTargetSample -GET /api/v1/seine/TargetSampleService/getSampleSpecies v1.seine.TargetSampleServiceController.getSampleSpecies -GET /api/v1/seine/TargetSampleService/loadForm v1.seine.TargetSampleServiceController.loadForm -GET /api/v1/seine/TransmittingBuoyOperationService/loadForm v1.seine.TransmittingBuoyOperationServiceController.loadForm -GET /api/v1/seine/TripSeineGearUseService/loadForm v1.seine.TripSeineGearUseServiceController.loadForm -GET /api/v1/seine/TripSeineService/exists v1.seine.TripSeineServiceController.exists -GET /api/v1/seine/TripSeineService/getAllTripSeine v1.seine.TripSeineServiceController.getAllTripSeine -GET /api/v1/seine/TripSeineService/getSpeciesByListAndTrip v1.seine.TripSeineServiceController.getSpeciesByListAndTrip -GET /api/v1/seine/TripSeineService/getTripSeineByProgram v1.seine.TripSeineServiceController.getTripSeineByProgram -GET /api/v1/seine/TripSeineService/getTripSeineMap v1.seine.TripSeineServiceController.getTripSeineMap -GET /api/v1/seine/TripSeineService/getTripSeinePositionInProgram v1.seine.TripSeineServiceController.getTripSeinePositionInProgram -GET /api/v1/seine/TripSeineService/loadDto v1.seine.TripSeineServiceController.loadDto -GET /api/v1/seine/TripSeineService/loadForm v1.seine.TripSeineServiceController.loadForm -GET /api/v1/seine/TripSeineService/loadReferenceToRead v1.seine.TripSeineServiceController.loadReferenceToRead -GET /api/v1/seine/TripSeineService/preCreate v1.seine.TripSeineServiceController.preCreate -POST /api/v1/ReferentialService/computeMissingReferentials v1.ReferentialServiceController.computeMissingReferentials -POST /api/v1/ReferentialService/getReferentialIds v1.ReferentialServiceController.getReferentialIds -POST /api/v1/ReferentialService/insertMissingReferentials v1.ReferentialServiceController.insertMissingReferentials -POST /api/v1/ReferentialService/save v1.ReferentialServiceController.save +GET /api/v1/data/longline/ActivityLongLineEncounterService/loadForm v1.data.longline.ActivityLongLineEncounterServiceController.loadForm +GET /api/v1/data/longline/ActivityLongLineSensorUsedService/getDataFile v1.data.longline.ActivityLongLineSensorUsedServiceController.getDataFile +GET /api/v1/data/longline/ActivityLongLineSensorUsedService/loadForm v1.data.longline.ActivityLongLineSensorUsedServiceController.loadForm +GET /api/v1/data/longline/ActivityLonglineService/exists v1.data.longline.ActivityLonglineServiceController.exists +GET /api/v1/data/longline/ActivityLonglineService/getActivityLonglineByTripLongline v1.data.longline.ActivityLonglineServiceController.getActivityLonglineByTripLongline +GET /api/v1/data/longline/ActivityLonglineService/getActivityLonglinePositionInTripLongline v1.data.longline.ActivityLonglineServiceController.getActivityLonglinePositionInTripLongline +GET /api/v1/data/longline/ActivityLonglineService/loadDto v1.data.longline.ActivityLonglineServiceController.loadDto +GET /api/v1/data/longline/ActivityLonglineService/loadForm v1.data.longline.ActivityLonglineServiceController.loadForm +GET /api/v1/data/longline/ActivityLonglineService/loadReferenceToRead v1.data.longline.ActivityLonglineServiceController.loadReferenceToRead +GET /api/v1/data/longline/ActivityLonglineService/preCreate v1.data.longline.ActivityLonglineServiceController.preCreate +GET /api/v1/data/longline/BranchlineService/loadForm v1.data.longline.BranchlineServiceController.loadForm +GET /api/v1/data/longline/SetLonglineCatchService/loadForm v1.data.longline.SetLonglineCatchServiceController.loadForm +GET /api/v1/data/longline/SetLonglineDetailCompositionService/canDeleteBasket v1.data.longline.SetLonglineDetailCompositionServiceController.canDeleteBasket +GET /api/v1/data/longline/SetLonglineDetailCompositionService/canDeleteBranchline v1.data.longline.SetLonglineDetailCompositionServiceController.canDeleteBranchline +GET /api/v1/data/longline/SetLonglineDetailCompositionService/canDeleteSection v1.data.longline.SetLonglineDetailCompositionServiceController.canDeleteSection +GET /api/v1/data/longline/SetLonglineDetailCompositionService/loadForm v1.data.longline.SetLonglineDetailCompositionServiceController.loadForm +GET /api/v1/data/longline/SetLonglineGlobalCompositionService/loadForm v1.data.longline.SetLonglineGlobalCompositionServiceController.loadForm +GET /api/v1/data/longline/SetLonglineService/exists v1.data.longline.SetLonglineServiceController.exists +GET /api/v1/data/longline/SetLonglineService/loadDto v1.data.longline.SetLonglineServiceController.loadDto +GET /api/v1/data/longline/SetLonglineService/loadForm v1.data.longline.SetLonglineServiceController.loadForm +GET /api/v1/data/longline/SetLonglineService/loadReferenceToRead v1.data.longline.SetLonglineServiceController.loadReferenceToRead +GET /api/v1/data/longline/SetLonglineService/preCreate v1.data.longline.SetLonglineServiceController.preCreate +GET /api/v1/data/longline/TdrService/getDataFile v1.data.longline.TdrServiceController.getDataFile +GET /api/v1/data/longline/TdrService/loadForm v1.data.longline.TdrServiceController.loadForm +GET /api/v1/data/longline/TripLonglineGearUseService/loadForm v1.data.longline.TripLonglineGearUseServiceController.loadForm +GET /api/v1/data/longline/TripLonglineService/exists v1.data.longline.TripLonglineServiceController.exists +GET /api/v1/data/longline/TripLonglineService/getAllTripLongline v1.data.longline.TripLonglineServiceController.getAllTripLongline +GET /api/v1/data/longline/TripLonglineService/getSpeciesByListAndTrip v1.data.longline.TripLonglineServiceController.getSpeciesByListAndTrip +GET /api/v1/data/longline/TripLonglineService/getTripLonglineByProgram v1.data.longline.TripLonglineServiceController.getTripLonglineByProgram +GET /api/v1/data/longline/TripLonglineService/getTripLonglineMap v1.data.longline.TripLonglineServiceController.getTripLonglineMap +GET /api/v1/data/longline/TripLonglineService/getTripLonglinePositionInProgram v1.data.longline.TripLonglineServiceController.getTripLonglinePositionInProgram +GET /api/v1/data/longline/TripLonglineService/loadDto v1.data.longline.TripLonglineServiceController.loadDto +GET /api/v1/data/longline/TripLonglineService/loadForm v1.data.longline.TripLonglineServiceController.loadForm +GET /api/v1/data/longline/TripLonglineService/loadReferenceToRead v1.data.longline.TripLonglineServiceController.loadReferenceToRead +GET /api/v1/data/longline/TripLonglineService/preCreate v1.data.longline.TripLonglineServiceController.preCreate +GET /api/v1/data/seine/ActivitySeineService/exists v1.data.seine.ActivitySeineServiceController.exists +GET /api/v1/data/seine/ActivitySeineService/getActivitySeineByRoute v1.data.seine.ActivitySeineServiceController.getActivitySeineByRoute +GET /api/v1/data/seine/ActivitySeineService/getActivitySeinePositionInRoute v1.data.seine.ActivitySeineServiceController.getActivitySeinePositionInRoute +GET /api/v1/data/seine/ActivitySeineService/loadDto v1.data.seine.ActivitySeineServiceController.loadDto +GET /api/v1/data/seine/ActivitySeineService/loadForm v1.data.seine.ActivitySeineServiceController.loadForm +GET /api/v1/data/seine/ActivitySeineService/loadReferenceToRead v1.data.seine.ActivitySeineServiceController.loadReferenceToRead +GET /api/v1/data/seine/ActivitySeineService/preCreate v1.data.seine.ActivitySeineServiceController.preCreate +GET /api/v1/data/seine/FloatingObjectService/exists v1.data.seine.FloatingObjectServiceController.exists +GET /api/v1/data/seine/FloatingObjectService/getFloatingObjectByActivitySeine v1.data.seine.FloatingObjectServiceController.getFloatingObjectByActivitySeine +GET /api/v1/data/seine/FloatingObjectService/loadDto v1.data.seine.FloatingObjectServiceController.loadDto +GET /api/v1/data/seine/FloatingObjectService/loadForm v1.data.seine.FloatingObjectServiceController.loadForm +GET /api/v1/data/seine/FloatingObjectService/loadReferenceToRead v1.data.seine.FloatingObjectServiceController.loadReferenceToRead +GET /api/v1/data/seine/FloatingObjectService/preCreate v1.data.seine.FloatingObjectServiceController.preCreate +GET /api/v1/data/seine/NonTargetCatchService/loadForm v1.data.seine.NonTargetCatchServiceController.loadForm +GET /api/v1/data/seine/NonTargetSampleService/canUseNonTargetSample v1.data.seine.NonTargetSampleServiceController.canUseNonTargetSample +GET /api/v1/data/seine/NonTargetSampleService/getSampleSpecies v1.data.seine.NonTargetSampleServiceController.getSampleSpecies +GET /api/v1/data/seine/NonTargetSampleService/loadForm v1.data.seine.NonTargetSampleServiceController.loadForm +GET /api/v1/data/seine/ObjectObservedSpeciesService/loadForm v1.data.seine.ObjectObservedSpeciesServiceController.loadForm +GET /api/v1/data/seine/ObjectSchoolEstimateService/loadForm v1.data.seine.ObjectSchoolEstimateServiceController.loadForm +GET /api/v1/data/seine/RouteService/exists v1.data.seine.RouteServiceController.exists +GET /api/v1/data/seine/RouteService/getRouteByTripSeine v1.data.seine.RouteServiceController.getRouteByTripSeine +GET /api/v1/data/seine/RouteService/getRoutePositionInTripSeine v1.data.seine.RouteServiceController.getRoutePositionInTripSeine +GET /api/v1/data/seine/RouteService/loadDto v1.data.seine.RouteServiceController.loadDto +GET /api/v1/data/seine/RouteService/loadForm v1.data.seine.RouteServiceController.loadForm +GET /api/v1/data/seine/RouteService/loadReferenceToRead v1.data.seine.RouteServiceController.loadReferenceToRead +GET /api/v1/data/seine/RouteService/preCreate v1.data.seine.RouteServiceController.preCreate +GET /api/v1/data/seine/SchoolEstimateService/loadForm v1.data.seine.SchoolEstimateServiceController.loadForm +GET /api/v1/data/seine/SetSeineService/exists v1.data.seine.SetSeineServiceController.exists +GET /api/v1/data/seine/SetSeineService/loadDto v1.data.seine.SetSeineServiceController.loadDto +GET /api/v1/data/seine/SetSeineService/loadForm v1.data.seine.SetSeineServiceController.loadForm +GET /api/v1/data/seine/SetSeineService/loadReferenceToRead v1.data.seine.SetSeineServiceController.loadReferenceToRead +GET /api/v1/data/seine/SetSeineService/preCreate v1.data.seine.SetSeineServiceController.preCreate +GET /api/v1/data/seine/TargetCatchService/loadForm v1.data.seine.TargetCatchServiceController.loadForm +GET /api/v1/data/seine/TargetSampleService/canUseTargetSample v1.data.seine.TargetSampleServiceController.canUseTargetSample +GET /api/v1/data/seine/TargetSampleService/getSampleSpecies v1.data.seine.TargetSampleServiceController.getSampleSpecies +GET /api/v1/data/seine/TargetSampleService/loadForm v1.data.seine.TargetSampleServiceController.loadForm +GET /api/v1/data/seine/TransmittingBuoyOperationService/loadForm v1.data.seine.TransmittingBuoyOperationServiceController.loadForm +GET /api/v1/data/seine/TripSeineGearUseService/loadForm v1.data.seine.TripSeineGearUseServiceController.loadForm +GET /api/v1/data/seine/TripSeineService/exists v1.data.seine.TripSeineServiceController.exists +GET /api/v1/data/seine/TripSeineService/getAllTripSeine v1.data.seine.TripSeineServiceController.getAllTripSeine +GET /api/v1/data/seine/TripSeineService/getSpeciesByListAndTrip v1.data.seine.TripSeineServiceController.getSpeciesByListAndTrip +GET /api/v1/data/seine/TripSeineService/getTripSeineByProgram v1.data.seine.TripSeineServiceController.getTripSeineByProgram +GET /api/v1/data/seine/TripSeineService/getTripSeineMap v1.data.seine.TripSeineServiceController.getTripSeineMap +GET /api/v1/data/seine/TripSeineService/getTripSeinePositionInProgram v1.data.seine.TripSeineServiceController.getTripSeinePositionInProgram +GET /api/v1/data/seine/TripSeineService/loadDto v1.data.seine.TripSeineServiceController.loadDto +GET /api/v1/data/seine/TripSeineService/loadForm v1.data.seine.TripSeineServiceController.loadForm +GET /api/v1/data/seine/TripSeineService/loadReferenceToRead v1.data.seine.TripSeineServiceController.loadReferenceToRead +GET /api/v1/data/seine/TripSeineService/preCreate v1.data.seine.TripSeineServiceController.preCreate +GET /api/v1/referential/ReferentialService/exists v1.referential.ReferentialServiceController.exists +GET /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceController.findAllUsages +GET /api/v1/referential/ReferentialService/getReferenceSet v1.referential.ReferentialServiceController.getReferenceSet +GET /api/v1/referential/ReferentialService/getReferentialReferenceSets v1.referential.ReferentialServiceController.getReferentialReferenceSets +GET /api/v1/referential/ReferentialService/loadForm v1.referential.ReferentialServiceController.loadForm +GET /api/v1/referential/ReferentialService/loadReference v1.referential.ReferentialServiceController.loadReference +GET /api/v1/referential/ReferentialService/loadSpecies v1.referential.ReferentialServiceController.loadSpecies +GET /api/v1/referential/ReferentialService/preCreate v1.referential.ReferentialServiceController.preCreate +GET /api/v1/referential/ReferentialService/replaceReference v1.referential.ReferentialServiceController.replaceReference +GET /api/v1/sql/SqlScriptProducerService/produceAddSqlScript v1.sql.SqlScriptProducerServiceController.produceAddSqlScript +GET /api/v1/sql/SqlScriptProducerService/produceDeleteSqlScript v1.sql.SqlScriptProducerServiceController.produceDeleteSqlScript POST /api/v1/actions/consolidate/ConsolidateDataService/consolidateTripSeines v1.actions.consolidate.ConsolidateDataServiceController.consolidateTripSeines POST /api/v1/actions/report/ReportService/executeReport v1.actions.report.ReportServiceController.executeReport POST /api/v1/actions/report/ReportService/populateVariables v1.actions.report.ReportServiceController.populateVariables @@ -191,41 +187,45 @@ POST /api/v1/actions/synchro/referential/ng/ReferentialSynchronizeService/execut POST /api/v1/actions/synchro/referential/ng/ReferentialSynchronizeService/produceSqlsRequest v1.actions.synchro.referential.ng.ReferentialSynchronizeServiceController.produceSqlsRequest POST /api/v1/actions/validate/ValidateService/validateData v1.actions.validate.ValidateServiceController.validateData POST /api/v1/actions/validate/ValidateService/validateReferentials v1.actions.validate.ValidateServiceController.validateReferentials -POST /api/v1/longline/ActivityLongLineEncounterService/save v1.longline.ActivityLongLineEncounterServiceController.save -POST /api/v1/longline/ActivityLongLineSensorUsedService/save v1.longline.ActivityLongLineSensorUsedServiceController.save -POST /api/v1/longline/ActivityLonglineService/moveActivityLonglineToTripLongline v1.longline.ActivityLonglineServiceController.moveActivityLonglineToTripLongline -POST /api/v1/longline/ActivityLonglineService/moveActivityLonglinesToTripLongline v1.longline.ActivityLonglineServiceController.moveActivityLonglinesToTripLongline -POST /api/v1/longline/ActivityLonglineService/save v1.longline.ActivityLonglineServiceController.save -POST /api/v1/longline/BranchlineService/save v1.longline.BranchlineServiceController.save -POST /api/v1/longline/SetLonglineCatchService/save v1.longline.SetLonglineCatchServiceController.save -POST /api/v1/longline/SetLonglineDetailCompositionService/save v1.longline.SetLonglineDetailCompositionServiceController.save -POST /api/v1/longline/SetLonglineGlobalCompositionService/save v1.longline.SetLonglineGlobalCompositionServiceController.save -POST /api/v1/longline/SetLonglineService/save v1.longline.SetLonglineServiceController.save -POST /api/v1/longline/TdrService/save v1.longline.TdrServiceController.save -POST /api/v1/longline/TripLonglineGearUseService/save v1.longline.TripLonglineGearUseServiceController.save -POST /api/v1/longline/TripLonglineService/moveTripLonglineToProgram v1.longline.TripLonglineServiceController.moveTripLonglineToProgram -POST /api/v1/longline/TripLonglineService/moveTripLonglinesToProgram v1.longline.TripLonglineServiceController.moveTripLonglinesToProgram -POST /api/v1/longline/TripLonglineService/save v1.longline.TripLonglineServiceController.save -POST /api/v1/seine/ActivitySeineService/moveActivitySeineToRoute v1.seine.ActivitySeineServiceController.moveActivitySeineToRoute -POST /api/v1/seine/ActivitySeineService/moveActivitySeinesToRoute v1.seine.ActivitySeineServiceController.moveActivitySeinesToRoute -POST /api/v1/seine/ActivitySeineService/save v1.seine.ActivitySeineServiceController.save -POST /api/v1/seine/FloatingObjectService/save v1.seine.FloatingObjectServiceController.save -POST /api/v1/seine/NonTargetCatchService/save v1.seine.NonTargetCatchServiceController.save -POST /api/v1/seine/NonTargetSampleService/save v1.seine.NonTargetSampleServiceController.save -POST /api/v1/seine/ObjectObservedSpeciesService/save v1.seine.ObjectObservedSpeciesServiceController.save -POST /api/v1/seine/ObjectSchoolEstimateService/save v1.seine.ObjectSchoolEstimateServiceController.save -POST /api/v1/seine/RouteService/moveRouteToTripSeine v1.seine.RouteServiceController.moveRouteToTripSeine -POST /api/v1/seine/RouteService/moveRoutesToTripSeine v1.seine.RouteServiceController.moveRoutesToTripSeine -POST /api/v1/seine/RouteService/save v1.seine.RouteServiceController.save -POST /api/v1/seine/SchoolEstimateService/save v1.seine.SchoolEstimateServiceController.save -POST /api/v1/seine/SetSeineService/save v1.seine.SetSeineServiceController.save -POST /api/v1/seine/TargetCatchService/save v1.seine.TargetCatchServiceController.save -POST /api/v1/seine/TargetSampleService/save v1.seine.TargetSampleServiceController.save -POST /api/v1/seine/TransmittingBuoyOperationService/save v1.seine.TransmittingBuoyOperationServiceController.save -POST /api/v1/seine/TripSeineGearUseService/save v1.seine.TripSeineGearUseServiceController.save -POST /api/v1/seine/TripSeineService/moveTripSeineToProgram v1.seine.TripSeineServiceController.moveTripSeineToProgram -POST /api/v1/seine/TripSeineService/moveTripSeinesToProgram v1.seine.TripSeineServiceController.moveTripSeinesToProgram -POST /api/v1/seine/TripSeineService/save v1.seine.TripSeineServiceController.save -POST /api/v1/trip/TripManagementService/deleteTrip v1.trip.TripManagementServiceController.deleteTrip -POST /api/v1/trip/TripManagementService/exportTrip v1.trip.TripManagementServiceController.exportTrip -POST /api/v1/trip/TripManagementService/importTrip v1.trip.TripManagementServiceController.importTrip +POST /api/v1/data/TripManagementService/deleteTrip v1.data.TripManagementServiceController.deleteTrip +POST /api/v1/data/TripManagementService/exportTrip v1.data.TripManagementServiceController.exportTrip +POST /api/v1/data/TripManagementService/importTrip v1.data.TripManagementServiceController.importTrip +POST /api/v1/data/longline/ActivityLongLineEncounterService/save v1.data.longline.ActivityLongLineEncounterServiceController.save +POST /api/v1/data/longline/ActivityLongLineSensorUsedService/save v1.data.longline.ActivityLongLineSensorUsedServiceController.save +POST /api/v1/data/longline/ActivityLonglineService/moveActivityLonglineToTripLongline v1.data.longline.ActivityLonglineServiceController.moveActivityLonglineToTripLongline +POST /api/v1/data/longline/ActivityLonglineService/moveActivityLonglinesToTripLongline v1.data.longline.ActivityLonglineServiceController.moveActivityLonglinesToTripLongline +POST /api/v1/data/longline/ActivityLonglineService/save v1.data.longline.ActivityLonglineServiceController.save +POST /api/v1/data/longline/BranchlineService/save v1.data.longline.BranchlineServiceController.save +POST /api/v1/data/longline/SetLonglineCatchService/save v1.data.longline.SetLonglineCatchServiceController.save +POST /api/v1/data/longline/SetLonglineDetailCompositionService/save v1.data.longline.SetLonglineDetailCompositionServiceController.save +POST /api/v1/data/longline/SetLonglineGlobalCompositionService/save v1.data.longline.SetLonglineGlobalCompositionServiceController.save +POST /api/v1/data/longline/SetLonglineService/save v1.data.longline.SetLonglineServiceController.save +POST /api/v1/data/longline/TdrService/save v1.data.longline.TdrServiceController.save +POST /api/v1/data/longline/TripLonglineGearUseService/save v1.data.longline.TripLonglineGearUseServiceController.save +POST /api/v1/data/longline/TripLonglineService/moveTripLonglineToProgram v1.data.longline.TripLonglineServiceController.moveTripLonglineToProgram +POST /api/v1/data/longline/TripLonglineService/moveTripLonglinesToProgram v1.data.longline.TripLonglineServiceController.moveTripLonglinesToProgram +POST /api/v1/data/longline/TripLonglineService/save v1.data.longline.TripLonglineServiceController.save +POST /api/v1/data/seine/ActivitySeineService/moveActivitySeineToRoute v1.data.seine.ActivitySeineServiceController.moveActivitySeineToRoute +POST /api/v1/data/seine/ActivitySeineService/moveActivitySeinesToRoute v1.data.seine.ActivitySeineServiceController.moveActivitySeinesToRoute +POST /api/v1/data/seine/ActivitySeineService/save v1.data.seine.ActivitySeineServiceController.save +POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceController.save +POST /api/v1/data/seine/NonTargetCatchService/save v1.data.seine.NonTargetCatchServiceController.save +POST /api/v1/data/seine/NonTargetSampleService/save v1.data.seine.NonTargetSampleServiceController.save +POST /api/v1/data/seine/ObjectObservedSpeciesService/save v1.data.seine.ObjectObservedSpeciesServiceController.save +POST /api/v1/data/seine/ObjectSchoolEstimateService/save v1.data.seine.ObjectSchoolEstimateServiceController.save +POST /api/v1/data/seine/RouteService/moveRouteToTripSeine v1.data.seine.RouteServiceController.moveRouteToTripSeine +POST /api/v1/data/seine/RouteService/moveRoutesToTripSeine v1.data.seine.RouteServiceController.moveRoutesToTripSeine +POST /api/v1/data/seine/RouteService/save v1.data.seine.RouteServiceController.save +POST /api/v1/data/seine/SchoolEstimateService/save v1.data.seine.SchoolEstimateServiceController.save +POST /api/v1/data/seine/SetSeineService/save v1.data.seine.SetSeineServiceController.save +POST /api/v1/data/seine/TargetCatchService/save v1.data.seine.TargetCatchServiceController.save +POST /api/v1/data/seine/TargetSampleService/save v1.data.seine.TargetSampleServiceController.save +POST /api/v1/data/seine/TransmittingBuoyOperationService/save v1.data.seine.TransmittingBuoyOperationServiceController.save +POST /api/v1/data/seine/TripSeineGearUseService/save v1.data.seine.TripSeineGearUseServiceController.save +POST /api/v1/data/seine/TripSeineService/moveTripSeineToProgram v1.data.seine.TripSeineServiceController.moveTripSeineToProgram +POST /api/v1/data/seine/TripSeineService/moveTripSeinesToProgram v1.data.seine.TripSeineServiceController.moveTripSeinesToProgram +POST /api/v1/data/seine/TripSeineService/save v1.data.seine.TripSeineServiceController.save +POST /api/v1/referential/ReferentialService/computeMissingReferentials v1.referential.ReferentialServiceController.computeMissingReferentials +POST /api/v1/referential/ReferentialService/getReferentialIds v1.referential.ReferentialServiceController.getReferentialIds +POST /api/v1/referential/ReferentialService/insertMissingReferentials v1.referential.ReferentialServiceController.insertMissingReferentials +POST /api/v1/referential/ReferentialService/save v1.referential.ReferentialServiceController.save diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java index 1bab47a..384f76c 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java @@ -29,8 +29,8 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.services.service.ReferenceSetsRequest; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferenceSetsRequest; +import fr.ird.observe.services.service.referential.ReferentialService; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java index 232e99d..37923d9 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java @@ -32,7 +32,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import org.junit.Assert; import org.junit.Test; 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 ccdd171..2bfc71d 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 @@ -31,8 +31,8 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.rest.service.AbstractServiceRestTest; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Assume; 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 ef77c10..a52827d 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 @@ -33,7 +33,7 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.rest.service.AbstractServiceRestTest; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Ignore; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index f615ac7..b857b52 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -45,13 +45,13 @@ import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationExce import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveJdbcHelper; import fr.ird.observe.services.topia.ObserveSecurityHelper; import fr.ird.observe.services.topia.ObserveServiceTopia; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 9ce88be..fe89790 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -571,7 +571,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); - if (!outputSizeMeasureType.equals(inputSizeMeasureType)) { + if (outputSizeMeasureType != null && !outputSizeMeasureType.equals(inputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, inputSizeMeasureType, outputSizeMeasureType); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java index 754412a..14c7d5b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.data; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.RunScriptTopiaSqlWork; -import fr.ird.observe.services.service.ObserveBlobsContainer; +import fr.ird.observe.services.service.sql.ObserveBlobsContainer; import javax.sql.rowset.serial.SerialBlob; import java.sql.Connection; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java similarity index 88% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java index b1dfb37..fff3a98 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.data; /*- * #%L @@ -24,21 +24,21 @@ package fr.ird.observe.services.topia.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.DeleteTripRequest; +import fr.ird.observe.services.service.data.DeleteTripResult; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.ImportTripResult; +import fr.ird.observe.services.service.data.TripManagementService; import fr.ird.observe.services.topia.ObserveServiceContextTopia; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.IdHelper; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; -import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; -import fr.ird.observe.services.service.ObserveBlobsContainer; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.ObserveBlobsContainer; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java index cd0c68d..289e402 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java index 566d576..4895cf7 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SensorUsed; -import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java index d708fd9..c171d52 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultHelper; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java index 9e1b931..bad2ec5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.service.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java index 2686bc0..cfb1c10 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java index ebcdb5a..76b8c8d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.longline; */ import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.service.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.CatchLonglineDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java index e21fe2e..b9a6f6f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java index 6b10143..c610982 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.longline; */ import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java index 8f59193..3f206ef 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import org.apache.commons.lang3.time.DateUtils; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java index 39502bf..1ce2803 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.services.service.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TdrService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java index d2d2876..db87c01 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.services.service.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java index 7da83f4..18455ad 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.longline; +package fr.ird.observe.services.topia.service.data.longline; /* * #%L @@ -33,7 +33,7 @@ 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.longline.TripLonglineService; +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; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java index ec65dae..684b1c9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java index e89bb87..938b503 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.seine; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java index 64fdabc..a49647c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.service.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java index bcac6db..d92dfaa 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -29,7 +29,7 @@ import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; -import fr.ird.observe.services.service.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.Form; @@ -45,7 +45,6 @@ import org.apache.commons.logging.LogFactory; import java.util.Collection; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; /** diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java index 4b443bb..8efcde0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java index d031b3e..0ff576b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java index 795baa6..c629808 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -33,7 +33,7 @@ import fr.ird.observe.entities.seine.RouteTopiaDao; import fr.ird.observe.entities.seine.Routes; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java index e12625b..1874ba7 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.seine; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.service.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java index b5b514d..1eb7217 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.SetSeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java index 45f59e5..72391e2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /*- * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetCatchs; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.service.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java index 3f89e07..e560c40 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.Form; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java index 15967fd..b5ead73 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java index 411b8b4..21ced57 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.seine; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java index 5bc8903..ebe73f1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.topia.service.data.seine; /* * #%L @@ -44,7 +44,7 @@ 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.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.entity.TripMapDtoFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java index 8430e9c..6ae7ac5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.referential; /* * #%L @@ -50,15 +50,16 @@ 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.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; +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.MissingReferentialResult; -import fr.ird.observe.services.service.ReferenceSetsRequest; -import fr.ird.observe.services.service.ReferentialService; +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.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; +import fr.ird.observe.services.topia.service.sql.SqlScriptProducerServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -348,7 +349,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe SqlScriptProducerServiceTopia sqlScriptProducerService = serviceContext.newService(SqlScriptProducerServiceTopia.class); AddSqlScriptProducerResult addSqlScriptProducerResult = sqlScriptProducerService.produceAddSqlScript(request); - + return MissingReferentialResult.of(missingReferentialIds, addSqlScriptProducerResult.getSqlCode()); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java index a2c919f..2bd64fd 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialsShellBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.referential; import com.google.common.cache.AbstractLoadingCache; import com.google.common.cache.LoadingCache; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java index 0f57576..7f697e9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.sql; /*- * #%L @@ -28,11 +28,11 @@ import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.entities.Entities; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; -import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; -import fr.ird.observe.services.service.ObserveBlobsContainer; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.sql.DeleteSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.ObserveBlobsContainer; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java index 280ad2e..118e158 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ObserveReferentialCache; +import fr.ird.observe.services.service.referential.ObserveReferentialCache; import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.TestMethodResourceSupport; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java index 9dc2d57..c1dac94 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.topia.TopiaTestClassResource; import fr.ird.observe.services.topia.TopiaTestMethodResource; import fr.ird.observe.services.dto.Form; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java index 859363a..9bc58a4 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java @@ -28,7 +28,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java index abb5148..7b0877f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java @@ -33,7 +33,8 @@ import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.topia.service.referential.ReferentialServiceTopia; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java index f2beb72..56b4059 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java @@ -32,8 +32,8 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.spi.DatabaseLoginConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java index 0ac2b12..138be62 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java @@ -33,14 +33,14 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.data.DeleteTripRequest; +import fr.ird.observe.services.service.data.DeleteTripResult; +import fr.ird.observe.services.service.data.ExportTripRequest; +import fr.ird.observe.services.service.data.ExportTripResult; +import fr.ird.observe.services.service.data.ImportTripRequest; +import fr.ird.observe.services.service.data.TripManagementService; import fr.ird.observe.services.topia.ObserveDataSourceConnectionTopiaTaiste; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index fe857ad..7fdd407 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java index e0522b0..ac2288b 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.seine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java index d7ee168..1492859 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.seine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java index 9a52356..a227bfd 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -30,9 +30,9 @@ import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java index 86e4fb8..4c70595 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.seine; */ import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.topia.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; @@ -39,7 +39,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java similarity index 95% rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java index aac79d8..b9cbf0a 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.sql; /*- * #%L @@ -24,13 +24,14 @@ package fr.ird.observe.services.topia.service; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopiaTest.java similarity index 93% rename from services-topia/src/test/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopiaTest.java index 332b42c..e089670 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.topia.service.sql; /*- * #%L @@ -23,10 +23,10 @@ package fr.ird.observe.services.topia.service; */ import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; diff --git a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java index 89ad319..619d44a 100644 --- a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java @@ -25,40 +25,40 @@ package fr.ird.observe.services; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.PingService; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; -import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; -import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.service.longline.BranchlineService; -import fr.ird.observe.services.service.longline.SetLonglineCatchService; -import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; -import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; -import fr.ird.observe.services.service.longline.SetLonglineService; -import fr.ird.observe.services.service.longline.TdrService; -import fr.ird.observe.services.service.longline.TripLonglineGearUseService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.service.seine.FloatingObjectService; -import fr.ird.observe.services.service.seine.NonTargetCatchService; -import fr.ird.observe.services.service.seine.NonTargetSampleService; -import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; -import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; -import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.SchoolEstimateService; -import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.services.service.seine.TargetCatchService; -import fr.ird.observe.services.service.seine.TargetSampleService; -import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; -import fr.ird.observe.services.service.seine.TripSeineGearUseService; -import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.data.TripManagementService; /** * Un provider de services typés. diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/data/DeleteTripRequest.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/data/DeleteTripRequest.java index 160cd15..8b081fc 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/DeleteTripRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java b/services/src/main/java/fr/ird/observe/services/service/data/DeleteTripResult.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/data/DeleteTripResult.java index 2c585e2..d3f558f 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/DeleteTripResult.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java index 95a5427..d25e4b1 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java index 4ff93cd..af32fb1 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ExportTripResult.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.trip; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.ObserveDto; -import fr.ird.observe.services.service.ObserveBlobsContainer; +import fr.ird.observe.services.service.sql.ObserveBlobsContainer; /** * Created on 27/08/16. diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java rename to services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java index da6be0d..fc14c0a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.trip; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.ObserveDto; -import fr.ird.observe.services.service.ObserveBlobsContainer; +import fr.ird.observe.services.service.sql.ObserveBlobsContainer; /** * Created on 27/08/16. diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripResult.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename to services/src/main/java/fr/ird/observe/services/service/data/ImportTripResult.java index 2f40580..b4548e8 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/ImportTripResult.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java b/services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java rename to services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java index 201caa5..ec25407 100644 --- a/services/src/main/java/fr/ird/observe/services/service/trip/TripManagementService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.service.data; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java index 7ce8aad..0a68597 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java index 70c8fc0..2ae3d99 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java index 1e60dd1..a7b5f01 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java index 3bd35b2..f0c219f 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java index e6513f6..78d4e87 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java index 9055d5f..b7a2bc2 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java index f1b55e9..8705cc7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java index 15591c7..bb8cb03 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/TdrService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java index 59ad71b..4904806 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/TdrService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java index e50117d..ac679bc 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java index fcb2996..74e398a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.service.data.longline; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java index 3fc6a00..cec441e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java index 1cdb5c6..88de81d 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java index 3d6fc13..4281c87 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java index 9e9f360..79c9dd6 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java index cc154b5..c2f8832 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java index e274504..f22547c 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/seine/RouteService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java index 5ba0736..88c6ee2 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java index 9a89e5f..86d4815 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java index c82822e..c88bdd8 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java index 60fc851..9e630ec 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java index c467bb1..4da9868 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java index c147b2a..6d9a46a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java index 5567eb6..30dfb31 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java rename to services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java index f9e56f7..59b6a17 100644 --- a/services/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.service.data.seine; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/MissingReferentialResult.java b/services/src/main/java/fr/ird/observe/services/service/referential/MissingReferentialResult.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/service/MissingReferentialResult.java rename to services/src/main/java/fr/ird/observe/services/service/referential/MissingReferentialResult.java index 5161404..abce1ac 100644 --- a/services/src/main/java/fr/ird/observe/services/service/MissingReferentialResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/MissingReferentialResult.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.referential; import com.google.common.collect.SetMultimap; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java similarity index 99% rename from services/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java rename to services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java index d2d5c54..511cf0d 100644 --- a/services/src/main/java/fr/ird/observe/services/service/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.referential; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java b/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java rename to services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java index ea5218e..50d85f0 100644 --- a/services/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.referential; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/ReferentialService.java rename to services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java index 5356f6b..9df931a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.referential; /* * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; 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.service.DataNotFoundException; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; diff --git a/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java rename to services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java index 0b24ee6..fbb0ffe 100644 --- a/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.sql; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java rename to services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java index 54c512a..f46a184 100644 --- a/services/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.sql; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java b/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java rename to services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java index e8504d6..1e8ff3f 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DeleteSqlScriptProducerRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.sql; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java b/services/src/main/java/fr/ird/observe/services/service/sql/ObserveBlobsContainer.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java rename to services/src/main/java/fr/ird/observe/services/service/sql/ObserveBlobsContainer.java index fcaf601..c846a47 100644 --- a/services/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/ObserveBlobsContainer.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.sql; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java b/services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java rename to services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java index 6b8acaa..40ae489 100644 --- a/services/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.service.sql; /*- * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.