This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a6987a619a7a77540db9db3760cac8aea323beb7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 26 14:00:48 2016 +0100 Utilisation du nouveu service d'import de données dans les actions d'ui --- .../ui/actions/importData/AbstractLaunchImport.java | 16 ++++++++++------ .../echobase/ui/actions/importData/CreateMission.java | 6 +++--- .../ui/actions/importData/LaunchAcousticImport.java | 12 +++++++++--- .../ui/actions/importData/LaunchCatchesImport.java | 12 +++++++++--- .../ui/actions/importData/LaunchCommonImport.java | 12 +++++++++--- .../ui/actions/importData/LaunchOperationImport.java | 12 +++++++++--- .../ui/actions/importData/LaunchResultsImport.java | 13 ++++++++++--- 7 files changed, 59 insertions(+), 24 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java index e41c315..400a95d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java @@ -20,9 +20,11 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.importdata.AbstractImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.AbstractImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +37,7 @@ import javax.inject.Inject; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class AbstractLaunchImport<M extends AbstractImportConfiguration, S extends AbstractImportDataService<M>> extends AbstractWaitAndExecAction<M, S> { +public abstract class AbstractLaunchImport<M extends AbstractImportConfiguration, S extends EchoBaseServiceSupport> extends AbstractWaitAndExecAction<M, S> { private static final long serialVersionUID = 1L; @@ -59,10 +61,11 @@ public class AbstractLaunchImport<M extends AbstractImportConfiguration, S exten return t("echobase.info.importData.failed"); } + protected abstract String doImport(S service, M model, EchoBaseUser user) throws ImportException; + @Override protected String getResultMessage(M model) { - String message = t("echobase.message.importData.result", - model.getActionTime(), model.getResultMessage()); + String message = t("echobase.message.importData.result", model.getActionTime(), model.getResultMessage()); if (log.isInfoEnabled()) { log.info("Result: " + message); } @@ -80,8 +83,9 @@ public class AbstractLaunchImport<M extends AbstractImportConfiguration, S exten log.info("Start imports for " + getModel()); } - model.setResultMessage( - service.doImport(model, getEchoBaseSession().getUser())); + String importResult = doImport(service, model, getEchoBaseSession().getUser()); + model.setResultMessage(importResult); + } @Override diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java index 13ec6af..f75d934 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java @@ -23,8 +23,8 @@ package fr.ifremer.echobase.ui.actions.importData; import com.google.common.base.Preconditions; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.MissionImpl; -import fr.ifremer.echobase.services.service.importdata.CommonImportService; import fr.ifremer.echobase.services.service.importdata.MissionNameAlreadyExistException; +import fr.ifremer.echobase.services.service.importdata.MissionService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +62,7 @@ public class CreateMission extends EchoBaseActionSupport { String result = INPUT; try { - Mission missionSaved = commonImportService.createMission(mission); + Mission missionSaved = missionService.createMission(mission); if (log.isInfoEnabled()) { log.info("Created mission : " + missionSaved.getTopiaId()); @@ -82,5 +82,5 @@ public class CreateMission extends EchoBaseActionSupport { //------------------------------------------------------------------------// @Inject - protected transient CommonImportService commonImportService; + protected transient MissionService missionService; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java index 6478873..3a22569 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java @@ -20,8 +20,10 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.AcousticImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.AcousticImportService; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; /** * Configure a accoustic data import. @@ -29,12 +31,16 @@ import fr.ifremer.echobase.services.service.importdata.AcousticImportService; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchAcousticImport extends AbstractLaunchImport<AcousticImportConfiguration, AcousticImportService> { +public class LaunchAcousticImport extends AbstractLaunchImport<AcousticImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchAcousticImport() { - super(AcousticImportConfiguration.class, AcousticImportService.class); + super(AcousticImportConfiguration.class, ImportDataService.class); } + @Override + protected String doImport(ImportDataService service, AcousticImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportAcoustics(model, user); + } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java index 03b2469..1072b7e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java @@ -20,8 +20,10 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.CatchesImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.CatchesImportService; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; /** * Configure a accoustic data import. @@ -29,12 +31,16 @@ import fr.ifremer.echobase.services.service.importdata.CatchesImportService; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchCatchesImport extends AbstractLaunchImport<CatchesImportConfiguration, CatchesImportService> { +public class LaunchCatchesImport extends AbstractLaunchImport<CatchesImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchCatchesImport() { - super(CatchesImportConfiguration.class, CatchesImportService.class); + super(CatchesImportConfiguration.class, ImportDataService.class); } + @Override + protected String doImport(ImportDataService service, CatchesImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportCatches(model, user); + } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java index 8bea769..badc72c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java @@ -20,8 +20,10 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.CommonImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.CommonImportService; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; /** * Configure a accoustic data import. @@ -29,12 +31,16 @@ import fr.ifremer.echobase.services.service.importdata.CommonImportService; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchCommonImport extends AbstractLaunchImport<CommonImportConfiguration, CommonImportService> { +public class LaunchCommonImport extends AbstractLaunchImport<CommonImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchCommonImport() { - super(CommonImportConfiguration.class, CommonImportService.class); + super(CommonImportConfiguration.class, ImportDataService.class); } + @Override + protected String doImport(ImportDataService service, CommonImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportCommons(model, user); + } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java index 258fb24..676dd41 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java @@ -20,8 +20,10 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.services.service.importdata.OperationImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.OperationImportService; /** * TODO @@ -29,12 +31,16 @@ import fr.ifremer.echobase.services.service.importdata.OperationImportService; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchOperationImport extends AbstractLaunchImport<OperationImportConfiguration, OperationImportService> { +public class LaunchOperationImport extends AbstractLaunchImport<OperationImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchOperationImport() { - super(OperationImportConfiguration.class, OperationImportService.class); + super(OperationImportConfiguration.class, ImportDataService.class); } + @Override + protected String doImport(ImportDataService service, OperationImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportOperations(model, user); + } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java index 892f408..152c036 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java @@ -20,8 +20,10 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.services.service.importdata.ImportDataService; +import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.services.service.importdata.ResultsImportConfiguration; -import fr.ifremer.echobase.services.service.importdata.ResultsImportService; /** * Configure a "result" import. @@ -29,12 +31,17 @@ import fr.ifremer.echobase.services.service.importdata.ResultsImportService; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchResultsImport extends AbstractLaunchImport<ResultsImportConfiguration, ResultsImportService> { +public class LaunchResultsImport extends AbstractLaunchImport<ResultsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchResultsImport() { - super(ResultsImportConfiguration.class, ResultsImportService.class); + super(ResultsImportConfiguration.class, ImportDataService.class); } + @Override + protected String doImport(ImportDataService service, ResultsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportResults(model, user); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.