September 2015 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7463 updated (652eaa9 -> c884bd5)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from 652eaa9 controleur pour les actions pour le serveur web (refs #7463) new c884bd5 Changement de l'API de DataSourceService pour quelle renvoie le résultat de la connexion à la source de données The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c884bd58986b25f220d70ba9a8393ece65477d72 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 09:20:49 2015 +0200 Changement de l'API de DataSourceService pour quelle renvoie le résultat de la connexion à la source de données Summary of changes: .../ObserveWebApplicationConfiguration.java | 7 ++++ .../ObserveWebApplicationConfigurationOption.java | 2 + .../controller/v1/DataSourceServiceController.java | 43 ++++++++++++++++++---- .../ObserveWebSecurityApplicationContext.java | 21 ++++++++++- .../services/service/DataSourceService.java | 5 ++- .../ObserveDataSourceConnectionRest.java | 14 +++---- .../ObserveDataSourceConnectionTopia.java | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 9 ++--- .../services/service/DataSourceServiceTopia.java | 28 +++++++++++++- 9 files changed, 103 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463 updated (15ea9ab -> 652eaa9)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from 15ea9ab controleur pour la palangre pour le serveur web (refs #7463) new 652eaa9 controleur pour les actions pour le serveur web (refs #7463) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 652eaa99b87f6c3953b0208bb6cbd269adaea1d9 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 4 09:06:25 2015 +0200 controleur pour les actions pour le serveur web (refs #7463) Summary of changes: .../ConsolidateDataServiceController.java | 22 ++++++++++++++ .../v1/actions/report/ReportServiceController.java | 34 ++++++++++++++++++++++ .../validate/ValidateServiceController.java | 34 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463 updated (60fabd0 -> 15ea9ab)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from 60fabd0 Introduction d'un objet qui contient une connexion à une source de données (avec les droits utilisateurs) new 15ea9ab controleur pour la palangre pour le serveur web (refs #7463) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 15ea9ab47f6605bdafbccb86b7693842d70a62f9 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 4 08:53:05 2015 +0200 controleur pour la palangre pour le serveur web (refs #7463) Summary of changes: .../ActivityLongLineEncouterServiceController.java | 31 ++++++++++++++ ...ctivityLongLineSensorUsedServiceController.java | 31 ++++++++++++++ .../ActivityLonglineServiceController.java | 49 ++++++++++++++++++++++ .../GearUseFeaturesLonglineServiceController.java | 48 +++++++++++++++++++++ .../SetLonglineCatchServiceController.java | 31 ++++++++++++++ ...LonglineDetailCompositionServiceController.java | 31 ++++++++++++++ ...LonglineGlobalCompositionServiceController.java | 31 ++++++++++++++ .../v1/longline/SetLonglineServiceController.java | 41 ++++++++++++++++++ .../v1/longline/TdrServiceController.java | 31 ++++++++++++++ .../v1/longline/TripLonglineServiceController.java | 49 ++++++++++++++++++++++ 10 files changed, 373 insertions(+) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/GearUseFeaturesLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463 updated (05be1c0 -> 60fabd0)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from 05be1c0 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation new 60fabd0 Introduction d'un objet qui contient une connexion à une source de données (avec les droits utilisateurs) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 60fabd0ad757356e6683d6ba8326189358b157c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 08:47:16 2015 +0200 Introduction d'un objet qui contient une connexion à une source de données (avec les droits utilisateurs) Summary of changes: .../ObserveDataSourceConfiguration.java | 4 +- .../configuration/ObserveDataSourceConnection.java | 37 ++++++++++++++ .../ObserveDataSourceConnectionSupport.java | 56 ++++++++++++++++++++++ ...veDataSourceConfigurationRestAuthenticated.java | 6 --- ...ataSourceConfigurationRestNotAuthenticated.java | 6 --- .../ObserveDataSourceConfigurationRestSupport.java | 7 +-- .../ObserveDataSourceConnectionRest.java | 25 ++++++++++ .../ObserveDataSourceConfigurationTopiaH2.java | 8 ++-- .../ObserveDataSourceConfigurationTopiaPG.java | 6 --- .../ObserveDataSourceConnectionTopia.java | 18 +++++++ .../services/service/DataSourceServiceTopia.java | 17 ++++--- .../service/DataSourceServiceTopiaTest.java | 3 ++ 12 files changed, 155 insertions(+), 38 deletions(-) create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java create mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java create mode 100644 observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463 updated (dd37e61 -> 05be1c0)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from dd37e61 Début de tests sur le client rest (See #7563) new 05be1c0 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 05be1c06e9e114da3d2294bf6dbb0e1c2c166cc2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 08:12:45 2015 +0200 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation Summary of changes: .../services/service/ReferentialService.java | 11 +++++++++- .../consolidate/ConsolidateDataService.java | 4 ++++ .../service/actions/report/ReportService.java | 8 ++++++++ ...ResultForDto.java => ValidateResultForDto.java} | 4 ++-- .../actions/validate/ValidateResultForDtoType.java | 10 ++++----- .../service/actions/validate/ValidateService.java | 5 +++++ .../longline/ActivityLongLineEncouterService.java | 5 +++++ .../ActivityLongLineSensorUsedService.java | 5 +++++ .../service/longline/ActivityLonglineService.java | 8 ++++++++ .../longline/GearUseFeaturesLonglineService.java | 8 ++++++++ .../service/longline/SetLonglineCatchService.java | 5 +++++ .../SetLonglineDetailCompositionService.java | 5 +++++ .../SetLonglineGlobalCompositionService.java | 5 +++++ .../service/longline/SetLonglineService.java | 7 +++++++ .../services/service/longline/TdrService.java | 5 +++++ .../service/longline/TripLonglineService.java | 8 ++++++++ .../seine/ActivitySeineObservedSystemService.java | 5 +++++ .../service/seine/ActivitySeineService.java | 8 ++++++++ .../service/seine/FloatingObjectService.java | 8 ++++++++ .../service/seine/GearUseFeaturesSeineService.java | 8 ++++++++ .../service/seine/NonTargetCatchService.java | 5 +++++ .../service/seine/NonTargetSampleService.java | 6 ++++++ .../seine/ObjectObservedSpeciesService.java | 5 +++++ .../service/seine/ObjectSchoolEstimateService.java | 5 +++++ .../services/service/seine/RouteService.java | 8 ++++++++ .../service/seine/SchoolEstimateService.java | 5 +++++ .../services/service/seine/SetSeineService.java | 7 +++++++ .../services/service/seine/TargetCatchService.java | 5 +++++ .../service/seine/TargetSampleService.java | 6 ++++++ .../seine/TransmittingBuoyOperationService.java | 5 +++++ .../services/service/seine/TripSeineService.java | 8 ++++++++ .../{NoDataAccess.java => ReadDataPermission.java} | 6 +++--- ...aAccess.java => ReadReferentialPermission.java} | 6 +++--- ...{NoDataAccess.java => WriteDataPermission.java} | 6 +++--- ...Access.java => WriteReferentialPermission.java} | 6 +++--- .../actions/validate/ValidateServiceTopia.java | 6 +++--- .../actions/validate/ValidateServiceTopiaTest.java | 24 +++++++++++----------- 37 files changed, 216 insertions(+), 35 deletions(-) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/{ValidationResultForDto.java => ValidateResultForDto.java} (82%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => ReadDataPermission.java} (73%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => ReadReferentialPermission.java} (71%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => WriteDataPermission.java} (72%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => WriteReferentialPermission.java} (70%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463 updated (c579af1 -> dd37e61)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from c579af1 controleur pour seine pour le serveur web (refs #7463) new 24036b0 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) new 7fcd439 Revue un peu du paquetage http (See #7463) new 42de064 Introduction de constants pour les choses mises dans les headers de la requete (See #7463) new dd37e61 Début de tests sur le client rest (See #7563) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dd37e614f4edbe50745d824d62e3608fe24c0041 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:35:26 2015 +0200 Début de tests sur le client rest (See #7563) commit 42de064264a3a4b33c5423c3fe28579a102a534e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:34:49 2015 +0200 Introduction de constants pour les choses mises dans les headers de la requete (See #7463) commit 7fcd43926d4593cc6710ee24b6b98212d1693594 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:22:36 2015 +0200 Revue un peu du paquetage http (See #7463) commit 24036b0a246555e6be2c3d9bd908847780f64433 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:21:16 2015 +0200 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) Summary of changes: .../application/web/ObserveWebMotionFilter.java | 27 ++-- ...eDataSourceConfigurationRestAuthenticated.java} | 38 ++---- ...bserveDataSourceConfigurationRestConstants.java | 23 ++++ ...ataSourceConfigurationRestNotAuthenticated.java | 69 +++++++++++ ...ObserveDataSourceConfigurationRestSupport.java} | 16 +-- observe-services-rest/pom.xml | 6 + .../services/ObserveServiceFactoryRest.java | 104 ++++++++++------ .../ird/observe/services/http/RequestBuilder.java | 8 +- .../ird/observe/services/http/RequestResult.java | 52 ++------ .../fr/ird/observe/services/TestClassResource.java | 136 +++++++++++++++++++++ .../ird/observe/services/TestMethodResource.java | 97 +++++++++++++++ .../service/DataSourceServiceRestTest.java | 72 +++++++++++ .../ObserveDataSourceConfigurationMainFactory.java | 26 +++- 13 files changed, 539 insertions(+), 135 deletions(-) copy observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/{ObserveDataSourceConfigurationRest.java => ObserveDataSourceConfigurationRestAuthenticated.java} (52%) create mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java create mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java rename observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/{ObserveDataSourceConfigurationRest.java => ObserveDataSourceConfigurationRestSupport.java} (65%) create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

02/04: Revue un peu du paquetage http (See #7463)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit 7fcd43926d4593cc6710ee24b6b98212d1693594 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:22:36 2015 +0200 Revue un peu du paquetage http (See #7463) --- .../ird/observe/services/http/RequestBuilder.java | 8 ++-- .../ird/observe/services/http/RequestResult.java | 52 ++++++---------------- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java index 8eb1e0b..1a67ae0 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java @@ -2,12 +2,12 @@ package fr.ird.observe.services.http; import com.google.common.base.Charsets; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; +import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,7 +58,7 @@ public class RequestBuilder { @Override public Gson get() { - return new Gson(); + return new ObserveDtoGsonSupplier().get(); } }; @@ -364,7 +364,7 @@ public class RequestBuilder { public <T> T postAndGetJsonAndCloseConnection(Type type) throws IOException { RequestResult postResult = postAndCloseConnection(); if (postResult.getStatusCode() != 200 && log.isWarnEnabled()) { - log.warn(String.format("Unexpected status code: %d%nResponse is: %s", postResult.getStatusCode(), postResult)); + log.warn(String.format("Unexpected status code: %d\nResponse is: %s", postResult.getStatusCode(), postResult)); } T result = convertJson(postResult.getResponse(), type, getGson()); return result; @@ -489,7 +489,7 @@ public class RequestBuilder { @Override public String toString() { - Objects.ToStringHelper helper = Objects.toStringHelper(this).add("url", baseUrl); + MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).add("url", baseUrl); if (header != null) { for (Map.Entry<String, String> entry : header.entrySet()) { String key = String.format("Header [%s]", entry.getKey()); diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java index b83da5b..47d7ed2 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java @@ -13,24 +13,26 @@ import java.io.StringWriter; */ public class RequestResult { - protected int statusCode; - protected Header[] headers; - protected String responseAsString; + protected final int statusCode; + + protected final Header[] headers; + + protected final String responseAsString; public RequestResult(HttpResponse response) throws IOException { this.statusCode = response.getStatusLine().getStatusCode(); this.headers = response.getAllHeaders(); response.getEntity(); - StringWriter writer = new StringWriter(); - InputStream inputStream = response.getEntity().getContent(); - try { - IOUtils.copy(inputStream, writer, "UTF-8"); - inputStream.close(); - } finally { - IOUtils.closeQuietly(inputStream); + try (InputStream inputStream = response.getEntity().getContent()) { + + try (StringWriter writer = new StringWriter()) { + + IOUtils.copy(inputStream, writer, "UTF-8"); + + responseAsString = writer.toString(); + } } - responseAsString = writer.toString(); } public int getStatusCode() { @@ -64,34 +66,6 @@ public class RequestResult { throw new IllegalArgumentException(key + " key is not found in header"); } -// public String getResponseAsString(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new Gson().(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes.asText(); -// } -// -// public Boolean getResponseAsBoolean(String fieldName) throws IOException { -// JsonNode jsonNodes = getResponseAsJsonNode(fieldName); -// if (jsonNodes == null) return null; -// return jsonNodes.asBoolean(); -// } -// -// public JsonNode getResponseAsJsonNode(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new ObjectMapper().readTree(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes; -// } - public String getResponse() throws IOException { return responseAsString; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7463 updated (f7490c6 -> c579af1)
by codelutin.com scm 03 Sep '15

03 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git discards f7490c6 controleur pour seine pour le serveur web (refs #7463) discards 073aaaf premier controleur pour le serveur web (refs #7463) adds c3a48f1 mise en place du service de validation (refs #7493) adds c97b146 ajout du test du service de validation (refs #7493) adds 9ff038a Ajout de propertyChange listener sur les entités (See #7493) adds 6c724df Implantation du service de validation (See #7493) adds 73d72d0 Debut d'intégration des validateurs d'entités (See #7493) adds fdaf365 Fix validation test (See #7493) adds e3c79cb recupération des différents types de dto adds ac1f0ff Renommage de certains objets Simplificiation du détecteur de messages (on n'utilise plus les références sur entités) See #7493 adds 70d655b Tout sur develop (mais il reste encore à gerer les traductions des messages) See #7493 Merge branch 'feature/7493' into develop adds 4a0089a implantation du service de generation des rapport + test (refs #7498) adds a43149f implantation du service de generation des rapport + test (refs #7498) adds 9f49fbf implantation du service de generation des rapport + test (refs #7498) adds dd58708 Merge sur develop (termine #7498) adds 0fcf540 Renommage services de consolidation adds 88e7990 Ajout d'un adapter Gson pour les Class adds 3ba643f Ajout de méthodes de création des différentes datasources new 6cf362b premier controleur pour le serveur web (refs #7463) new c579af1 controleur pour seine pour le serveur web (refs #7463) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f7490c6) \ N -- N -- N refs/heads/feature/7463 (c579af1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c579af126d7bb0ae06ba37f8449e87e1389e54de Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) commit 6cf362b76f2d25baaf2648f3ed8201104f3d5c2f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 3 16:18:08 2015 +0200 premier controleur pour le serveur web (refs #7463) Summary of changes: .../ObserveWebSecurityApplicationContext.java | 2 + .../fr/ird/observe/AbstractObserveTopiaDao.java | 18 + .../ird/observe/entities/seine/ActivitySeines.java | 160 ++++ .../src/main/xmi/observe-common.properties | 1 + .../src/main/xmi/observe-longline.properties | 1 + .../src/main/xmi/observe-seine.properties | 1 + observe-services-api/pom.xml | 29 +- .../src/main/filters/observe-reports.properties | 8 +- ...ataService.java => ConsolidateDataService.java} | 2 +- .../service/actions}/report/ReportBuilder.java | 17 +- .../service/actions/report/ReportService.java | 20 + .../service/actions}/report/model/DataMatrix.java | 2 +- .../service/actions}/report/model/Report.java | 15 +- .../actions}/report/model/ReportOperation.java | 20 +- .../actions}/report/model/ReportRequest.java | 63 +- .../actions}/report/model/ReportVariable.java | 27 +- .../report/model/operations/ExecuteRequests.java | 45 +- .../report/model/operations/GroupByLength.java | 20 +- .../report/model/operations/SumColumn.java | 25 +- .../report/model/operations/SumIntColumn.java | 25 +- .../report/model/operations/SumIntRow.java | 25 +- .../actions}/report/model/operations/SumRow.java | 25 +- .../actions/validate/ValidateDataRequest.java | 54 ++ .../actions/validate/ValidateDataResult.java | 32 + .../validate/ValidateReferentialsRequest.java | 55 ++ .../validate/ValidateReferentialsResult.java | 32 + .../actions/validate/ValidateResultForDtoType.java | 28 + .../service/actions/validate/ValidateService.java | 25 + .../actions/validate/ValidationMessage.java | 45 + .../actions/validate/ValidationResultForDto.java | 34 + ...es.service.actions.report.model.ReportOperation | 6 + .../service/actions/report/ReportBuilderTest.java | 130 +++ .../actions/report/observe-reports-test.properties | 27 + .../observe/services/dto/gson/ClassAdapter.java | 42 + .../services/dto/gson/ObserveDtoGsonSupplier.java | 1 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +- observe-services-topia/pom.xml | 9 + .../ird/observe/services/ObserveServiceTopia.java | 33 + ...Topia.java => ConsolidateDataServiceTopia.java} | 4 +- .../service/actions/report/ReportServiceTopia.java | 207 +++++ .../service/actions/validate/ObserveValidator.java | 166 ++++ .../actions/validate/ValidateServiceTopia.java | 226 +++++ .../actions/validate/ValidationDataContext.java | 181 ++++ .../validate/ValidationMessageDetector.java | 489 +++++++++++ .../service/actions/validate}/ValidatorsMap.java | 24 +- ...t.java => ConsolidateDataServiceTopiaTest.java} | 6 +- .../report/AbstractReportServiceTopiaTest.java | 150 ++-- .../actions/report/ReportAccessoryCatch2Test.java | 199 +++++ .../report/ReportAccessoryCatchByGroup2Test.java | 68 ++ .../report/ReportAccessoryCatchByGroupTest.java | 100 +++ .../actions/report/ReportAccessoryCatchTest.java | 156 ++++ .../report/ReportActivityWithCommentTest.java | 348 ++++++++ .../actions/report/ReportAllActivitysTest.java | 943 +++++++++++++++++++++ .../actions/report/ReportDailySetAndCatchTest.java | 61 +- .../service/actions/report/ReportDcpUsageTest.java | 67 +- .../report/ReportSetByAssociation2Test.java | 14 +- .../actions/report/ReportSetByAssociationTest.java | 26 +- .../report/ReportTargetCatchByAssociationTest.java | 66 +- .../ReportTargetDiscardedByAssociationTest.java | 66 +- .../actions/validate/ValidateServiceTopiaTest.java | 207 +++++ observe-validation/pom.xml | 4 +- .../field/ActivityDebutDePecheSaneValidator.java | 9 +- .../field/ActivityFinDePecheSaneValidator.java | 11 +- .../field/ActivityFinDeVeilleExistsValidator.java | 3 +- .../field/ActivitySimpleSpeedValidator.java | 27 +- .../validation/field/ActivitySpeedValidator.java | 30 +- .../validation/field/OpenableFieldValidator.java | 138 --- .../field/RouteActivitysFieldValidator.java | 7 +- .../field/SetLonglineUniqueHomeIdValidator.java | 14 +- .../field/SetLonglineUniqueNumberValidator.java | 14 +- .../field/VesselActivityFieldValidator.java | 49 +- .../TripLongline-n1-update-warning-validation.xml | 10 +- .../seine/Route-n1-update-warning-validation.xml | 6 +- .../TripSeine-n1-update-warning-validation.xml | 6 +- .../src/main/resources/validators.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 4 +- .../field/ActivitySeineSpeedValidatorTest.java | 3 +- .../field/OpenableEntityFieldValidatorTest.java | 82 -- .../seine/TripSeine-testOpen-error-validation.xml | 32 - pom.xml | 2 +- 80 files changed, 4660 insertions(+), 723 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java copy {observe-business => observe-services-api}/src/main/filters/observe-reports.properties (99%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataService.java => ConsolidateDataService.java} (92%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/ReportBuilder.java (97%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/DataMatrix.java (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/Report.java (88%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportOperation.java (82%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportRequest.java (86%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportVariable.java (71%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/ExecuteRequests.java (70%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/GroupByLength.java (83%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntRow.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumRow.java (84%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java create mode 100644 observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation create mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java create mode 100644 observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopia.java => ConsolidateDataServiceTopia.java} (99%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java copy {observe-business/src/main/java/fr/ird/observe/validation => observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate}/ValidatorsMap.java (75%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopiaTest.java => ConsolidateDataServiceTopiaTest.java} (88%) copy observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java (60%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java copy observe-business/src/test/java/fr/ird/observe/its/report/dailySetAndCatch/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java (53%) copy observe-business/src/test/java/fr/ird/observe/its/report/dcpUsage/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java (55%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/Report2IT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java (85%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java (83%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetCatchByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java (56%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetDiscardedByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java (55%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java delete mode 100644 observe-validation/src/main/java/fr/ird/observe/validation/field/OpenableFieldValidator.java delete mode 100644 observe-validation/src/test/java/fr/ird/observe/validation/field/OpenableEntityFieldValidatorTest.java delete mode 100644 observe-validation/src/test/resources/fr/ird/observe/entities/seine/TripSeine-testOpen-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7463 updated (073aaaf -> f7490c6)
by codelutin.com scm 03 Sep '15

03 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from 073aaaf premier controleur pour le serveur web (refs #7463) new f7490c6 controleur pour seine pour le serveur web (refs #7463) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f7490c63e275df6e40b7bf372a06bf805c66de78 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) Summary of changes: ...tivitySeineObservedSystemServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 9 ++-- .../v1/seine/FloatingObjectServiceController.java | 49 ++++++++++++++++++++++ .../GearUseFeaturesSeineServiceController.java | 48 +++++++++++++++++++++ .../v1/seine/NonTargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/NonTargetSampleServiceController.java | 36 ++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 31 ++++++++++++++ .../ObjectSchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/RouteServiceController.java | 49 ++++++++++++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/SetSeineServiceController.java | 41 ++++++++++++++++++ .../v1/seine/TargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/TargetSampleServiceController.java | 36 ++++++++++++++++ ...TransmittingBuoyOperationServiceController.java | 31 ++++++++++++++ .../service/seine/NonTargetSampleService.java | 3 +- 15 files changed, 456 insertions(+), 6 deletions(-) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (88e7990 -> 3ba643f)
by codelutin.com scm 03 Sep '15

03 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 88e7990 Ajout d'un adapter Gson pour les Class new 3ba643f Ajout de méthodes de création des différentes datasources The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3ba643fc497f6e350da60493fb1e8ab190be076d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 3 16:38:06 2015 +0200 Ajout de méthodes de création des différentes datasources Summary of changes: .../ObserveWebSecurityApplicationContext.java | 2 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1