branch develop updated (adde7a2 -> 5d5fb2f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from adde7a2 optimize i18n new dd6e68a fix i18n typo new dcf59b6 review transaction usage new 5d5fb2f clean code 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 5d5fb2fcc48e0e6516a404b81c15ec831386ba1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:05:40 2016 +0200 clean code commit dcf59b66dae4b6b91492ccbba6a937638f822354 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:05:21 2016 +0200 review transaction usage commit dd6e68a22cbdd1483124e4a2bd7c013cbd1a8ed2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:04:59 2016 +0200 fix i18n typo Summary of changes: .../ui/admin/consolidate/ConsolidateUIHandler.java | 48 +++--------- .../swing/ui/admin/export/ExportUIHandler.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 15 ++-- .../observe-application-swing_fr_FR.properties | 2 +- .../services/service/trip/ExportTripRequest.java | 8 +- .../service/trip/TripManagementServiceTopia.java | 89 +++++++++++----------- 6 files changed, 70 insertions(+), 94 deletions(-) -- 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 dd6e68a22cbdd1483124e4a2bd7c013cbd1a8ed2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:04:59 2016 +0200 fix i18n typo --- .../src/main/resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 76fa05e..0123f8c 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -226,7 +226,7 @@ observe.actions.synchro.data.prepare.deleteFromRightTask=Préparation de la supp observe.actions.synchro.data.result.delete.left.trip=Suppression de la marée %s - %s dans la base de gauche effectuée. observe.actions.synchro.data.result.delete.right.trip=Suppression de la marée %s - %s dans la base de droite effectuée. observe.actions.synchro.data.result.export.left.trip=Export de la marée %s - %s depuis la base de gauche effectuée. -observe.actions.synchro.data.result.export.right.trip=Export de la marée %s - %s depuisla base de droite effectuée. +observe.actions.synchro.data.result.export.right.trip=Export de la marée %s - %s depuis la base de droite effectuée. observe.actions.synchro.data.result.import.left.trip=Insertion de la marée %s - %s dans la base de gauche effectuée. observe.actions.synchro.data.result.import.right.trip=Insertion de la marée %s - %s dans la base de droite effectuée. observe.actions.synchro.data.step=Gestion avancée de données -- 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 dcf59b66dae4b6b91492ccbba6a937638f822354 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:05:21 2016 +0200 review transaction usage --- .../swing/ui/admin/export/ExportUIHandler.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 15 ++-- .../services/service/trip/ExportTripRequest.java | 8 +- .../service/trip/TripManagementServiceTopia.java | 89 +++++++++++----------- 4 files changed, 59 insertions(+), 55 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index acdc0f4..0234d3a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -274,7 +274,7 @@ public class ExportUIHandler extends AdminTabUIHandler { for (TripEntry tripEntry : tripEntries) { - ExportTripResult exportTripResult = localTripManagementService.exportTrip(new ExportTripRequest(tripEntry.getProgramId(), tripEntry.getTripId())); + ExportTripResult exportTripResult = localTripManagementService.exportTrip(new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId())); logExportResult(n("observe.actions.export.result.export.trip"), exportTripResult, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 7a22336..11fe76a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFro import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -253,10 +253,10 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsH2 = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaH2; + boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsH2 = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaH2; + boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -284,12 +284,12 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.deleteFromLeftTask", programStr, tripStr)); DeleteTripResult deleteTripResult = leftTripManagementService.deleteTrip(new DeleteTripRequest(programId, tripId)); + logDeleteResult(n("observe.actions.synchro.data.result.delete.left.trip"), deleteTripResult, programDecorator, program, trip); - continue; } @@ -299,6 +299,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.deleteFromRightTask", programStr, tripStr)); DeleteTripResult deleteTripResult = rightTripManagementService.deleteTrip(new DeleteTripRequest(programId, tripId)); + logDeleteResult(n("observe.actions.synchro.data.result.delete.right.trip"), deleteTripResult, programDecorator, @@ -312,7 +313,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripResult exportTripResult = rightTripManagementService.exportTrip(new ExportTripRequest(programId, tripId)); + ExportTripResult exportTripResult = rightTripManagementService.exportTrip(new ExportTripRequest(rightSourceIsPG, programId, tripId)); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -328,7 +329,6 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { programDecorator, program, trip); - continue; } @@ -337,8 +337,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - - ExportTripResult exportTripResult = leftTripManagementService.exportTrip(new ExportTripRequest(programId, tripId)); + ExportTripResult exportTripResult = leftTripManagementService.exportTrip(new ExportTripRequest(leftSourceIsPG, programId, tripId)); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java index 94c7613..78f063a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripRequest.java @@ -30,14 +30,20 @@ package fr.ird.observe.services.service.trip; */ public class ExportTripRequest { + private final boolean forPG; private final String programId; private final String tripId; - public ExportTripRequest(String programId, String tripId) { + public ExportTripRequest(boolean forPG, String programId, String tripId) { + this.forPG = forPG; this.programId = programId; this.tripId = tripId; } + public boolean isForPG() { + return forPG; + } + public String getProgramId() { return programId; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java index 6bc4d99..e04c6de 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java @@ -71,9 +71,9 @@ public class TripManagementServiceTopia extends ObserveServiceTopia implements T log.info("Start export of trip: " + tripId); } - //FIXME Get real database type - AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres().dataIdsToAdd(ImmutableSet.of(tripId)); - + AddSqlScriptProducerRequest request; + request = (exportRequest.isForPG() ? AddSqlScriptProducerRequest.forPostgres() : AddSqlScriptProducerRequest.forH2()) + .dataIdsToAdd(ImmutableSet.of(tripId)); AddSqlScriptProducerResult producerResult = sqlScriptProducerService.produceAddSqlScript(request); byte[] tripContent = producerResult.getSqlCode(); ImmutableSet<ObserveBlobsContainer> blobsContainers = producerResult.getBlobsContainers(); @@ -87,28 +87,26 @@ public class TripManagementServiceTopia extends ObserveServiceTopia implements T @Override public DeleteTripResult deleteTrip(DeleteTripRequest request) { - try (ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaApplicationContext().newPersistenceContext()) { - - Set<String> tripSeineIds = new TreeSet<>(persistenceContext.getTripSeineDao().findAllIds()); - Set<String> tripLonglineIds = new TreeSet<>(persistenceContext.getTripLonglineDao().findAllIds()); - - String tripId = request.getTripId(); + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - long t0 = System.nanoTime(); + Set<String> tripSeineIds = new TreeSet<>(persistenceContext.getTripSeineDao().findAllIds()); + Set<String> tripLonglineIds = new TreeSet<>(persistenceContext.getTripLonglineDao().findAllIds()); - boolean deleted = deleteTrip(persistenceContext, tripId, tripSeineIds, tripLonglineIds); + String tripId = request.getTripId(); - if (deleted) { + long t0 = System.nanoTime(); - long time = System.nanoTime() - t0; - if (log.isInfoEnabled()) { - log.info("Delete of trip: " + tripId + " done in " + StringUtil.convertTime(time)); - } + boolean deleted = deleteTrip(persistenceContext, tripId, tripSeineIds, tripLonglineIds); - return new DeleteTripResult(request, time); + if (deleted) { + long time = System.nanoTime() - t0; + if (log.isInfoEnabled()) { + log.info("Delete of trip: " + tripId + " done in " + StringUtil.convertTime(time)); } + return new DeleteTripResult(request, time); + } return null; @@ -118,55 +116,55 @@ public class TripManagementServiceTopia extends ObserveServiceTopia implements T @Override public ImportTripResult importTrip(ImportTripRequest request) { - try (ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaApplicationContext().newPersistenceContext()) { - - Set<String> tripSeineIds = new TreeSet<>(persistenceContext.getTripSeineDao().findAllIds()); - Set<String> tripLonglineIds = new TreeSet<>(persistenceContext.getTripLonglineDao().findAllIds()); - - String tripId = request.getTripId(); + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - long t0 = System.nanoTime(); + Set<String> tripSeineIds = new TreeSet<>(persistenceContext.getTripSeineDao().findAllIds()); + Set<String> tripLonglineIds = new TreeSet<>(persistenceContext.getTripLonglineDao().findAllIds()); - boolean deleted = deleteTrip(persistenceContext, tripId, tripSeineIds, tripLonglineIds); + String tripId = request.getTripId(); - long t1 = System.nanoTime(); + long t0 = System.nanoTime(); - long deleteTime = 0; - if (deleted) { + boolean deleted = deleteTrip(persistenceContext, tripId, tripSeineIds, tripLonglineIds); - deleteTime = System.nanoTime() - t0; - if (log.isInfoEnabled()) { - log.info("Delete of trip: " + tripId + " done in " + StringUtil.convertTime(deleteTime)); - } + long t1 = System.nanoTime(); - } + long deleteTime = 0; + if (deleted) { + deleteTime = System.nanoTime() - t0; if (log.isInfoEnabled()) { - log.info("Start import of trip: " + request.getTripId()); + log.info("Delete of trip: " + tripId + " done in " + StringUtil.convertTime(deleteTime)); } - ImmutableSet<ObserveBlobsContainer> blobsContainers = request.getBlobsContainers(); + } - if (blobsContainers.isEmpty()) { + if (log.isInfoEnabled()) { + log.info("Start import of trip: " + request.getTripId()); + } - persistenceContext.executeSqlScript(request.getSqlContent()); + ImmutableSet<ObserveBlobsContainer> blobsContainers = request.getBlobsContainers(); - } else { + if (blobsContainers.isEmpty()) { - persistenceContext.getSqlSupport().doSqlWork(new ImportTripScriptTopiaSqlWork(1000, request.getSqlContent(), blobsContainers)); + persistenceContext.executeSqlScript(request.getSqlContent()); - } + } else { - long t2 = System.nanoTime(); + persistenceContext.getSqlSupport().doSqlWork(new ImportTripScriptTopiaSqlWork(1000, request.getSqlContent(), blobsContainers)); - if (log.isInfoEnabled()) { - log.info("Import of trip: " + tripId + " done in " + StringUtil.convertTime(t1, t2)); - } + } + + persistenceContext.commit(); - return new ImportTripResult(request, true, t1 - t0, deleted, deleteTime); + long t2 = System.nanoTime(); + if (log.isInfoEnabled()) { + log.info("Import of trip: " + tripId + " done in " + StringUtil.convertTime(t1, t2)); } + return new ImportTripResult(request, true, t2 - t1, deleted, deleteTime); + } private boolean deleteTrip(ObserveTopiaPersistenceContext persistenceContext, String tripId, Set<String> tripSeineIds, Set<String> tripLonglineIds) { @@ -198,6 +196,7 @@ public class TripManagementServiceTopia extends ObserveServiceTopia implements T tripLonglineIds.remove(tripId); } + persistenceContext.commit(); } return deleted; -- 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 5d5fb2fcc48e0e6516a404b81c15ec831386ba1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 20:05:40 2016 +0200 clean code --- .../ui/admin/consolidate/ConsolidateUIHandler.java | 48 +++++----------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index a7c1b04..00c4ac9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -23,11 +23,6 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; -import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; -import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; -import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -35,6 +30,11 @@ import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,8 +79,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { t("observe.actions.synchro.launch.operation", t(tabUI.getStep().getOperationLabel()))); - final SelectDataUI selectTabUI = (SelectDataUI) - ui.getStepUI(AdminStep.SELECT_DATA); + SelectDataUI selectTabUI = (SelectDataUI) ui.getStepUI(AdminStep.SELECT_DATA); PropertyChangeListener listener = evt -> { AdminUIModel model1 = (AdminUIModel) evt.getSource(); @@ -94,10 +93,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { } updateSelectionModel(selectTabUI); }; - tabUI.getModel().addPropertyChangeListener( - AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, - listener - ); + tabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, listener); } public void startAction() { @@ -110,22 +106,15 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { log.debug(this); } - WizardState init = initDB(); - - if (init != null) { + getStepModel().setSource(model.getSafeLocalSource(false)); - // une erreur ou une annulation - return init; - } Set<DataReference> trips = model.getSelectionDataModel().getSelectedData(); ImmutableSet<String> tripIds = ImmutableSet.copyOf(trips.stream() .filter(DataReference.newTripSeinePredicate()) .map(DataReference.ID_FUNCTION) .collect(Collectors.toSet())); - ObserveSwingDataSource dataSource = getStepModel().getSource(); - - try { + try (ObserveSwingDataSource dataSource = getStepModel().getSource()) { ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService(); @@ -158,29 +147,12 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.consolidate.message.save.changes", results.size())); } - sendMessage(t("observe.actions.consolidate.message.operation.done", - new Date())); - - } finally { - - dataSource.close(); + sendMessage(t("observe.actions.consolidate.message.operation.done", new Date())); } - return WizardState.SUCCESSED; - } - - - protected WizardState initDB() throws Exception { - - // on recupere la source de données - ObserveSwingDataSource source = model.getSafeLocalSource(false); - getStepModel().setSource(source); - - openSource(source); - return null; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm