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

branch feature/7520 updated (5dce55c -> 63cea72)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git discards 5dce55c ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) discards 1f5c293 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) adds 7a69101 test sauvegard de trip seine (refs #7463) adds 27f0d09 ajout la traduction (refs #7463) adds 6608e8e Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs adds 5c0958d Rendre les configuration clonable adds 9a90711 Suppression d'un converter non utilisé adds 0ccce26 Ajout d'un test pour le service de Ping adds 148a817 Vérifier si le host existe bien adds 04279d6 L'injecteur de configuration de sources de données utilise le parametre de la requete adds cc0f39c Revue injecteurs de configuration adds 0f8b763 revue des configuration de test (j'ai remis les valeurs par defaut adds 49833e6 Changement d'api adds 3ddbb24 Changement d'api adds 0197833 Ajout de FIXME à corriger plus tard adds 8efc6af Revue de l'init d'une base sur l'application web adds b6555d5 Possibilité d'utiliser la connexion pour obtenir un service adds fd42767 Le test de ping refonctionne adds 01b2a88 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 adds e1754fe On ne soumet dans le header que le jeton de securite adds 2b4cab6 Simplification de la sécurité + Gestion des erreurs au niveau du serveur web (reste à gérer le retour dans le client REST) adds 4e74ded Test de validation et des équipements + correction (refs #7463) adds 250042d renommer les propriétées dans le context de validation (refs #7463) adds d6e11a2 ajout de la traduction des messages de validation côté serveur (refs #7463) adds 841c7c4 optimisation des tests topia (refs #7463) adds 5eeab8c Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) adds dee5817 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) adds 30aa0b1 Test de consilidation des données en mode REST (refs #7463) adds b7cff03 Test de consilidation des données en mode REST (refs #7463) adds 43cab37 Ajout de javadoc adds 01c67c9 Renommage aussi de editingReferentielList en editingReferentielListEntity adds c586f6f Ajout aussi de la méthode DELETE sur le mapping adds 6ceca24 Retour sur develop Merge branch 'feature/7463-3' into develop new 8b62ca0 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 63cea72 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) 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 (5dce55c) \ N -- N -- N refs/heads/feature/7520 (63cea72) 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 63cea729061a15fe4f46b43c2b511bf8d5ebc797 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) commit 8b62ca0cb7373042998854d2030c03bf69f3725d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) Summary of changes: observe-application-web/pom.xml | 7 + .../ObserveDataSourceConfigurationConverter.java | 47 --- .../web/ObserveWebApplicationListener.java | 34 +- .../application/web/ObserveWebMotionFilter.java | 60 +-- .../web/controller/ObserveWebMotionController.java | 13 +- .../web/controller/v1/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 49 ++- ...serveAuthenticatedServiceControllerSupport.java | 30 ++ .../v1/ObserveServiceControllerSupport.java | 54 ++- .../controller/v1/ObserveWebErrorController.java | 97 +++++ .../v1/ReferentialServiceController.java | 9 +- .../ConsolidateDataServiceController.java | 4 +- .../v1/actions/report/ReportServiceController.java | 16 +- .../validate/ValidateServiceController.java | 12 +- .../ActivityLongLineEncouterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../GearUseFeaturesLonglineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TdrServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 4 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 4 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../GearUseFeaturesSeineServiceController.java | 4 +- .../v1/seine/NonTargetCatchServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 4 +- .../v1/seine/SchoolEstimateServiceController.java | 4 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetCatchServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 4 +- .../ObserveDataSourceConfigurationInjector.java | 57 +++ .../web/injector/ObserveDtoInjector.java | 50 +++ .../web/request/ObserveWebRequestContext.java | 70 ++-- .../request/ObserveWebRequestSecurityContext.java | 62 --- .../web/security/AdminApiKeyNotFoundException.java | 11 + .../AuthenticationTokenNotFoundException.java | 11 + .../BadObserveWebUserPasswordException.java | 5 +- .../InvalidAdminKeyApiException.java | 4 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 13 +- .../ObserveWebSecurityExceptionSupport.java | 26 ++ .../SecurityRequestContextNotFoundException.java | 11 + .../security/UnknownObserveWebUserException.java | 4 +- .../UnknownObserveWebUserForDatabaseException.java | 3 +- .../web/security/UserLoginNotFoundException.java | 11 + .../security/UserPasswordNotFoundException.java | 11 + observe-application-web/src/main/resources/mapping | 10 +- .../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 +- .../Country-n1-create-error-validation.xml | 8 +- .../Country-n1-update-error-validation.xml | 8 +- .../FpaZone-n1-create-error-validation.xml | 4 +- .../FpaZone-n1-update-error-validation.xml | 4 +- .../Gear-n1-create-error-validation.xml | 4 +- .../Gear-n1-update-error-validation.xml | 4 +- ...earCaracteristic-n1-create-error-validation.xml | 4 +- ...earCaracteristic-n1-update-error-validation.xml | 4 +- ...aracteristicType-n1-create-error-validation.xml | 4 +- ...aracteristicType-n1-update-error-validation.xml | 4 +- .../Harbour-n1-create-error-validation.xml | 4 +- .../Harbour-n1-update-error-validation.xml | 4 +- ...hWeightParameter-n1-create-error-validation.xml | 10 +- ...hWeightParameter-n1-update-error-validation.xml | 10 +- .../Ocean-n1-create-error-validation.xml | 4 +- .../Ocean-n1-update-error-validation.xml | 4 +- .../Organism-n1-create-error-validation.xml | 4 +- .../Organism-n1-update-error-validation.xml | 4 +- .../Person-n1-create-error-validation.xml | 4 +- .../Person-n1-update-error-validation.xml | 4 +- .../Program-n1-create-error-validation.xml | 4 +- .../Program-n1-update-error-validation.xml | 4 +- .../referentiel/Sex-n1-create-error-validation.xml | 4 +- .../referentiel/Sex-n1-update-error-validation.xml | 4 +- .../Species-n1-create-error-validation.xml | 12 +- .../Species-n1-update-error-validation.xml | 12 +- .../SpeciesGroup-n1-create-error-validation.xml | 4 +- .../SpeciesGroup-n1-update-error-validation.xml | 4 +- .../SpeciesList-n1-create-error-validation.xml | 4 +- .../SpeciesList-n1-update-error-validation.xml | 4 +- .../Vessel-n1-create-error-validation.xml | 4 +- .../Vessel-n1-update-error-validation.xml | 4 +- ...sselSizeCategory-n1-create-error-validation.xml | 4 +- ...sselSizeCategory-n1-update-error-validation.xml | 4 +- .../VesselType-n1-create-error-validation.xml | 4 +- .../VesselType-n1-update-error-validation.xml | 4 +- ...aitHaulingStatus-n1-create-error-validation.xml | 4 +- ...aitHaulingStatus-n1-update-error-validation.xml | 4 +- ...aitSettingStatus-n1-create-error-validation.xml | 4 +- ...aitSettingStatus-n1-update-error-validation.xml | 4 +- .../BaitType-n1-create-error-validation.xml | 4 +- .../BaitType-n1-update-error-validation.xml | 4 +- ...atchFateLongline-n1-create-error-validation.xml | 4 +- ...atchFateLongline-n1-update-error-validation.xml | 4 +- .../EncounterType-n1-create-error-validation.xml | 4 +- .../EncounterType-n1-update-error-validation.xml | 4 +- .../Healthness-n1-create-error-validation.xml | 4 +- .../Healthness-n1-update-error-validation.xml | 4 +- .../HookPosition-n1-create-error-validation.xml | 4 +- .../HookPosition-n1-update-error-validation.xml | 4 +- .../HookSize-n1-create-error-validation.xml | 4 +- .../HookSize-n1-update-error-validation.xml | 4 +- .../HookType-n1-create-error-validation.xml | 4 +- .../HookType-n1-update-error-validation.xml | 4 +- ...rizontalPosition-n1-create-error-validation.xml | 4 +- ...rizontalPosition-n1-update-error-validation.xml | 4 +- ...VerticalPosition-n1-create-error-validation.xml | 4 +- ...VerticalPosition-n1-update-error-validation.xml | 4 +- ...LightsticksColor-n1-create-error-validation.xml | 4 +- ...LightsticksColor-n1-update-error-validation.xml | 4 +- .../LightsticksType-n1-create-error-validation.xml | 4 +- .../LightsticksType-n1-update-error-validation.xml | 4 +- .../LineType-n1-create-error-validation.xml | 4 +- .../LineType-n1-update-error-validation.xml | 4 +- .../MaturityStatus-n1-create-error-validation.xml | 4 +- .../MaturityStatus-n1-update-error-validation.xml | 4 +- .../MitigationType-n1-create-error-validation.xml | 4 +- .../MitigationType-n1-update-error-validation.xml | 4 +- .../SensorBrand-n1-create-error-validation.xml | 4 +- .../SensorBrand-n1-update-error-validation.xml | 4 +- ...SensorDataFormat-n1-create-error-validation.xml | 4 +- ...SensorDataFormat-n1-update-error-validation.xml | 4 +- .../SensorType-n1-create-error-validation.xml | 4 +- .../SensorType-n1-update-error-validation.xml | 4 +- .../SettingShape-n1-create-error-validation.xml | 4 +- .../SettingShape-n1-update-error-validation.xml | 4 +- .../SizeMeasureType-n1-create-error-validation.xml | 4 +- .../SizeMeasureType-n1-update-error-validation.xml | 4 +- .../StomacFullness-n1-create-error-validation.xml | 4 +- .../StomacFullness-n1-update-error-validation.xml | 4 +- .../TripType-n1-create-error-validation.xml | 4 +- .../TripType-n1-update-error-validation.xml | 4 +- ...ActivityLongline-n1-create-error-validation.xml | 4 +- ...ActivityLongline-n1-update-error-validation.xml | 4 +- ...eightMeasureType-n1-create-error-validation.xml | 4 +- ...eightMeasureType-n1-update-error-validation.xml | 4 +- .../DetectionMode-n1-create-error-validation.xml | 4 +- .../DetectionMode-n1-update-error-validation.xml | 4 +- .../ObjectFate-n1-create-error-validation.xml | 4 +- .../ObjectFate-n1-update-error-validation.xml | 4 +- .../ObjectOperation-n1-create-error-validation.xml | 4 +- .../ObjectOperation-n1-update-error-validation.xml | 4 +- .../ObjectType-n1-create-error-validation.xml | 4 +- .../ObjectType-n1-update-error-validation.xml | 4 +- .../ObservedSystem-n1-create-error-validation.xml | 4 +- .../ObservedSystem-n1-update-error-validation.xml | 4 +- ...ReasonForDiscard-n1-create-error-validation.xml | 4 +- ...ReasonForDiscard-n1-update-error-validation.xml | 4 +- ...asonForNoFishing-n1-create-error-validation.xml | 4 +- ...asonForNoFishing-n1-update-error-validation.xml | 4 +- ...ReasonForNullSet-n1-create-error-validation.xml | 4 +- ...ReasonForNullSet-n1-update-error-validation.xml | 4 +- .../SpeciesFate-n1-create-error-validation.xml | 4 +- .../SpeciesFate-n1-update-error-validation.xml | 4 +- .../SpeciesStatus-n1-create-error-validation.xml | 4 +- .../SpeciesStatus-n1-update-error-validation.xml | 4 +- ...roundingActivity-n1-create-error-validation.xml | 4 +- ...roundingActivity-n1-update-error-validation.xml | 4 +- ...ingBuoyOperation-n1-create-error-validation.xml | 4 +- ...ingBuoyOperation-n1-update-error-validation.xml | 4 +- ...smittingBuoyType-n1-create-error-validation.xml | 4 +- ...smittingBuoyType-n1-update-error-validation.xml | 4 +- ...selActivitySeine-n1-create-error-validation.xml | 4 +- ...selActivitySeine-n1-update-error-validation.xml | 4 +- .../WeightCategory-n1-create-error-validation.xml | 4 +- .../WeightCategory-n1-update-error-validation.xml | 4 +- .../seine/Wind-n1-create-error-validation.xml | 4 +- .../seine/Wind-n1-update-error-validation.xml | 4 +- .../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 +- ...> observe-entities-validation_es_ES.properties} | 0 .../src/main/filters/observe-reports.properties | 10 +- .../services/service/ReferentialService.java | 5 + .../ConsolidateActivitySeineDataResult.java | 3 +- .../consolidate/ConsolidateDataService.java | 2 + .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/ReportBuilder.java | 49 +-- .../service/actions/report/ReportService.java | 14 +- .../actions/report/model/ReportOperation.java | 106 ----- .../actions/report/model/ReportRequest.java | 406 ------------------- .../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 ------ .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../service/actions/validate/ValidateService.java | 7 +- .../actions/validate/ValidationMessage.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 + .../spi/{NoDataAccess.java => DeleteRequest.java} | 9 +- .../spi/{NoDataAccess.java => PostRequest.java} | 8 +- .../service/actions/report/ReportBuilderTest.java | 11 +- .../ObserveDataSourceConfigurationRest.java | 26 +- ...bserveDataSourceConfigurationRestConstants.java | 6 - .../ObserveDataSourceConfigurationTopiaH2.java | 8 +- .../ObserveDataSourceConfigurationTopiaPG.java | 8 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 11 + .../fr/ird/observe/services/dto/ObserveDto.java | 7 + .../fr/ird/observe/services/dto/ReferenceDto.java | 7 + .../services/dto/actions/report}/DataMatrix.java | 5 +- .../services/dto/actions/report}/Report.java | 5 +- .../dto/actions/report/ReportOperation.java | 17 +- .../services/dto/actions/report/ReportRequest.java | 187 +++++++++ .../dto/actions/report}/ReportVariable.java | 34 +- .../services/dto/gson/ImmutableListAdapter.java | 21 +- .../services/dto/gson/ImmutableMapAdapter.java | 39 ++ .../services/dto/gson/ImmutableSetAdapter.java | 37 ++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 7 + .../services/dto/gson/ReferenceDtoAdapter.java | 21 +- .../dto/gson/ReferentialReferenceDtoAdapter.java | 10 +- .../services/dto/gson/ReportVariableAdapter.java | 55 +++ .../services/ObserveServiceFactoryRest.java | 26 +- .../services/http/ObserveResponseBuilder.java | 3 +- .../fr/ird/observe/services/TestClassResource.java | 16 +- .../ird/observe/services/TestMethodResource.java | 17 +- .../services/service/AbstractServiceRestTest.java | 57 +++ .../service/DataSourceServiceRestTest.java | 10 +- .../services/service/PingServiceRestTest.java | 51 +++ .../ConsolidateDataServiceRestTest.java | 22 +- .../report/AbstractReportServiceRestTest.java | 28 +- .../report/ReportAccessoryCatchRestTest.java | 9 +- .../actions/validate/ValidateServiceTest.java | 60 ++- .../seine/GearUseFeaturesSeineServiceTest.java | 273 +++++++++++++ .../service/seine/TripSeineServiceTest.java | 197 ++++----- .../ObserveDataSourceConfigurationMainFactory.java | 3 +- .../services/ObserveServiceMainFactory.java | 16 +- .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../EntityToReferentialReferenceDtoBuilder.java | 17 + .../service/actions/report/ReportServiceTopia.java | 441 ++++++++++++++++++++- .../actions/validate/ValidateServiceTopia.java | 13 +- .../actions/validate/ValidationDataContext.java | 136 +++---- .../validate/ValidationMessageDetector.java | 64 ++- .../services/ApplicationContextResource.java | 29 ++ .../ird/observe/services/DataSourceResource.java | 31 +- .../services/service/AbstractServiceTopiaTest.java | 30 +- .../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 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- 304 files changed, 2719 insertions(+), 2493 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/{ => security}/InvalidAdminKeyApiException.java (72%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java rename observe-entities-validation/src/main/resources/i18n/{observe-entities-validation_es_ES_.properties => observe-entities-validation_es_ES.properties} (100%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => DeleteRequest.java} (51%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => PostRequest.java} (51%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/DataMatrix.java (97%) rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/Report.java (96%) copy observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java (73%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/ReportVariable.java (63%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java (61%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java (89%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java (95%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java (88%) create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch develop updated (6ceca24 -> 8b8c125)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

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 6ceca24 Retour sur develop Merge branch 'feature/7463-3' into develop new 8b8c125 Optimise dependencies 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 8b8c1251fb89d636cd3fdd769065805f4e2f0474 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 11 08:51:57 2015 +0200 Optimise dependencies Summary of changes: observe-application-web/pom.xml | 8 ++------ observe-services-api/pom.xml | 8 -------- observe-services-model/pom.xml | 4 ++++ observe-services-rest/pom.xml | 4 ++++ 4 files changed, 10 insertions(+), 14 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 develop updated (adff7ca -> 6ceca24)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

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 adff7ca Ne pas utiliser des API sun wtf :( new 7a69101 test sauvegard de trip seine (refs #7463) new 27f0d09 ajout la traduction (refs #7463) new 6608e8e Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs new 5c0958d Rendre les configuration clonable new 9a90711 Suppression d'un converter non utilisé new 0ccce26 Ajout d'un test pour le service de Ping new 148a817 Vérifier si le host existe bien new 04279d6 L'injecteur de configuration de sources de données utilise le parametre de la requete new cc0f39c Revue injecteurs de configuration new 0f8b763 revue des configuration de test (j'ai remis les valeurs par defaut new 49833e6 Changement d'api new 3ddbb24 Changement d'api new 0197833 Ajout de FIXME à corriger plus tard new 8efc6af Revue de l'init d'une base sur l'application web new b6555d5 Possibilité d'utiliser la connexion pour obtenir un service new fd42767 Le test de ping refonctionne new 01b2a88 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 new e1754fe On ne soumet dans le header que le jeton de securite new 2b4cab6 Simplification de la sécurité + Gestion des erreurs au niveau du serveur web (reste à gérer le retour dans le client REST) new 4e74ded Test de validation et des équipements + correction (refs #7463) new 250042d renommer les propriétées dans le context de validation (refs #7463) new d6e11a2 ajout de la traduction des messages de validation côté serveur (refs #7463) new 841c7c4 optimisation des tests topia (refs #7463) new 5eeab8c Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) new dee5817 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) new 30aa0b1 Test de consilidation des données en mode REST (refs #7463) new b7cff03 Test de consilidation des données en mode REST (refs #7463) new 43cab37 Ajout de javadoc new 01c67c9 Renommage aussi de editingReferentielList en editingReferentielListEntity new c586f6f Ajout aussi de la méthode DELETE sur le mapping new 6ceca24 Retour sur develop Merge branch 'feature/7463-3' into develop The 31 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 6ceca24ce25493dd45363f6b19b8b726e928a00e Merge: adff7ca c586f6f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 11 08:28:22 2015 +0200 Retour sur develop Merge branch 'feature/7463-3' into develop commit c586f6ff0db529e7eeef59a90000bb950e6c711c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 11 08:23:14 2015 +0200 Ajout aussi de la méthode DELETE sur le mapping commit 01c67c9afb17faedc44b7152a457d07cf7f4bc78 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 11 08:22:03 2015 +0200 Renommage aussi de editingReferentielList en editingReferentielListEntity commit 43cab373dd3f6e358ecfe1aabd3e88be5a0f72fa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 11 08:19:04 2015 +0200 Ajout de javadoc commit b7cff03d46f6bf64bec2781dfb768e4be11511f2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 9 15:54:49 2015 +0200 Test de consilidation des données en mode REST (refs #7463) commit 30aa0b1a77ec64c3fae85572bd01c4fd6350f7a4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 9 15:40:57 2015 +0200 Test de consilidation des données en mode REST (refs #7463) commit dee581748ef3230a658c8fa6a6d16f32d1823ea4 Author: Sylvain Bavencoff <bavencoff(a)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) commit 5eeab8cace10e1d171c78b998084ac08eb3127b3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 17:01:04 2015 +0200 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) commit 841c7c4bb7bea10abae09162246df31e8963247c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 16:18:32 2015 +0200 optimisation des tests topia (refs #7463) commit d6e11a2f3b031b4c6b9a50e858b61b2a5ecd4437 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 14:42:28 2015 +0200 ajout de la traduction des messages de validation côté serveur (refs #7463) commit 250042d93ed6c9d2a75d68d994bcac5e225a5e2c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 12:08:01 2015 +0200 renommer les propriétées dans le context de validation (refs #7463) commit 4e74ded362b96c46413ae371e106c00bfeb172ee Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 11:39:15 2015 +0200 Test de validation et des équipements + correction (refs #7463) commit 2b4cab6de42305b2a29f4efd5530cba7c3a69c1d Author: Tony CHEMIT <chemit(a)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) commit e1754fe782248bb0bfb1dea00023dea5088d54f9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 23:47:12 2015 +0200 On ne soumet dans le header que le jeton de securite commit 01b2a883603ed596135a727c6819b8a8ec30ccc2 Author: Tony CHEMIT <chemit(a)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 commit fd42767f05fc9cbdeee139e7dca5d915769e4993 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 22:14:40 2015 +0200 Le test de ping refonctionne commit b6555d5db5362d399dd73cbbb928cfe1b5df6155 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 22:03:30 2015 +0200 Possibilité d'utiliser la connexion pour obtenir un service commit 8efc6af092de21aeb0bfac8018e02de4b581d015 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 21:58:40 2015 +0200 Revue de l'init d'une base sur l'application web commit 0197833d7bfb50baca63e8b2ca1287a0d994e38f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 16:02:18 2015 +0200 Ajout de FIXME à corriger plus tard commit 3ddbb2494697aea44d5bc078f1f21ceb0fe37512 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:55:09 2015 +0200 Changement d'api commit 49833e6e6d0557894f01082f2ad3579a5b86a792 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:54:51 2015 +0200 Changement d'api commit 0f8b763a8072717d81708cf1ab52ec921997a07e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:54:39 2015 +0200 revue des configuration de test (j'ai remis les valeurs par defaut commit cc0f39c14e1b19806719b2226adee324a4ad6f62 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:54:19 2015 +0200 Revue injecteurs de configuration commit 04279d6469f03175646750b7edd9824cc06dc708 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:45:38 2015 +0200 L'injecteur de configuration de sources de données utilise le parametre de la requete commit 148a8170ad229059ff9b680277b58d959edfb0fd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:42:54 2015 +0200 Vérifier si le host existe bien commit 0ccce26187ae0c417f9fa74b08cb2ecbf3763e06 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:31:22 2015 +0200 Ajout d'un test pour le service de Ping commit 9a90711bdc2dc6444a25a9ee6aa5e45ea003fbe6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:31:04 2015 +0200 Suppression d'un converter non utilisé commit 5c0958d4b934a45ded30c625156cb3d57ad4dee3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:30:54 2015 +0200 Rendre les configuration clonable commit 6608e8e368170a51e482f0a80bcf12b033e63380 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 7 14:08:49 2015 +0200 Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs commit 27f0d09ccc3aa4642a640f01dae26f2c566f9f74 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Sep 7 11:41:11 2015 +0200 ajout la traduction (refs #7463) commit 7a6910172aa7653e520d9f783542c9c8b4141b40 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Sep 7 11:34:29 2015 +0200 test sauvegard de trip seine (refs #7463) Summary of changes: observe-application-web/pom.xml | 7 + .../ObserveDataSourceConfigurationConverter.java | 47 --- .../web/ObserveWebApplicationListener.java | 34 +- .../application/web/ObserveWebMotionFilter.java | 60 +-- .../web/controller/ObserveWebMotionController.java | 13 +- .../web/controller/v1/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 49 ++- ...serveAuthenticatedServiceControllerSupport.java | 30 ++ .../v1/ObserveServiceControllerSupport.java | 54 ++- .../controller/v1/ObserveWebErrorController.java | 97 +++++ .../v1/ReferentialServiceController.java | 9 +- .../ConsolidateDataServiceController.java | 4 +- .../v1/actions/report/ReportServiceController.java | 16 +- .../validate/ValidateServiceController.java | 12 +- .../ActivityLongLineEncouterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../GearUseFeaturesLonglineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TdrServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 4 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 4 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../GearUseFeaturesSeineServiceController.java | 4 +- .../v1/seine/NonTargetCatchServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 4 +- .../v1/seine/SchoolEstimateServiceController.java | 4 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetCatchServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 4 +- .../ObserveDataSourceConfigurationInjector.java | 57 +++ .../web/injector/ObserveDtoInjector.java | 50 +++ .../web/request/ObserveWebRequestContext.java | 70 ++-- .../request/ObserveWebRequestSecurityContext.java | 62 --- .../web/security/AdminApiKeyNotFoundException.java | 11 + .../AuthenticationTokenNotFoundException.java | 11 + .../BadObserveWebUserPasswordException.java | 5 +- .../InvalidAdminKeyApiException.java | 4 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 13 +- .../ObserveWebSecurityExceptionSupport.java | 26 ++ .../SecurityRequestContextNotFoundException.java | 11 + .../security/UnknownObserveWebUserException.java | 4 +- .../UnknownObserveWebUserForDatabaseException.java | 3 +- .../web/security/UserLoginNotFoundException.java | 11 + .../security/UserPasswordNotFoundException.java | 11 + observe-application-web/src/main/resources/mapping | 10 +- .../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 +- .../Country-n1-create-error-validation.xml | 8 +- .../Country-n1-update-error-validation.xml | 8 +- .../FpaZone-n1-create-error-validation.xml | 4 +- .../FpaZone-n1-update-error-validation.xml | 4 +- .../Gear-n1-create-error-validation.xml | 4 +- .../Gear-n1-update-error-validation.xml | 4 +- ...earCaracteristic-n1-create-error-validation.xml | 4 +- ...earCaracteristic-n1-update-error-validation.xml | 4 +- ...aracteristicType-n1-create-error-validation.xml | 4 +- ...aracteristicType-n1-update-error-validation.xml | 4 +- .../Harbour-n1-create-error-validation.xml | 4 +- .../Harbour-n1-update-error-validation.xml | 4 +- ...hWeightParameter-n1-create-error-validation.xml | 10 +- ...hWeightParameter-n1-update-error-validation.xml | 10 +- .../Ocean-n1-create-error-validation.xml | 4 +- .../Ocean-n1-update-error-validation.xml | 4 +- .../Organism-n1-create-error-validation.xml | 4 +- .../Organism-n1-update-error-validation.xml | 4 +- .../Person-n1-create-error-validation.xml | 4 +- .../Person-n1-update-error-validation.xml | 4 +- .../Program-n1-create-error-validation.xml | 4 +- .../Program-n1-update-error-validation.xml | 4 +- .../referentiel/Sex-n1-create-error-validation.xml | 4 +- .../referentiel/Sex-n1-update-error-validation.xml | 4 +- .../Species-n1-create-error-validation.xml | 12 +- .../Species-n1-update-error-validation.xml | 12 +- .../SpeciesGroup-n1-create-error-validation.xml | 4 +- .../SpeciesGroup-n1-update-error-validation.xml | 4 +- .../SpeciesList-n1-create-error-validation.xml | 4 +- .../SpeciesList-n1-update-error-validation.xml | 4 +- .../Vessel-n1-create-error-validation.xml | 4 +- .../Vessel-n1-update-error-validation.xml | 4 +- ...sselSizeCategory-n1-create-error-validation.xml | 4 +- ...sselSizeCategory-n1-update-error-validation.xml | 4 +- .../VesselType-n1-create-error-validation.xml | 4 +- .../VesselType-n1-update-error-validation.xml | 4 +- ...aitHaulingStatus-n1-create-error-validation.xml | 4 +- ...aitHaulingStatus-n1-update-error-validation.xml | 4 +- ...aitSettingStatus-n1-create-error-validation.xml | 4 +- ...aitSettingStatus-n1-update-error-validation.xml | 4 +- .../BaitType-n1-create-error-validation.xml | 4 +- .../BaitType-n1-update-error-validation.xml | 4 +- ...atchFateLongline-n1-create-error-validation.xml | 4 +- ...atchFateLongline-n1-update-error-validation.xml | 4 +- .../EncounterType-n1-create-error-validation.xml | 4 +- .../EncounterType-n1-update-error-validation.xml | 4 +- .../Healthness-n1-create-error-validation.xml | 4 +- .../Healthness-n1-update-error-validation.xml | 4 +- .../HookPosition-n1-create-error-validation.xml | 4 +- .../HookPosition-n1-update-error-validation.xml | 4 +- .../HookSize-n1-create-error-validation.xml | 4 +- .../HookSize-n1-update-error-validation.xml | 4 +- .../HookType-n1-create-error-validation.xml | 4 +- .../HookType-n1-update-error-validation.xml | 4 +- ...rizontalPosition-n1-create-error-validation.xml | 4 +- ...rizontalPosition-n1-update-error-validation.xml | 4 +- ...VerticalPosition-n1-create-error-validation.xml | 4 +- ...VerticalPosition-n1-update-error-validation.xml | 4 +- ...LightsticksColor-n1-create-error-validation.xml | 4 +- ...LightsticksColor-n1-update-error-validation.xml | 4 +- .../LightsticksType-n1-create-error-validation.xml | 4 +- .../LightsticksType-n1-update-error-validation.xml | 4 +- .../LineType-n1-create-error-validation.xml | 4 +- .../LineType-n1-update-error-validation.xml | 4 +- .../MaturityStatus-n1-create-error-validation.xml | 4 +- .../MaturityStatus-n1-update-error-validation.xml | 4 +- .../MitigationType-n1-create-error-validation.xml | 4 +- .../MitigationType-n1-update-error-validation.xml | 4 +- .../SensorBrand-n1-create-error-validation.xml | 4 +- .../SensorBrand-n1-update-error-validation.xml | 4 +- ...SensorDataFormat-n1-create-error-validation.xml | 4 +- ...SensorDataFormat-n1-update-error-validation.xml | 4 +- .../SensorType-n1-create-error-validation.xml | 4 +- .../SensorType-n1-update-error-validation.xml | 4 +- .../SettingShape-n1-create-error-validation.xml | 4 +- .../SettingShape-n1-update-error-validation.xml | 4 +- .../SizeMeasureType-n1-create-error-validation.xml | 4 +- .../SizeMeasureType-n1-update-error-validation.xml | 4 +- .../StomacFullness-n1-create-error-validation.xml | 4 +- .../StomacFullness-n1-update-error-validation.xml | 4 +- .../TripType-n1-create-error-validation.xml | 4 +- .../TripType-n1-update-error-validation.xml | 4 +- ...ActivityLongline-n1-create-error-validation.xml | 4 +- ...ActivityLongline-n1-update-error-validation.xml | 4 +- ...eightMeasureType-n1-create-error-validation.xml | 4 +- ...eightMeasureType-n1-update-error-validation.xml | 4 +- .../DetectionMode-n1-create-error-validation.xml | 4 +- .../DetectionMode-n1-update-error-validation.xml | 4 +- .../ObjectFate-n1-create-error-validation.xml | 4 +- .../ObjectFate-n1-update-error-validation.xml | 4 +- .../ObjectOperation-n1-create-error-validation.xml | 4 +- .../ObjectOperation-n1-update-error-validation.xml | 4 +- .../ObjectType-n1-create-error-validation.xml | 4 +- .../ObjectType-n1-update-error-validation.xml | 4 +- .../ObservedSystem-n1-create-error-validation.xml | 4 +- .../ObservedSystem-n1-update-error-validation.xml | 4 +- ...ReasonForDiscard-n1-create-error-validation.xml | 4 +- ...ReasonForDiscard-n1-update-error-validation.xml | 4 +- ...asonForNoFishing-n1-create-error-validation.xml | 4 +- ...asonForNoFishing-n1-update-error-validation.xml | 4 +- ...ReasonForNullSet-n1-create-error-validation.xml | 4 +- ...ReasonForNullSet-n1-update-error-validation.xml | 4 +- .../SpeciesFate-n1-create-error-validation.xml | 4 +- .../SpeciesFate-n1-update-error-validation.xml | 4 +- .../SpeciesStatus-n1-create-error-validation.xml | 4 +- .../SpeciesStatus-n1-update-error-validation.xml | 4 +- ...roundingActivity-n1-create-error-validation.xml | 4 +- ...roundingActivity-n1-update-error-validation.xml | 4 +- ...ingBuoyOperation-n1-create-error-validation.xml | 4 +- ...ingBuoyOperation-n1-update-error-validation.xml | 4 +- ...smittingBuoyType-n1-create-error-validation.xml | 4 +- ...smittingBuoyType-n1-update-error-validation.xml | 4 +- ...selActivitySeine-n1-create-error-validation.xml | 4 +- ...selActivitySeine-n1-update-error-validation.xml | 4 +- .../WeightCategory-n1-create-error-validation.xml | 4 +- .../WeightCategory-n1-update-error-validation.xml | 4 +- .../seine/Wind-n1-create-error-validation.xml | 4 +- .../seine/Wind-n1-update-error-validation.xml | 4 +- .../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 +- ...> observe-entities-validation_es_ES.properties} | 0 .../src/main/filters/observe-reports.properties | 10 +- .../services/service/ReferentialService.java | 5 + .../ConsolidateActivitySeineDataResult.java | 3 +- .../consolidate/ConsolidateDataService.java | 2 + .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/ReportBuilder.java | 49 +-- .../service/actions/report/ReportService.java | 14 +- .../actions/report/model/ReportOperation.java | 106 ----- .../actions/report/model/ReportRequest.java | 406 ------------------- .../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 ------ .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../service/actions/validate/ValidateService.java | 7 +- .../actions/validate/ValidationMessage.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 + .../spi/{NoDataAccess.java => DeleteRequest.java} | 9 +- .../spi/{NoDataAccess.java => PostRequest.java} | 8 +- .../service/actions/report/ReportBuilderTest.java | 11 +- .../ObserveDataSourceConfigurationRest.java | 26 +- ...bserveDataSourceConfigurationRestConstants.java | 6 - .../ObserveDataSourceConfigurationTopiaH2.java | 8 +- .../ObserveDataSourceConfigurationTopiaPG.java | 8 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 11 + .../fr/ird/observe/services/dto/ObserveDto.java | 7 + .../fr/ird/observe/services/dto/ReferenceDto.java | 7 + .../services/dto/actions/report}/DataMatrix.java | 5 +- .../services/dto/actions/report}/Report.java | 5 +- .../dto/actions/report/ReportOperation.java | 17 +- .../services/dto/actions/report/ReportRequest.java | 187 +++++++++ .../dto/actions/report}/ReportVariable.java | 34 +- .../services/dto/gson/ImmutableListAdapter.java | 21 +- .../services/dto/gson/ImmutableMapAdapter.java | 39 ++ .../services/dto/gson/ImmutableSetAdapter.java | 37 ++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 7 + .../services/dto/gson/ReferenceDtoAdapter.java | 21 +- .../dto/gson/ReferentialReferenceDtoAdapter.java | 10 +- .../services/dto/gson/ReportVariableAdapter.java | 55 +++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33879 -> 34629 bytes .../services/ObserveServiceFactoryRest.java | 26 +- .../services/http/ObserveResponseBuilder.java | 3 +- .../fr/ird/observe/services/TestClassResource.java | 16 +- .../ird/observe/services/TestMethodResource.java | 17 +- .../services/service/AbstractServiceRestTest.java | 57 +++ .../service/DataSourceServiceRestTest.java | 10 +- .../services/service/PingServiceRestTest.java | 51 +++ .../ConsolidateDataServiceRestTest.java | 22 +- .../report/AbstractReportServiceRestTest.java | 28 +- .../report/ReportAccessoryCatchRestTest.java | 9 +- .../actions/validate/ValidateServiceTest.java | 60 ++- .../seine/GearUseFeaturesSeineServiceTest.java | 273 +++++++++++++ .../service/seine/TripSeineServiceTest.java | 197 ++++----- .../ObserveDataSourceConfigurationMainFactory.java | 3 +- .../services/ObserveServiceMainFactory.java | 16 +- .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../EntityToReferentialReferenceDtoBuilder.java | 17 + .../service/actions/report/ReportServiceTopia.java | 441 ++++++++++++++++++++- .../actions/validate/ValidateServiceTopia.java | 13 +- .../actions/validate/ValidationDataContext.java | 136 +++---- .../validate/ValidationMessageDetector.java | 64 ++- .../services/ApplicationContextResource.java | 29 ++ .../ird/observe/services/DataSourceResource.java | 31 +- .../services/service/AbstractServiceTopiaTest.java | 30 +- .../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 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- 305 files changed, 2719 insertions(+), 2493 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/{ => security}/InvalidAdminKeyApiException.java (72%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java rename observe-entities-validation/src/main/resources/i18n/{observe-entities-validation_es_ES_.properties => observe-entities-validation_es_ES.properties} (100%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => DeleteRequest.java} (51%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => PostRequest.java} (51%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/DataMatrix.java (97%) rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/Report.java (96%) copy observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java (73%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/ReportVariable.java (63%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java (61%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java (89%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java (95%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java (88%) create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 31

branch feature/7463-3 deleted (was e5d0614)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git was e5d0614 Test de consilidation des données en mode REST (refs #7463) This change permanently discards the following revisions: discards e5d0614 Test de consilidation des données en mode REST (refs #7463) discards e51650b Test de consilidation des données en mode REST (refs #7463) discards 5386018 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) discards c3adfe9 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) discards d3f56f7 optimisation des tests topia (refs #7463) discards e059a29 ajout de la traduction des messages de validation côté serveur (refs #7463) discards 8ca9e23 renommer les propriétées dans le context de validation (refs #7463) discards a9d753d Test de validation et des équipements + correction (refs #7463) discards 695639a Simplification de la sécurité + Gestion des erreurs au niveau du serveur web (reste à gérer le retour dans le client REST) discards 69296b9 On ne soumet dans le header que le jeton de securite discards 884b8d8 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 discards 09c2923 Le test de ping refonctionne discards 7fdf68a Possibilité d'utiliser la connexion pour obtenir un service discards 608d4f3 Revue de l'init d'une base sur l'application web discards df6e99c Ajout de FIXME à corriger plus tard discards a5b8877 Changement d'api discards f3c489c Changement d'api discards f4864bb revue des configuration de test (j'ai remis les valeurs par defaut discards 3679a6a Revue injecteurs de configuration discards b5a742e L'injecteur de configuration de sources de données utilise le parametre de la requete discards 3d07598 Vérifier si le host existe bien discards 19a0e0b Ajout d'un test pour le service de Ping discards 6e2d4dc Suppression d'un converter non utilisé discards 5a2d955 Rendre les configuration clonable discards 14cfd0e Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs discards 152a298 Ne pas utiliser des API sun wtf :( discards 576c7b8 Meilleure isolation des tests de l'application web discards 2d6de16 Optimise licenses discards 7cf72a5 Fix build discards f7289eb ajout la traduction (refs #7463) discards b180fa2 test sauvegard de trip seine (refs #7463) -- 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/7520 updated (1f5c293 -> 5dce55c)
by codelutin.com scm Sept. 10, 2015

Sept. 10, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git from 1f5c293 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 5dce55c ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) 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 5dce55c1313789ceff6749581839f335caf8a375 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) Summary of changes: .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../resources/db/5.0/add_lastUpdate_field-H2.sql | 24 +++++++++++++++++++-- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 20 +++++++++++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 36629 -> 37033 bytes .../src/main/xmi/observe-longline.zargo | Bin 95691 -> 96937 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 83247 -> 84597 bytes .../services/service/AbstractServiceTopiaTest.java | 16 ++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 14 ------------ .../service/seine/TripSeineServiceTopiaTest.java | 15 +++++++++++++ 11 files changed, 76 insertions(+), 19 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/7520 created (now 1f5c293)
by codelutin.com scm Sept. 10, 2015

Sept. 10, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git at 1f5c293 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) This branch includes the following new commits: new 1f5c293 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) 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 1f5c2930bc9f825281bd89f255fd6a796f570fac Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) -- 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-3 updated (5386018 -> e5d0614)
by codelutin.com scm Sept. 9, 2015

Sept. 9, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from 5386018 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) new e51650b Test de consilidation des données en mode REST (refs #7463) new e5d0614 Test de consilidation des données en mode REST (refs #7463) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e5d06148d74b9de19d4c68bf35a159f2ea4853b9 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 9 15:54:49 2015 +0200 Test de consilidation des données en mode REST (refs #7463) commit e51650b54fcc14002536df7e46bba2d735ae1b32 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 9 15:40:57 2015 +0200 Test de consilidation des données en mode REST (refs #7463) Summary of changes: .../ConsolidateDataServiceRestTest.java | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java (61%) -- 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-3 updated (c3adfe9 -> 5386018)
by codelutin.com scm Sept. 9, 2015

Sept. 9, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from c3adfe9 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) new 5386018 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) 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 53860184823192f4c4ac206e7790e8ed268ed473 Author: Sylvain Bavencoff <bavencoff(a)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) Summary of changes: .../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 + .../spi/{Write.java => DeleteRequest.java} | 9 +- .../services/spi/{Write.java => PostRequest.java} | 9 +- .../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 | 17 +- .../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, 859 insertions(+), 1453 deletions(-) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{Write.java => DeleteRequest.java} (63%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{Write.java => PostRequest.java} (63%) rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/DataMatrix.java (99%) rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/Report.java (98%) copy observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java (73%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/ReportVariable.java (66%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java (89%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java (95%) -- 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-3 updated (e059a29 -> c3adfe9)
by codelutin.com scm Sept. 8, 2015

Sept. 8, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from e059a29 ajout de la traduction des messages de validation côté serveur (refs #7463) new d3f56f7 optimisation des tests topia (refs #7463) new c3adfe9 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c3adfe9607aaefe3de9f0f33ac2e478467fbe03c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 17:01:04 2015 +0200 Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) commit d3f56f79e8a45e0775363cbd4126803d8eb083dd Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 16:18:32 2015 +0200 optimisation des tests topia (refs #7463) Summary of changes: .../web/ObserveWebApplicationListener.java | 10 +---- .../application/web/injector/IdDtoInjector.java | 50 --------------------- ...ormDtoInjector.java => ObserveDtoInjector.java} | 18 ++++---- .../web/injector/ValidateDataRequestInjector.java | 48 -------------------- .../ValidateReferentialsRequestInjector.java | 48 -------------------- .../ConsolidateActivitySeineDataResult.java | 3 +- .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/model/DataMatrix.java | 3 +- .../service/actions/report/model/Report.java | 3 +- .../actions/report/model/ReportOperation.java | 3 +- .../actions/report/model/ReportRequest.java | 5 ++- .../actions/report/model/ReportVariable.java | 4 +- .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../actions/validate/ValidationMessage.java | 3 +- .../fr/ird/observe/services/dto/ObserveDto.java | 7 +++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33879 -> 34629 bytes .../services/ApplicationContextResource.java | 29 ++++++++++++ .../ird/observe/services/DataSourceResource.java | 31 +++++++++---- .../services/service/AbstractServiceTopiaTest.java | 30 ++++++++++--- 25 files changed, 125 insertions(+), 194 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/IdDtoInjector.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/injector/{FormDtoInjector.java => ObserveDtoInjector.java} (64%) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateDataRequestInjector.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ValidateReferentialsRequestInjector.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7463-3 updated (8ca9e23 -> e059a29)
by codelutin.com scm Sept. 8, 2015

Sept. 8, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from 8ca9e23 renommer les propriétées dans le context de validation (refs #7463) new e059a29 ajout de la traduction des messages de validation côté serveur (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 e059a2995c63e63ee1266d8b6c158ab380280fbb Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 8 14:42:28 2015 +0200 ajout de la traduction des messages de validation côté serveur (refs #7463) Summary of changes: .../observe-entities-validation_es_ES.properties | 461 +++++++++++---------- .../observe-entities-validation_es_ES_.properties | 424 ------------------- .../actions/validate/ValidateServiceTopia.java | 9 +- .../validate/ValidationMessageDetector.java | 32 +- 4 files changed, 269 insertions(+), 657 deletions(-) delete mode 100644 observe-entities-validation/src/main/resources/i18n/observe-entities-validation_es_ES_.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1