This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7a6910172aa7653e520d9f783542c9c8b4141b40 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 7 11:34:29 2015 +0200 test sauvegard de trip seine (refs #7463) --- observe-application-web/pom.xml | 7 + .../ird/observe/services/TestMethodResource.java | 17 ++- .../service/seine/TripSeineServiceTest.java | 160 +++++++-------------- 3 files changed, 73 insertions(+), 111 deletions(-) diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index c678672..6692462 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -143,6 +143,13 @@ <artifactId>yamlbeans</artifactId> </dependency> + <!-- paranamer --> + <dependency> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index 97f1c27..e53eed9 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -30,14 +30,21 @@ public class TestMethodResource implements TestRule { protected final char[] password; + protected final String databaseName; + protected ObserveDataSourceConfigurationRest dataSourceConfiguration; public TestMethodResource(TestClassResource testClassResource) { - this(testClassResource, "admin", 'a'); + this(testClassResource, null); + } + + public TestMethodResource(TestClassResource testClassResource, String databaseName) { + this(testClassResource, databaseName, "userTest", "password3".toCharArray()); } - public TestMethodResource(TestClassResource testClassResource, String login, char... password) { + public TestMethodResource(TestClassResource testClassResource, String databaseName, String login, char... password) { this.testClassResource = testClassResource; + this.databaseName = databaseName; this.login = login; this.password = password; } @@ -80,7 +87,7 @@ public class TestMethodResource implements TestRule { testClassResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); - dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, "admin", 'a'); + dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, databaseName, login, password); checkServerIsAvailable(testClass, methodName); @@ -94,7 +101,6 @@ public class TestMethodResource implements TestRule { log.debug("Ends " + testClass.getName() + "::" + methodName); } - testClassResource.closeServiceFactory(); testClassResource.setTemporaryDirectoryRoot(null); } @@ -111,6 +117,9 @@ public class TestMethodResource implements TestRule { serverExist = false; } } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("error on check server ", e); + } serverExist = false; } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java index 88c0ccd..65fda18 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java @@ -12,13 +12,13 @@ import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -29,7 +29,7 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@Ignore + public class TripSeineServiceTest { public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; @@ -42,7 +42,7 @@ public class TripSeineServiceTest { public static final TestClassResource testClassResource = new TestClassResource(); @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); + public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource, "testSeine"); protected TripSeineService service; @@ -61,7 +61,7 @@ public class TripSeineServiceTest { Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.size()); + Assert.assertEquals(3, stubDtos.size()); TripSeineStubDto tripSeineStub1Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); @@ -221,109 +221,55 @@ public class TripSeineServiceTest { } -// @Test -// public void saveCreateTest() { -// -// FormDto<TripSeineDto> formDto = service.preCreate(PROGRAM_ID); -// -// TripSeineDto tripSeineDto = formDto.getForm(); -// -// ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); -// ReferenceSetDto<VesselDto> vesselRefs = formDto.getReferenceSetDto(VesselDto.class); -// ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); -// ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); -// -// tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); -// tripSeineDto.setObserver((ReferentialReferenceDto<PersonDto>) personRefs.getReference(1)); -// tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); -// -// tripSeineDto.setVessel((ReferentialReferenceDto<VesselDto>) vesselRefs.getReference(0)); -// -// tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); -// -// tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); -// tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); -// -// tripSeineDto.setErsId("ersid"); -// -// tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); -// tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); -// -// tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); -// tripSeineDto.setReportsUrl("http://une.url.com/rapport"); -// -// tripSeineDto.setComment("Un commentaire"); -// -// String tripSeineId = service.save(formDto); -// -// TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, tripSeineId); -// -// assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); -// Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); -// Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); -// Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); -// Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); -// Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); -// Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); -// -// } -// -// -// @Ignore -// @Test -// public void saveUpdateTest() { -// -// FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); -// -// TripSeineDto tripSeineDto = formDto.getForm(); -// -// ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); -// ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); -// ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); -// -// tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); -// tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); -// -// tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); -// -// tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); -// tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); -// -// tripSeineDto.setErsId("ersid"); -// -// tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); -// tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); -// -// tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); -// tripSeineDto.setReportsUrl("http://une.url.com/rapport"); -// -// tripSeineDto.setComment("Un commentaire"); -// -// service.save(formDto); -// -// TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); -// -// assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); -// assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); -// Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); -// Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); -// Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); -// Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); -// Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); -// Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); -// -// } + @Test + public void saveUpdateTest() { + + FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); + + TripSeineDto tripSeineDto = formDto.getForm(); + + ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); + ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); + ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + + tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); + tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + + tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + + tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); + tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + + tripSeineDto.setErsId("ersid"); + + tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); + tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); + + tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); + tripSeineDto.setReportsUrl("http://une.url.com/rapport"); + + tripSeineDto.setComment("Un commentaire"); + + service.save(formDto); + + FormDto<TripSeineDto> formDtoReload = service.loadToRead(TRIP_SEINE_ID_1); + TripSeineDto tripSeineDtoReload = formDtoReload.getForm(); + + Assert.assertEquals(tripSeineDto.getCaptain(), tripSeineDtoReload.getCaptain()); + Assert.assertEquals(tripSeineDto.getObserver(), tripSeineDtoReload.getObserver()); + Assert.assertEquals(tripSeineDto.getDataEntryOperator(), tripSeineDtoReload.getDataEntryOperator()); + Assert.assertEquals(tripSeineDto.getVessel(), tripSeineDtoReload.getVessel()); + Assert.assertEquals(tripSeineDto.getOcean(), tripSeineDtoReload.getOcean()); + Assert.assertEquals(tripSeineDto.getDepartureHarbour(), tripSeineDtoReload.getDepartureHarbour()); + Assert.assertEquals(tripSeineDto.getLandingHarbour(), tripSeineDtoReload.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeineDtoReload.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeineDtoReload.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeineDtoReload.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeineDtoReload.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeineDtoReload.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeineDtoReload.getComment()); + + } } -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 6608e8e368170a51e482f0a80bcf12b033e63380 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:08:49 2015 +0200 Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs --- .../web/ObserveWebApplicationListener.java | 36 ++++------------ .../application/web/injector/FormDtoInjector.java | 50 ++++++++++++++++++++++ .../application/web/injector/IdDtoInjector.java | 50 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationInjector.java | 43 +++++++++++++++++++ 4 files changed, 151 insertions(+), 28 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 f25db9d..eedbd98 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,17 +1,15 @@ package fr.ird.observe.application.web; -import fr.ird.observe.application.web.request.ObserveWebRequestContext; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.WebMotionServerListener; -import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.ServerContext; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; -import java.lang.reflect.Type; - /** * @author Tony Chemit : chemit@codelutin.com */ @@ -35,29 +33,11 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { throw new ObserveWebApplicationContextInitException("Impossible d'initialiser le context applicatif", e); } - context.addInjector(new ExecutorParametersInjectorHandler.Injector() { - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - ObserveDataSourceConfiguration dataSourceConfiguration = null; - if (type.equals(ObserveDataSourceConfiguration.class)) { - - // on recupère la configuration de source de données depuis le requestContext - ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); - - dataSourceConfiguration = requestContext.getDataSourceConfiguration(); - - if (log.isInfoEnabled()) { - log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); - } - - } - - return dataSourceConfiguration; + Gson gson = applicationContext.getGsonSupplier().get(); - } - }); + context.addInjector(new ObserveDataSourceConfigurationInjector()); + context.addInjector(new IdDtoInjector(gson)); + context.addInjector(new FormDtoInjector(gson)); context.getServletContext().setAttribute( ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); 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/FormDtoInjector.java new file mode 100644 index 0000000..6bcb302 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/FormDtoInjector.java @@ -0,0 +1,50 @@ +package fr.ird.observe.application.web.injector; + +import com.google.gson.Gson; +import fr.ird.observe.services.dto.FormDto; +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 FormDtoInjector implements ExecutorParametersInjectorHandler.Injector { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FormDtoInjector.class); + + protected final Gson gson; + + public FormDtoInjector(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)) { + + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + + String gsonContent= ((String[])parameterTree.getValue())[0]; + + formDto = gson.fromJson(gsonContent, generic); + + if (log.isInfoEnabled()) { + log.info("Inject formDto: " + formDto); + } + + } + + return formDto; + + } +} 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 new file mode 100644 index 0000000..5ff658a --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java @@ -0,0 +1,50 @@ +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/ObserveDataSourceConfigurationInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java new file mode 100644 index 0000000..19fcbb9 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -0,0 +1,43 @@ +package fr.ird.observe.application.web.injector; + +import fr.ird.observe.application.web.request.ObserveWebRequestContext; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +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 ObserveDataSourceConfigurationInjector implements ExecutorParametersInjectorHandler.Injector { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveDataSourceConfigurationInjector.class); + + @Override + public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { + + ObserveDataSourceConfiguration dataSourceConfiguration = null; + if (type.equals(ObserveDataSourceConfiguration.class)) { + + // on recupère la configuration de source de données depuis le requestContext + ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); + + dataSourceConfiguration = requestContext.getDataSourceConfiguration(); + + if (log.isInfoEnabled()) { + log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); + } + + } + + return dataSourceConfiguration; + + } +} -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 9a90711bdc2dc6444a25a9ee6aa5e45ea003fbe6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:31:04 2015 +0200 Suppression d'un converter non utilisé --- .../ObserveDataSourceConfigurationConverter.java | 47 ---------------------- 1 file changed, 47 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java deleted file mode 100644 index 0e688ae..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.application.web; - -import com.google.gson.Gson; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; -import org.apache.commons.beanutils.converters.AbstractConverter; - -/** - * Created on 05/09/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveDataSourceConfigurationConverter extends AbstractConverter { - - protected final Gson gson; - - public ObserveDataSourceConfigurationConverter(boolean devMode) { - gson = new ObserveDtoGsonSupplier(devMode).get(); - } - - @Override - protected <T> T convertToType(Class<T> type, Object value) throws Throwable { - - String stringValue; - - if (value instanceof String) { - - stringValue = (String) value; - - } else { - - stringValue = ((String[]) value)[0]; - - } - - T result = (T) gson.fromJson(stringValue, ObserveDataSourceConfigurationTopiaPG.class); - - return result; - - } - - @Override - protected Class<?> getDefaultType() { - return ObserveDataSourceConfiguration.class; - } -} -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 148a8170ad229059ff9b680277b58d959edfb0fd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:42:54 2015 +0200 Vérifier si le host existe bien --- .../main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java index a132f24..2d4eca8 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java @@ -44,6 +44,7 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; import java.net.ConnectException; +import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.List; import java.util.Map; @@ -280,7 +281,7 @@ public class ObserveResponseBuilder { try { HttpResponse response = client.execute(request); return response; - } catch (ConnectException e) { + } catch (UnknownHostException | ConnectException e) { // Le service n'est pas accessible throw new ObserveServiceRestNotAvailableException(request.getURI().toURL()); } -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit cc0f39c14e1b19806719b2226adee324a4ad6f62 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:19 2015 +0200 Revue injecteurs de configuration --- .../application/web/ObserveWebApplicationListener.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 17 ++++------------- 2 files changed, 5 insertions(+), 14 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 d6b357d..eedbd98 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 @@ -35,7 +35,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { Gson gson = applicationContext.getGsonSupplier().get(); - context.addInjector(new ObserveDataSourceConfigurationInjector(gson)); + context.addInjector(new ObserveDataSourceConfigurationInjector()); context.addInjector(new IdDtoInjector(gson)); context.addInjector(new FormDtoInjector(gson)); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java index 683b7b0..19fcbb9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -1,8 +1,7 @@ package fr.ird.observe.application.web.injector; -import com.google.gson.Gson; +import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -21,24 +20,16 @@ public class ObserveDataSourceConfigurationInjector implements ExecutorParameter /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDataSourceConfigurationInjector.class); - protected final Gson gson; - - public ObserveDataSourceConfigurationInjector(Gson gson) { - this.gson = gson; - } - @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { ObserveDataSourceConfiguration dataSourceConfiguration = null; if (type.equals(ObserveDataSourceConfiguration.class)) { - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; + // on recupère la configuration de source de données depuis le requestContext + ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); - // On récupère obligatoirement une configuration de type rest - dataSourceConfiguration = gson.fromJson(gsonContent, ObserveDataSourceConfigurationRest.class); + dataSourceConfiguration = requestContext.getDataSourceConfiguration(); if (log.isInfoEnabled()) { log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 49833e6e6d0557894f01082f2ad3579a5b86a792 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:51 2015 +0200 Changement d'api --- .../observe/services/ObserveDataSourceConfigurationMainFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java index 5331b72..eed962b 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java @@ -1,6 +1,5 @@ package fr.ird.observe.services; -import com.google.common.base.Optional; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -68,7 +67,7 @@ public class ObserveDataSourceConfigurationMainFactory { result.setServerUrl(serverUrl); result.setLogin(login); result.setPassword(password); - result.setOptionalDatabaseName(Optional.fromNullable(databaseName)); + result.setOptionalDatabaseName(databaseName); return result; -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 0197833d7bfb50baca63e8b2ca1287a0d994e38f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 16:02:18 2015 +0200 Ajout de FIXME à corriger plus tard --- .../fr/ird/observe/application/web/ObserveWebMotionFilter.java | 9 ++++++--- .../fr/ird/observe/services/service/PingServiceRestTest.java | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index 562c5c2..72dad1b 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -13,6 +13,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestC import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.WebMotionFilter; +import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.HttpContext; import org.nuiton.converter.ConverterUtil; @@ -24,13 +25,13 @@ import java.util.Locale; */ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDataSourceConfigurationRestConstants { - public void inject(HttpContext context) throws InvalidAuthenticationTokenException, UnknownObserveWebUserException, BadObserveWebUserPasswordException, UnknownObserveWebUserForDatabaseException, InvalidAdminKeyApiException { + public void inject(HttpContext context, Call call) throws InvalidAuthenticationTokenException, UnknownObserveWebUserException, BadObserveWebUserPasswordException, UnknownObserveWebUserForDatabaseException, InvalidAdminKeyApiException { ObserveWebApplicationContext applicationContext = ObserveWebApplicationContext.getApplicationContext(context); HttpServletRequest request = context.getRequest(); - ObserveWebRequestSecurityContext securityContext = createSecurityContext(applicationContext, request); + ObserveWebRequestSecurityContext securityContext = createSecurityContext(applicationContext, request, call); Locale applicationLocale = getApplicationLocale(request); ReferentialLocale referentialLocale = getReferentialLocale(request); @@ -74,7 +75,9 @@ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDa } - protected ObserveWebRequestSecurityContext createSecurityContext(ObserveWebApplicationContext applicationContext, HttpServletRequest request) throws InvalidAuthenticationTokenException, UnknownObserveWebUserForDatabaseException, BadObserveWebUserPasswordException, UnknownObserveWebUserException { + //FIXME Il ne faut pas chercher à récuperer dans securityContext des informations si le service (ou la méthode du service) est annotée NoDataAccess + //FIXME On fera la transformation et recherche de la sécurité alors plus tard au niveau du serviceController + protected ObserveWebRequestSecurityContext createSecurityContext(ObserveWebApplicationContext applicationContext, HttpServletRequest request, Call call) throws InvalidAuthenticationTokenException, UnknownObserveWebUserForDatabaseException, BadObserveWebUserPasswordException, UnknownObserveWebUserException { ObserveWebRequestSecurityContext securityContext = null; String authenticationToken = getRequestHeaderOrParameterValueOrNull(request, REQUEST_AUTHENTICATION_TOKEN); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java index a338309..eb53f42 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java @@ -5,6 +5,7 @@ import fr.ird.observe.services.TestClassResource; import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -36,6 +37,8 @@ public class PingServiceRestTest { } + //FIXME Il ne faut pas chercher à récuperer dans securityContext des informations pour ce genre de service + @Ignore @Test public void testPingWithBadUserName() throws CloneNotSupportedException { -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit b6555d5db5362d399dd73cbbb928cfe1b5df6155 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 22:03:30 2015 +0200 Possibilité d'utiliser la connexion pour obtenir un service --- .../ird/observe/services/ObserveServiceMainFactory.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java index 7f5cd95..24f1168 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java @@ -57,11 +57,17 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { public <S extends ObserveService> S newService(ObserveServiceInitializer observeServiceInitializer, Class<S> serviceType) { Preconditions.checkNotNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); - ObserveDataSourceConfiguration dataSourceConfiguration = observeServiceInitializer.getDataSourceConfiguration(); - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - ObserveServiceFactory factory = getFactory(dataSourceConfiguration, serviceType); + ObserveServiceFactory factory; + if (observeServiceInitializer.withDataSourceConnection()) { + factory = getFactory(observeServiceInitializer.getDataSourceConnection(), serviceType); + } else if (observeServiceInitializer.withDataSourceConfiguration()) { + factory = getFactory(observeServiceInitializer.getDataSourceConfiguration(), serviceType); + } else { + throw new IllegalStateException("No dataSourceConnection, nor dataSourceConfiguration given."); + } + Preconditions.checkNotNull(factory, "factory can't be null."); if (log.isDebugEnabled()) { @@ -84,9 +90,11 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { for (ObserveServiceFactory delegateFactory : delegateFactories) { delegateFactory.close(); } + } protected ObserveServiceMainFactory() { + if (log.isInfoEnabled()) { log.info("Init MainServiceFactory."); } @@ -99,8 +107,10 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { } factory.setMainServiceFactory(this); builder.add(factory); + } delegateFactories = builder.build(); + } protected <S extends ObserveService> ObserveServiceFactory getFactory(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 01b2a883603ed596135a727c6819b8a8ec30ccc2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 22:15:24 2015 +0200 Ajout de fixme sur le test de DatasourceService car la gestion d'esxception n'est pas encore gérée au niveau du serveur web --- .../observe/services/service/DataSourceServiceRestTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java index 269edb0..e09761d 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java @@ -28,10 +28,13 @@ public class DataSourceServiceRestTest { @Rule public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); - @Test(expected = DatabaseNotFoundException.class) - public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { + //FIXME + @Ignore + @Test + public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + dataSourceConfiguration.setLogin(dataSourceConfiguration.getLogin() + System.nanoTime()); DataSourceService service = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); service.open(dataSourceConfiguration); @@ -57,6 +60,7 @@ public class DataSourceServiceRestTest { } + //FIXME @Ignore @Test public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 2b4cab6de42305b2a29f4efd5530cba7c3a69c1d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 23:47:48 2015 +0200 Simplification de la sécurité + Gestion des erreurs au niveau du serveur web (reste à gérer le retour dans le client REST) --- .../application/web/ObserveWebMotionFilter.java | 52 ++---------- .../web/controller/v1/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 3 - .../controller/v1/ObserveWebErrorController.java | 97 ++++++++++++++++++++++ .../v1/ReferentialServiceController.java | 7 -- .../web/request/ObserveWebRequestContext.java | 63 +++++--------- .../request/ObserveWebRequestSecurityContext.java | 54 ------------ .../web/security/AdminApiKeyNotFoundException.java | 11 +++ .../AuthenticationTokenNotFoundException.java | 11 +++ .../BadObserveWebUserPasswordException.java | 2 +- .../InvalidAdminKeyApiException.java | 4 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 13 ++- .../ObserveWebSecurityExceptionSupport.java | 26 ++++++ .../SecurityRequestContextNotFoundException.java | 11 +++ .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../web/security/UserLoginNotFoundException.java | 11 +++ .../security/UserPasswordNotFoundException.java | 11 +++ observe-application-web/src/main/resources/mapping | 3 + 20 files changed, 230 insertions(+), 157 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index b67c3fc..aabdd5d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -1,11 +1,7 @@ package fr.ird.observe.application.web; +import com.google.common.base.Strings; import fr.ird.observe.application.web.request.ObserveWebRequestContext; -import fr.ird.observe.application.web.request.ObserveWebRequestSecurityContext; -import fr.ird.observe.application.web.security.BadObserveWebUserPasswordException; -import fr.ird.observe.application.web.security.InvalidAuthenticationTokenException; -import fr.ird.observe.application.web.security.UnknownObserveWebUserException; -import fr.ird.observe.application.web.security.UnknownObserveWebUserForDatabaseException; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; @@ -21,27 +17,26 @@ import java.util.Locale; */ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDataSourceConfigurationRestConstants { - public void inject(HttpContext context) throws InvalidAuthenticationTokenException, UnknownObserveWebUserException, BadObserveWebUserPasswordException, UnknownObserveWebUserForDatabaseException, InvalidAdminKeyApiException { + public void inject(HttpContext context) { ObserveWebApplicationContext applicationContext = ObserveWebApplicationContext.getApplicationContext(context); HttpServletRequest request = context.getRequest(); - ObserveWebRequestSecurityContext securityContext = createSecurityContext(request); - Locale applicationLocale = getApplicationLocale(request); ReferentialLocale referentialLocale = getReferentialLocale(request); String adminApiKey = getRequestHeaderOrParameterValueOrNull(request, REQUEST_ADMIN_API_KEY); + if (Strings.isNullOrEmpty(adminApiKey)) { + adminApiKey = null; + } - if (adminApiKey != null) { - String configurationAdminKey = applicationContext.getApplicationConfiguration().getAdminApiKey(); - if (!configurationAdminKey.equals(adminApiKey)) { - throw new InvalidAdminKeyApiException(adminApiKey); - } + String authenticationToken = getRequestHeaderOrParameterValueOrNull(request, REQUEST_AUTHENTICATION_TOKEN); + if (Strings.isNullOrEmpty(authenticationToken)) { + authenticationToken = null; } - ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, securityContext, applicationLocale, referentialLocale, adminApiKey); + ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, applicationLocale, referentialLocale, adminApiKey, authenticationToken); ObserveWebRequestContext.setRequestContext(context, requestContext); doProcess(); @@ -71,35 +66,6 @@ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDa } - protected ObserveWebRequestSecurityContext createSecurityContext(HttpServletRequest request) throws InvalidAuthenticationTokenException, UnknownObserveWebUserForDatabaseException, BadObserveWebUserPasswordException, UnknownObserveWebUserException { - - ObserveWebRequestSecurityContext securityContext = null; - - String authenticationToken = getRequestHeaderOrParameterValueOrNull(request, REQUEST_AUTHENTICATION_TOKEN); - if (StringUtils.isNotBlank(authenticationToken)) { - - securityContext = ObserveWebRequestSecurityContext.createAuthenticated(authenticationToken); - - } else { - - // Cas où on l'utilisateur n'est pas connecté - - String userLogin = getRequestHeaderOrParameterValueOrNull(request, REQUEST_USER_LOGIN); - String userPassword = getRequestHeaderOrParameterValueOrNull(request, REQUEST_USER_PASSWORD); - String userDatabaseName = getRequestHeaderOrParameterValueOrNull(request, REQUEST_USER_DATABASE_NAME); - - if (!(userLogin == null && userPassword == null)) { - - securityContext = ObserveWebRequestSecurityContext.create(userLogin, userPassword, userDatabaseName); - - } - - } - - return securityContext; - - } - protected String getRequestHeaderOrParameterValueOrNull(HttpServletRequest request, String parameterName) { String result = request.getHeader(parameterName); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java index ca4815e..6684a6d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java @@ -27,7 +27,7 @@ public class ConfigurationController extends ObserveWebMotionController { @Override public void setContextable(WebMotionContextable contextable) { super.setContextable(contextable); - getRequestContext().checkAdminApiKeyIsPresent(); + getRequestContext().checkAdminApiKeyIsValid(); } public Render mapping() { diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 9d0728c..5ffd414 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -2,7 +2,6 @@ package fr.ird.observe.application.web.controller.v1; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.rometools.utils.Strings; import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; @@ -91,10 +90,8 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport ObserveDataSourceConfigurationRest dataSourceConfigurationRest = (ObserveDataSourceConfigurationRest) dataSourceConfigurationFromRequest; String login = dataSourceConfigurationRest.getLogin(); - Preconditions.checkState(Strings.isNotEmpty(login), "Pas de login fournit"); String password = new String(dataSourceConfigurationRest.getPassword()); - Preconditions.checkState(Strings.isNotEmpty(password), "Pas de mot de passe fournit"); Optional<String> optionalDatabaseName = dataSourceConfigurationRest.getOptionalDatabaseName(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java new file mode 100644 index 0000000..7eb0731 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -0,0 +1,97 @@ +package fr.ird.observe.application.web.controller.v1; + +import fr.ird.observe.application.web.security.ObserveWebSecurityExceptionSupport; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.WebMotionException; +import org.debux.webmotion.server.call.HttpContext; + +import java.lang.reflect.InvocationTargetException; +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * Pour gérer les erreurs. + * + * On retourne un rendu json avec le status http, l'erreur déclanchée... + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveWebErrorController extends WebMotionController { + + class Error { + + protected final Integer httpCode; + + protected final Class<?> exceptionType; + + protected final String message; + + protected final Throwable exception; + + Error(Integer httpCode, Class<?> exceptionType, String message, Throwable exception) { + this.httpCode = httpCode; + this.exceptionType = exceptionType; + this.message = message; + this.exception = exception; + } + } + + public Error error(HttpContext.ErrorData errorData) { + + @SuppressWarnings("ThrowableResultOfMethodCallIgnored") + Throwable exception = errorData.getException(); + + if (exception instanceof WebMotionException) { + + if (exception.getCause() == exception) { + exception.initCause(null); + } else { + exception = exception.getCause(); + } + + } + + if (exception instanceof InvocationTargetException) { + + exception = exception.getCause(); + + } + + Integer statusCode = errorData.getStatusCode(); + + String message = errorData.getMessage(); + + if (exception != null) { + + Set<StackTraceElement> stackTraceElements = new LinkedHashSet<>(); + if (exception.getStackTrace() != null) { + for (StackTraceElement stackTraceElement : exception.getStackTrace()) { + if (stackTraceElement.getClassName().contains("sun.reflect.")) { + continue; + } + stackTraceElements.add(stackTraceElement); + } + } + + if (exception instanceof ObserveWebSecurityExceptionSupport) { + statusCode = 403; + } + + exception.setStackTrace(stackTraceElements.toArray(new StackTraceElement[stackTraceElements.size()])); + exception.initCause(null); + + message = exception.getMessage(); + + } + + Error error = new Error(statusCode, + exception == null ? null : exception.getClass(), + message, + exception); + + return error; + + } + +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 678425a..6189071 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -5,7 +5,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.ReferentialService; -import org.debux.webmotion.server.WebMotionContextable; import java.util.Collection; @@ -21,12 +20,6 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override - public void setContextable(WebMotionContextable contextable) { - super.setContextable(contextable); - getRequestContext().checkIsAuthenticated(); - } - - @Override public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type) { return service.getReferentialReferenceSet(type); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index e21c48a..c2d71c2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -1,8 +1,10 @@ package fr.ird.observe.application.web.request; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import fr.ird.observe.application.web.ObserveWebApplicationContext; +import fr.ird.observe.application.web.security.AdminApiKeyNotFoundException; +import fr.ird.observe.application.web.security.AuthenticationTokenNotFoundException; +import fr.ird.observe.application.web.security.InvalidAdminKeyApiException; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; @@ -40,22 +42,18 @@ public class ObserveWebRequestContext { protected final Optional<String> optionalAdminApiKey; - protected final Optional<ObserveWebRequestSecurityContext> optionalSecurityContext; + protected final Optional<String> optionalAuthenticationToken; public ObserveWebRequestContext(ObserveWebApplicationContext applicationContext, - ObserveWebRequestSecurityContext optionalSecurityContext, Locale applicationLocale, ReferentialLocale referentialLocale, - String adminApiKey) { + String adminApiKey, + String authenticationToken) { this.applicationContext = applicationContext; this.applicationLocale = applicationLocale; this.referentialLocale = referentialLocale; this.optionalAdminApiKey = Optional.fromNullable(adminApiKey); - this.optionalSecurityContext = Optional.fromNullable(optionalSecurityContext); - } - - public Optional<String> getOptionalAdminApiKey() { - return optionalAdminApiKey; + this.optionalAuthenticationToken = Optional.fromNullable(authenticationToken); } public ObserveWebApplicationContext getApplicationContext() { @@ -74,46 +72,29 @@ public class ObserveWebRequestContext { } - public void checkIsAuthenticated() { - checkSecurityContextIsPresent(); - Preconditions.checkState(getSecurityContext().isAuthenticationTokenPresent()); - } - - public void checkSecurityContextIsPresent() { - Preconditions.checkState(optionalSecurityContext.isPresent()); - } - public void checkAdminApiKeyIsPresent() { - Preconditions.checkState(optionalAdminApiKey.isPresent()); - } - - public String getUserLogin() { - checkSecurityContextIsPresent(); - ObserveWebRequestSecurityContext securityContext = getSecurityContext(); - Preconditions.checkState(securityContext.getOptionalUserLogin().isPresent()); - return securityContext.getOptionalUserLogin().get(); + if (!optionalAdminApiKey.isPresent()) { + throw new AdminApiKeyNotFoundException(); + } } - public String getUserPassword() { - checkSecurityContextIsPresent(); - ObserveWebRequestSecurityContext securityContext = getSecurityContext(); - Preconditions.checkState(securityContext.getOptionalUserPassword().isPresent()); - return securityContext.getOptionalUserPassword().get(); + public void checkAdminApiKeyIsValid() { + checkAdminApiKeyIsPresent(); + String configurationAdminKey = applicationContext.getApplicationConfiguration().getAdminApiKey(); + if (!configurationAdminKey.equals(optionalAdminApiKey.get())) { + throw new InvalidAdminKeyApiException(optionalAdminApiKey.get()); + } } - public Optional<String> getOptionalDatabaseName() { - checkSecurityContextIsPresent(); - return optionalSecurityContext.get().getOptionalUserDatabaseName(); + public void checkAuthenticationTokenIsPresent() { + if (!optionalAuthenticationToken.isPresent()) { + throw new AuthenticationTokenNotFoundException(); + } } public String getAuthenticationToken() { - checkSecurityContextIsPresent(); - ObserveWebRequestSecurityContext securityContext = getSecurityContext(); - Preconditions.checkState(securityContext.getOptionalAuthenticationToken().isPresent()); - return securityContext.getOptionalAuthenticationToken().get(); + checkAuthenticationTokenIsPresent(); + return optionalAuthenticationToken.get(); } - protected ObserveWebRequestSecurityContext getSecurityContext() { - return optionalSecurityContext.get(); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java deleted file mode 100644 index 9ee4bdc..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java +++ /dev/null @@ -1,54 +0,0 @@ -package fr.ird.observe.application.web.request; - -import com.google.common.base.Optional; - -/** - * Created on 31/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveWebRequestSecurityContext { - - public static ObserveWebRequestSecurityContext create(String userLogin, String userPassword, String userDatabaseName) { - return new ObserveWebRequestSecurityContext(Optional.<String>absent(), Optional.fromNullable(userLogin), Optional.fromNullable(userPassword), Optional.fromNullable(userDatabaseName)); - } - - public static ObserveWebRequestSecurityContext createAuthenticated(String authenticationToken) { - return new ObserveWebRequestSecurityContext(Optional.of(authenticationToken), Optional.<String>absent(), Optional.<String>absent(), Optional.<String>absent()); - } - - protected final Optional<String> optionalAuthenticationToken; - - protected final Optional<String> optionalUserLogin; - - protected final Optional<String> optionalUserPassword; - - protected final Optional<String> optionalUserDatabaseName; - - public boolean isAuthenticationTokenPresent() { - return optionalAuthenticationToken.isPresent(); - } - - public Optional<String> getOptionalAuthenticationToken() { - return optionalAuthenticationToken; - } - - public Optional<String> getOptionalUserLogin() { - return optionalUserLogin; - } - - public Optional<String> getOptionalUserPassword() { - return optionalUserPassword; - } - - public Optional<String> getOptionalUserDatabaseName() { - return optionalUserDatabaseName; - } - - protected ObserveWebRequestSecurityContext(Optional<String> optionalAuthenticationToken, Optional<String> optionalUserLogin, Optional<String> optionalUserPassword, Optional<String> optionalUserDatabaseName) { - this.optionalAuthenticationToken = optionalAuthenticationToken; - this.optionalUserLogin = optionalUserLogin; - this.optionalUserPassword = optionalUserPassword; - this.optionalUserDatabaseName = optionalUserDatabaseName; - } -} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java new file mode 100644 index 0000000..aaa8b69 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java @@ -0,0 +1,11 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class AdminApiKeyNotFoundException extends ObserveWebSecurityExceptionSupport{ + + private static final long serialVersionUID = 1L; +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java new file mode 100644 index 0000000..d24ebd5 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java @@ -0,0 +1,11 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class AuthenticationTokenNotFoundException extends ObserveWebSecurityExceptionSupport{ + + private static final long serialVersionUID = 1L; +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java index 7fdd8ff..9bcea8d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java @@ -5,7 +5,7 @@ package fr.ird.observe.application.web.security; * * @author Tony Chemit - chemit@codelutin.com */ -public class BadObserveWebUserPasswordException extends RuntimeException { +public class BadObserveWebUserPasswordException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/InvalidAdminKeyApiException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java similarity index 72% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/InvalidAdminKeyApiException.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java index 331ce44..2c9c3ac 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/InvalidAdminKeyApiException.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java @@ -1,11 +1,11 @@ -package fr.ird.observe.application.web; +package fr.ird.observe.application.web.security; /** * Created on 02/09/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class InvalidAdminKeyApiException extends Exception { +public class InvalidAdminKeyApiException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java index 1b48e74..dbd94e1 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java @@ -5,7 +5,7 @@ package fr.ird.observe.application.web.security; * * @author Tony Chemit - chemit@codelutin.com */ -public class InvalidAuthenticationTokenException extends RuntimeException { +public class InvalidAuthenticationTokenException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index f07d941..d0ffb77 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -2,6 +2,7 @@ package fr.ird.observe.application.web.security; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.web.configuration.db.ObserveWebDatabase; import fr.ird.observe.application.web.configuration.db.ObserveWebDatabaseRole; @@ -167,7 +168,15 @@ public class ObserveWebSecurityApplicationContext implements Closeable { } - public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, String userPassword, Optional<String> optionalDatabaseName) throws UnknownObserveWebUserException, BadObserveWebUserPasswordException, UnknownObserveWebUserForDatabaseException { + public ObserveDataSourceConfiguration getDataSourceConfiguration(String userLogin, String userPassword, Optional<String> optionalDatabaseName) { + + if (Strings.isNullOrEmpty(userLogin)) { + throw new UserLoginNotFoundException(); + } + + if (Strings.isNullOrEmpty(userPassword)) { + throw new UserPasswordNotFoundException(); + } // Get user Optional<? extends ObserveWebUser> optionalUser = users.getUserByLogin(userLogin); @@ -190,7 +199,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable { * @return la configuration de la data source associée au jeton * @throws InvalidAuthenticationTokenException si le jeton n'est pas connu */ - public ObserveDataSourceConfiguration getDataSourceConfiguration(String authenticationToken) throws InvalidAuthenticationTokenException { + public ObserveDataSourceConfiguration getDataSourceConfiguration(String authenticationToken) { ObserveDataSourceConfiguration dataSourceConfiguration = authenticateCache.getDataSourceConfigurationIfPresent(authenticationToken); if (dataSourceConfiguration == null) { throw new InvalidAuthenticationTokenException(authenticationToken); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java new file mode 100644 index 0000000..a0c90be --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java @@ -0,0 +1,26 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public abstract class ObserveWebSecurityExceptionSupport extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public ObserveWebSecurityExceptionSupport() { + } + + public ObserveWebSecurityExceptionSupport(String message) { + super(message); + } + + public ObserveWebSecurityExceptionSupport(String message, Throwable cause) { + super(message, cause); + } + + public ObserveWebSecurityExceptionSupport(Throwable cause) { + super(cause); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java new file mode 100644 index 0000000..4bb116a --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java @@ -0,0 +1,11 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class SecurityRequestContextNotFoundException extends ObserveWebSecurityExceptionSupport{ + + private static final long serialVersionUID = 1L; +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java index 674300e..362880e 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java @@ -5,7 +5,7 @@ package fr.ird.observe.application.web.security; * * @author Tony Chemit - chemit@codelutin.com */ -public class UnknownObserveWebUserException extends RuntimeException { +public class UnknownObserveWebUserException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java index 401113a..a31573d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java @@ -5,7 +5,7 @@ package fr.ird.observe.application.web.security; * * @author Tony Chemit - chemit@codelutin.com */ -public class UnknownObserveWebUserForDatabaseException extends RuntimeException { +public class UnknownObserveWebUserForDatabaseException extends ObserveWebSecurityExceptionSupport { private static final long serialVersionUID = 1L; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java new file mode 100644 index 0000000..958922c --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java @@ -0,0 +1,11 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class UserLoginNotFoundException extends ObserveWebSecurityExceptionSupport{ + + private static final long serialVersionUID = 1L; +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java new file mode 100644 index 0000000..98ee672 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java @@ -0,0 +1,11 @@ +package fr.ird.observe.application.web.security; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class UserPasswordNotFoundException extends ObserveWebSecurityExceptionSupport{ + + private static final long serialVersionUID = 1L; +} diff --git a/observe-application-web/src/main/resources/mapping b/observe-application-web/src/main/resources/mapping index 60d2791..ec98670 100644 --- a/observe-application-web/src/main/resources/mapping +++ b/observe-application-web/src/main/resources/mapping @@ -39,6 +39,9 @@ default.render=fr.ird.observe.application.web.ObserveWebMotionRender [filters] * /* ObserveWebMotionFilter.inject +[errors] +* ObserveWebErrorController.error + [actions] GET /admin/configuration/{method} ConfigurationController.{method} -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 250042d93ed6c9d2a75d68d994bcac5e225a5e2c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 12:08:01 2015 +0200 renommer les propriétées dans le context de validation (refs #7463) --- .../field/ActivityDebutDePecheSaneValidator.java | 4 +- .../field/ActivityFinDePecheSaneValidator.java | 4 +- .../field/ActivityFinDeVeilleExistsValidator.java | 4 +- .../field/ActivitySimpleSpeedValidator.java | 2 +- .../field/RouteActivitysFieldValidator.java | 4 +- .../field/SetLonglineUniqueHomeIdValidator.java | 2 +- .../field/SetLonglineUniqueNumberValidator.java | 2 +- .../field/VesselActivityFieldValidator.java | 8 +- ...ActivityLongline-n1-create-error-validation.xml | 12 +- ...ActivityLongline-n1-update-error-validation.xml | 10 +- .../SetLongline-n1-create-error-validation.xml | 40 +++---- .../SetLongline-n1-update-error-validation.xml | 40 +++---- .../ActivitySeine-n1-create-error-validation.xml | 12 +- .../ActivitySeine-n1-update-error-validation.xml | 12 +- .../seine/Route-n1-create-error-validation.xml | 6 +- .../seine/Route-n1-create-warning-validation.xml | 2 +- .../seine/Route-n1-update-error-validation.xml | 16 +-- .../seine/Route-n1-update-warning-validation.xml | 2 +- .../seine/SetSeine-n1-create-error-validation.xml | 6 +- .../seine/SetSeine-n1-update-error-validation.xml | 8 +- .../actions/validate/ValidationDataContext.java | 124 ++++++++++----------- .../validate/ValidationMessageDetector.java | 32 +++--- 22 files changed, 176 insertions(+), 176 deletions(-) diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java index db12299..2fe6270 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java @@ -118,11 +118,11 @@ public class ActivityDebutDePecheSaneValidator extends FieldValidatorSupport { // activité (de caléé positive) qui n'est pas suivi d'une activité // de fin de pêche - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java index 93d77c6..3bfc206 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java @@ -119,11 +119,11 @@ public class ActivityFinDePecheSaneValidator extends FieldValidatorSupport { // activité (de caléé positive) qui n'est pas suivi d'une activité // de fin de pêche - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java index 43b1ad2..aa6c017 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java @@ -142,11 +142,11 @@ public class ActivityFinDeVeilleExistsValidator extends FieldValidatorSupport { // on doit vérifier qu'il n'existe pas déjà une autre activité de // fin de veille - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java index 8750114..349dcf2 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java @@ -123,7 +123,7 @@ public class ActivitySimpleSpeedValidator extends FieldValidatorSupport { return; } - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); ActivitySeine previousActivity = ActivitySeines.getPreviousActivity(route, activity); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java index 7a78f02..d7d77b9 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java @@ -102,11 +102,11 @@ public class RouteActivitysFieldValidator extends FieldValidatorSupport { // en profondeur (alors que celle offerte par l 'objet est celle de l'ui // et qu'elle est déconnectée de la base ). - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java index 18b4244..6079072 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java @@ -56,7 +56,7 @@ public class SetLonglineUniqueHomeIdValidator extends FieldValidatorSupport { String setLonglineTopiaId = setLongline.getTopiaId(); - TripLongline tripLongline = (TripLongline) stack.findValue("currentTrip"); + TripLongline tripLongline = (TripLongline) stack.findValue("TripEntity"); Set<ActivityLongline> activityLonglines = tripLongline.getActivityLongline(); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java index 90005bd..2eb83f4 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java @@ -56,7 +56,7 @@ public class SetLonglineUniqueNumberValidator extends FieldValidatorSupport { String setLonglineTopiaId = setLongline.getTopiaId(); - TripLongline tripLongline = (TripLongline) stack.findValue("currentTrip"); + TripLongline tripLongline = (TripLongline) stack.findValue("tripEntity"); Set<ActivityLongline> activityLonglines = tripLongline.getActivityLongline(); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java index 1aa0c90..de01693 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java @@ -125,20 +125,20 @@ public class VesselActivityFieldValidator extends FieldValidatorSupport { boolean valid = true; - TripSeine maree = (TripSeine) stack.findValue("currentMaree"); + TripSeine maree = (TripSeine) stack.findValue("tripEntity"); if (maree == null) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentTrip]"); + log.warn("COULD NOT FIND DATA CONTEXT! [tripEntity]"); return; } if (log.isDebugEnabled()) { log.debug("maree : " + maree); } - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); return; } if (log.isDebugEnabled()) { diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml index 7e9d99e..59ea2d5 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml @@ -63,7 +63,7 @@ <!--field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ - currentRoute.isTimeAvailable(topiaId, time) + routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> @@ -86,14 +86,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || quadrant == null || quadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripLongline.ocean.libelle} + validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml index f5a164b..c199ffb 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml @@ -71,14 +71,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || quadrant == null || quadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripLongline.ocean.libelle} + validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml index 81721e9..19fb1fd 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml @@ -227,14 +227,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -249,14 +249,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -272,14 +272,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -294,14 +294,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml index 66ce39d..81d0220 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml @@ -227,14 +227,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -249,14 +249,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -272,14 +272,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -294,14 +294,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml index eaab4b5..f62c9e9 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml @@ -155,7 +155,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ - currentRoute.isTimeAvailable(topiaId, time) + routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> @@ -173,14 +173,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.ocean == null || quadrant == null || quadrant == 0 - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripSeineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripSeine.ocean.libelle} + validator.activity.invalid.quadrant##${tripSeineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml index c7517d2..05c051e 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml @@ -36,14 +36,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - quadrant == null || quadrant == 0 || currentTripSeine.ocean == null - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + quadrant == null || quadrant == 0 || tripSeineEntity.ocean == null + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripSeine.ocean.label2} + validator.activity.invalid.quadrant##${tripSeineEntity.ocean.label2} </message> </field-validator> @@ -101,7 +101,7 @@ <!-- heure observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentRoute.isTimeAvailable(topiaId, time) ]]> + <![CDATA[ routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml index 4890f67..660f43f 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml @@ -36,16 +36,16 @@ <!-- coherence jour observation < trip.startDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.startDate.time <= date.time + tripSeineEntity.startDate.time <= date.time ]]> </param> - <message>validator.route.invalid.date##${currentTripSeine.startDate}</message> + <message>validator.route.invalid.date##${tripSeineEntity.startDate}</message> </field-validator> <!-- jour observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.isDateAvailable(topiaId, date) + tripSeineEntity.isDateAvailable(topiaId, date) ]]> </param> <message>validator.route.duplicated.date</message> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml index ef27e87..171e1cc 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml @@ -38,7 +38,7 @@ <field-validator type="collectionFieldExpression"> <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> - <param name="collectionFieldName">currentTripSeine.route</param> + <param name="collectionFieldName">tripSeineEntity.route</param> <!--param name="expressionForFirst"><![CDATA[ current.startLogValue == null || current.startLogValue == 0 ]]></param--> <param name="expression"> <![CDATA[ startLogValue == null || current.endLogValue == null || current.date.time > date.time || current.endLogValue <= startLogValue ]]> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml index 8f3d6c1..3b38176 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml @@ -36,16 +36,16 @@ <!-- coherence jour observation < maree.startDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.startDate.time <= date.time + tripSeineEntity.startDate.time <= date.time ]]> </param> - <message>validator.route.invalid.date##${currentTripSeine.startDate}</message> + <message>validator.route.invalid.date##${tripSeineEntity.startDate}</message> </field-validator> <!-- jour observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.isDateAvailable(topiaId, date) + tripSeineEntity.isDateAvailable(topiaId, date) ]]> </param> <message>validator.route.duplicated.date</message> @@ -86,13 +86,13 @@ <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> <param name="expression"><![CDATA[ - currentTripSeine.ocean == null || current.quadrant == null || current.quadrant == 0 - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( current.quadrant == 1 || current.quadrant == 2 || current.quadrant == 3 || current.quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( current.quadrant == 1 || current.quadrant == 2)) + tripSeineEntity.ocean == null || current.quadrant == null || current.quadrant == 0 + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( current.quadrant == 1 || current.quadrant == 2 || current.quadrant == 3 || current.quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( current.quadrant == 1 || current.quadrant == 2)) ]]> </param> - <message>validator.route.invalid.quadrant##${index}##${currentTripSeine.ocean.libelle}</message> + <message>validator.route.invalid.quadrant##${index}##${tripSeineEntity.ocean.libelle}</message> </field-validator> </field> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml index e982526..0252268 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml @@ -45,7 +45,7 @@ <field-validator type="collectionFieldExpression"> <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> - <param name="collectionFieldName">currentTripSeine.route</param> + <param name="collectionFieldName">tripSeineEntity.route</param> <param name="expression"> <![CDATA[ startLogValue == null || current.endLogValue == null || current.topiaId == topiaId || current.date.time > date.time || current.endLogValue <= startLogValue ]]> </param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml index 75d1b56..bc0303b 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml @@ -98,11 +98,11 @@ <field name="endPursingDate"> - <!-- currentRoute.date <= endPursingDate --> + <!-- routeEntity.date <= endPursingDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingDate == null || - @org.nuiton.util.DateUtil@getDay(currentRoute.date).time <= endPursingDate.time + @org.nuiton.util.DateUtil@getDay(routeEntity.date).time <= endPursingDate.time ]]> </param> <message>validator.set.endPursingDate.after.date</message> @@ -115,7 +115,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingTimeStamp == null || - @org.nuiton.util.DateUtil@getDateAndTime(currentRoute.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> + @org.nuiton.util.DateUtil@getDateAndTime(routeEntity.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> </param> <message>validator.set.endPursingTimeStamp.after.startTime</message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml index 947ff6e..871afbd 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml @@ -102,7 +102,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ startTime == null || - @org.nuiton.util.DateUtil@getTime(currentActivity.time, false, false).time <= @org.nuiton.util.DateUtil@getTime(startTime, false, false).time ]]> + @org.nuiton.util.DateUtil@getTime(activityEntity.time, false, false).time <= @org.nuiton.util.DateUtil@getTime(startTime, false, false).time ]]> </param> <message>validator.set.startTime.after.time</message> </field-validator> @@ -111,10 +111,10 @@ <field name="endPursingDate"> - <!-- currentRoute.date <= endPursingDate --> + <!-- routeEntity.date <= endPursingDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ endPursingDate == null || @org.nuiton.util.DateUtil@getDay(currentRoute.date).time <= endPursingDate.time + <![CDATA[ endPursingDate == null || @org.nuiton.util.DateUtil@getDay(routeEntity.date).time <= endPursingDate.time ]]> </param> <message>validator.set.endPursingDate.after.date</message> @@ -127,7 +127,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingTimeStamp == null || - @org.nuiton.util.DateUtil@getDateAndTime(currentRoute.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> + @org.nuiton.util.DateUtil@getDateAndTime(routeEntity.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> </param> <message>validator.set.endPursingTimeStamp.after.startTime</message> </field-validator> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java index 341bec2..beae8ac 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java @@ -46,132 +46,132 @@ public class ValidationDataContext { protected List<?> editingReferentielList; - protected Program currentProgram; + protected Program programEntity; - protected TripSeine currentTripSeine; + protected TripSeine tripSeineEntity; - protected TripLongline currentTripLongline; + protected TripLongline tripLonglineEntity; - protected Route currentRoute; + protected Route routeEntity; - protected ActivitySeine currentActivitySeine; + protected ActivitySeine activitySeineEntity; - protected ActivityLongline currentActivityLongline; + protected ActivityLongline activityLonglineEntity; - protected SetSeine currentSetSeine; + protected SetSeine setSeineEntity; - protected SetLongline currentSetLongline; + protected SetLongline setLonglineEntity; - protected FloatingObject currentFloatingObject; + protected FloatingObject floatingObjectEntity; public void clear() { editingReferentielList = null; - currentProgram = null; - currentTripSeine = null; - currentRoute = null; - currentActivitySeine = null; - currentActivityLongline = null; - currentSetSeine = null; - currentSetLongline = null; - currentFloatingObject = null; + programEntity = null; + tripSeineEntity = null; + routeEntity = null; + activitySeineEntity = null; + activityLonglineEntity = null; + setSeineEntity = null; + setLonglineEntity = null; + floatingObjectEntity = null; } - public Program getCurrentProgram() { - return currentProgram; + public Program getProgramEntity() { + return programEntity; } - public Trip getCurrentTrip() { - Trip result = getCurrentTripSeine(); + public Trip getTripEntity() { + Trip result = getTripSeineEntity(); if (result == null) { - result = getCurrentTripLongline(); + result = getTripLonglineEntity(); } return result; } - public TripSeine getCurrentTripSeine() { - return currentTripSeine; + public TripSeine getTripSeineEntity() { + return tripSeineEntity; } - public TripLongline getCurrentTripLongline() { - return currentTripLongline; + public TripLongline getTripLonglineEntity() { + return tripLonglineEntity; } - public Route getCurrentRoute() { - return currentRoute; + public Route getRouteEntity() { + return routeEntity; } - public Activity getCurrentActivity() { - Activity result = getCurrentActivitySeine(); + public Activity getActivityEntity() { + Activity result = getActivitySeineEntity(); if (result == null) { - result = getCurrentActivityLongline(); + result = getActivityLonglineEntity(); } return result; } - public ActivitySeine getCurrentActivitySeine() { - return currentActivitySeine; + public ActivitySeine getActivitySeineEntity() { + return activitySeineEntity; } - public ActivityLongline getCurrentActivityLongline() { - return currentActivityLongline; + public ActivityLongline getActivityLonglineEntity() { + return activityLonglineEntity; } - public ObserveSet getCurrentSet() { - ObserveSet result = getCurrentSetSeine(); + public ObserveSet getSetEntity() { + ObserveSet result = getSetSeineEntity(); if (result == null) { - result = getCurrentSetLongline(); + result = getSetLonglineEntity(); } return result; } - public SetSeine getCurrentSetSeine() { - return currentSetSeine; + public SetSeine getSetSeineEntity() { + return setSeineEntity; } - public SetLongline getCurrentSetLongline() { - return currentSetLongline; + public SetLongline getSetLonglineEntity() { + return setLonglineEntity; } - public FloatingObject getCurrentFloatingObject() { - return currentFloatingObject; + public FloatingObject getFloatingObjectEntity() { + return floatingObjectEntity; } public List<?> getEditingReferentielList() { return editingReferentielList; } - void setCurrentTripSeine(TripSeine currentTripSeine) { - this.currentTripSeine = currentTripSeine; - this.currentProgram = currentTripSeine == null ? null : currentTripSeine.getProgram(); + void setTripSeineEntity(TripSeine tripSeineEntity) { + this.tripSeineEntity = tripSeineEntity; + this.programEntity = tripSeineEntity == null ? null : tripSeineEntity.getProgram(); } - void setCurrentTripLongline(TripLongline currentTripLongline) { - this.currentTripLongline = currentTripLongline; - this.currentProgram = currentTripLongline == null ? null : currentTripLongline.getProgram(); + void setTripLonglineEntity(TripLongline tripLonglineEntity) { + this.tripLonglineEntity = tripLonglineEntity; + this.programEntity = tripLonglineEntity == null ? null : tripLonglineEntity.getProgram(); } - void setCurrentRoute(Route currentRoute) { - this.currentRoute = currentRoute; + void setRouteEntity(Route routeEntity) { + this.routeEntity = routeEntity; } - void setCurrentActivitySeine(ActivitySeine currentActivitySeine) { - this.currentActivitySeine = currentActivitySeine; + void setActivitySeineEntity(ActivitySeine activitySeineEntity) { + this.activitySeineEntity = activitySeineEntity; } - void setCurrentActivityLongline(ActivityLongline currentActivityLongline) { - this.currentActivityLongline = currentActivityLongline; + void setActivityLonglineEntity(ActivityLongline activityLonglineEntity) { + this.activityLonglineEntity = activityLonglineEntity; } - void setCurrentSetSeine(SetSeine currentSetSeine) { - this.currentSetSeine = currentSetSeine; + void setSetSeineEntity(SetSeine setSeineEntity) { + this.setSeineEntity = setSeineEntity; } - void setCurrentSetLongline(SetLongline currentSetLongline) { - this.currentSetLongline = currentSetLongline; + void setSetLonglineEntity(SetLongline setLonglineEntity) { + this.setLonglineEntity = setLonglineEntity; } - void setCurrentFloatingObject(FloatingObject currentFloatingObject) { - this.currentFloatingObject = currentFloatingObject; + void setFloatingObjectEntity(FloatingObject floatingObjectEntity) { + this.floatingObjectEntity = floatingObjectEntity; } void setEditingReferentielList(List<?> editingReferentielList) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java index aeef8ef..c437ed9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java @@ -278,28 +278,28 @@ public class ValidationMessageDetector { ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(entity); switch (anEnum) { case Route: - validationDataContext.setCurrentRoute((Route) entity); + validationDataContext.setRouteEntity((Route) entity); break; case TripSeine: - validationDataContext.setCurrentTripSeine((TripSeine) entity); + validationDataContext.setTripSeineEntity((TripSeine) entity); break; case ActivitySeine: - validationDataContext.setCurrentActivitySeine((ActivitySeine) entity); + validationDataContext.setActivitySeineEntity((ActivitySeine) entity); break; case SetSeine: - validationDataContext.setCurrentSetSeine((SetSeine) entity); + validationDataContext.setSetSeineEntity((SetSeine) entity); break; case TripLongline: - validationDataContext.setCurrentTripSeine((TripSeine) entity); + validationDataContext.setTripSeineEntity((TripSeine) entity); break; case ActivityLongline: - validationDataContext.setCurrentActivityLongline((ActivityLongline) entity); + validationDataContext.setActivityLonglineEntity((ActivityLongline) entity); break; case SetLongline: - validationDataContext.setCurrentSetLongline((SetLongline) entity); + validationDataContext.setSetLonglineEntity((SetLongline) entity); break; case FloatingObject: - validationDataContext.setCurrentFloatingObject((FloatingObject) entity); + validationDataContext.setFloatingObjectEntity((FloatingObject) entity); break; case NonTargetLength: break; @@ -384,28 +384,28 @@ public class ValidationMessageDetector { ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(entity); switch (anEnum) { case Route: - validationDataContext.setCurrentRoute(null); + validationDataContext.setRouteEntity(null); break; case TripSeine: - validationDataContext.setCurrentTripSeine(null); + validationDataContext.setTripSeineEntity(null); break; case ActivitySeine: - validationDataContext.setCurrentActivitySeine(null); + validationDataContext.setActivitySeineEntity(null); break; case SetSeine: - validationDataContext.setCurrentSetSeine(null); + validationDataContext.setSetSeineEntity(null); break; case TripLongline: - validationDataContext.setCurrentTripLongline(null); + validationDataContext.setTripLonglineEntity(null); break; case ActivityLongline: - validationDataContext.setCurrentActivityLongline(null); + validationDataContext.setActivityLonglineEntity(null); break; case SetLongline: - validationDataContext.setCurrentSetLongline(null); + validationDataContext.setSetLonglineEntity(null); break; case FloatingObject: - validationDataContext.setCurrentFloatingObject(null); + validationDataContext.setFloatingObjectEntity(null); break; case NonTargetLength: break; -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 841c7c4bb7bea10abae09162246df31e8963247c 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 develop in repository observe. See http://git.codelutin.com/observe.git commit dee581748ef3230a658c8fa6a6d16f32d1823ea4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 9 15:25:11 2015 +0200 Test de generation des rapports en mode REST + correction Ajout des annotayions @PostRequest et @DeleteRequest pour utiliser les méthodes POST ou DELETE dans les requêtes REST (refs #7463) --- .../v1/actions/report/ReportServiceController.java | 12 +- .../src/main/filters/observe-reports.properties | 10 +- .../services/service/ReferentialService.java | 5 + .../consolidate/ConsolidateDataService.java | 2 + .../service/actions/report/ReportBuilder.java | 49 +-- .../service/actions/report/ReportService.java | 14 +- .../actions/report/model/ReportOperation.java | 107 ----- .../actions/report/model/ReportRequest.java | 407 ------------------- .../report/model/operations/ExecuteRequests.java | 120 ------ .../report/model/operations/GroupByLength.java | 111 ------ .../actions/report/model/operations/SumColumn.java | 129 ------ .../report/model/operations/SumIntColumn.java | 129 ------ .../actions/report/model/operations/SumIntRow.java | 129 ------ .../actions/report/model/operations/SumRow.java | 129 ------ .../service/actions/validate/ValidateService.java | 3 + .../longline/ActivityLongLineEncouterService.java | 2 + .../ActivityLongLineSensorUsedService.java | 2 + .../service/longline/ActivityLonglineService.java | 4 + .../longline/GearUseFeaturesLonglineService.java | 4 + .../service/longline/SetLonglineCatchService.java | 2 + .../SetLonglineDetailCompositionService.java | 2 + .../SetLonglineGlobalCompositionService.java | 2 + .../service/longline/SetLonglineService.java | 4 + .../services/service/longline/TdrService.java | 2 + .../service/longline/TripLonglineService.java | 4 + .../seine/ActivitySeineObservedSystemService.java | 2 + .../service/seine/ActivitySeineService.java | 4 + .../service/seine/FloatingObjectService.java | 4 + .../service/seine/GearUseFeaturesSeineService.java | 4 + .../service/seine/NonTargetCatchService.java | 2 + .../service/seine/NonTargetSampleService.java | 2 + .../seine/ObjectObservedSpeciesService.java | 2 + .../service/seine/ObjectSchoolEstimateService.java | 2 + .../services/service/seine/RouteService.java | 4 + .../service/seine/SchoolEstimateService.java | 2 + .../services/service/seine/SetSeineService.java | 4 + .../services/service/seine/TargetCatchService.java | 2 + .../service/seine/TargetSampleService.java | 2 + .../seine/TransmittingBuoyOperationService.java | 2 + .../services/service/seine/TripSeineService.java | 4 + .../fr/ird/observe/services/spi/DeleteRequest.java | 14 + .../fr/ird/observe/services/spi/PostRequest.java | 14 + .../service/actions/report/ReportBuilderTest.java | 11 +- .../services/dto/actions/report}/DataMatrix.java | 2 +- .../services/dto/actions/report}/Report.java | 2 +- .../dto/actions/report/ReportOperation.java | 41 ++ .../services/dto/actions/report/ReportRequest.java | 187 +++++++++ .../dto/actions/report}/ReportVariable.java | 32 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../services/dto/gson/ReportVariableAdapter.java | 55 +++ .../services/ObserveServiceFactoryRest.java | 11 +- .../report/AbstractReportServiceRestTest.java | 28 +- .../report/ReportAccessoryCatchRestTest.java | 9 +- .../service/actions/report/ReportServiceTopia.java | 441 ++++++++++++++++++++- .../report/AbstractReportServiceTopiaTest.java | 8 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 7 +- .../actions/report/ReportAccessoryCatchTest.java | 7 +- .../report/ReportActivityWithCommentTest.java | 6 +- .../actions/report/ReportAllActivitysTest.java | 7 +- .../actions/report/ReportDailySetAndCatchTest.java | 6 +- .../service/actions/report/ReportDcpUsageTest.java | 6 +- .../report/ReportSetByAssociation2Test.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 6 +- .../report/ReportTargetCatchByAssociationTest.java | 6 +- .../ReportTargetDiscardedByAssociationTest.java | 6 +- 67 files changed, 914 insertions(+), 1432 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java index f41c17f..c93a58d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java @@ -1,12 +1,9 @@ package fr.ird.observe.application.web.controller.v1.actions.report; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; - -import java.util.List; -import java.util.Map; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -26,9 +23,4 @@ public class ReportServiceController extends ObserveAuthenticatedServiceControll public DataMatrix executeReport(Report report, String tripId) { return service.executeReport(report, tripId); } - - @Override - public <R> List<R> executeRequest(String request, Map<String, Object> params) { - return service.executeRequest(request, params); - } } diff --git a/observe-services-api/src/main/filters/observe-reports.properties b/observe-services-api/src/main/filters/observe-reports.properties index 732b367..c39af69 100644 --- a/observe-services-api/src/main/filters/observe-reports.properties +++ b/observe-services-api/src/main/filters/observe-reports.properties @@ -682,7 +682,7 @@ report.nonTargetDistributionLengths.name=Distribution des tailles par esp\u00e8c report.nonTargetDistributionLengths.description=Afficher la nombre d'individus mesur\u00e9s par classe de taille pour les esp\u00e8ces non cibl\u00e9es report.nonTargetDistributionLengths.columns=Classe de taille,Effectif report.nonTargetDistributionLengths.operations.1=GroupByLength -report.nonTargetDistributionLengths.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +report.nonTargetDistributionLengths.variable.speciesId=fr.ird.observe.services.dto.referential.SpeciesDto|\ Select distinct ntl.species \ From TripSeineImpl t \ Join t.route r \ @@ -710,7 +710,7 @@ report.targetStoredDistributionLengthsLD1.name=Distribution des tailles des capt report.targetStoredDistributionLengthsLD1.description=Afficher le nombre d'individus captur\u00e9s, mesur\u00e9s par classe de taille LD1 pour les esp\u00e8ces cibl\u00e9es report.targetStoredDistributionLengthsLD1.columns=Classe de taille,Effectif report.targetStoredDistributionLengthsLD1.operations.1=GroupByLength -report.targetStoredDistributionLengthsLD1.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +report.targetStoredDistributionLengthsLD1.variable.speciesId=fr.ird.observe.services.dto.referential.SpeciesDto|\ Select distinct tl.species \ From TripSeineImpl t \ Join t.route r \ @@ -742,7 +742,7 @@ report.targetDiscardedDistributionLengthsLD1.name=Distribution des tailles des r report.targetDiscardedDistributionLengthsLD1.description=Afficher la nombre d'individus rejet\u00e9s, mesur\u00e9s par classe de taille LD1 pour les esp\u00e8ces cibl\u00e9es report.targetDiscardedDistributionLengthsLD1.columns=Classe de taille,Effectif report.targetDiscardedDistributionLengthsLD1.operations.1=GroupByLength -report.targetDiscardedDistributionLengthsLD1.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +report.targetDiscardedDistributionLengthsLD1.variable.speciesId=fr.ird.observe.services.dto.referential.SpeciesDto|\ Select distinct tl.species \ From TripSeineImpl t \ Join t.route r \ @@ -774,7 +774,7 @@ report.targetStoredDistributionLengthsLF.name=Distribution des tailles des captu report.targetStoredDistributionLengthsLF.description=Afficher le nombre d'individus captur\u00e9s, mesur\u00e9s par classe de taille LF pour les esp\u00e8ces cibl\u00e9es report.targetStoredDistributionLengthsLF.columns=Classe de taille,Effectif report.targetStoredDistributionLengthsLF.operations.1=GroupByLength -report.targetStoredDistributionLengthsLF.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +report.targetStoredDistributionLengthsLF.variable.speciesId=fr.ird.observe.services.dto.referential.SpeciesDto|\ Select distinct tl.species \ From TripSeineImpl t \ Join t.route r \ @@ -806,7 +806,7 @@ report.targetDiscardedDistributionLengthsLF.name=Distribution des tailles des re report.targetDiscardedDistributionLengthsLF.description=Afficher le nombre d'individus rejet\u00e9s, mesur\u00e9s par classe de taille LF pour les esp\u00e8ces cibl\u00e9es report.targetDiscardedDistributionLengthsLF.columns=Classe de taille,Effectif report.targetDiscardedDistributionLengthsLF.operations.1=GroupByLength -report.targetDiscardedDistributionLengthsLF.variable.speciesId=fr.ird.observe.entities.referentiel.Species|\ +report.targetDiscardedDistributionLengthsLF.variable.speciesId=fr.ird.observe.services.dto.referential.SpeciesDto|\ Select distinct tl.species \ From TripSeineImpl t \ Join t.route r \ diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index f33f58c..53a957b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.spi.DeleteRequest; +import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadReferentialPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteReferentialPermission; @@ -31,14 +33,17 @@ public interface ReferentialService extends ObserveService { @WriteReferentialPermission @Write + @PostRequest <R extends ReferentialDto> String save(FormDto<R> form); @WriteReferentialPermission @Write + @DeleteRequest <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException; @WriteReferentialPermission @Write + @DeleteRequest <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException; } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java index 861ba27..5390472 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; 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.WriteDataPermission; @@ -24,6 +25,7 @@ public interface ConsolidateDataService extends ObserveService{ */ @ReadDataPermission @WriteDataPermission + @PostRequest ImmutableSet<ConsolidateTripSeineDataResult> consolidateTripSeines(ConsolidateTripSeineDataRequest consolidateTripSeineDataRequest); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java index 55b40b3..8fb69de 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportOperation; +import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.dto.actions.report.ReportVariable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.SortedProperties; @@ -40,7 +40,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.ServiceLoader; import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -76,34 +75,6 @@ public class ReportBuilder { /** les operations connues par le système */ protected static Map<String, Class<?>> operations; - public static Map<String, Class<?>> getOperations() { - if (operations == null) { - operations = new TreeMap<String, Class<?>>(); - ServiceLoader<ReportOperation> loader = - ServiceLoader.load(ReportOperation.class); - for (ReportOperation op : loader) { - if (log.isInfoEnabled()) { - log.info("Detected operations : " + op.getOperationName()); - } - operations.put(op.getOperationName(), op.getClass()); - } - } - return operations; - } - - public static ReportOperation newOperation(String operationsName) { - Class<?> operationsType = getOperations().get(operationsName); - if (operationsType == null) { - throw new IllegalArgumentException("No such operations [" + operationsName + "], available operationss : " + getOperations().keySet()); - } - try { - Object result = operationsType.newInstance(); - return (ReportOperation) result; - } catch (Exception e) { - throw new IllegalStateException("Could not instanciate operations [" + operationsType + "]", e); - } - } - public List<String> getReportNames() { return reportNames; } @@ -354,7 +325,7 @@ public class ReportBuilder { String operationsDef = requestDico.get(id); - ReportOperation def = getOperation(operationsDef); + ReportOperation def = ReportOperation.valueOf(operationsDef); if (log.isInfoEnabled()) { log.info("Detects a operations : " + def); } @@ -457,16 +428,6 @@ public class ReportBuilder { return result.toArray(new ReportVariable[result.size()]); } - protected ReportOperation getOperation(String operationsDef) { - - // pour le moment, une operations n'a qu'une seule valeur : celle - // du lastName de l'opération - String operationsName = operationsDef; - - ReportOperation def = newOperation(operationsName); - return def; - } - protected String getValue(Map<String, String> dico, String key) { String value = dico.get(key); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java index ac8ebeb..86df43f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java @@ -1,14 +1,12 @@ package fr.ird.observe.services.service.actions.report; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; -import java.util.List; -import java.util.Map; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -16,13 +14,11 @@ public interface ReportService extends ObserveService { @ReadDataPermission @ReadReferentialPermission + @PostRequest Report populateVariables(Report report, String tripId); @ReadDataPermission @ReadReferentialPermission + @PostRequest DataMatrix executeReport(Report report, String tripId); - - @ReadDataPermission - @ReadReferentialPermission - <R> List<R> executeRequest(String request, Map<String, Object> params); } 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 deleted file mode 100644 index c507bab..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -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; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; - -/** - * Pour caractériser une opération à lancer dans un report. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public abstract class ReportOperation implements Serializable, ObserveDto { - - private static final long serialVersionUID = 1L; - - /** Logger */ - private static final Log log = LogFactory.getLog(ReportOperation.class); - - public abstract String getOperationName(); - - /** - * Calcule la position où positionner le rsultat dans la matrice sortante. - * - * @param model le report - * @param incoming la matrice entrante - * @return la position de la première cellule - */ - protected abstract Point computeLocation(Report model, - DataMatrix incoming); - - /** - * Calcule la dimension du résultat de l'opération. - * - * @param model le report - * @param incoming la matrice entrante - * @return la dimension des données de l'opération - */ - protected abstract Dimension computeDimension(Report model, - DataMatrix incoming); - - /** - * Pour executer l'opération. - * - * @param reportService le service de raport - * @param model le modèle - * @param tripId l'identifiant du la maré - * @param incoming la matrice entrante - * @return la matrice sortante - * @pour toute erreur de manipulation de base - */ - public abstract DataMatrix execute(ReportService reportService, - Report model, - String tripId, - DataMatrix incoming); - - protected ReportOperation() { - } - - protected DataMatrix createTmpMatrix(Report model, DataMatrix incoming) { - - DataMatrix result = new DataMatrix(); - - // calcul de la position des résultats de l'opération - Point location = computeLocation(model, incoming); - result.setLocation(location); - - // calcul de la taille des résultats de l'opération - Dimension dim = computeDimension(model, incoming); - result.setDimension(dim); - - // creation de la matrice - result.createData(); - - if (log.isDebugEnabled()) { - log.debug("Operation [" + getOperationName() + "] tmp matrix : " + result); - } - return result; - } - -} 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 deleted file mode 100644 index c25f584..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java +++ /dev/null @@ -1,407 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -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; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Pour caractériser une requète à lancer dans un report. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class ReportRequest implements Serializable, ObserveDto { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(ReportRequest.class); - - public static final String TRIP_ID_VARIABLE = "tripId"; - - /** le layout de la requete. */ - public enum RequestLayout { - /** lorsque les résultats de la requète sont les lignes du résultat. */ - row, - /** lorsque les résultats de la requète sont les colonnes du résultat. */ - column - } - - /** Un repeater optionnel sur la requête. */ - public static class RequestRepeat implements Serializable, ObserveDto { - - protected final String variableName; - - protected final RequestLayout layout; - - private static final long serialVersionUID = 1L; - - public RequestRepeat(String variableName, RequestLayout layout) { - this.variableName = variableName; - this.layout = layout; - } - - public String getVariableName() { - return variableName; - } - - public RequestLayout getLayout() { - return layout; - } - - @Override - public String toString() { - ToStringBuilder builder = new ToStringBuilder(this); - builder.append("variableName", getVariableName()); - builder.append("layout", getLayout()); - return builder.toString(); - } - } - - /** layout de la requète. */ - protected final RequestLayout layout; - - /** la requète à exécuter. */ - protected final String request; - - /** la position de la requète. */ - protected final Point location; - - /** le repeater optionel. */ - protected final RequestRepeat repeat; - - public ReportRequest(RequestLayout layout, - int x, - int y, - String request, - RequestRepeat repeat) { - this.layout = layout; - this.request = request; - this.repeat = repeat; - location = new Point(x, y); - } - - public RequestLayout getLayout() { - return layout; - } - - public int getX() { - return (int) location.getX(); - } - - public int getY() { - return (int) location.getY(); - } - - public Point getLocation() { - return location; - } - - public String getRequest() { - return request; - } - - public RequestRepeat getRepeat() { - return repeat; - } - - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - ReportVariable repeatValues) { - - DataMatrix result = new DataMatrix(); - - Map<String, Object> params = extractParams(report, tripId); - - for (Object repeatValue : repeatValues.getValues()) { - params.put(repeat.getVariableName(), repeatValue); - DataMatrix tmp = execute(reportService, params); - if (result == null) { - - // premiere requete executee - result = tmp; - result.setX(0); - result.setY(0); - } else { - switch (repeat.getLayout()) { - - case row: - - // on ajoute le resultat a droite de celui deja present - tmp.setX(result.getX() + result.getWidth()); - tmp.setY(result.getY()); - break; - - case column: - - // on ajoute le resultat en dessous de celui deja present - tmp.setX(result.getX()); - tmp.setY(result.getY() + result.getHeight()); - break; - } - result = DataMatrix.merge(result, tmp); - } - } - result.setX(getX()); - result.setY(getY()); - if (log.isDebugEnabled()) { - log.debug("Result location : " + result.getLocation()); - log.debug("Result data :\n" + result.getClipbordContent(true, true)); - } - return result; - } - - public DataMatrix execute(ReportService reportService, - Report report, - String tripId) { - Map<String, Object> params = extractParams(report, tripId); - - DataMatrix dataMatrix = execute(reportService, params); - - return dataMatrix; - - - } - - public static Map<String, Object> extractParams(Report report, String tripId) { - - Map<String, Object> params = Maps.newHashMap(); - - params.put(TRIP_ID_VARIABLE, tripId); - - for (ReportVariable variable : report.getVariables()) { - - String name = variable.getName(); - - Object value = variable.getSelectedValue(); - - params.put(name, value); - - } - return params; - - } - - - protected DataMatrix execute(ReportService reportService, Map<String, Object> params) { - - // création des paramètres : couples (key, value) - if (log.isDebugEnabled()) { - log.debug("Request : " + request); - log.debug("Available params : " + params.keySet()); - log.debug("Params to use : " + params); - } - - // lancement de la requête - List<?> list = reportService.executeRequest(request, params); - if (log.isDebugEnabled()) { - log.debug("Result size : " + list.size()); - } - - // determination des dimensions du résultat - Dimension dimension = computeDimension(list); - if (log.isDebugEnabled()) { - log.debug("Result dimension : " + dimension); - } - - // construction du resultat - DataMatrix result = computeResult(dimension, list); - if (log.isDebugEnabled()) { - log.debug("Result location : " + result.getLocation()); - log.debug("Result data :\n" + result.getClipbordContent(true, true)); - } - return result; - } - - protected DataMatrix computeResult(Dimension dimension, List<?> list) { - - DataMatrix result = new DataMatrix(); - result.setDimension(dimension); - result.createData(); - - // le seul cas différent est le n-* (une ligne correspond à une colonne) - - int y = 0; - int x = 0; - - switch (layout) { - - case row: - - boolean uniqueColumn = result.getWidth() == 1; - - // les lignes du résultat sont les lignes du tableau - - for (Object row : list) { - - if (uniqueColumn) { - - // une seule colonne - result.setValue(0, y, row); - } else { - - x = 0; - Object[] cells = (Object[]) row; - for (Object cell : cells) { - result.setValue(x++, y, cell); - } - } - - // on passage a la ligne suivante - y++; - } - break; - case column: - - // les lignes du résultat sont les colonnes du tableau - - boolean uniqueRow = result.getHeight() == 1; - - for (Object col : list) { - - if (uniqueRow) { - - // une seule ligne - result.setValue(x, 0, col); - } else { - - y = 0; - Object[] cells = (Object[]) col; - for (Object cell : cells) { - result.setValue(x, y++, cell); - } - } - - // on passage a la colonne suivante - x++; - } - break; - } - - // on pousse la position du résultat - result.setX(getX()); - result.setY(getY()); - return result; - } - - protected Dimension computeDimension(List<?> list) { - - int height = 0; - int width = 0; - - switch (layout) { - - case row: - - // le count de result est le lastNamebre de lignes - height = list.size(); - - if (list.isEmpty()) { - - // vu qu'il n'y a pas de résultat, on ne peut rien dire - width = 0; - } else { - - Object o = list.get(0); - - if (o == null || !o.getClass().isArray()) { - - // une seule colonne - width = 1; - } else { - width = ((Object[]) o).length; - } - } - - break; - case column: - - // le count de result est le lastNamebre de colonnes - width = list.size(); - - if (list.isEmpty()) { - - // vu qu'il n'y a pas de résultat, on ne peut rien dire - height = 0; - } else { - - Object o = list.get(0); - - if (o == null || !o.getClass().isArray()) { - - // une seule ligne - height = 1; - } else { - height = ((Object[]) o).length; - } - } - - break; - } - return new Dimension(width, height); - } - - public static Object[] getParams(String request, Map<String, Object> params) { - - // on parcourt la liste de tous les paramètres pour savoir si on doit - // les inclure pour la requête donnée : - List<String> namesToUsed = new ArrayList<String>(); - for (String paramName : params.keySet()) { - if (request.contains(":" + paramName)) { - namesToUsed.add(paramName); - } - } - Object[] datas = new Object[namesToUsed.size() * 2]; - int index = 0; - for (String name : namesToUsed) { - Object value = params.get(name); - datas[index * 2] = name; - datas[index * 2 + 1] = value; - index++; - } - namesToUsed.clear(); - return datas; - } - - @Override - public String toString() { - ToStringBuilder builder = new ToStringBuilder(this); - builder.append("request", getRequest()); - builder.append("layout", getLayout()); - builder.append("location", getLocation()); - builder.append("repeatVariable", getRepeat()); - return builder.toString(); - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java deleted file mode 100644 index 075a7c3..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.actions.report.model.operations; - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; - -/** - * Opération pour lancer les requètes d'un report. - * <p/> - * Cette opération est toujours exécuter en premier lors de la construction - * du résultat d'un report. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class ExecuteRequests extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(ExecuteRequests.class); - - private static final long serialVersionUID = 1L; - - public static final String OPERATION_NAME = "ExecuteRequests"; - - public ExecuteRequests() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - ReportRequest[] requests = report.getRequests(); - - DataMatrix[] requestResults = new DataMatrix[requests.length]; - - int i = 0; - for (ReportRequest request : requests) { - - ReportRequest.RequestRepeat repeatVariable = request.getRepeat(); - - DataMatrix result; - - if (repeatVariable == null) { - - // requete simple sans repetition - result = request.execute(reportService, report, tripId); - } else { - - // on a une requete avec repetition - String repeatVariableName = repeatVariable.getVariableName(); - ReportVariable repeat = report.getRepeatVariable(repeatVariableName); - - - result = request.execute(reportService, report, tripId, repeat); - - - } - - requestResults[i++] = result; - } - - int rows = report.getRows(); - int columns = report.getColumns(); - - DataMatrix result = DataMatrix.merge(rows, columns, requestResults); - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(0, 0); - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java deleted file mode 100644 index effca69..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java +++ /dev/null @@ -1,111 +0,0 @@ -package fr.ird.observe.services.service.actions.report.model.operations; - -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import org.apache.commons.lang3.mutable.MutableInt; - -import java.awt.Dimension; -import java.awt.Point; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -/** - * To group by legnth (first column, second row is count). - * - * I don't know how to make this with hibernate the group by + sum does not work :(. - * - * Created on 5/23/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 4.0 - */ -public class GroupByLength extends ReportOperation { - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "GroupByLength"; - - @Override - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Set<String> lengths = new HashSet<String>(); - for (int i = 0; i < incoming.getHeight(); i++) { - lengths.add((String) incoming.getValue(0, i)); - } - Dimension result = new Dimension(incoming.getWidth(), lengths.size()); - return result; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - - // Première passe pour grouper par classe de taille - Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); - for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { - - String length = (String) incoming.getValue(0, i); - Integer count = Integer.valueOf(incoming.getValue(1, i).toString()); - - MutableInt mutableInt = data.get(length); - if (mutableInt == null) { - mutableInt = new MutableInt(); - data.put(length, mutableInt); - } - mutableInt.add(count); - - } - - // Deuxième passe pour remplir la matrice - DataMatrix result = createTmpMatrix(report, incoming); - int row = 0; - for (Map.Entry<String, MutableInt> entry : data.entrySet()) { - String length = entry.getKey(); - MutableInt mutableInt = entry.getValue(); - result.setValue(0, row, length); - result.setValue(1, row, mutableInt.intValue()); - row++; - } - - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java deleted file mode 100644 index eb88fd2..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.actions.report.model.operations; - - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; - -/** - * Opération pour calculer la somme de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumColumn"; - - - public SumColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du resultat - - DataMatrix tmpMatrix = createTmpMatrix(report, incoming); - - for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { - - Object result = getColumnData(i, incoming); - tmpMatrix.setValue(i, 0, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [" + i + ",0] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java deleted file mode 100644 index 364a07a..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.actions.report.model.operations; - - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une colonne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle ligne en bas - * du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntColumn extends ReportOperation { - - /** Logger */ - private static final Log log = - LogFactory.getLog(SumIntColumn.class); - - private static final long serialVersionUID = 1L; - - private static final String OPERATION_NAME = "SumIntColumn"; - - - public SumIntColumn() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du resultat - - DataMatrix tmpMatrix = createTmpMatrix(report, incoming); - - for (int i = 0, nbColumns = incoming.getWidth(); i < nbColumns; i++) { - - Object result = getColumnData(i, incoming); - tmpMatrix.setValue(i, 0, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [" + i + ",0] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - protected Object getColumnData(int column, DataMatrix incoming) { - Double result = 0d; - - int nbRows = incoming.getHeight(); - - for (int row = 0; row < nbRows; row++) { - Serializable o = incoming.getValue(column, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(0, incoming.getHeight()); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - Dimension result = new Dimension(incoming.getWidth(), 1); - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java deleted file mode 100644 index 66d2038..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.actions.report.model.operations; - - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; - -/** - * Opération pour calculer la somme entière de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumIntRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumIntRow.class); - - public static final String OPERATION_NAME = "SumIntRow"; - - private static final long serialVersionUID = 1L; - - public SumIntRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du result - - DataMatrix tmpMatrix = createTmpMatrix(report, incoming); - - for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { - - Object result = getRowData(i, incoming); - tmpMatrix.setValue(0, i, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [0, " + i + "] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result.intValue(); - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java deleted file mode 100644 index 438da89..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.services.service.actions.report.model.operations; - - -import fr.ird.observe.services.service.actions.report.ReportService; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Dimension; -import java.awt.Point; -import java.io.Serializable; - -/** - * Opération pour calculer la somme de toutes les cellules d'une ligne. - * <p/> - * Le résultat de l'opération vient se placer dans une nouvelle colonne à - * droite du tableau. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class SumRow extends ReportOperation { - - /** Logger */ - private static final Log log = LogFactory.getLog(SumRow.class); - - public static final String OPERATION_NAME = "SumRow"; - - private static final long serialVersionUID = 1L; - - public SumRow() { - } - - public String getOperationName() { - return OPERATION_NAME; - } - - @Override - public DataMatrix execute(ReportService reportService, - Report report, - String tripId, - DataMatrix incoming) { - if (log.isDebugEnabled()) { - log.debug("Launch " + this); - } - - // construction du result - - DataMatrix tmpMatrix = createTmpMatrix(report, incoming); - - for (int i = 0, nbRows = incoming.getHeight(); i < nbRows; i++) { - - Object result = getRowData(i, incoming); - tmpMatrix.setValue(0, i, result); - if (log.isDebugEnabled()) { - log.debug("objectOperation [0, " + i + "] = " + result); - } - } - - DataMatrix result = DataMatrix.merge(incoming, tmpMatrix); - return result; - } - - - protected Object getRowData(int row, DataMatrix incoming) { - - Double result = 0d; - - int nbColumns = incoming.getWidth(); - - for (int col = 0; col < nbColumns; col++) { - Serializable o = incoming.getValue(col, row); - - if (o == null || "null".equals(o)) { - o = 0; - } - Double d; - try { - d = Double.valueOf(o.toString()); - } catch (NumberFormatException e) { - // une des données de la colonne n'est pas un count - // on sort directement - if (log.isDebugEnabled()) { - log.debug("Could not convert " + o + " to number", e); - } - return "-"; - } - result += d; - } - - return result; - } - - @Override - protected Point computeLocation(Report model, DataMatrix incoming) { - Point result = new Point(incoming.getWidth(), 0); - return result; - } - - @Override - protected Dimension computeDimension(Report model, DataMatrix incoming) { - - Dimension result = new Dimension(1, incoming.getHeight()); - return result; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java index 29837f3..610c6e3 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.spi.NoDataAccess; +import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; @@ -21,10 +22,12 @@ public interface ValidateService extends ObserveService { ImmutableSet<String> getAvailableContextNames(); @ReadReferentialPermission + @PostRequest ValidateReferentialsResult validateReferentials(ValidateReferentialsRequest request); @ReadDataPermission @ReadReferentialPermission + @PostRequest ValidateDataResult validateData(ValidateDataRequest request); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java index 722bc1b..51d14cd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +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; @@ -20,6 +21,7 @@ public interface ActivityLongLineEncouterService extends ObserveService { @WriteDataPermission @Write + @PostRequest String save(FormDto<ActivityLonglineEncouterDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java index d370554..34d9b79 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +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; @@ -20,6 +21,7 @@ public interface ActivityLongLineSensorUsedService extends ObserveService { @WriteDataPermission @Write + @PostRequest String save(FormDto<ActivityLonglineSensorUsedDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index 486153e..8fbce7c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,9 +31,11 @@ public interface ActivityLonglineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String tripLonglineId, FormDto<ActivityLonglineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripLonglineId, String activityLonglineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java index e3e6bb9..52a57d9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -28,10 +30,12 @@ public interface GearUseFeaturesLonglineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String tripLonglineId, FormDto<GearUseFeaturesLonglineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripLonglineId, String gearUseFeaturesLonglineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java index 9788054..b233190 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +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; @@ -20,6 +21,7 @@ public interface SetLonglineCatchService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetLonglineCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java index 266dc42..ed66781 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; +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; @@ -20,6 +21,7 @@ public interface SetLonglineDetailCompositionService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetLonglineDetailCompositionDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java index 6d21dc3..5e6a387 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +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; @@ -20,6 +21,7 @@ public interface SetLonglineGlobalCompositionService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetLonglineGlobalCompositionDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index ba67ee9..6d0f340 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -23,10 +25,12 @@ public interface SetLonglineService extends ObserveService { @WriteDataPermission @Write + @PostRequest String save(String activityLonglineId, FormDto<SetLonglineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String activityLonglineId, String setLonglineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java index 340b4f2..5138b61 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +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; @@ -20,6 +21,7 @@ public interface TdrService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetLonglineTdrDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 2ad90f8..245acad 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,10 +31,12 @@ public interface TripLonglineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<TripLonglineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripLonglineId); } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index 16b1e49..4f9a3bd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +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; @@ -20,6 +21,7 @@ public interface ActivitySeineObservedSystemService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<ActivitySeineObservedSystemDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index d29d88c..a06b19c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,9 +31,11 @@ public interface ActivitySeineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String routeId, FormDto<ActivitySeineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String routeId, String activitySeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index ab63ca5..308445b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,10 +31,12 @@ public interface FloatingObjectService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String activitySeineId, FormDto<FloatingObjectDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String activitySeineId, String floatingObjectId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java index 2f3a599..49e8b19 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -28,10 +30,12 @@ public interface GearUseFeaturesSeineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String tripSeineId, FormDto<GearUseFeaturesSeineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripSeineId, String gearUseFeaturesSeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java index 116fa1c..b4e28ea 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +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; @@ -20,5 +21,6 @@ public interface NonTargetCatchService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetSeineNonTargetCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java index 2fdb72a..a56b570 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +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; @@ -23,6 +24,7 @@ public interface NonTargetSampleService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String setSeineId, FormDto<NonTargetSampleDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 0a8aed5..493b9a1 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +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; @@ -20,6 +21,7 @@ public interface ObjectObservedSpeciesService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<FloatingObjectObservedSpeciesDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java index 145716d..2cc7ff5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +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; @@ -20,5 +21,6 @@ public interface ObjectSchoolEstimateService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<FloatingObjectSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 0ce1a77..10c0e24 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,10 +31,12 @@ public interface RouteService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String tripSeineId, FormDto<RouteDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripSeineId, String routeId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java index 8641d23..3b0f1a4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +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; @@ -20,6 +21,7 @@ public interface SchoolEstimateService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetSeineSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index 628d950..274095d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -23,10 +25,12 @@ public interface SetSeineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String activitySeineId, FormDto<SetSeineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String activitySeineId, String setSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java index 5bcc92f..9c18783 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +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; @@ -20,5 +21,6 @@ public interface TargetCatchService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<SetSeineTargetCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java index a6d7157..6afdec4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; +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; @@ -23,6 +24,7 @@ public interface TargetSampleService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(String setSeineId, FormDto<TargetSampleDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index f12399a..aff73a6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +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; @@ -20,6 +21,7 @@ public interface TransmittingBuoyOperationService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<FloatingObjectTransmittingBuoyDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index ac71130..a5494bb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.spi.DeleteRequest; +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; @@ -29,10 +31,12 @@ public interface TripSeineService extends ObserveService { @Write @WriteDataPermission + @PostRequest String save(FormDto<TripSeineDto> form); @Write @WriteDataPermission + @DeleteRequest void delete(String tripSeineId); } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java new file mode 100644 index 0000000..73f0c16 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/DeleteRequest.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface DeleteRequest { +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java new file mode 100644 index 0000000..440490b --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/PostRequest.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface PostRequest { +} diff --git a/observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java b/observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java index d63920f..2db2d0e 100644 --- a/observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java +++ b/observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java @@ -1,10 +1,10 @@ package fr.ird.observe.services.service.actions.report; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportOperation; +import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -99,8 +99,7 @@ public class ReportBuilderTest { Assert.assertEquals(1, report2.getOperations().length); ReportOperation operation = report2.getOperations()[0]; - Assert.assertNotNull(operation); - Assert.assertEquals("SumRow", operation.getOperationName()); + Assert.assertEquals(ReportOperation.SumRow, operation); Assert.assertEquals(2, report2.getRequests().length); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java similarity index 99% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java index a9599f4..05c32a6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/DataMatrix.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report.model; +package fr.ird.observe.services.dto.actions.report; import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java similarity index 98% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java index d62d5e5..5e76144 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/Report.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report.model; +package fr.ird.observe.services.dto.actions.report; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java new file mode 100644 index 0000000..87a6499 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java @@ -0,0 +1,41 @@ +/* + * #%L + * ObServe :: Business + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.actions.report; + +import fr.ird.observe.services.dto.ObserveDto; + +/** + * Pour caractériser une opération à lancer dans un report. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public enum ReportOperation implements ObserveDto { + + ExecuteRequests, + GroupByLength, + SumColumn, + SumIntColumn, + SumIntRow, + SumRow; + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java new file mode 100644 index 0000000..b21dfcf --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java @@ -0,0 +1,187 @@ +/* + * #%L + * ObServe :: Business + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.actions.report; + +import com.google.common.collect.Maps; +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; + +import java.awt.Point; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Pour caractériser une requète à lancer dans un report. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class ReportRequest implements Serializable, ObserveDto { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(ReportRequest.class); + + public static final String TRIP_ID_VARIABLE = "tripId"; + + /** le layout de la requete. */ + public enum RequestLayout { + /** lorsque les résultats de la requète sont les lignes du résultat. */ + row, + /** lorsque les résultats de la requète sont les colonnes du résultat. */ + column + } + + /** Un repeater optionnel sur la requête. */ + public static class RequestRepeat implements Serializable, ObserveDto { + + protected final String variableName; + + protected final RequestLayout layout; + + private static final long serialVersionUID = 1L; + + public RequestRepeat(String variableName, RequestLayout layout) { + this.variableName = variableName; + this.layout = layout; + } + + public String getVariableName() { + return variableName; + } + + public RequestLayout getLayout() { + return layout; + } + + @Override + public String toString() { + ToStringBuilder builder = new ToStringBuilder(this); + builder.append("variableName", getVariableName()); + builder.append("layout", getLayout()); + return builder.toString(); + } + } + + /** layout de la requète. */ + protected final RequestLayout layout; + + /** la requète à exécuter. */ + protected final String request; + + /** la position de la requète. */ + protected final Point location; + + /** le repeater optionel. */ + protected final RequestRepeat repeat; + + public ReportRequest(RequestLayout layout, + int x, + int y, + String request, + RequestRepeat repeat) { + this.layout = layout; + this.request = request; + this.repeat = repeat; + location = new Point(x, y); + } + + public RequestLayout getLayout() { + return layout; + } + + public int getX() { + return (int) location.getX(); + } + + public int getY() { + return (int) location.getY(); + } + + public Point getLocation() { + return location; + } + + public String getRequest() { + return request; + } + + public RequestRepeat getRepeat() { + return repeat; + } + + public static Map<String, Object> extractParams(Report report, String tripId) { + + Map<String, Object> params = Maps.newHashMap(); + + params.put(TRIP_ID_VARIABLE, tripId); + + for (ReportVariable variable : report.getVariables()) { + + String name = variable.getName(); + + Object value = variable.getSelectedValue(); + + params.put(name, value); + + } + return params; + + } + + public static Object[] getParams(String request, Map<String, Object> params) { + + // on parcourt la liste de tous les paramètres pour savoir si on doit + // les inclure pour la requête donnée : + List<String> namesToUsed = new ArrayList<String>(); + for (String paramName : params.keySet()) { + if (request.contains(":" + paramName)) { + namesToUsed.add(paramName); + } + } + Object[] datas = new Object[namesToUsed.size() * 2]; + int index = 0; + for (String name : namesToUsed) { + Object value = params.get(name); + datas[index * 2] = name; + datas[index * 2 + 1] = value; + index++; + } + namesToUsed.clear(); + return datas; + } + + @Override + public String toString() { + ToStringBuilder builder = new ToStringBuilder(this); + builder.append("request", getRequest()); + builder.append("layout", getLayout()); + builder.append("location", getLocation()); + builder.append("repeatVariable", getRepeat()); + return builder.toString(); + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java similarity index 66% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java index bce8e27..47747cd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportVariable.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report.model; +package fr.ird.observe.services.dto.actions.report; import fr.ird.observe.services.dto.ObserveDto; @@ -32,21 +32,31 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 1.7 */ -public class ReportVariable implements Serializable, ObserveDto { +public class ReportVariable<V> implements Serializable, ObserveDto { + + public final static String PROPERTY_NAME = "name"; + + public final static String PROPERTY_TYPE = "type"; + + public final static String PROPERTY_REQUEST = "request"; + + public final static String PROPERTY_VALUES = "values"; + + public final static String PROPERTY_SELECTED_VALUE = "selectedValue"; private static final long serialVersionUID = 1L; protected String name; - protected Class type; + protected Class<V> type; protected String request; - protected Set values; + protected Set<V> values; - protected Object selectedValue; + protected V selectedValue; - public ReportVariable(String name, Class type, String request) { + public ReportVariable(String name, Class<V> type, String request) { this.name = name; this.type = type; this.request = request; @@ -56,7 +66,7 @@ public class ReportVariable implements Serializable, ObserveDto { return name; } - public Class<?> getType() { + public Class<V> getType() { return type; } @@ -64,19 +74,19 @@ public class ReportVariable implements Serializable, ObserveDto { return request; } - public Set getValues() { + public Set<V> getValues() { return values; } - public void setValues(Set values) { + public void setValues(Set<V> values) { this.values = values; } - public Object getSelectedValue() { + public V getSelectedValue() { return selectedValue; } - public void setSelectedValue(Object selectedValue) { + public void setSelectedValue(V selectedValue) { this.selectedValue = selectedValue; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java index 426c9c7..b732268 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java @@ -7,6 +7,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import java.sql.Timestamp; @@ -70,6 +71,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(ImmutableMap.class, new ImmutableMapAdapter()); gsonBuilder.registerTypeAdapter(ReferenceDto.class, new ReferenceDtoAdapter()); gsonBuilder.registerTypeAdapter(ReferentialReferenceDto.class, new ReferentialReferenceDtoAdapter()); + gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter()); gsonBuilder.enableComplexMapKeySerialization(); } return gsonBuilder; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java new file mode 100644 index 0000000..ad614ec --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java @@ -0,0 +1,55 @@ +package fr.ird.observe.services.dto.gson; + +import com.google.common.collect.Sets; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.actions.report.ReportVariable; + +import java.lang.reflect.Type; +import java.util.Set; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ReportVariableAdapter implements JsonDeserializer<ReportVariable> { + + @Override + public ReportVariable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + JsonObject reportVariableJson = json.getAsJsonObject(); + + String name = context.deserialize(reportVariableJson.get(ReportVariable.PROPERTY_NAME), String.class); + Class<?> type = context.deserialize(reportVariableJson.get(ReportVariable.PROPERTY_TYPE), Class.class); + String request = context.deserialize(reportVariableJson.get(ReportVariable.PROPERTY_REQUEST), String.class); + + ReportVariable reportVariable = new ReportVariable<>(name, type, request); + + Class valueType = type; + + if (IdDto.class.isAssignableFrom(type)) { + valueType = ReferenceDto.class; + } + + JsonElement valuesJson = reportVariableJson.get(ReportVariable.PROPERTY_VALUES); + + if (valuesJson != null) { + Set values = Sets.newHashSet(); + for (JsonElement valueJson : valuesJson.getAsJsonArray()) { + Object value = context.deserialize(valueJson, valueType); + values.add(value); + } + + reportVariable.setValues(values); + } + + Object selectedValue = context.deserialize(reportVariableJson.get(ReportVariable.PROPERTY_SELECTED_VALUE), valueType); + + reportVariable.setSelectedValue(selectedValue); + + return reportVariable; + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index cb40777..79f6e21 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -21,7 +21,8 @@ import fr.ird.observe.services.http.ObserveRequestMethod; import fr.ird.observe.services.http.ObserveResponse; import fr.ird.observe.services.http.ObserveResponseBuilder; import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.DeleteRequest; +import fr.ird.observe.services.spi.PostRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -246,10 +247,12 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl addParameters(requestBuilder, method, args); addHeaders(requestBuilder); - //FIXME On devrait utiliser des annotations POST, PUT et DELETE - boolean writeData = method.isAnnotationPresent(Write.class); - if (writeData) { + boolean post = method.isAnnotationPresent(PostRequest.class); + boolean delete = method.isAnnotationPresent(DeleteRequest.class); + if (post) { requestBuilder.setRequestMethod(ObserveRequestMethod.POST); + } else if (delete) { + requestBuilder.setRequestMethod(ObserveRequestMethod.DELETE); } else { requestBuilder.setRequestMethod(ObserveRequestMethod.GET); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java similarity index 89% copy from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java copy to observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java index 302845c..826d10b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java @@ -22,14 +22,13 @@ package fr.ird.observe.services.service.actions.report; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.ReferenceDtos; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.service.AbstractServiceRestTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -41,7 +40,6 @@ import java.net.URL; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; /** * Classe abstraite de test d'un report. @@ -52,10 +50,10 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 1.9 */ -public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopiaTest { +public abstract class AbstractReportServiceRestTest extends AbstractServiceRestTest { /** Logger */ - private static final Log log = LogFactory.getLog(AbstractReportServiceTopiaTest.class); + private static final Log log = LogFactory.getLog(AbstractReportServiceRestTest.class); protected ReportService service; @@ -67,16 +65,6 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi protected abstract String getReportId(); - @Override - public String getScriptName() { - return "dataForTestSeine"; - } - - @Override - public Set<String> getTestNamesChangeDataBase() { - return ImmutableSet.of(); - } - @Before public final void setUp() throws Exception { @@ -160,7 +148,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi if (reports == null) { URL reportLocation = - AbstractReportServiceTopiaTest.class.getResource("/observe-reports.properties"); + AbstractReportServiceRestTest.class.getResource("/observe-reports.properties"); if (log.isInfoEnabled()) { log.info("Loading reports from " + reportLocation); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java similarity index 95% copy from observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java copy to observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java index dbfe11c..971a311 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java @@ -22,10 +22,9 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.AbstractReportServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** @@ -34,7 +33,7 @@ import org.junit.Assert; * @author Tony Chemit - chemit@codelutin.com * @since 1.9 */ -public class ReportAccessoryCatchTest extends AbstractReportServiceTopiaTest { +public class ReportAccessoryCatchRestTest extends AbstractReportServiceRestTest { @Override protected void testReportSyntax(Report report) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java index 00a26de..a10871b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java @@ -6,19 +6,25 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportOperation; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; -import fr.ird.observe.services.service.actions.report.model.operations.ExecuteRequests; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportOperation; +import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.dto.actions.report.ReportVariable; +import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; +import java.awt.Dimension; +import java.awt.Point; +import java.io.Serializable; +import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; /** @@ -103,13 +109,9 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer } - - // creation de la première opération qui exécute les requètes - ReportOperation firstRequest = ReportBuilder.newOperation(ExecuteRequests.OPERATION_NAME); - // lancement de la première opération et la matrice de resultat - DataMatrix result = firstRequest.execute( - this, + DataMatrix result = executeReportOperation( + ReportOperation.ExecuteRequests, report, tripId, new DataMatrix()); @@ -121,8 +123,8 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer if (log.isDebugEnabled()) { log.debug("Apply objectOperation " + objectOperation + " to " + tmp); } - result = objectOperation.execute( - this, + result = executeReportOperation( + objectOperation, report, tripId, tmp); @@ -133,8 +135,413 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer return result; } - @Override - public <R> List<R> executeRequest(String request, Map<String, Object> params) { + private DataMatrix executeReportOperation(ReportOperation executeRequests, Report report, String tripId, DataMatrix incoming) { + + DataMatrix result = incoming; + + switch (executeRequests) { + case ExecuteRequests: { + + ReportRequest[] requests = report.getRequests(); + + DataMatrix[] requestResults = new DataMatrix[requests.length]; + + int i = 0; + for (ReportRequest request : requests) { + + ReportRequest.RequestRepeat repeatVariable = request.getRepeat(); + + if (repeatVariable == null) { + + // requete simple sans repetition + result = executeReportRequest(request, report, tripId); + } else { + + // on a une requete avec repetition + String repeatVariableName = repeatVariable.getVariableName(); + ReportVariable repeat = report.getRepeatVariable(repeatVariableName); + + + result = executeReportRequest(request, report, tripId, repeat); + + + } + + requestResults[i++] = result; + } + + int rows = report.getRows(); + int columns = report.getColumns(); + + result = DataMatrix.merge(rows, columns, requestResults); + } break; + + case GroupByLength: { + // Première passe pour grouper par classe de taille + Map<String, MutableInt> data = new LinkedHashMap<String, MutableInt>(); + for (int row = 0, nbRows = incoming.getHeight(); row < nbRows; row++) { + + String length = (String) incoming.getValue(0, row); + Integer count = Integer.valueOf(incoming.getValue(1, row).toString()); + + MutableInt mutableInt = data.get(length); + if (mutableInt == null) { + mutableInt = new MutableInt(); + data.put(length, mutableInt); + } + mutableInt.add(count); + + } + + // Deuxième passe pour remplir la matrice + Set<String> lengths = new HashSet<String>(); + for (int row = 0; row < incoming.getHeight(); row++) { + lengths.add((String) incoming.getValue(0, row)); + } + + result = createTmpMatrix(0, incoming.getHeight(), incoming.getWidth(), lengths.size()); + int row = 0; + for (Map.Entry<String, MutableInt> entry : data.entrySet()) { + String length = entry.getKey(); + MutableInt mutableInt = entry.getValue(); + result.setValue(0, row, length); + result.setValue(1, row, mutableInt.intValue()); + row++; + } + } break; + + case SumColumn: + case SumIntColumn: { + + DataMatrix tmpMatrix = createTmpMatrix(0, incoming.getHeight(), incoming.getWidth(), 1); + + for (int column = 0, nbColumns = incoming.getWidth(); column < nbColumns; column++) { + + Object sumColumn = getSumColumn(column, incoming); + if (ReportOperation.SumIntColumn.equals(executeRequests) && sumColumn instanceof Number) { + sumColumn = ((Number) sumColumn).intValue(); + } + tmpMatrix.setValue(column, 0, sumColumn); + if (log.isDebugEnabled()) { + log.debug("objectOperation [" + column + ",0] = " + sumColumn); + } + } + + result = DataMatrix.merge(incoming, tmpMatrix); + } break; + case SumRow: + case SumIntRow: { + + DataMatrix tmpMatrix = createTmpMatrix(incoming.getWidth(), 0, 1, incoming.getHeight()); + + for (int row = 0, nbRows = incoming.getHeight(); row < nbRows; row++) { + + Object sumRow = getSumRow(row, incoming); + if (ReportOperation.SumIntRow.equals(executeRequests) && sumRow instanceof Number) { + sumRow = ((Number) sumRow).intValue(); + } + tmpMatrix.setValue(0, row, sumRow); + if (log.isDebugEnabled()) { + log.debug("objectOperation [0, " + row + "] = " + sumRow); + } + } + + result = DataMatrix.merge(incoming, tmpMatrix); + + } break; + } + + return result; + } + + protected Object getSumColumn(int column, DataMatrix incoming) { + Double result = 0d; + + int nbRows = incoming.getHeight(); + + for (int row = 0; row < nbRows; row++) { + Serializable o = incoming.getValue(column, row); + + if (o == null || "null".equals(o)) { + o = 0; + } + Double d; + try { + d = Double.valueOf(o.toString()); + } catch (NumberFormatException e) { + // une des données de la colonne n'est pas un count + // on sort directement + if (log.isDebugEnabled()) { + log.debug("Could not convert " + o + " to number", e); + } + return "-"; + } + result += d; + } + + return result; + } + + protected Object getSumRow(int row, DataMatrix incoming) { + + Double result = 0d; + + int nbColumns = incoming.getWidth(); + + for (int col = 0; col < nbColumns; col++) { + Serializable o = incoming.getValue(col, row); + + if (o == null || "null".equals(o)) { + o = 0; + } + Double d; + try { + d = Double.valueOf(o.toString()); + } catch (NumberFormatException e) { + // une des données de la colonne n'est pas un count + // on sort directement + if (log.isDebugEnabled()) { + log.debug("Could not convert " + o + " to number", e); + } + return "-"; + } + result += d; + } + + return result; + } + + + private DataMatrix createTmpMatrix(int positionX, int positionY, int width, int height) { + + DataMatrix result = new DataMatrix(); + + // calcul de la position des résultats de l'opération + Point location = new Point(positionX, positionY); + result.setLocation(location); + + // calcul de la taille des résultats de l'opération + Dimension dim = new Dimension(width, height); + result.setDimension(dim); + + // creation de la matrice + result.createData(); + + return result; + } + + public DataMatrix executeReportRequest(ReportRequest request, Report report, String tripId, ReportVariable repeatValues) { + + DataMatrix result = new DataMatrix(); + + Map<String, Object> params = request.extractParams(report, tripId); + + for (Object repeatValue : repeatValues.getValues()) { + params.put(request.getRepeat().getVariableName(), repeatValue); + DataMatrix tmp = executeReportRequest(request, params); + if (result == null) { + + // premiere requete executee + result = tmp; + result.setX(0); + result.setY(0); + } else { + switch (request.getRepeat().getLayout()) { + + case row: + + // on ajoute le resultat a droite de celui deja present + tmp.setX(result.getX() + result.getWidth()); + tmp.setY(result.getY()); + break; + + case column: + + // on ajoute le resultat en dessous de celui deja present + tmp.setX(result.getX()); + tmp.setY(result.getY() + result.getHeight()); + break; + } + result = DataMatrix.merge(result, tmp); + } + } + result.setX(request.getX()); + result.setY(request.getY()); + if (log.isDebugEnabled()) { + log.debug("Result location : " + result.getLocation()); + log.debug("Result data :\n" + result.getClipbordContent(true, true)); + } + return result; + } + + public DataMatrix executeReportRequest(ReportRequest request, Report report, String tripId) { + Map<String, Object> params = request.extractParams(report, tripId); + + DataMatrix dataMatrix = executeReportRequest(request, params); + + return dataMatrix; + + } + + protected DataMatrix executeReportRequest(ReportRequest reportRequest, Map<String, Object> params) { + + // création des paramètres : couples (key, value) + if (log.isDebugEnabled()) { + log.debug("Request : " + reportRequest.getRequest()); + log.debug("Available params : " + params.keySet()); + log.debug("Params to use : " + params); + } + + // lancement de la requête + List<?> list = executeRequest(reportRequest.getRequest(), params); + if (log.isDebugEnabled()) { + log.debug("Result size : " + list.size()); + } + + // determination des dimensions du résultat + Dimension dimension = computeDimension(reportRequest, list); + if (log.isDebugEnabled()) { + log.debug("Result dimension : " + dimension); + } + + // construction du resultat + DataMatrix result = computeResult(reportRequest, dimension, list); + if (log.isDebugEnabled()) { + log.debug("Result location : " + result.getLocation()); + log.debug("Result data :\n" + result.getClipbordContent(true, true)); + } + return result; + } + + protected DataMatrix computeResult(ReportRequest request, Dimension dimension, List<?> list) { + + DataMatrix result = new DataMatrix(); + result.setDimension(dimension); + result.createData(); + + // le seul cas différent est le n-* (une ligne correspond à une colonne) + + int y = 0; + int x = 0; + + switch (request.getLayout()) { + + case row: + + boolean uniqueColumn = result.getWidth() == 1; + + // les lignes du résultat sont les lignes du tableau + + for (Object row : list) { + + if (uniqueColumn) { + + // une seule colonne + result.setValue(0, y, row); + } else { + + x = 0; + Object[] cells = (Object[]) row; + for (Object cell : cells) { + result.setValue(x++, y, cell); + } + } + + // on passage a la ligne suivante + y++; + } + break; + case column: + + // les lignes du résultat sont les colonnes du tableau + + boolean uniqueRow = result.getHeight() == 1; + + for (Object col : list) { + + if (uniqueRow) { + + // une seule ligne + result.setValue(x, 0, col); + } else { + + y = 0; + Object[] cells = (Object[]) col; + for (Object cell : cells) { + result.setValue(x, y++, cell); + } + } + + // on passage a la colonne suivante + x++; + } + break; + } + + // on pousse la position du résultat + result.setX(request.getX()); + result.setY(request.getY()); + return result; + } + + protected Dimension computeDimension(ReportRequest request, List<?> list) { + + int height = 0; + int width = 0; + + switch (request.getLayout()) { + + case row: + + // le count de result est le lastNamebre de lignes + height = list.size(); + + if (list.isEmpty()) { + + // vu qu'il n'y a pas de résultat, on ne peut rien dire + width = 0; + } else { + + Object o = list.get(0); + + if (o == null || !o.getClass().isArray()) { + + // une seule colonne + width = 1; + } else { + width = ((Object[]) o).length; + } + } + + break; + case column: + + // le count de result est le lastNamebre de colonnes + width = list.size(); + + if (list.isEmpty()) { + + // vu qu'il n'y a pas de résultat, on ne peut rien dire + height = 0; + } else { + + Object o = list.get(0); + + if (o == null || !o.getClass().isArray()) { + + // une seule ligne + height = 1; + } else { + height = ((Object[]) o).length; + } + } + + break; + } + return new Dimension(width, height); + } + + protected <R> List<R> executeRequest(String request, Map<String, Object> params) { // si il y a des references de DTO dans les valeur des paramètres on les remplace par leur id // on copie pour ne pas modifier le paramètre de la méthode @@ -200,8 +607,6 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer variable.setValues(values); } - - } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java index 302845c..e250b36 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java @@ -25,11 +25,11 @@ package fr.ird.observe.services.service.actions.report; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.service.AbstractServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; -import fr.ird.observe.services.service.actions.report.model.ReportVariable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java index 0d821da..31c48b8 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; +import fr.ird.observe.services.dto.actions.report.DataMatrix; /** * Test du report {@code discardedAccessoire}. diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java index 09c5776..a0a5a4e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; +import fr.ird.observe.services.dto.actions.report.DataMatrix; /** * Pour tester le report {@code discardedAccessoireByGroup} diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java index 21fa2c1..2f9851c 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java @@ -21,10 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.AbstractReportServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java index dbfe11c..fc6c124 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java @@ -22,10 +22,9 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.AbstractReportServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java index 39e6e80..6547513 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java index 969788f..435812e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java @@ -22,10 +22,9 @@ package fr.ird.observe.services.service.actions.report; * #L% */ -import fr.ird.observe.services.service.actions.report.AbstractReportServiceTopiaTest; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java index 0b07b83..e647329 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java index 530d467..82b1e7a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java index 18c1b48..c20e07b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; +import fr.ird.observe.services.dto.actions.report.DataMatrix; import org.junit.Ignore; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java index d29f976..0b9900e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java index e75dd69..c27a4ca 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java index 7d1ca56..66c45b6 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.service.actions.report.model.DataMatrix; -import fr.ird.observe.services.service.actions.report.model.Report; -import fr.ird.observe.services.service.actions.report.model.ReportRequest; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportRequest; import org.junit.Assert; /** -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit b7cff03d46f6bf64bec2781dfb768e4be11511f2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Sep 9 15:54:49 2015 +0200 Test de consilidation des données en mode REST (refs #7463) --- ...teDataServiceTopiaTest.java => ConsolidateDataServiceRestTest.java} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java similarity index 93% rename from observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java rename to observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java index 42ba6c1..0fbe3d9 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java @@ -13,7 +13,7 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class ConsolidateDataServiceTopiaTest extends AbstractServiceRestTest { +public class ConsolidateDataServiceRestTest extends AbstractServiceRestTest { protected ConsolidateDataService service; @@ -37,6 +37,5 @@ public class ConsolidateDataServiceTopiaTest extends AbstractServiceRestTest { //FIXME Il faudrait avoir des données modifiées dans la base de test Assert.assertEquals(0, results.size()); - } } \ No newline at end of file -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 01c67c9afb17faedc44b7152a457d07cf7f4bc78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 11 08:22:03 2015 +0200 Renommage aussi de editingReferentielList en editingReferentielListEntity --- .../referentiel/Country-n1-create-error-validation.xml | 8 ++++---- .../referentiel/Country-n1-update-error-validation.xml | 8 ++++---- .../referentiel/FpaZone-n1-create-error-validation.xml | 4 ++-- .../referentiel/FpaZone-n1-update-error-validation.xml | 4 ++-- .../entities/referentiel/Gear-n1-create-error-validation.xml | 4 ++-- .../entities/referentiel/Gear-n1-update-error-validation.xml | 4 ++-- .../GearCaracteristic-n1-create-error-validation.xml | 4 ++-- .../GearCaracteristic-n1-update-error-validation.xml | 4 ++-- .../GearCaracteristicType-n1-create-error-validation.xml | 4 ++-- .../GearCaracteristicType-n1-update-error-validation.xml | 4 ++-- .../referentiel/Harbour-n1-create-error-validation.xml | 4 ++-- .../referentiel/Harbour-n1-update-error-validation.xml | 4 ++-- .../LengthWeightParameter-n1-create-error-validation.xml | 10 +++++----- .../LengthWeightParameter-n1-update-error-validation.xml | 10 +++++----- .../referentiel/Ocean-n1-create-error-validation.xml | 4 ++-- .../referentiel/Ocean-n1-update-error-validation.xml | 4 ++-- .../referentiel/Organism-n1-create-error-validation.xml | 4 ++-- .../referentiel/Organism-n1-update-error-validation.xml | 4 ++-- .../referentiel/Person-n1-create-error-validation.xml | 4 ++-- .../referentiel/Person-n1-update-error-validation.xml | 4 ++-- .../referentiel/Program-n1-create-error-validation.xml | 4 ++-- .../referentiel/Program-n1-update-error-validation.xml | 4 ++-- .../entities/referentiel/Sex-n1-create-error-validation.xml | 4 ++-- .../entities/referentiel/Sex-n1-update-error-validation.xml | 4 ++-- .../referentiel/Species-n1-create-error-validation.xml | 12 ++++++------ .../referentiel/Species-n1-update-error-validation.xml | 12 ++++++------ .../referentiel/SpeciesGroup-n1-create-error-validation.xml | 4 ++-- .../referentiel/SpeciesGroup-n1-update-error-validation.xml | 4 ++-- .../referentiel/SpeciesList-n1-create-error-validation.xml | 4 ++-- .../referentiel/SpeciesList-n1-update-error-validation.xml | 4 ++-- .../referentiel/Vessel-n1-create-error-validation.xml | 4 ++-- .../referentiel/Vessel-n1-update-error-validation.xml | 4 ++-- .../VesselSizeCategory-n1-create-error-validation.xml | 4 ++-- .../VesselSizeCategory-n1-update-error-validation.xml | 4 ++-- .../referentiel/VesselType-n1-create-error-validation.xml | 4 ++-- .../referentiel/VesselType-n1-update-error-validation.xml | 4 ++-- .../BaitHaulingStatus-n1-create-error-validation.xml | 4 ++-- .../BaitHaulingStatus-n1-update-error-validation.xml | 4 ++-- .../BaitSettingStatus-n1-create-error-validation.xml | 4 ++-- .../BaitSettingStatus-n1-update-error-validation.xml | 4 ++-- .../longline/BaitType-n1-create-error-validation.xml | 4 ++-- .../longline/BaitType-n1-update-error-validation.xml | 4 ++-- .../CatchFateLongline-n1-create-error-validation.xml | 4 ++-- .../CatchFateLongline-n1-update-error-validation.xml | 4 ++-- .../longline/EncounterType-n1-create-error-validation.xml | 4 ++-- .../longline/EncounterType-n1-update-error-validation.xml | 4 ++-- .../longline/Healthness-n1-create-error-validation.xml | 4 ++-- .../longline/Healthness-n1-update-error-validation.xml | 4 ++-- .../longline/HookPosition-n1-create-error-validation.xml | 4 ++-- .../longline/HookPosition-n1-update-error-validation.xml | 4 ++-- .../longline/HookSize-n1-create-error-validation.xml | 4 ++-- .../longline/HookSize-n1-update-error-validation.xml | 4 ++-- .../longline/HookType-n1-create-error-validation.xml | 4 ++-- .../longline/HookType-n1-update-error-validation.xml | 4 ++-- .../ItemHorizontalPosition-n1-create-error-validation.xml | 4 ++-- .../ItemHorizontalPosition-n1-update-error-validation.xml | 4 ++-- .../ItemVerticalPosition-n1-create-error-validation.xml | 4 ++-- .../ItemVerticalPosition-n1-update-error-validation.xml | 4 ++-- .../longline/LightsticksColor-n1-create-error-validation.xml | 4 ++-- .../longline/LightsticksColor-n1-update-error-validation.xml | 4 ++-- .../longline/LightsticksType-n1-create-error-validation.xml | 4 ++-- .../longline/LightsticksType-n1-update-error-validation.xml | 4 ++-- .../longline/LineType-n1-create-error-validation.xml | 4 ++-- .../longline/LineType-n1-update-error-validation.xml | 4 ++-- .../longline/MaturityStatus-n1-create-error-validation.xml | 4 ++-- .../longline/MaturityStatus-n1-update-error-validation.xml | 4 ++-- .../longline/MitigationType-n1-create-error-validation.xml | 4 ++-- .../longline/MitigationType-n1-update-error-validation.xml | 4 ++-- .../longline/SensorBrand-n1-create-error-validation.xml | 4 ++-- .../longline/SensorBrand-n1-update-error-validation.xml | 4 ++-- .../longline/SensorDataFormat-n1-create-error-validation.xml | 4 ++-- .../longline/SensorDataFormat-n1-update-error-validation.xml | 4 ++-- .../longline/SensorType-n1-create-error-validation.xml | 4 ++-- .../longline/SensorType-n1-update-error-validation.xml | 4 ++-- .../longline/SettingShape-n1-create-error-validation.xml | 4 ++-- .../longline/SettingShape-n1-update-error-validation.xml | 4 ++-- .../longline/SizeMeasureType-n1-create-error-validation.xml | 4 ++-- .../longline/SizeMeasureType-n1-update-error-validation.xml | 4 ++-- .../longline/StomacFullness-n1-create-error-validation.xml | 4 ++-- .../longline/StomacFullness-n1-update-error-validation.xml | 4 ++-- .../longline/TripType-n1-create-error-validation.xml | 4 ++-- .../longline/TripType-n1-update-error-validation.xml | 4 ++-- .../VesselActivityLongline-n1-create-error-validation.xml | 4 ++-- .../VesselActivityLongline-n1-update-error-validation.xml | 4 ++-- .../WeightMeasureType-n1-create-error-validation.xml | 4 ++-- .../WeightMeasureType-n1-update-error-validation.xml | 4 ++-- .../seine/DetectionMode-n1-create-error-validation.xml | 4 ++-- .../seine/DetectionMode-n1-update-error-validation.xml | 4 ++-- .../seine/ObjectFate-n1-create-error-validation.xml | 4 ++-- .../seine/ObjectFate-n1-update-error-validation.xml | 4 ++-- .../seine/ObjectOperation-n1-create-error-validation.xml | 4 ++-- .../seine/ObjectOperation-n1-update-error-validation.xml | 4 ++-- .../seine/ObjectType-n1-create-error-validation.xml | 4 ++-- .../seine/ObjectType-n1-update-error-validation.xml | 4 ++-- .../seine/ObservedSystem-n1-create-error-validation.xml | 4 ++-- .../seine/ObservedSystem-n1-update-error-validation.xml | 4 ++-- .../seine/ReasonForDiscard-n1-create-error-validation.xml | 4 ++-- .../seine/ReasonForDiscard-n1-update-error-validation.xml | 4 ++-- .../seine/ReasonForNoFishing-n1-create-error-validation.xml | 4 ++-- .../seine/ReasonForNoFishing-n1-update-error-validation.xml | 4 ++-- .../seine/ReasonForNullSet-n1-create-error-validation.xml | 4 ++-- .../seine/ReasonForNullSet-n1-update-error-validation.xml | 4 ++-- .../seine/SpeciesFate-n1-create-error-validation.xml | 4 ++-- .../seine/SpeciesFate-n1-update-error-validation.xml | 4 ++-- .../seine/SpeciesStatus-n1-create-error-validation.xml | 4 ++-- .../seine/SpeciesStatus-n1-update-error-validation.xml | 4 ++-- .../seine/SurroundingActivity-n1-create-error-validation.xml | 4 ++-- .../seine/SurroundingActivity-n1-update-error-validation.xml | 4 ++-- .../TransmittingBuoyOperation-n1-create-error-validation.xml | 4 ++-- .../TransmittingBuoyOperation-n1-update-error-validation.xml | 4 ++-- .../TransmittingBuoyType-n1-create-error-validation.xml | 4 ++-- .../TransmittingBuoyType-n1-update-error-validation.xml | 4 ++-- .../seine/VesselActivitySeine-n1-create-error-validation.xml | 4 ++-- .../seine/VesselActivitySeine-n1-update-error-validation.xml | 4 ++-- .../seine/WeightCategory-n1-create-error-validation.xml | 4 ++-- .../seine/WeightCategory-n1-update-error-validation.xml | 4 ++-- .../referentiel/seine/Wind-n1-create-error-validation.xml | 4 ++-- .../referentiel/seine/Wind-n1-update-error-validation.xml | 4 ++-- .../service/actions/validate/ValidationDataContext.java | 12 ++++++------ 119 files changed, 260 insertions(+), 260 deletions(-) diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml index 669e786..6aad3b1 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -59,7 +59,7 @@ <!-- clef unique sur le iso2Code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">iso2Code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -76,7 +76,7 @@ <!-- clef unique sur le iso3Code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">iso3Code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml index 669e786..6aad3b1 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -59,7 +59,7 @@ <!-- clef unique sur le iso2Code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">iso2Code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -76,7 +76,7 @@ <!-- clef unique sur le iso3Code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">iso3Code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml index 470663a..b323f8c 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml @@ -28,7 +28,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -41,7 +41,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml index 470663a..b323f8c 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml @@ -28,7 +28,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -41,7 +41,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml index 7bf463a..39b9df0 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntityEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml index 7bf463a..9ac1e38 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml index f340882..cdd92c8 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml index f340882..cdd92c8 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml index 7bf463a..9ac1e38 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml index 7bf463a..9ac1e38 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml index b9e2680..b9958a9 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml index 5fb0871..0d8f609 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml index 12a8244..f6311ae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -47,7 +47,7 @@ <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -57,7 +57,7 @@ <field name="ocean"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -67,7 +67,7 @@ <field name="sex"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -77,7 +77,7 @@ <field name="startDate"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml index cc3a121..eeb730b 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -47,7 +47,7 @@ <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -57,7 +57,7 @@ <field name="ocean"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -67,7 +67,7 @@ <field name="sex"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> @@ -77,7 +77,7 @@ <field name="startDate"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">species,sex,ocean,startDate</param> <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml index e450220..01a4ba4 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml index 90f04a2..2692af5 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml index 875e527..fdb057d 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri--> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml index cdd7e62..194ce1a 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri--> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml index 2cd2378..6726c03 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml index 2211306..3b021dc 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml index 470663a..b323f8c 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml @@ -28,7 +28,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -41,7 +41,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml index 470663a..b323f8c 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml @@ -28,7 +28,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -41,7 +41,7 @@ <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml index 3fb2083..e981a11 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -53,7 +53,7 @@ <field name="homeId"> <!-- clef unique sur le homeId --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">homeId</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -64,7 +64,7 @@ <field name="faoCode"> <!-- clef unique sur le faoCode --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">faoCode</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -75,7 +75,7 @@ <field name="wormsId"> <!-- clef unique sur le wormsId --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">wormsId</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -106,7 +106,7 @@ <!-- clef unique sur le scientificLabel --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">scientificLabel</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml index 8f1a67f..f357281 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -53,7 +53,7 @@ <field name="homeId"> <!-- clef unique sur le homeId --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">homeId</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -64,7 +64,7 @@ <field name="faoCode"> <!-- clef unique sur le faoCode --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">faoCode</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -75,7 +75,7 @@ <field name="wormsId"> <!-- clef unique sur le wormsId --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">wormsId</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -105,7 +105,7 @@ <!-- clef unique sur le scientificLabel --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">scientificLabel</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml index e5de94a..a108075 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml index 3face9b..ebed934 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml index 32e5053..827ebd4 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml index 2a1284a..d9e00c4 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml index b14c452..1869733 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml index b14c452..1869733 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml index d6e1286..1967477 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml @@ -31,7 +31,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -43,7 +43,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml index b551248..2a90a31 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml index 8cfd2fa..139ecae 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml index 1f8caa4..043a266 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml index bd15d45..82a637d 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml index 3c0da44..a44070e 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml index 3c0da44..a44070e 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml @@ -30,7 +30,7 @@ <!-- clef unique sur le code --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">code</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> @@ -42,7 +42,7 @@ <field name="uri"> <!-- clef unique sur l'uri --> <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielList</param> + <param name="collectionFieldName">editingReferentielListEntity</param> <param name="keys">uri</param> <param name="againstMe">true</param> <param name="nullValueSkipped">true</param> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java index beae8ac..fed4c95 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java @@ -44,7 +44,7 @@ import java.util.List; */ public class ValidationDataContext { - protected List<?> editingReferentielList; + protected List<?> editingReferentielListEntity; protected Program programEntity; @@ -65,7 +65,7 @@ public class ValidationDataContext { protected FloatingObject floatingObjectEntity; public void clear() { - editingReferentielList = null; + editingReferentielListEntity = null; programEntity = null; tripSeineEntity = null; routeEntity = null; @@ -136,8 +136,8 @@ public class ValidationDataContext { return floatingObjectEntity; } - public List<?> getEditingReferentielList() { - return editingReferentielList; + public List<?> getEditingReferentielListEntity() { + return editingReferentielListEntity; } void setTripSeineEntity(TripSeine tripSeineEntity) { @@ -174,8 +174,8 @@ public class ValidationDataContext { this.floatingObjectEntity = floatingObjectEntity; } - void setEditingReferentielList(List<?> editingReferentielList) { - this.editingReferentielList = editingReferentielList; + void setEditingReferentielListEntity(List<?> editingReferentielListEntity) { + this.editingReferentielListEntity = editingReferentielListEntity; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.