Merge branch 'master' of https://github.com/apache/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/fb2a4661 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/fb2a4661 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/fb2a4661 Branch: refs/heads/master Commit: fb2a4661e5150257e48019ab0b89621047dda665 Parents: 9917834 4a998d4 Author: William Guo <guo...@icloud.com> Authored: Tue Oct 31 16:35:30 2017 +0800 Committer: William Guo <guo...@icloud.com> Committed: Tue Oct 31 16:35:30 2017 +0800 ---------------------------------------------------------------------- griffin-doc/postman/griffin.json | 4 +- service/pom.xml | 24 ------ .../griffin/core/config/SwaggerConfig.java | 62 ---------------- .../core/info/GriffinInfoController.java | 4 - .../apache/griffin/core/job/JobController.java | 25 ++----- .../apache/griffin/core/job/JobServiceImpl.java | 20 ++--- .../apache/griffin/core/job/SparkSubmitJob.java | 2 +- .../griffin/core/job/entity/SparkJobDO.java | 29 -------- .../griffin/core/job/repo/JobInstanceRepo.java | 2 +- .../griffin/core/login/LoginController.java | 7 -- .../griffin/core/measure/MeasureController.java | 22 ++---- .../core/measure/MeasureOrgController.java | 29 ++------ .../griffin/core/measure/MeasureOrgService.java | 32 ++++++++ .../core/measure/MeasureOrgServiceImpl.java | 57 +++++++++++++++ .../griffin/core/measure/entity/DataSource.java | 2 - .../metastore/hive/HiveMetaStoreController.java | 22 ++---- .../hive/HiveMetaStoreServiceImpl.java | 15 ++-- .../metastore/kafka/KafkaSchemaController.java | 4 - .../griffin/core/metric/MetricController.java | 9 +-- .../core/measure/MeasureOrgControllerTest.java | 16 ++-- .../core/measure/MeasureOrgServiceImplTest.java | 77 ++++++++++++++++++++ 21 files changed, 224 insertions(+), 240 deletions(-) ----------------------------------------------------------------------
