branch feature/7463-3 updated (e059a29 -> c3adfe9)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from e059a29 ajout de la traduction des messages de validation côté serveur (refs #7463) new d3f56f7 optimisation des tests topia (refs #7463) new c3adfe9 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) The 2 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 c3adfe9607aaefe3de9f0f33ac2e478467fbe03c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 17:01:04 2015 +0200 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) commit d3f56f79e8a45e0775363cbd4126803d8eb083dd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 16:18:32 2015 +0200 optimisation des tests topia (refs #7463) Summary of changes: .../web/ObserveWebApplicationListener.java | 10 +---- .../application/web/injector/IdDtoInjector.java | 50 --------------------- ...ormDtoInjector.java => ObserveDtoInjector.java} | 18 ++++---- .../web/injector/ValidateDataRequestInjector.java | 48 -------------------- .../ValidateReferentialsRequestInjector.java | 48 -------------------- .../ConsolidateActivitySeineDataResult.java | 3 +- .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/model/DataMatrix.java | 3 +- .../service/actions/report/model/Report.java | 3 +- .../actions/report/model/ReportOperation.java | 3 +- .../actions/report/model/ReportRequest.java | 5 ++- .../actions/report/model/ReportVariable.java | 4 +- .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../actions/validate/ValidationMessage.java | 3 +- .../fr/ird/observe/services/dto/ObserveDto.java | 7 +++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33879 -> 34629 bytes .../services/ApplicationContextResource.java | 29 ++++++++++++ .../ird/observe/services/DataSourceResource.java | 31 +++++++++---- .../services/service/AbstractServiceTopiaTest.java | 30 ++++++++++--- 25 files changed, 125 insertions(+), 194 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/injector/{FormDtoInjector.java => ObserveDtoInjector.java} (64%) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateDataRequestInjector.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateReferentialsRequestInjector.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git commit d3f56f79e8a45e0775363cbd4126803d8eb083dd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 16:18:32 2015 +0200 optimisation des tests topia (refs #7463) --- .../services/ApplicationContextResource.java | 29 ++++++++++++++++++++ .../ird/observe/services/DataSourceResource.java | 31 ++++++++++++++++------ .../services/service/AbstractServiceTopiaTest.java | 30 ++++++++++++++++----- 3 files changed, 75 insertions(+), 15 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index fb086e0..4cc0ace 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -35,6 +35,8 @@ public class ApplicationContextResource implements TestRule { private File dataBaseDirectory; + private File dataBaseCommonRefDirectory; + private Path temporaryDirectoryRoot; public ApplicationContextResource() { @@ -128,6 +130,14 @@ public class ApplicationContextResource implements TestRule { this.dataBaseDirectory = dataBaseDirectory; } + public File getDataBaseCommonRefDirectory() { + return dataBaseCommonRefDirectory; + } + + public void setDataBaseCommonRefDirectory(File dataBaseCommonRefDirectory) { + this.dataBaseCommonRefDirectory = dataBaseCommonRefDirectory; + } + public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(Class<?> testClass, String dbName) { ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); @@ -147,6 +157,25 @@ public class ApplicationContextResource implements TestRule { } + public ObserveDataSourceConfigurationTopiaH2 createCommonsDataSourceConfigurationH2(String dbName) { + + ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); + + File localDbFile = new File(dataBaseCommonRefDirectory, dbName); + + if (log.isInfoEnabled()) { + log.info("db directory: " + localDbFile); + } + configurationTopiaH2.setLabel("Commons database#" + dbName); + configurationTopiaH2.setUsername(TestHelper.TEST_H2_LOGIN); + configurationTopiaH2.setPassword(TestHelper.TEST_H2_PASSWORD); + configurationTopiaH2.setDirectory(localDbFile); + configurationTopiaH2.setDbName("obstuna"); + configurationTopiaH2.setAutoMigrate(true); + return configurationTopiaH2; + + } + public void assertSchemaCreated(ObserveTopiaApplicationContext topiaApplicationContext) { try (ObserveTopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index 3f83804..b9e39d7 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -77,6 +77,19 @@ public class DataSourceResource implements TestRule { } + public void createCommonsDataSourceFromScript(String scriptPath) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + + byte[] databaseToImportContent = getDatabaseToImportContent(scriptPath); + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = applicationContextResource.createCommonsDataSourceConfigurationH2("localdb"); + + DataSourceService dataSourceService = applicationContextResource.newService(dataSourceConfiguration, DataSourceService.class); + DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); + createConfiguration.setImportDatabase(databaseToImportContent); + dataSourceService.create(dataSourceConfiguration, createConfiguration); + + } + public ObserveTopiaPersistenceContext newPersistenceContext() { ObserveTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); @@ -146,21 +159,23 @@ public class DataSourceResource implements TestRule { applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); - if (testNamesChangeDataBase.contains(methodName)) { - - File dataBaseDirectory = new File (testDirectory, scriptName); + File commonsDir = TestHelper.getCommonsDir(); - applicationContextResource.setDataBaseDirectory(dataBaseDirectory); + File dataBaseCommonsRefDirectory = new File (commonsDir, scriptName); - } else { + applicationContextResource.setDataBaseCommonRefDirectory(dataBaseCommonsRefDirectory); - File commonsDir = TestHelper.getCommonsDir(); + //if (testNamesChangeDataBase.contains(methodName)) { - File dataBaseDirectory = new File (commonsDir, scriptName); + File dataBaseDirectory = new File (testDirectory, scriptName); applicationContextResource.setDataBaseDirectory(dataBaseDirectory); - } +// } else { +// +// applicationContextResource.setDataBaseDirectory(dataBaseCommonsRefDirectory); +// +// } dataSourceConfiguration = applicationContextResource.createDataSourceConfigurationH2(testClass, "localdb"); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java index 4b5bf6d..727ba7a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java @@ -13,7 +13,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.FileUtil; +import java.io.File; import java.nio.file.Files; import java.util.Set; @@ -42,18 +44,32 @@ public abstract class AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - if (! applicationContextResource.getDataBaseDirectory().isDirectory()) { + File dataBaseDirectory = applicationContextResource.getDataBaseDirectory(); - if (log.isInfoEnabled()) { - log.info("create Database on " + applicationContextResource.getDataBaseDirectory() + " from script " + getScriptName()); + if (! dataBaseDirectory.isDirectory()) { + + File dataBaseCommonRefDirectory = applicationContextResource.getDataBaseCommonRefDirectory(); + + if (!dataBaseCommonRefDirectory.isDirectory()) { + + if (log.isInfoEnabled()) { + log.info("create Database on " + dataBaseDirectory + " from script " + getScriptName()); + } + + Files.createDirectories(dataBaseDirectory.toPath()); + + // Create database from script + String scriptPath = applicationContextResource.getScriptPath(getScriptName(), H2DataSourceMigration.V_4_0_1); + + dataSourceResource.createCommonsDataSourceFromScript(scriptPath); } - Files.createDirectories(applicationContextResource.getDataBaseDirectory().toPath()); + if (! dataBaseCommonRefDirectory.equals(dataBaseDirectory)) { - // Create database from script - String scriptPath = applicationContextResource.getScriptPath(getScriptName(), H2DataSourceMigration.V_4_0_1); + FileUtil.copyAndRenameRecursively(dataBaseCommonRefDirectory, dataBaseDirectory, false, (String) null, (String) null, false); + + } - dataSourceResource.createDataSourceFromScript(scriptPath); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git commit c3adfe9607aaefe3de9f0f33ac2e478467fbe03c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 17:01:04 2015 +0200 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) --- .../web/ObserveWebApplicationListener.java | 10 +---- .../application/web/injector/IdDtoInjector.java | 50 --------------------- ...ormDtoInjector.java => ObserveDtoInjector.java} | 18 ++++---- .../web/injector/ValidateDataRequestInjector.java | 48 -------------------- .../ValidateReferentialsRequestInjector.java | 48 -------------------- .../ConsolidateActivitySeineDataResult.java | 3 +- .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/model/DataMatrix.java | 3 +- .../service/actions/report/model/Report.java | 3 +- .../actions/report/model/ReportOperation.java | 3 +- .../actions/report/model/ReportRequest.java | 5 ++- .../actions/report/model/ReportVariable.java | 4 +- .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../actions/validate/ValidationMessage.java | 3 +- .../fr/ird/observe/services/dto/ObserveDto.java | 7 +++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33879 -> 34629 bytes 22 files changed, 50 insertions(+), 179 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index a3d2fe8..fce275e 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -1,11 +1,8 @@ package fr.ird.observe.application.web; import com.google.gson.Gson; -import fr.ird.observe.application.web.injector.FormDtoInjector; -import fr.ird.observe.application.web.injector.IdDtoInjector; import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInjector; -import fr.ird.observe.application.web.injector.ValidateDataRequestInjector; -import fr.ird.observe.application.web.injector.ValidateReferentialsRequestInjector; +import fr.ird.observe.application.web.injector.ObserveDtoInjector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.WebMotionServerListener; @@ -38,10 +35,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { Gson gson = applicationContext.getGsonSupplier().get(); context.addInjector(new ObserveDataSourceConfigurationInjector(gson)); - context.addInjector(new IdDtoInjector(gson)); - context.addInjector(new FormDtoInjector(gson)); - context.addInjector(new ValidateDataRequestInjector(gson)); - context.addInjector(new ValidateReferentialsRequestInjector(gson)); + context.addInjector(new ObserveDtoInjector(gson)); context.getServletContext().setAttribute( ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java deleted file mode 100644 index 5ff658a..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java +++ /dev/null @@ -1,50 +0,0 @@ -package fr.ird.observe.application.web.injector; - -import com.google.gson.Gson; -import fr.ird.observe.services.dto.IdDto; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; -import org.debux.webmotion.server.mapping.Mapping; - -import java.lang.reflect.Type; - -/** - * Created on 07/09/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class IdDtoInjector implements ExecutorParametersInjectorHandler.Injector { - - /** Logger. */ - private static final Log log = LogFactory.getLog(IdDtoInjector.class); - - protected final Gson gson; - - public IdDtoInjector(Gson gson) { - this.gson = gson; - } - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - IdDto idDto = null; - if (type.isAssignableFrom(IdDto.class)) { - - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; - - idDto = gson.fromJson(gsonContent, generic); - - if (log.isInfoEnabled()) { - log.info("Inject idDto: " + idDto); - } - - } - - return idDto; - - } -} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/FormDtoInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java similarity index 64% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/injector/FormDtoInjector.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java index 6bcb302..4ac6b3e 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/FormDtoInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java @@ -1,7 +1,7 @@ package fr.ird.observe.application.web.injector; import com.google.gson.Gson; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -15,36 +15,36 @@ import java.lang.reflect.Type; * * @author Tony Chemit - chemit@codelutin.com */ -public class FormDtoInjector implements ExecutorParametersInjectorHandler.Injector { +public class ObserveDtoInjector implements ExecutorParametersInjectorHandler.Injector { /** Logger. */ - private static final Log log = LogFactory.getLog(FormDtoInjector.class); + private static final Log log = LogFactory.getLog(ObserveDtoInjector.class); protected final Gson gson; - public FormDtoInjector(Gson gson) { + public ObserveDtoInjector(Gson gson) { this.gson = gson; } @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - FormDto formDto = null; - if (type.isAssignableFrom(FormDto.class)) { + ObserveDto observeDto = null; + if (ObserveDto.class.isAssignableFrom(type)) { Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); String gsonContent= ((String[])parameterTree.getValue())[0]; - formDto = gson.fromJson(gsonContent, generic); + observeDto = gson.fromJson(gsonContent, generic); if (log.isInfoEnabled()) { - log.info("Inject formDto: " + formDto); + log.info("Inject observeDto: " + observeDto); } } - return formDto; + return observeDto; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateDataRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateDataRequestInjector.java deleted file mode 100644 index aedbdb9..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateDataRequestInjector.java +++ /dev/null @@ -1,48 +0,0 @@ -package fr.ird.observe.application.web.injector; - -import com.google.gson.Gson; -import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; -import org.debux.webmotion.server.mapping.Mapping; - -import java.lang.reflect.Type; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ValidateDataRequestInjector implements ExecutorParametersInjectorHandler.Injector { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ValidateDataRequestInjector.class); - - protected final Gson gson; - - public ValidateDataRequestInjector(Gson gson) { - this.gson = gson; - } - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - ValidateDataRequest request = null; - if (type.isAssignableFrom(ValidateDataRequest.class)) { - - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent= ((String[])parameterTree.getValue())[0]; - - request = gson.fromJson(gsonContent, generic); - - if (log.isInfoEnabled()) { - log.info("Inject validateDataRequest: " + request); - } - - } - - return request; - - } -} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateReferentialsRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateReferentialsRequestInjector.java deleted file mode 100644 index 61de50b..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateReferentialsRequestInjector.java +++ /dev/null @@ -1,48 +0,0 @@ -package fr.ird.observe.application.web.injector; - -import com.google.gson.Gson; -import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; -import org.debux.webmotion.server.mapping.Mapping; - -import java.lang.reflect.Type; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ValidateReferentialsRequestInjector implements ExecutorParametersInjectorHandler.Injector { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ValidateReferentialsRequestInjector.class); - - protected final Gson gson; - - public ValidateReferentialsRequestInjector(Gson gson) { - this.gson = gson; - } - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - ValidateReferentialsRequest request = null; - if (type.isAssignableFrom(ValidateReferentialsRequest.class)) { - - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent= ((String[])parameterTree.getValue())[0]; - - request = gson.fromJson(gsonContent, generic); - - if (log.isInfoEnabled()) { - log.info("Inject validateDataRequest: " + request); - } - - } - - return request; - - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java index b017438..2a0bece 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; @@ -13,7 +14,7 @@ import java.io.Serializable; * * @author Tony Chemit - chemit@codelutin.com */ -public class ConsolidateActivitySeineDataResult implements Serializable { +public class ConsolidateActivitySeineDataResult implements Serializable,ObserveDto { private static final long serialVersionUID = 1L; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java index 0077f09..0ec4cde 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; @@ -11,7 +12,7 @@ import java.io.Serializable; * * @author Tony Chemit - chemit@codelutin.com */ -public class ConsolidateTripSeineDataRequest implements Serializable { +public class ConsolidateTripSeineDataRequest implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java index 4eeaf55..e7876ce 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; @@ -13,7 +14,7 @@ import java.io.Serializable; * * @author Tony Chemit - chemit@codelutin.com */ -public class ConsolidateTripSeineDataResult implements Serializable { +public class ConsolidateTripSeineDataResult implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java index c7c8bc6..a9599f4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.services.service.actions.report.model; +import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +36,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class DataMatrix { +public class DataMatrix implements ObserveDto { /** Logger */ private static final Log log = LogFactory.getLog(DataMatrix.class); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java index ea12c0e..d62d5e5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.report.model; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,7 +32,7 @@ import java.io.Serializable; import static org.nuiton.i18n.I18n.t; -public class Report implements Serializable { +public class Report implements Serializable, ObserveDto { /** Logger. */ private static final Log log = LogFactory.getLog(Report.class); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java index c7da96e..c507bab 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.services.service.actions.report.model; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.service.actions.report.ReportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +36,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ReportOperation implements Serializable { +public abstract class ReportOperation implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java index bdc6acc..c25f584 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.actions.report.model; import com.google.common.collect.Maps; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.service.actions.report.ReportService; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; @@ -40,7 +41,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReportRequest implements Serializable { +public class ReportRequest implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; @@ -58,7 +59,7 @@ public class ReportRequest implements Serializable { } /** Un repeater optionnel sur la requête. */ - public static class RequestRepeat implements Serializable { + public static class RequestRepeat implements Serializable, ObserveDto { protected final String variableName; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java index a06f6a0..bce8e27 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.services.service.actions.report.model; +import fr.ird.observe.services.dto.ObserveDto; + import java.io.Serializable; import java.util.Set; @@ -30,7 +32,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 1.7 */ -public class ReportVariable implements Serializable { +public class ReportVariable implements Serializable, ObserveDto { private static final long serialVersionUID = 1L; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java index 03c31f7..36eb2b8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import org.nuiton.validator.NuitonValidatorScope; /** @@ -10,7 +11,7 @@ import org.nuiton.validator.NuitonValidatorScope; * * @author Tony Chemit - chemit@codelutin.com */ -public class ValidateDataRequest { +public class ValidateDataRequest implements ObserveDto { /** * Les niveaux de validation à vérifier. diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java index 0489c75..ab34e62 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; /** * Le résultat d'une validation de données. @@ -10,7 +11,7 @@ import fr.ird.observe.services.dto.IdDto; * * @author Tony Chemit - chemit@codelutin.com */ -public class ValidateDataResult { +public class ValidateDataResult implements ObserveDto { protected final ValidateDataRequest validateDataRequest; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java index 8507926..57255e9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.nuiton.validator.NuitonValidatorScope; @@ -11,7 +12,7 @@ import org.nuiton.validator.NuitonValidatorScope; * * @author Tony Chemit - chemit@codelutin.com */ -public class ValidateReferentialsRequest { +public class ValidateReferentialsRequest implements ObserveDto { /** * Les niveaux de validation à vérifier. diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java index cf6f397..10f2d23 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableMap; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; /** @@ -10,7 +11,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; * * @author Tony Chemit - chemit@codelutin.com */ -public class ValidateReferentialsResult { +public class ValidateReferentialsResult implements ObserveDto { protected final ValidateReferentialsRequest validateReferentialsRequest; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java index 1d5b3b0..35d44e0 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.ReferenceDto; /** @@ -12,7 +13,7 @@ import fr.ird.observe.services.dto.ReferenceDto; * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ValidateResultForDto<D extends IdDto> { +public class ValidateResultForDto<D extends IdDto> implements ObserveDto { protected final ReferenceDto<D> dto; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java index 4347099..30408c1 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; /** * Le résultat d'une validation d'un type de dto donné. @@ -10,7 +11,7 @@ import fr.ird.observe.services.dto.IdDto; * * @author Tony Chemit - chemit@codelutin.com */ -public class ValidateResultForDtoType<D extends IdDto> { +public class ValidateResultForDtoType<D extends IdDto> implements ObserveDto { /** * Les messages regroupés pour chaque dto. diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java index 5c8b4c2..034fe53 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.base.MoreObjects; +import fr.ird.observe.services.dto.ObserveDto; import org.nuiton.validator.NuitonValidatorScope; /** @@ -8,7 +9,7 @@ import org.nuiton.validator.NuitonValidatorScope; * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ValidationMessage { +public class ValidationMessage implements ObserveDto { protected final NuitonValidatorScope scope; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java new file mode 100644 index 0000000..de8ed37 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java @@ -0,0 +1,7 @@ +package fr.ird.observe.services.dto; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface ObserveDto { +} diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index e6653f3..fadfb2d 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm