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@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@list.forge.codelutin.com>.