Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/33ff150c Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/33ff150c Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/33ff150c Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 33ff150c7e54ab3affe9f2496c3b35fd3bcf8d08 Parents: 882c6ed 44eea86 Author: Lionel Liu <bhlx3l...@163.com> Authored: Tue Jan 16 17:00:44 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Tue Jan 16 17:00:44 2018 +0800 ---------------------------------------------------------------------- griffin-doc/service/api-guide.md | 1084 +++++++++ griffin-doc/service/postman/griffin.json | 2259 ++++++++++-------- .../apache/griffin/core/job/JobController.java | 2 +- .../apache/griffin/core/job/JobInstance.java | 3 +- .../org/apache/griffin/core/job/JobService.java | 2 +- .../apache/griffin/core/job/JobServiceImpl.java | 86 +- .../griffin/core/job/entity/JobDataSegment.java | 5 + .../griffin/core/job/entity/JobSchedule.java | 6 +- .../griffin/core/login/LoginController.java | 3 +- .../measure/ExternalMeasureOperationImpl.java | 14 +- .../measure/GriffinMeasureOperationImpl.java | 12 +- .../core/measure/MeasureServiceImpl.java | 14 +- .../core/measure/entity/DataConnector.java | 21 +- .../core/measure/entity/GriffinMeasure.java | 8 + .../griffin/core/metric/MetricController.java | 5 +- .../griffin/core/metric/MetricService.java | 5 +- .../griffin/core/metric/MetricServiceImpl.java | 20 +- .../griffin/core/metric/MetricStoreImpl.java | 2 +- .../src/main/resources/application.properties | 16 +- .../griffin/core/job/JobControllerTest.java | 308 +-- .../core/job/repo/JobInstanceRepoTest.java | 87 + .../core/measure/MeasureControllerTest.java | 398 ++- .../core/measure/MeasureOrgControllerTest.java | 1 - .../core/measure/MeasureOrgServiceImplTest.java | 4 +- .../core/measure/MeasureServiceImplTest.java | 6 +- .../griffin/core/measure/MeasureTestHelper.java | 89 - .../core/measure/repo/MeasureRepoTest.java | 2 +- .../apache/griffin/core/util/EntityHelper.java | 89 + 28 files changed, 3057 insertions(+), 1494 deletions(-) ----------------------------------------------------------------------
