This is an automated email from the git hooks/post-receive script. New change to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 31a27a1 Continue ui for data synchronize action new e40d8eb debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie new dae0234 Début d'implantation de la logique de synchronisation de données new f332626 Meilleure utilisation des déclarations de service The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f332626318c7d13f494f116400706018489cab37 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:09 2016 +0200 Meilleure utilisation des déclarations de service commit dae0234c6559d7de0076c5bdfc5732e451677126 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:05 2016 +0200 Début d'implantation de la logique de synchronisation de données commit e40d8ebc097c221b023e0dd7597d68f4b93ff1cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 11:35:44 2016 +0200 debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie Summary of changes: .../fr/ird/observe/db/ObserveSwingDataSource.java | 118 +++++++++++++++++---- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 4 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../datasynchro/CopyToLeftDataSynchronizeTask.java | 10 +- .../CopyToRightDataSynchronizeTask.java | 9 +- .../ui/admin/datasynchro/DataSynchroUIHandler.java | 115 +++++++++++++++++--- .../observe/ui/admin/export/ExportUIHandler.java | 4 +- .../observe/ui/admin/report/ReportUIHandler.java | 4 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 4 +- .../ui/storage/tabs/DataSelectionModel.java | 9 +- .../ird/observe/validation/ValidationContext.java | 18 ++-- .../datasynchro/DataSynchronizeCopyTask.java | 27 +++++ .../datasynchro/DataSynchronizeDeleteTask.java | 14 +++ .../datasynchro/DataSynchronizeRequest.java | 90 ++++++++++++++++ .../datasynchro/DataSynchronizeService.java | 41 +++++++ .../datasynchro/DataSyncrhonizeTaskSupport.java | 26 +++++ .../datasynchro/DataSynchronizeServiceTopia.java | 102 ++++++++++++++++++ 22 files changed, 545 insertions(+), 62 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeServiceTopia.java -- 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 feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e40d8ebc097c221b023e0dd7597d68f4b93ff1cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 11:35:44 2016 +0200 debut de gestion de la prise en compte des marées présentes des deux cotés lors d'une recopie --- .../datasynchro/CopyToLeftDataSynchronizeTask.java | 10 ++++- .../CopyToRightDataSynchronizeTask.java | 9 ++++- .../ui/admin/datasynchro/DataSynchroUIHandler.java | 47 +++++++++++++++------- .../ui/storage/tabs/DataSelectionModel.java | 5 +++ 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java index 26689a2..15cf796 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToLeftDataSynchronizeTask.java @@ -14,12 +14,20 @@ import static org.nuiton.i18n.I18n.t; */ public class CopyToLeftDataSynchronizeTask extends DataSynchronizeTaskSupport { - public CopyToLeftDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference) { + private final boolean tripExistOnLeft; + + public CopyToLeftDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference, boolean tripExistOnLeft) { super(programReference, tripReference); + this.tripExistOnLeft=tripExistOnLeft; } @Override public String getLabel() { return t("observe.datasynchro.copyToLeftTask", decorateProgram(), decorateTrip()); } + + public boolean isTripExistOnLeft() { + return tripExistOnLeft; + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java index 03bf7f0..ecb6420 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/CopyToRightDataSynchronizeTask.java @@ -14,8 +14,11 @@ import static org.nuiton.i18n.I18n.t; */ public class CopyToRightDataSynchronizeTask extends DataSynchronizeTaskSupport { - public CopyToRightDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference) { + private final boolean tripExistOnRight; + + public CopyToRightDataSynchronizeTask(ReferentialReference<ProgramDto> programReference, DataReference tripReference, boolean tripExistOnRight) { super(programReference, tripReference); + this.tripExistOnRight = tripExistOnRight; } @Override @@ -23,4 +26,8 @@ public class CopyToRightDataSynchronizeTask extends DataSynchronizeTaskSupport { return t("observe.datasynchro.copyToRightTask", decorateProgram(), decorateTrip()); } + public boolean isTripExistOnRight() { + return tripExistOnRight; + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java index 98b49fd..0c0a3a2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java @@ -112,16 +112,24 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { public void addCopyToLeftTasks() { - DataSelectionModel selectionDataModel = getStepModel().getRightSelectionDataModel(); - ObserveTreeHelper treeHelper = getUi().getRightTreeHelper(); - Map<ReferentialReference<ProgramDto>, List<DataReference>> selectedDataByProgram = selectionDataModel.getSelectedDataByProgram(); - selectionDataModel.removeAllSelectedData(); + DataSelectionModel rightSelectionDataModel = getStepModel().getRightSelectionDataModel(); + DataSelectionModel leftSelectionDataModel = getStepModel().getLeftSelectionDataModel(); + ObserveTreeHelper rightTreeHelper = getUi().getRightTreeHelper(); + ObserveTreeHelper leftTreeHelper = getUi().getLeftTreeHelper(); + Map<ReferentialReference<ProgramDto>, List<DataReference>> selectedDataByProgram = rightSelectionDataModel.getSelectedDataByProgram(); + rightSelectionDataModel.removeAllSelectedData(); for (Map.Entry<ReferentialReference<ProgramDto>, List<DataReference>> entry : selectedDataByProgram.entrySet()) { ReferentialReference<ProgramDto> program = entry.getKey(); for (DataReference trip : entry.getValue()) { - getStepModel().addTask(new CopyToLeftDataSynchronizeTask(program, trip)); - treeHelper.removeTrip(program, trip); - selectionDataModel.removeTrip(program, trip); + boolean tripExistOnLeft = leftSelectionDataModel.containsData(program, trip); + getStepModel().addTask(new CopyToLeftDataSynchronizeTask(program, trip, tripExistOnLeft)); + rightTreeHelper.removeTrip(program, trip); + rightSelectionDataModel.removeTrip(program, trip); + + if (tripExistOnLeft) { + leftTreeHelper.removeTrip(program, trip); + leftSelectionDataModel.removeTrip(program, trip); + } } } @@ -130,16 +138,25 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { public void addCopyToRightTasks() { - DataSelectionModel selectionDataModel = getStepModel().getLeftSelectionDataModel(); - ObserveTreeHelper treeHelper = getUi().getLeftTreeHelper(); - Map<ReferentialReference<ProgramDto>, List<DataReference>> selectedDataByProgram = selectionDataModel.getSelectedDataByProgram(); - selectionDataModel.removeAllSelectedData(); + DataSelectionModel leftSelectionDataModel = getStepModel().getLeftSelectionDataModel(); + DataSelectionModel rightSelectionDataModel = getStepModel().getRightSelectionDataModel(); + ObserveTreeHelper leftTreeHelper = getUi().getLeftTreeHelper(); + ObserveTreeHelper rightTreeHelper = getUi().getRightTreeHelper(); + Map<ReferentialReference<ProgramDto>, List<DataReference>> selectedDataByProgram = leftSelectionDataModel.getSelectedDataByProgram(); + leftSelectionDataModel.removeAllSelectedData(); for (Map.Entry<ReferentialReference<ProgramDto>, List<DataReference>> entry : selectedDataByProgram.entrySet()) { ReferentialReference<ProgramDto> program = entry.getKey(); for (DataReference trip : entry.getValue()) { - getStepModel().addTask(new CopyToRightDataSynchronizeTask(program, trip)); - treeHelper.removeTrip(program, trip); - selectionDataModel.removeTrip(program, trip); + + boolean tripExistOnRight = rightSelectionDataModel.containsData(program, trip); + getStepModel().addTask(new CopyToRightDataSynchronizeTask(program, trip, tripExistOnRight)); + leftTreeHelper.removeTrip(program, trip); + leftSelectionDataModel.removeTrip(program, trip); + + if (tripExistOnRight) { + rightTreeHelper.removeTrip(program, trip); + rightSelectionDataModel.removeTrip(program, trip); + } } } @@ -188,6 +205,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { DataSynchronizeTaskSupport task = getStepModel().getTasks().getElementAt(selectionIndex); getStepModel().getTasks().removeElementAt(selectionIndex); + //TODO Deal with tripExistOnxxx for copy tasks + ObserveTreeHelper treeHelper; DataSelectionModel selectionDataModel; if (task instanceof CopyToLeftDataSynchronizeTask || task instanceof DeleteFromRightDataSynchronizeTask) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index 9f7f29e..93d2cf8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -229,6 +229,11 @@ public class DataSelectionModel implements Serializable { return datas; } + public boolean containsData(ReferentialReference<ProgramDto> program, DataReference trip) { + List<DataReference> datas = getDatas(program.getId()); + return datas!=null && datas.contains(trip); + } + public Set<DataReference> getSelectedData() { if (selectedData == null) { selectedData = Sets.newHashSet(); -- 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 feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit dae0234c6559d7de0076c5bdfc5732e451677126 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:05 2016 +0200 Début d'implantation de la logique de synchronisation de données --- .../ui/admin/datasynchro/DataSynchroUIHandler.java | 68 +++++++++++++- .../datasynchro/DataSynchronizeCopyTask.java | 27 ++++++ .../datasynchro/DataSynchronizeDeleteTask.java | 14 +++ .../datasynchro/DataSynchronizeRequest.java | 90 ++++++++++++++++++ .../datasynchro/DataSynchronizeService.java | 41 +++++++++ .../datasynchro/DataSyncrhonizeTaskSupport.java | 26 ++++++ .../datasynchro/DataSynchronizeServiceTopia.java | 102 +++++++++++++++++++++ 7 files changed, 367 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java index 0c0a3a2..f59acf1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUIHandler.java @@ -1,9 +1,14 @@ package fr.ird.observe.ui.admin.datasynchro; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; 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.actions.datasynchro.DataSynchronizeCopyTask; +import fr.ird.observe.services.service.actions.datasynchro.DataSynchronizeDeleteTask; +import fr.ird.observe.services.service.actions.datasynchro.DataSynchronizeRequest; +import fr.ird.observe.services.service.actions.datasynchro.DataSynchronizeService; import fr.ird.observe.ui.admin.AdminTabUIHandler; import fr.ird.observe.ui.admin.AdminUI; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; @@ -14,6 +19,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.DefaultListModel; import javax.swing.JList; import javax.swing.border.TitledBorder; import java.awt.event.MouseEvent; @@ -241,7 +247,67 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { public void doExecuteAction() { - //TODO + ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); + boolean leftSourceIsH2 = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaH2; + + ObserveSwingDataSource rightSource = getStepModel().getRightSource(); + boolean rightSourceIsH2 = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaH2; + + DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); + int size = tasks.size(); + + DataSynchronizeRequest.Builder leftDataSynchronizeRequestBuilder = DataSynchronizeRequest.builder(rightSourceIsH2); + DataSynchronizeRequest.Builder rightDataSynchronizeRequestBuilder = DataSynchronizeRequest.builder(leftSourceIsH2); + for (int i = 0; i < size; i++) { + + DataSynchronizeTaskSupport task = tasks.getElementAt(i); + + if (task instanceof DeleteFromLeftDataSynchronizeTask) { + + leftDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); + continue; + } + + if (task instanceof DeleteFromRightDataSynchronizeTask) { + rightDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); + continue; + } + + if (task instanceof CopyToLeftDataSynchronizeTask) { + CopyToLeftDataSynchronizeTask copyTask = (CopyToLeftDataSynchronizeTask) task; + if (copyTask.isTripExistOnLeft()) { + leftDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); + } + leftDataSynchronizeRequestBuilder.addCopyTask(new DataSynchronizeCopyTask(task.getProgram().getId(), task.getTrip().getId())); + continue; + } + + if (task instanceof CopyToRightDataSynchronizeTask) { + CopyToRightDataSynchronizeTask copyTask = (CopyToRightDataSynchronizeTask) task; + if (copyTask.isTripExistOnRight()) { + rightDataSynchronizeRequestBuilder.addDeleteTask(new DataSynchronizeDeleteTask(task.getProgram().getId(), task.getTrip().getId())); + } + rightDataSynchronizeRequestBuilder.addCopyTask(new DataSynchronizeCopyTask(task.getProgram().getId(), task.getTrip().getId())); + } + + } + + + DataSynchronizeService leftDataSynchronizeService = leftSource.newDataSynchronizeService(); + DataSynchronizeService rightDataSynchronizeService = rightSource.newDataSynchronizeService(); + + DataSynchronizeRequest leftDataSynchronizeRequest = leftDataSynchronizeRequestBuilder.build(); + if (leftDataSynchronizeRequest.isNotEmpty()) { + rightDataSynchronizeService.prepareRequestOnOppositeDataSource(leftDataSynchronizeRequest); + leftDataSynchronizeService.executeRequest(leftDataSynchronizeRequest); + } + + DataSynchronizeRequest rightDataSynchronizeRequest = rightDataSynchronizeRequestBuilder.build(); + if (rightDataSynchronizeRequest.isNotEmpty()) { + leftDataSynchronizeService.prepareRequestOnOppositeDataSource(rightDataSynchronizeRequest); + rightDataSynchronizeService.executeRequest(rightDataSynchronizeRequest); + } + getModel().setStepState(WizardState.SUCCESSED); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java new file mode 100644 index 0000000..2217414 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java @@ -0,0 +1,27 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSynchronizeCopyTask extends DataSyncrhonizeTaskSupport { + + /** + * Contient le code sql de la copie de la marée. + */ + private byte[] dataContent; + + public DataSynchronizeCopyTask(String programId, String tripId) { + super(programId, tripId); + } + + public byte[] getDataContent() { + return dataContent; + } + + public void setDataContent(byte[] dataContent) { + this.dataContent = dataContent; + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java new file mode 100644 index 0000000..490eae0 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSynchronizeDeleteTask extends DataSyncrhonizeTaskSupport { + + public DataSynchronizeDeleteTask(String programId, String tripId) { + super(programId, tripId); + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeRequest.java new file mode 100644 index 0000000..16cc43f --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeRequest.java @@ -0,0 +1,90 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +import com.google.common.collect.ImmutableSet; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSynchronizeRequest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSynchronizeRequest.class); + + public static Builder builder(boolean oppositeH2) { + return new Builder(oppositeH2); + } + + /** + * Is opposite data source use h2 ? + */ + private final boolean oppositeH2; + /** + * Copy tasks. + */ + private final ImmutableSet<DataSynchronizeCopyTask> copyTasks; + + /** + * Delete tasks. + */ + private final ImmutableSet<DataSynchronizeDeleteTask> deleteTasks; + + public static class Builder { + + private final boolean oppositeH2; + private final ImmutableSet.Builder<DataSynchronizeCopyTask> copyTasksBuilder = ImmutableSet.builder(); + private final ImmutableSet.Builder<DataSynchronizeDeleteTask> deleteTasksBuilder = ImmutableSet.builder(); + + public Builder(boolean oppositeH2) { + this.oppositeH2 = oppositeH2; + } + + public DataSynchronizeRequest build() { + return new DataSynchronizeRequest(oppositeH2, copyTasksBuilder.build(), deleteTasksBuilder.build()); + } + + public Builder addDeleteTask(DataSynchronizeDeleteTask deleteTask) { + + if (log.isInfoEnabled()) { + log.info("Add delete task for trip: " + deleteTask.getProgramId() + " / " + deleteTask.getTripId()); + } + deleteTasksBuilder.add(deleteTask); + return this; + } + + public Builder addCopyTask(DataSynchronizeCopyTask copyTask) { + if (log.isInfoEnabled()) { + log.info("Add copy task for trip: " + copyTask.getProgramId() + " / " + copyTask.getTripId()); + } + copyTasksBuilder.add(copyTask); + return this; + } + + } + + public ImmutableSet<DataSynchronizeCopyTask> getCopyTasks() { + return copyTasks; + } + + public ImmutableSet<DataSynchronizeDeleteTask> getDeleteTasks() { + return deleteTasks; + } + + public boolean isNotEmpty() { + return !(copyTasks.isEmpty() && deleteTasks.isEmpty()); + } + + public boolean isOppositeH2() { + return oppositeH2; + } + + private DataSynchronizeRequest(boolean oppositeH2, ImmutableSet<DataSynchronizeCopyTask> copyTasks, ImmutableSet<DataSynchronizeDeleteTask> deleteTasks) { + this.oppositeH2 = oppositeH2; + this.copyTasks = copyTasks; + this.deleteTasks = deleteTasks; + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeService.java new file mode 100644 index 0000000..1f15d58 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeService.java @@ -0,0 +1,41 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.spi.PostRequest; +import fr.ird.observe.services.spi.ReadDataPermission; +import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public interface DataSynchronizeService extends ObserveService { + + /** + * Prépare la demande donnée en paramètre. Par exemple s'il y a des demandes de recopie, on récupère le code sql de recopie. + * + * Cette méthode doit être executée sur la base opposée. + * + * @param request la demande des tâches à préparer. + */ + @ReadDataPermission + @PostRequest + void prepareRequestOnOppositeDataSource(DataSynchronizeRequest request); + + /** + * Exécution de la demande donnée en paramètre. + * + * Cette méthode doit être exécutée sur la base cible. + * + * @param request la demande des tâches à réaliser. + */ + @ReadDataPermission + @WriteDataPermission + @Write + @PostRequest + void executeRequest(DataSynchronizeRequest request); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java new file mode 100644 index 0000000..c90b217 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java @@ -0,0 +1,26 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public abstract class DataSyncrhonizeTaskSupport { + + private final String programId; + private final String tripId; + + protected DataSyncrhonizeTaskSupport(String programId, String tripId) { + this.programId = programId; + this.tripId = tripId; + } + + public String getProgramId() { + return programId; + } + + public String getTripId() { + return tripId; + } +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeServiceTopia.java new file mode 100644 index 0000000..3dead6c --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeServiceTopia.java @@ -0,0 +1,102 @@ +package fr.ird.observe.services.service.actions.datasynchro; + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.longline.TripLonglineTopiaDao; +import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.entities.seine.TripSeineTopiaDao; +import fr.ird.observe.services.ObserveServiceContextTopia; +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.SqlScriptProducerRequest; +import fr.ird.observe.services.service.SqlScriptProducerService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created on 08/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class DataSynchronizeServiceTopia extends ObserveServiceTopia implements DataSynchronizeService { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSynchronizeServiceTopia.class); + + protected SqlScriptProducerService sqlScriptProducerService; + + @Override + public void setServiceContext(ObserveServiceContextTopia serviceContext) { + super.setServiceContext(serviceContext); + sqlScriptProducerService = serviceContext.newService(SqlScriptProducerService.class); + } + + @Override + public void prepareRequestOnOppositeDataSource(DataSynchronizeRequest request) { + + for (DataSynchronizeCopyTask copyTask : request.getCopyTasks()) { + + if (log.isInfoEnabled()) { + log.info("Obtain trip sql content: " + copyTask.getProgramId() + " / " + copyTask.getTripId()); + } + + // get the data content + + SqlScriptProducerRequest sqlRequest; + if (request.isOppositeH2()) { + sqlRequest = SqlScriptProducerRequest.forH2(); + } else { + sqlRequest = SqlScriptProducerRequest.forPostgres(); + } + sqlRequest.addDataIds(ImmutableSet.of(copyTask.getTripId())); + byte[] sqlScript = sqlScriptProducerService.produceSqlScript(sqlRequest); + + // store it in task + copyTask.setDataContent(sqlScript); + + } + + } + + @Override + public void executeRequest(DataSynchronizeRequest request) { + + TripSeineTopiaDao tripSeineDao = serviceContext.getTopiaPersistenceContext().getTripSeineDao(); + TripLonglineTopiaDao tripLonglineDao = serviceContext.getTopiaPersistenceContext().getTripLonglineDao(); + + for (DataSynchronizeDeleteTask deleteTask : request.getDeleteTasks()) { + + String tripId = deleteTask.getTripId(); + boolean longlineId = Entities.isLonglineId(tripId); + + if (longlineId) { + + if (log.isInfoEnabled()) { + log.info("Delete longline trip: " + deleteTask.getProgramId() + " / " + deleteTask.getTripId()); + } + TripLongline tripLongline = tripLonglineDao.forTopiaIdEquals(tripId).findUnique(); + tripLonglineDao.delete(tripLongline); + + } else { + + if (log.isInfoEnabled()) { + log.info("Delete seine trip: " + deleteTask.getProgramId() + " / " + deleteTask.getTripId()); + } + TripSeine tripSeine = tripSeineDao.forTopiaIdEquals(tripId).findUnique(); + tripSeineDao.delete(tripSeine); + + } + + } + + for (DataSynchronizeCopyTask copyTask : request.getCopyTasks()) { + + if (log.isInfoEnabled()) { + log.info("Copy trip: " + copyTask.getProgramId() + " / " + copyTask.getTripId()); + } + serviceContext.getTopiaApplicationContext().executeSqlStatements(copyTask.getDataContent()); + + } + } +} -- 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 feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f332626318c7d13f494f116400706018489cab37 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 8 12:08:09 2016 +0200 Meilleure utilisation des déclarations de service --- .../fr/ird/observe/db/ObserveSwingDataSource.java | 118 +++++++++++++++++---- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 4 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 4 +- .../observe/ui/admin/report/ReportUIHandler.java | 4 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 4 +- .../ui/storage/tabs/DataSelectionModel.java | 4 +- .../ird/observe/validation/ValidationContext.java | 18 ++-- 13 files changed, 123 insertions(+), 45 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 4da3d56..88eb540 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -55,10 +55,24 @@ 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.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.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.datasynchro.DataSynchronizeService; +import fr.ird.observe.services.service.actions.export.ReplicateTripService; +import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.synchro.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.UnidirectionalReferentialSynchronizeRemoteService; +import fr.ird.observe.services.service.actions.validate.ValidateService; +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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; @@ -172,7 +186,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements fireOpening(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); connection = dataSourceService.open(configuration); @@ -189,7 +203,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements fireNewMessage(t("observe.storage.message.creating", getLabel())); fireOpening(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); connection = dataSourceService.create(configuration, createDto); @@ -210,7 +224,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements try { // si la connection a expirée la source a deja été fermer pas le serveur if (!expired) { - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); dataSourceService.close(); } @@ -233,7 +247,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements referentialCache.close(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); dataSourceService.destroy(); @@ -248,7 +262,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsNotOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); Set<ObserveDbUserDto> users = dataSourceService.getUsers(getConfiguration()); @@ -260,7 +274,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsNotOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); dataSourceService.applySecurity(getConfiguration(), users); } @@ -291,7 +305,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements if (answer == JOptionPane.YES_OPTION) { - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); if (log.isInfoEnabled()) { @@ -307,7 +321,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements public ImmutableMap<Class<?>, ReferentialReferenceSet<?>> updateReferentialReferenceSetsCache(String referentialReferenceSetsRequestName) { - ReferentialService referentialService = newService(ReferentialService.class); + ReferentialService referentialService = newReferentialService(); return referentialCache.loadReferenceSets(referentialService, referentialReferenceSetsRequestName); } @@ -316,7 +330,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsOpen(); - ReferentialService referentialService = newService(ReferentialService.class); + ReferentialService referentialService = newReferentialService(); return referentialCache.getReferentialReferenceSet(referentialService, type); } @@ -342,6 +356,26 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return newService(SqlScriptProducerService.class); } + public ValidateService newValidateService() { + return newService(ValidateService.class); + } + + public ReportService newReportService() { + return newService(ReportService.class); + } + + public PingService newPingService() { + return newService(PingService.class); + } + + public ReplicateTripService newReplicateTripService() { + return newService(ReplicateTripService.class); + } + + public ConsolidateDataService newConsolidateDataService() { + return newService(ConsolidateDataService.class); + } + public UnidirectionalReferentialSynchronizeLocalService newUnidirectionalReferentialSynchronizeLocalService() { return newService(UnidirectionalReferentialSynchronizeLocalService.class); } @@ -350,21 +384,55 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return newService(UnidirectionalReferentialSynchronizeRemoteService.class); } - public <S extends ObserveService> S newService(Class<S> serviceType) { + public DataSynchronizeService newDataSynchronizeService() { + return newService(DataSynchronizeService.class); + } - ObserveServiceInitializer observeServiceInitializer = getObserveServiceInitializer(); + public DataSourceService newDataSourceService() { + return newService(DataSourceService.class); + } - ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); + public ReferentialService newReferentialService() { + return newService(ReferentialService.class); + } - S service = serviceFactory.newService(observeServiceInitializer, serviceType); - return service; + public TripSeineService newTripSeineService() { + return newService(TripSeineService.class); + } + + public RouteService newRouteService() { + return newService(RouteService.class); + } + + public FloatingObjectService newFloatingObjectService() { + return newService(FloatingObjectService.class); + } + + public ActivitySeineService newActivitySeineService() { + return newService(ActivitySeineService.class); + } + + public SetSeineService newSetSeineService() { + return newService(SetSeineService.class); + } + + public TripLonglineService newTripLonglineService() { + return newService(TripLonglineService.class); + } + + public ActivityLonglineService newActivityLonglineService() { + return newService(ActivityLonglineService.class); + } + + public SetLonglineService newSetLonglineService() { + return newService(SetLonglineService.class); } public ObserveDataSourceInformation checkCanConnect() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { checkIsNotAlreadyOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = newDataSourceService(); ObserveDataSourceInformation dataSourceInformation = dataSourceService.checkCanConnect(configuration); @@ -427,6 +495,14 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } } + public boolean isExpired() { + return expired; + } + + public void expired() { + this.expired = true; + } + protected ObserveServiceInitializer getObserveServiceInitializer() { ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); @@ -501,11 +577,13 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements Preconditions.checkState(!isOpen(), "Connection is open"); } - public boolean isExpired() { - return expired; - } + private <S extends ObserveService> S newService(Class<S> serviceType) { - public void expired() { - this.expired = true; + ObserveServiceInitializer observeServiceInitializer = getObserveServiceInitializer(); + + ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); + + S service = serviceFactory.newService(observeServiceInitializer, serviceType); + return service; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 77cf722..9776e7c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -1333,11 +1333,11 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { List<DataReference<?>> existingTrip = Lists.newArrayList(); - TripSeineService tripSeineService = source.newService(TripSeineService.class); + TripSeineService tripSeineService = source.newTripSeineService(); DataReferenceSet<TripSeineDto> tripSeineSet = tripSeineService.getAllTripSeine(); existingTrip.addAll(tripSeineSet.getReferences()); - TripLonglineService tripLonglineService = source.newService(TripLonglineService.class); + TripLonglineService tripLonglineService = source.newTripLonglineService(); DataReferenceSet<TripLonglineDto> tripLonglineSet = tripLonglineService.getAllTripLongline(); existingTrip.addAll(tripLonglineSet.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java index 15c0546..d6aa2cd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java @@ -128,7 +128,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { try { - ConsolidateDataService consolidateDataService = dataSource.newService(ConsolidateDataService.class); + ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService(); ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); request.setTripSeineIds(tripIds); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index ad9afb8..e60a641 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -303,7 +303,7 @@ public class ExportUIHandler extends AdminTabUIHandler { try { openSource(source); - ReplicateTripService sourceReplicateService = source.newService(ReplicateTripService.class); + ReplicateTripService sourceReplicateService = source.newReplicateTripService(); tripExportResults = sourceReplicateService.exportTrips(request); } finally { @@ -317,7 +317,7 @@ public class ExportUIHandler extends AdminTabUIHandler { try { openSource(target); - ReplicateTripService targetReplicateService = target.newService(ReplicateTripService.class); + ReplicateTripService targetReplicateService = target.newReplicateTripService(); result = targetReplicateService.importTrips(tripExportResults); } finally { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index d69f170..e725ab4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -313,7 +313,7 @@ public class ReportUIHandler extends AdminTabUIHandler { } - ReportService reportService = dataSource.newService(ReportService.class); + ReportService reportService = dataSource.newReportService(); report = reportService.populateVariables(report, getModel().getSelectedTrip().getId()); @@ -428,7 +428,7 @@ public class ReportUIHandler extends AdminTabUIHandler { dataSource.open(); } - ReportService reportService = dataSource.newService(ReportService.class); + ReportService reportService = dataSource.newReportService(); DataMatrix data = reportService.executeReport(report, trip.getId()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 0984941..9266ebf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -408,7 +408,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { dataSourceToValidate.open(); } - ValidateService validateService = dataSourceToValidate.newService(ValidateService.class); + ValidateService validateService = dataSourceToValidate.newValidateService(); Map<Class<? extends IdDto>, ValidateResultForDtoType> messages = Maps.newHashMap(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 9e51cbc..0968063 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -220,6 +220,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } protected FloatingObjectService getFloatingObjectService() { - return getDataSource().newService(FloatingObjectService.class); + return getDataSource().newFloatingObjectService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 99ebe34..9013221 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -196,7 +196,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip public List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + ReferentialService referentialService = getDataSource().newReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index f3c55b3..3477614 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -194,7 +194,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei public List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + ReferentialService referentialService = getDataSource().newReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 6096c18..34a5147 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -629,7 +629,7 @@ public class StorageUIHandler { File dst, Set<DataReference> trips) { - SqlScriptProducerService dumpService = dataSource.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = dataSource.newSqlScriptProducerService(); if (trips == null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index eddc5d8..89f63fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1595,7 +1595,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { source.open(); - SqlScriptProducerService dumpService = source.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = source.newSqlScriptProducerService(); SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential(); byte[] dump = dumpService.produceSqlScript(request); @@ -1744,7 +1744,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (DbMode.USE_SERVER.equals(getDbMode()) || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { - PingService pingService = dataSource.newService(PingService.class); + PingService pingService = dataSource.newPingService(); Version modelServerVersion = pingService.ping(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index 93d2cf8..cf6e505 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -69,8 +69,8 @@ public class DataSelectionModel implements Serializable { Map<ReferentialReference<ProgramDto>, List<DataReference>> datas = Maps.newHashMap(); - TripSeineService tripSeineService = source.newService(TripSeineService.class); - TripLonglineService tripLonglineService = source.newService(TripLonglineService.class); + TripSeineService tripSeineService = source.newTripSeineService(); + TripLonglineService tripLonglineService = source.newTripLonglineService(); Set<ReferentialReference<ProgramDto>> programSet = source.getReferentialReferences(ProgramDto.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java index 551762f..d794766 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -69,7 +69,7 @@ public class ValidationContext { @Override public TripSeineDto get(ObserveSwingDataSource dataSource, String id) { - TripSeineService service = dataSource.newService(TripSeineService.class); + TripSeineService service = dataSource.newTripSeineService(); TripSeineDto dto = service.loadDto(id); return dto; } @@ -79,7 +79,7 @@ public class ValidationContext { @Override public RouteDto get(ObserveSwingDataSource dataSource, String id) { - RouteService service = dataSource.newService(RouteService.class); + RouteService service = dataSource.newRouteService(); RouteDto dto = service.loadDto(id); return dto; } @@ -89,7 +89,7 @@ public class ValidationContext { @Override public ActivitySeineDto get(ObserveSwingDataSource dataSource, String id) { - ActivitySeineService service = dataSource.newService(ActivitySeineService.class); + ActivitySeineService service = dataSource.newActivitySeineService(); ActivitySeineDto dto = service.loadDto(id); return dto; } @@ -99,7 +99,7 @@ public class ValidationContext { @Override public TripLonglineDto get(ObserveSwingDataSource dataSource, String id) { - TripLonglineService service = dataSource.newService(TripLonglineService.class); + TripLonglineService service = dataSource.newTripLonglineService(); TripLonglineDto dto = service.loadDto(id); return dto; } @@ -109,7 +109,7 @@ public class ValidationContext { @Override public ActivityLonglineDto get(ObserveSwingDataSource dataSource, String id) { - ActivityLonglineService service = dataSource.newService(ActivityLonglineService.class); + ActivityLonglineService service = dataSource.newActivityLonglineService(); ActivityLonglineDto dto = service.loadDto(id); return dto; } @@ -119,7 +119,7 @@ public class ValidationContext { @Override public SetSeineDto get(ObserveSwingDataSource dataSource, String id) { - SetSeineService service = dataSource.newService(SetSeineService.class); + SetSeineService service = dataSource.newSetSeineService(); SetSeineDto dto = service.loadDto(id); return dto; } @@ -129,7 +129,7 @@ public class ValidationContext { @Override public SetLonglineDto get(ObserveSwingDataSource dataSource, String id) { - SetLonglineService service = dataSource.newService(SetLonglineService.class); + SetLonglineService service = dataSource.newSetLonglineService(); SetLonglineDto dto = service.loadDto(id); return dto; } @@ -139,7 +139,7 @@ public class ValidationContext { @Override public FloatingObjectDto get(ObserveSwingDataSource dataSource, String id) { - FloatingObjectService service = dataSource.newService(FloatingObjectService.class); + FloatingObjectService service = dataSource.newFloatingObjectService(); FloatingObjectDto dto = service.loadDto(id); return dto; } @@ -149,7 +149,7 @@ public class ValidationContext { @Override public SpeciesDto get(ObserveSwingDataSource dataSource, String id) { - ReferentialService service = dataSource.newService(ReferentialService.class); + ReferentialService service = dataSource.newReferentialService(); SpeciesDto dto = service.loadSpecies(id); return dto; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm