You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/06/13 02:35:01 UTC

[2/2] incubator-griffin git commit: 20170613 10 30service

20170613 10 30service

Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>

Closes #70 from justACT/20170613-10-30service.


Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/ae6a308b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/ae6a308b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/ae6a308b

Branch: refs/heads/master
Commit: ae6a308b2f35f6ecdaac1b03ae6f1b2e2a046c99
Parents: a45937d
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Authored: Tue Jun 13 10:34:49 2017 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Tue Jun 13 10:34:49 2017 +0800

----------------------------------------------------------------------
 README.md                                       |   1 +
 service/pom.xml                                 |  20 ++
 .../griffin/core/measure/DataConnector.java     |   1 -
 .../core/measure/MeasureServiceImpl.java        |   9 +-
 .../griffin/core/measure/repo/MeasureRepo.java  |   9 +
 .../core/metastore/HiveMetastoreController.java |  20 +-
 .../core/metastore/HiveMetastoreProxy.java      |  27 +--
 .../core/metastore/HiveMetastoreService.java    |  95 +-------
 .../metastore/HiveMetastoreServiceImpl.java     | 153 +++++++++++++
 .../core/metastore/KafkaSchemaController.java   |   2 +-
 .../core/metastore/KafkaSchemaService.java      | 112 +---------
 .../core/metastore/KafkaSchemaServiceImpl.java  | 140 ++++++++++++
 .../apache/griffin/core/schedule/JobHealth.java |   5 +-
 .../core/schedule/Repo/ScheduleStateRepo.java   |   6 +-
 .../core/schedule/SchedulerController.java      | 190 ++--------------
 .../core/schedule/SchedulerRequestBody.java     |  35 +++
 .../griffin/core/schedule/SchedulerService.java |  24 +++
 .../core/schedule/SchedulerServiceImpl.java     | 214 +++++++++++++++++++
 .../griffin/core/schedule/SparkSubmitJob.java   |  24 +--
 .../main/resources/application-dev.properties   |   2 +-
 .../core/measure/MeasureControllerTest.java     | 177 +++++++++++++++
 .../core/measure/MeasureServiceImplTest.java    | 192 +++++++++++++++++
 .../measure/repo/MeasureControllerTest.java     | 101 ---------
 .../core/measure/repo/MeasureRepoTest.java      | 126 ++---------
 .../metastore/HiveMetastoreControllerTest.java  |   2 +-
 .../metastore/HiveMetastoreServiceImplTest.java | 118 ++++++++++
 .../metastore/HiveMetastoreServiceTests.java    | 129 -----------
 .../metastore/KafkaSchemaControllerTest.java    |   2 +-
 .../metastore/KafkaSchemaServiceImplTest.java   | 111 ++++++++++
 .../core/metric/MetricServiceImplTest.java      |  49 +++++
 .../core/schedule/SchedulerControllerTest.java  | 104 +++++++++
 .../core/schedule/SchedulerServiceImplTest.java | 178 +++++++++++++++
 .../core/schedule/SparkSubmitJobTest.java       |  60 +++---
 .../test/resources/application-test.properties  |  58 +++++
 service/src/test/resources/quartz.properties    |  11 +
 35 files changed, 1732 insertions(+), 775 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0eda770..274d5fb 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Release:
     ```
     Create a directory in Hdfs, and put our measure package into it.
     ```
+    cp /measure/target/measure-0.1.3-incubating-SNAPSHOT.jar /measure/target/griffin-measure.jar
     hdfs dfs -put /measure/target/griffin-measure.jar <griffin measure path>/
     ```
     After all our environment services startup, we can start our server.

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 41696e4..c9847cc 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -73,6 +73,12 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.1.5.RELEASE</version>
+        </dependency>
+
         <!--dev db-->
 
         <!--<dependency>-->
@@ -152,6 +158,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
     <profiles>
     </profiles>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
index aaf9e40..b2b0ad0 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
@@ -101,7 +101,6 @@ public class DataConnector extends AuditableEntity  {
 
 
     public DataConnector() {
-        System.out.println();
     }
 
     public DataConnector(ConnectorType type,String version, Map<String,String> config){

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
index ff74aa7..0b6b03a 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
@@ -87,7 +87,14 @@ public class MeasureServiceImpl implements MeasureService{
     }
 
     public GriffinOperationMessage updateMeasure(@RequestBody Measure measure) {
-
+//        Long measureId=measure.getId();
+//        if (measureRepo.findOne(measureId)==null){
+//            return GriffinOperationMessage.RESOURCE_NOT_FOUND;
+//        }else{
+//            measureRepo.updateMeasure(measureId,measure.getDescription(),measure.getOrganization(),measure.getSource(),measure.getTarget(),measure.getEvaluateRule());
+////            System.out.print(res);
+//            return GriffinOperationMessage.UPDATE_MEASURE_SUCCESS;
+//        }
         String name=measure.getName();
         Measure temp_mesaure=measureRepo.findByName(name);
         if (temp_mesaure==null){

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
index 5bc84a4..1ed2fb2 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
@@ -16,7 +16,10 @@ limitations under the License.
 package org.apache.griffin.core.measure.repo;
 
 
+import org.apache.griffin.core.measure.DataConnector;
+import org.apache.griffin.core.measure.EvaluateRule;
 import org.apache.griffin.core.measure.Measure;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
@@ -37,4 +40,10 @@ public interface MeasureRepo extends CrudRepository<Measure, Long> {
     @Query("select m.organization from Measure m "+
             "where m.name= ?1")
     String findOrgByName(String measureName);
+
+    @Modifying
+    @Query("update Measure m "+
+            "set m.description= ?2,m.organization= ?3,m.source= ?4,m.target= ?5,m.evaluateRule= ?6 where m.id= ?1")
+    void updateMeasure(Long Id, String description, String organization, DataConnector source, DataConnector target, EvaluateRule evaluateRule);
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
index 85a2d36..911ccb8 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreController.java
@@ -16,7 +16,9 @@ limitations under the License.
 package org.apache.griffin.core.metastore;
 
 
+import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.Table;
+import org.apache.thrift.TException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,42 +32,40 @@ import java.util.Map;
 public class HiveMetastoreController {
 
     @Autowired
-    HiveMetastoreService hiveMetastoreService;
+    HiveMetastoreServiceImpl hiveMetastoreService;
 
     @RequestMapping("/db")
-    public Iterable<String> getAllDatabases() {
+    public Iterable<String> getAllDatabases() throws MetaException{
         return hiveMetastoreService.getAllDatabases();
     }
 
     @RequestMapping("/table")
-    public Iterable<String> getDefAllTables() {
+    public Iterable<String> getDefAllTables() throws MetaException{
         return hiveMetastoreService.getAllTableNames("");
     }
 
     @RequestMapping("/{db}/table")
-    public Iterable<String> getAllTableNamess(@PathVariable("db") String dbName) {
+    public Iterable<String> getAllTableNamess(@PathVariable("db") String dbName) throws MetaException{
         return hiveMetastoreService.getAllTableNames(dbName);
     }
 
     @RequestMapping("/{db}/alltables")
-    public List<Table> getAllTables(@PathVariable("db") String dbName) {
+    public List<Table> getAllTables(@PathVariable("db") String dbName) throws TException {
         return hiveMetastoreService.getAllTable(dbName);
     }
 
     @RequestMapping("/alltables")
-    public Map<String,List<Table>> getAllTables() {
+    public Map<String,List<Table>> getAllTables() throws TException{
         return hiveMetastoreService.getAllTable();
     }
 
     @RequestMapping("/table/{table}")
-    public Table getDefTable(@PathVariable("table") String tableName) {
+    public Table getDefTable(@PathVariable("table") String tableName) throws TException{
         return hiveMetastoreService.getTable("", tableName);
     }
 
     @RequestMapping("/{db}/table/{table}")
-    public Table getTable(@PathVariable("db") String dbName, @PathVariable("table") String tableName) {
+    public Table getTable(@PathVariable("db") String dbName, @PathVariable("table") String tableName) throws TException{
         return hiveMetastoreService.getTable(dbName, tableName);
     }
-
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
index 185bc2b..c40c20e 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreProxy.java
@@ -24,6 +24,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PreDestroy;
+
 @Component
 public class HiveMetastoreProxy
 {
@@ -37,20 +39,21 @@ public class HiveMetastoreProxy
 
     @Bean
     public HiveMetaStoreClient initHiveMetastoreClient(){
-    HiveConf hiveConf = new HiveConf();
-    hiveConf.set("hive.metastore.local", "false");
-    hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
-    hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, uris);
-    try {
-        client= new HiveMetaStoreClient(hiveConf);
-    } catch (MetaException e) {
-        log.error("Failed to connect hive metastore",e.getMessage());
-        client = null;
+        HiveConf hiveConf = new HiveConf();
+        hiveConf.set("hive.metastore.local", "false");
+        hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
+        hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, uris);
+        try {
+            client= new HiveMetaStoreClient(hiveConf);
+        } catch (MetaException e) {
+            log.error("Failed to connect hive metastore",e.getMessage());
+            client = null;
+        }
+
+        return client;
     }
 
-    return client;
-}
-
+    @PreDestroy
     public void destroy() throws Exception {
         if(null!=client) client.close();
     }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
index c907b45..40d6610 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreService.java
@@ -15,104 +15,23 @@ limitations under the License.
 
 package org.apache.griffin.core.metastore;
 
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.Table;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import org.apache.thrift.TException;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+public interface HiveMetastoreService {
 
-@Service
-public class HiveMetastoreService {
+    public Iterable<String> getAllDatabases() throws MetaException;
 
-    private static final Logger log = LoggerFactory.getLogger(HiveMetastoreService.class);
+    public Iterable<String> getAllTableNames(String dbName) throws MetaException;
 
-    @Autowired
-    HiveMetaStoreClient client;
+    public List<Table> getAllTable(String db) throws TException;
 
-    @Value("${hive.metastore.dbname}")
-    private String defaultDbName;
-
-    private String getUseDbName(String dbName) {
-        if (!StringUtils.hasText(dbName)) return defaultDbName;
-        else return dbName;
-    }
-
-    public Iterable<String> getAllDatabases() {
-        Iterable<String> results = null;
-        try {
-            results = client.getAllDatabases();
-        } catch (MetaException e) {
-            log.error("Can not get databases : ",e.getMessage());
-        }
-        return results;
-    }
-
-    public Iterable<String> getAllTableNames(String dbName) {
-        Iterable<String> results = null;
-        String useDbName = getUseDbName(dbName);
-        try {
-            results = client.getAllTables(useDbName);
-        } catch (Exception e) {
-            log.warn("Exception fetching tables info" + e.getMessage());
-        }
-        return results;
-    }
-
-    public List<Table> getAllTable(String db){
-        List<Table> results = new ArrayList<Table>();
-        String useDbName = getUseDbName(db);
-        try {
-            Iterable<String> tables = client.getAllTables(useDbName);
-            for (String table: tables) {
-                Table tmp = client.getTable(db,table);
-                results.add(tmp);
-            }
-        } catch (Exception e) {
-            log.warn("Exception fetching tables info" + e.getMessage());
-        }
-        return results;
-    }
-
-    public Map<String,List<Table>> getAllTable(){
-        Map<String,List<Table>> results = new HashMap<String, List<Table>>();
-        Iterable<String> dbs = getAllDatabases();
-        for(String db: dbs){
-            List<Table> alltables = new ArrayList<Table>();
-            String useDbName = getUseDbName(db);
-            try {
-                Iterable<String> tables = client.getAllTables(useDbName);
-                for (String table: tables) {
-                    Table tmp = client.getTable(db,table);
-                    alltables.add(tmp);
-                }
-            } catch (Exception e) {
-                log.warn("Exception fetching tables info" + e.getMessage());
-            }
-            results.put(db,alltables);
-        }
-        return results;
-    }
-
-    public Table getTable(String dbName, String tableName) {
-        Table result = null;
-        String useDbName = getUseDbName(dbName);
-        try {
-            result = client.getTable(useDbName, tableName);
-        } catch (Exception e) {
-            log.warn("Exception fetching table info : " +tableName + " : " + e.getMessage());
-        }
-        return result;
-    }
+    public Map<String,List<Table>> getAllTable() throws TException;
 
+    public Table getTable(String dbName, String tableName) throws TException;
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreServiceImpl.java
new file mode 100644
index 0000000..ef8db93
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/metastore/HiveMetastoreServiceImpl.java
@@ -0,0 +1,153 @@
+/*-
+ * Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+package org.apache.griffin.core.metastore;
+
+import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
+import org.apache.hadoop.hive.metastore.api.MetaException;
+import org.apache.hadoop.hive.metastore.api.Table;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class HiveMetastoreServiceImpl implements HiveMetastoreService{
+
+    private static final Logger log = LoggerFactory.getLogger(HiveMetastoreServiceImpl.class);
+
+    @Autowired
+    HiveMetaStoreClient client;
+
+    @Value("${hive.metastore.dbname}")
+    private String defaultDbName;
+
+    private String getUseDbName(String dbName) {
+        if (!StringUtils.hasText(dbName)) return defaultDbName;
+        else return dbName;
+    }
+
+    @Retryable(value = { MetaException.class },
+            maxAttempts = 2,
+            backoff = @Backoff(delay = 5000))
+    @Override
+    public Iterable<String> getAllDatabases() throws MetaException{
+        Iterable<String> results = null;
+        try {
+            results = client.getAllDatabases();
+        } catch (MetaException e) {
+            reconnect();
+            log.error("Can not get databases : ",e.getMessage());
+            throw e;
+        }
+        return results;
+    }
+
+    @Retryable(value = { MetaException.class },
+            maxAttempts = 2,
+            backoff = @Backoff(delay = 5000))
+    @Override
+    public Iterable<String> getAllTableNames(String dbName) throws MetaException{
+        Iterable<String> results = null;
+        String useDbName = getUseDbName(dbName);
+        try {
+            results = client.getAllTables(useDbName);
+        } catch (Exception e) {
+            reconnect();
+            log.warn("Exception fetching tables info" + e.getMessage());
+            throw e;
+        }
+        return results;
+    }
+
+    @Retryable(value = { TException.class },
+            maxAttempts = 2,
+            backoff = @Backoff(delay = 5000))
+    @Override
+    public List<Table> getAllTable(String db) throws TException{
+        List<Table> results = new ArrayList<Table>();
+        String useDbName = getUseDbName(db);
+        try {
+            Iterable<String> tables = client.getAllTables(useDbName);
+            for (String table: tables) {
+                Table tmp = client.getTable(db,table);
+                results.add(tmp);
+            }
+        } catch (Exception e) {
+            reconnect();
+            log.warn("Exception fetching tables info" + e.getMessage());
+            throw e;
+        }
+        return results;
+    }
+
+    @Retryable(value = { TException.class },
+            maxAttempts = 2,
+            backoff = @Backoff(delay = 5000))
+    @Override
+    public Map<String,List<Table>> getAllTable() throws TException{
+        Map<String,List<Table>> results = new HashMap<String, List<Table>>();
+        Iterable<String> dbs = getAllDatabases();
+        for(String db: dbs){
+            List<Table> alltables = new ArrayList<Table>();
+            String useDbName = getUseDbName(db);
+            try {
+                Iterable<String> tables = client.getAllTables(useDbName);
+                for (String table: tables) {
+                    Table tmp = client.getTable(db,table);
+                    alltables.add(tmp);
+                }
+            } catch (Exception e) {
+                reconnect();
+                log.warn("Exception fetching tables info" + e.getMessage());
+                throw e;
+            }
+            results.put(db,alltables);
+        }
+        return results;
+    }
+
+    @Retryable(value = { TException.class },
+            maxAttempts = 2,
+            backoff = @Backoff(delay = 5000))
+    @Override
+    public Table getTable(String dbName, String tableName) throws TException{
+        Table result = null;
+        String useDbName = getUseDbName(dbName);
+        try {
+            result = client.getTable(useDbName, tableName);
+        } catch (Exception e) {
+            reconnect();
+            log.warn("Exception fetching table info : " +tableName + " : " + e.getMessage());
+            throw e;
+        }
+        return result;
+    }
+
+    private void reconnect() throws MetaException{
+        client.reconnect();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
index f4ae18d..11149a0 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaController.java
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class KafkaSchemaController {
 
     @Autowired
-    KafkaSchemaService kafkaSchemaService;
+    KafkaSchemaServiceImpl kafkaSchemaService;
 
     @RequestMapping("/schema/{id}")
     public SchemaString getSchemaString(@PathVariable("id") Integer id) {

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
index fc1e693..bccfc50 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaService.java
@@ -18,116 +18,18 @@ package org.apache.griffin.core.metastore;
 import io.confluent.kafka.schemaregistry.client.rest.entities.Config;
 import io.confluent.kafka.schemaregistry.client.rest.entities.Schema;
 import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
+public interface KafkaSchemaService {
+    public SchemaString getSchemaString(Integer id);
 
-@Service
-public class KafkaSchemaService {
+    public Iterable<String> getSubjects();
 
-    private static final Logger log = LoggerFactory.getLogger(KafkaSchemaService.class);
+    public Iterable<Integer> getSubjectVersions(String subject);
 
-    @Value("${kafka.schema.registry.url}")
-    private String url;
+    public Schema getSubjectSchema(String subject, String version);
 
+    public Config getTopLevelConfig();
 
-    private String registryUrl(final String path) {
-        if (StringUtils.hasText(path)) {
-            String usePath = path;
-            if (!path.startsWith("/")) usePath = "/" + path;
-            return this.url + usePath;
-        }
-        return "";
-    }
+    public Config getSubjectLevelConfig(String subject);
 
-    public SchemaString getSchemaString(Integer id) {
-        String path = "/schemas/ids/" + id;
-        String regUrl = registryUrl(path);
-        SchemaString result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<SchemaString> res = restTemplate.getForEntity(regUrl, SchemaString.class);
-            result = res.getBody();
-        } catch (Exception e) {
-            log.error("Exception getting schema of id " + id + " : ", e.getMessage());
-        }
-        return result;
-    }
-
-    public Iterable<String> getSubjects() {
-        String path = "/subjects";
-        String regUrl = registryUrl(path);
-        Iterable<String> result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<String[]> res = restTemplate.getForEntity(regUrl, String[].class);
-            result = Arrays.asList(res.getBody());
-        } catch (Exception e) {
-            log.error("Exception getting subjects : ", e.getMessage());
-        }
-        return result;
-    }
-
-    public Iterable<Integer> getSubjectVersions(String subject) {
-        String path = "/subjects/" + subject + "/versions";
-        String regUrl = registryUrl(path);
-        Iterable<Integer> result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<Integer[]> res = restTemplate.getForEntity(regUrl, Integer[].class);
-            result = Arrays.asList(res.getBody());
-        } catch (Exception e) {
-            log.error("Exception getting subject " + subject + " versions : ", e.getMessage());
-        }
-        return result;
-    }
-
-    public Schema getSubjectSchema(String subject, String version) {
-        String path = "/subjects/" + subject + "/versions/" + version;
-        String regUrl = registryUrl(path);
-        Schema result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<Schema> res = restTemplate.getForEntity(regUrl, Schema.class);
-            result = res.getBody();
-        } catch (Exception e) {
-            log.error("Exception getting subject " + subject + " with version " + version + " : ", e.getMessage());
-        }
-        return result;
-    }
-
-    public Config getTopLevelConfig() {
-        String path = "/config";
-        String regUrl = registryUrl(path);
-        Config result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<Config> res = restTemplate.getForEntity(regUrl, Config.class);
-            result = res.getBody();
-        } catch (Exception e) {
-            log.error("Exception getting top level config : ", e.getMessage());
-        }
-        return result;
-    }
-
-    public Config getSubjectLevelConfig(String subject) {
-        String path = "/config/" + subject;
-        String regUrl = registryUrl(path);
-        Config result = null;
-        try {
-            RestTemplate restTemplate = new RestTemplate();
-            ResponseEntity<Config> res = restTemplate.getForEntity(regUrl, Config.class);
-            result = res.getBody();
-        } catch (Exception e) {
-            log.error("Exception getting subject " + subject + " level config : ", e.getMessage());
-        }
-        return result;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaServiceImpl.java
new file mode 100644
index 0000000..87209c2
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/metastore/KafkaSchemaServiceImpl.java
@@ -0,0 +1,140 @@
+/*-
+ * Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+package org.apache.griffin.core.metastore;
+
+import io.confluent.kafka.schemaregistry.client.rest.entities.Config;
+import io.confluent.kafka.schemaregistry.client.rest.entities.Schema;
+import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Arrays;
+
+@Service
+public class KafkaSchemaServiceImpl implements KafkaSchemaService{
+
+    private static final Logger log = LoggerFactory.getLogger(KafkaSchemaServiceImpl.class);
+
+    @Value("${kafka.schema.registry.url}")
+    private String url;
+
+    RestTemplate restTemplate = new RestTemplate();
+
+    private String registryUrl(final String path) {
+        if (StringUtils.hasText(path)) {
+            String usePath = path;
+            if (!path.startsWith("/")) usePath = "/" + path;
+            return this.url + usePath;
+        }
+        return "";
+    }
+
+    @Override
+    public SchemaString getSchemaString(Integer id) {
+        String path = "/schemas/ids/" + id;
+        String regUrl = registryUrl(path);
+        SchemaString result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<SchemaString> res = restTemplate.getForEntity(regUrl, SchemaString.class);
+            result = res.getBody();
+        } catch (Exception e) {
+            log.error("Exception getting schema of id " + id + " : ", e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public Iterable<String> getSubjects() {
+        String path = "/subjects";
+        String regUrl = registryUrl(path);
+        Iterable<String> result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<String[]> res = restTemplate.getForEntity(regUrl, String[].class);
+            result = Arrays.asList(res.getBody());
+        } catch (Exception e) {
+            log.error("Exception getting subjects : ", e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public Iterable<Integer> getSubjectVersions(String subject) {
+        String path = "/subjects/" + subject + "/versions";
+        String regUrl = registryUrl(path);
+        Iterable<Integer> result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Integer[]> res = restTemplate.getForEntity(regUrl, Integer[].class);
+            result = Arrays.asList(res.getBody());
+        } catch (Exception e) {
+            log.error("Exception getting subject " + subject + " versions : ", e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public Schema getSubjectSchema(String subject, String version) {
+        String path = "/subjects/" + subject + "/versions/" + version;
+        String regUrl = registryUrl(path);
+        Schema result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Schema> res = restTemplate.getForEntity(regUrl, Schema.class);
+            result = res.getBody();
+        } catch (Exception e) {
+            log.error("Exception getting subject " + subject + " with version " + version + " : ", e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public Config getTopLevelConfig() {
+        String path = "/config";
+        String regUrl = registryUrl(path);
+        Config result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Config> res = restTemplate.getForEntity(regUrl, Config.class);
+
+            result = res.getBody();
+        } catch (Exception e) {
+            log.error("Exception getting top level config : ", e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public Config getSubjectLevelConfig(String subject) {
+        String path = "/config/" + subject;
+        String regUrl = registryUrl(path);
+        Config result = null;
+        try {
+//            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Config> res = restTemplate.getForEntity(regUrl, Config.class);
+            result = res.getBody();
+        } catch (Exception e) {
+            log.error("Exception getting subject " + subject + " level config : ", e.getMessage());
+        }
+        return result;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java b/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java
index 56ed981..f9af7cc 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/JobHealth.java
@@ -10,13 +10,10 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
  */
 package org.apache.griffin.core.schedule;
 
-/**
- * Created by xiangrchen on 6/1/17.
- */
+
 public class JobHealth {
     private int health;
     private int invalid;

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
index 4ab04f7..e49901d 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/Repo/ScheduleStateRepo.java
@@ -10,10 +10,10 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
  */
 package org.apache.griffin.core.schedule.Repo;
 
+
 import org.apache.griffin.core.schedule.ScheduleState;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
@@ -22,9 +22,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-/**
- * Created by xiangrchen on 5/31/17.
- */
+
 @Repository
 public interface ScheduleStateRepo extends CrudRepository<ScheduleState,Long>{
     @Query("select s from ScheduleState s " +

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index beae5b7..6447fa9 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -15,29 +15,18 @@ limitations under the License.
 
 package org.apache.griffin.core.schedule;
 
-import org.apache.griffin.core.schedule.Repo.ScheduleStateRepo;
-import org.quartz.*;
-import org.quartz.impl.matchers.GroupMatcher;
+import org.quartz.SchedulerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.web.bind.annotation.*;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.io.Serializable;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static org.quartz.JobBuilder.newJob;
-import static org.quartz.JobKey.jobKey;
-import static org.quartz.TriggerBuilder.newTrigger;
-import static org.quartz.TriggerKey.triggerKey;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/jobs")
@@ -45,187 +34,38 @@ public class SchedulerController {
     private static final Logger LOGGER = LoggerFactory.getLogger(SchedulerController.class);
 
     @Autowired
-    private SchedulerFactoryBean factory;
-    @Autowired
-    private ScheduleStateRepo scheduleStateRepo;
-
-    public static final String ACCURACY_BATCH_GROUP = "BA";
+    SchedulerService schedulerService;
 
     @RequestMapping("/")
-    public List<Map<String, Serializable>> jobs() throws SchedulerException,
+    public List<Map<String, Serializable>> getJobs() throws SchedulerException,
             ParseException {
-        Scheduler scheduler = factory.getObject();
-
-        List<Map<String, Serializable>> list = new ArrayList<>();
-        for (String groupName : scheduler.getJobGroupNames()) {
-            for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher
-                    .jobGroupEquals(groupName))) {
-                String jobName = jobKey.getName();
-                String jobGroup = jobKey.getGroup();
-
-                JobDetail jd = scheduler.getJobDetail(jobKey);
-
-                List<Trigger> triggers = (List<Trigger>) scheduler
-                        .getTriggersOfJob(jobKey);
-                Map<String, Serializable> map = new HashMap<>();
-
-                if (triggers.size() > 0) {
-                    //always get next run
-                    Date nextFireTime = triggers.get(0).getNextFireTime();
-                    Date previousFireTime=triggers.get(0).getPreviousFireTime();
-//                    triggers.get(0).getScheduleBuilder()
-
-                    Trigger.TriggerState triggerState=scheduler.getTriggerState(triggers.get(0).getKey());
-
-                    map.put("jobName", jobName);
-                    map.put("groupName", jobGroup);
-                    map.put("nextFireTime", nextFireTime.getTime());
-                    if (previousFireTime!=null)
-                        map.put("previousFireTime",previousFireTime.getTime());
-                    else
-                        map.put("previousFireTime",-1);
-                    map.put("triggerState",triggerState);
-
-                    map.put("measure", (String) jd.getJobDataMap().get("measure"));
-                    map.put("sourcePat",jd.getJobDataMap().getString("sourcePat"));
-                    map.put("targetPat",jd.getJobDataMap().getString("targetPat"));
-                    System.out.print("dataStartTimestamp:"+jd.getJobDataMap().getString("dataStartTimestamp"));
-                    if(jd.getJobDataMap().getString("dataStartTimestamp")!=null && !jd.getJobDataMap().getString("dataStartTimestamp").equals(""))
-                        map.put("dataStartTimestamp",jd.getJobDataMap().getString("dataStartTimestamp"));
-                    map.put("jobStartTime",jd.getJobDataMap().getString("jobStartTime"));
-                    map.put("periodTime",jd.getJobDataMap().getString("periodTime"));
-                    list.add(map);
-                }
-
-            }
-        }
-        return list;
-    }
-
-    @RequestMapping(value = "/{groupName}/{jobName}", method = RequestMethod.DELETE)
-    public String removeTask(@PathVariable String groupName, @PathVariable String jobName)
-            throws SchedulerException {
-        Scheduler scheduler = factory.getObject();
-        JobKey jobKey = new JobKey(jobName, groupName);
-        scheduler.deleteJob(jobKey);
-        return "task has been removed";
+        return schedulerService.getJobs();
     }
 
-    //@RequestMapping(value = "/add/{groupName}/{jobName}/{measureName}/{sourcePat}/{targetPat}")
     @RequestMapping(value = "/add/{groupName}/{jobName}/{measureName}", method = RequestMethod.POST)
     @ResponseBody
     @Produces(MediaType.APPLICATION_JSON)
-    public Boolean addTask(@PathVariable String groupName,
+    public boolean addJob(@PathVariable String groupName,
                            @PathVariable String jobName,
                            @PathVariable String measureName,
                            @RequestBody SchedulerRequestBody schedulerRequestBody) {
-        //@RequestParam(value = "sourcePat", required = false) String sourcePat,
-        //@RequestParam(value = "targetPat", required = false) String targetPat
-//        int jobStartTime = 0;
-        Date jobStartTime=null;
-        int periodTime = 0;
-        SimpleDateFormat format=new SimpleDateFormat("YYYYMMdd HH:mm:ss");
-        try{
-            periodTime = Integer.parseInt(schedulerRequestBody.getPeriodTime());
-            jobStartTime=format.parse(schedulerRequestBody.getJobStartTime());
-        }catch (Exception e){
-            LOGGER.info("jobStartTime or periodTime format error! "+e);
-            return false;
-        }
-        try {
-            Scheduler scheduler = factory.getObject();
-            TriggerKey triggerKey = triggerKey(jobName, groupName);
-
-            if (scheduler.checkExists(triggerKey)) {
-                scheduler.unscheduleJob(triggerKey);
-            }
-            JobKey jobKey = jobKey(jobName, groupName);
-            JobDetail jobDetail;
-            if (scheduler.checkExists(jobKey)) {
-                jobDetail = scheduler.getJobDetail(jobKey);
-                setJobDetail(jobDetail,schedulerRequestBody,measureName,groupName,jobName);
-                scheduler.addJob(jobDetail, true);
-            } else {
-                jobDetail = newJob(SparkSubmitJob.class)
-                        .storeDurably()
-                        .withIdentity(jobKey)
-                        .build();
-
-                setJobDetail(jobDetail,schedulerRequestBody,measureName,groupName,jobName);
-                scheduler.addJob(jobDetail, false);
-            }
-
-            Trigger trigger = newTrigger()
-                    .withIdentity(triggerKey)
-                    .forJob(jobDetail)
-                    //hardcode to
-//					.withSchedule(CronScheduleBuilder.cronSchedule("0 0/1 0 * * ?"))
-                    .withSchedule(SimpleScheduleBuilder.simpleSchedule()
-                            .withIntervalInSeconds(periodTime)
-                            .repeatForever())
-                    .startAt(jobStartTime)
-                    .build();
-            scheduler.scheduleJob(trigger);
-
-            return true;
-
-        } catch (SchedulerException e) {
-            LOGGER.error("", e);
-            return false;
-        }
-    }
-
-    private void setJobDetail(JobDetail jobDetail,SchedulerRequestBody schedulerRequestBody,String measureName,String groupName,String jobName){
-        jobDetail.getJobDataMap().put("measure", measureName);
-        jobDetail.getJobDataMap().put("sourcePat", schedulerRequestBody.getSourcePat());
-        jobDetail.getJobDataMap().put("targetPat", schedulerRequestBody.getTargetPat());
-        jobDetail.getJobDataMap().put("dataStartTimestamp", schedulerRequestBody.getDataStartTimestamp());
-        jobDetail.getJobDataMap().put("jobStartTime", schedulerRequestBody.getJobStartTime());
-        jobDetail.getJobDataMap().put("periodTime", schedulerRequestBody.getPeriodTime());
-        jobDetail.getJobDataMap().put("lastTime", "");
-        jobDetail.getJobDataMap().put("groupName",groupName);
-        jobDetail.getJobDataMap().put("jobName",jobName);
+        return schedulerService.addJob(groupName,jobName,measureName,schedulerRequestBody);
     }
 
-    @RequestMapping(value = "/groups/{group}/jobs/{name}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/del/{group}/{name}", method = RequestMethod.DELETE)
     public boolean deleteJob(@PathVariable String group, @PathVariable String name) {
-        try {
-            Scheduler scheduler = factory.getObject();
-            scheduler.deleteJob(new JobKey(name, group));
-            return true;
-        } catch (SchedulerException e) {
-            LOGGER.error(e.getMessage());
-            return false;
-        }
+        return schedulerService.deleteJob(group,name);
     }
 
-    @RequestMapping("/instances/groups/{group}/jobs/{name}/{page}/{size}")
-    public List<ScheduleState> findInstancesOfJob(@PathVariable String group,@PathVariable String name,@PathVariable int page,@PathVariable int size){
-        Pageable pageRequest=new PageRequest(page,size, Sort.Direction.DESC,"timestamp");
-        return scheduleStateRepo.findByGroupNameAndJobName(group,name,pageRequest);
+    @RequestMapping("/instances/{group}/{jobName}/{page}/{size}")
+    public List<ScheduleState> findInstancesOfJob(@PathVariable String group,@PathVariable String jobName,
+                                                  @PathVariable int page,@PathVariable int size){
+        return schedulerService.findInstancesOfJob(group,jobName,page,size);
     }
 
     @RequestMapping("/statics")
     public JobHealth getHealthInfo() throws SchedulerException {
-        Scheduler scheduler=factory.getObject();
-        int jobCount=scheduler.getJobGroupNames().size();
-        int health=0;
-        int invalid=0;
-        for (String groupName : scheduler.getJobGroupNames()){
-            for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName))){
-                String jobName=jobKey.getName();
-                String jobGroup=jobKey.getGroup();
-                Pageable pageRequest=new PageRequest(0,1, Sort.Direction.DESC,"timestamp");
-                ScheduleState scheduleState=scheduleStateRepo.findByGroupNameAndJobName(jobGroup,jobName,pageRequest).get(0);
-                if(scheduleState.getState().equals("starting")){
-                    health++;
-                }else{
-                    invalid++;
-                }
-            }
-        }
-        JobHealth jobHealth=new JobHealth(health,invalid,jobCount);
-        return jobHealth;
+        return schedulerService.getHealthInfo();
     }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
index d33472f..a5671b4 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerRequestBody.java
@@ -65,4 +65,39 @@ public class SchedulerRequestBody {
         this.periodTime = periodTime;
     }
 
+    public SchedulerRequestBody(String sourcePat, String targetPat, String dataStartTimestamp, String jobStartTime, String periodTime) {
+        this.sourcePat = sourcePat;
+        this.targetPat = targetPat;
+        this.dataStartTimestamp = dataStartTimestamp;
+        this.jobStartTime = jobStartTime;
+        this.periodTime = periodTime;
+    }
+
+    public SchedulerRequestBody() {
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SchedulerRequestBody that = (SchedulerRequestBody) o;
+
+        if (sourcePat != null ? !sourcePat.equals(that.sourcePat) : that.sourcePat != null) return false;
+        if (targetPat != null ? !targetPat.equals(that.targetPat) : that.targetPat != null) return false;
+        if (dataStartTimestamp != null ? !dataStartTimestamp.equals(that.dataStartTimestamp) : that.dataStartTimestamp != null)
+            return false;
+        if (jobStartTime != null ? !jobStartTime.equals(that.jobStartTime) : that.jobStartTime != null) return false;
+        return periodTime != null ? periodTime.equals(that.periodTime) : that.periodTime == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = sourcePat != null ? sourcePat.hashCode() : 0;
+        result = 31 * result + (targetPat != null ? targetPat.hashCode() : 0);
+        result = 31 * result + (dataStartTimestamp != null ? dataStartTimestamp.hashCode() : 0);
+        result = 31 * result + (jobStartTime != null ? jobStartTime.hashCode() : 0);
+        result = 31 * result + (periodTime != null ? periodTime.hashCode() : 0);
+        return result;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerService.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerService.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerService.java
new file mode 100644
index 0000000..5d57ba1
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerService.java
@@ -0,0 +1,24 @@
+package org.apache.griffin.core.schedule;
+
+import org.quartz.SchedulerException;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xiangrchen on 6/7/17.
+ */
+public interface SchedulerService {
+    public List<Map<String, Serializable>> getJobs() throws SchedulerException;
+
+    public Boolean addJob(String groupName,String jobName,String measureName,SchedulerRequestBody schedulerRequestBody);
+
+    public Boolean deleteJob(String groupName,String jobName);
+
+    public List<ScheduleState> findInstancesOfJob(String group,String name,int page,int size);
+
+    public JobHealth getHealthInfo() throws SchedulerException;
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerServiceImpl.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerServiceImpl.java
new file mode 100644
index 0000000..7c70623
--- /dev/null
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerServiceImpl.java
@@ -0,0 +1,214 @@
+/*-
+ * Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+package org.apache.griffin.core.schedule;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.griffin.core.schedule.Repo.ScheduleStateRepo;
+import org.quartz.*;
+import org.quartz.impl.matchers.GroupMatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static org.quartz.JobBuilder.newJob;
+import static org.quartz.JobKey.jobKey;
+import static org.quartz.TriggerBuilder.newTrigger;
+import static org.quartz.TriggerKey.triggerKey;
+
+@Service
+public class SchedulerServiceImpl implements SchedulerService{
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SchedulerServiceImpl.class);
+
+    @Autowired
+    private SchedulerFactoryBean factory;
+    @Autowired
+    private ScheduleStateRepo scheduleStateRepo;
+
+    public static final String ACCURACY_BATCH_GROUP = "BA";
+
+
+    @Override
+    public List<Map<String, Serializable>> getJobs() throws SchedulerException {
+        Scheduler scheduler = factory.getObject();
+        List<Map<String, Serializable>> list = new ArrayList<>();
+        for (String groupName : scheduler.getJobGroupNames()) {
+            for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher
+                    .jobGroupEquals(groupName))) {
+                setJobsByKey(list,scheduler, jobKey);
+            }
+        }
+        return list;
+    }
+
+    public void setJobsByKey(List<Map<String, Serializable>> list,Scheduler scheduler, JobKey jobKey) throws SchedulerException {
+        List<Trigger> triggers = (List<Trigger>) scheduler.getTriggersOfJob(jobKey);
+        if (triggers.size() > 0) {
+            //always get next run
+            Map<String, Serializable> map = new HashMap<>();
+            setMap(map,scheduler,jobKey);
+            list.add(map);
+        }
+    }
+
+
+    public void setMap(Map<String, Serializable> map,Scheduler scheduler,JobKey jobKey) throws SchedulerException {
+        List<Trigger> triggers = (List<Trigger>) scheduler.getTriggersOfJob(jobKey);
+        JobDetail jd = scheduler.getJobDetail(jobKey);
+        Date nextFireTime = triggers.get(0).getNextFireTime();
+        Date previousFireTime=triggers.get(0).getPreviousFireTime();
+        Trigger.TriggerState triggerState=scheduler.getTriggerState(triggers.get(0).getKey());
+
+        map.put("jobName", jobKey.getName());
+        map.put("groupName", jobKey.getGroup());
+        if (nextFireTime!=null){
+            map.put("nextFireTime", nextFireTime.getTime());
+        }
+        else {
+            map.put("nextFireTime", -1);
+        }
+        if (previousFireTime!=null) {
+            map.put("previousFireTime", previousFireTime.getTime());
+        }
+        else {
+            map.put("previousFireTime", -1);
+        }
+        map.put("triggerState",triggerState);
+        map.put("measure", jd.getJobDataMap().getString("measure"));
+        map.put("sourcePat",jd.getJobDataMap().getString("sourcePat"));
+        map.put("targetPat",jd.getJobDataMap().getString("targetPat"));
+        if(StringUtils.isNotEmpty(jd.getJobDataMap().getString("dataStartTimestamp"))) {
+            map.put("dataStartTimestamp", jd.getJobDataMap().getString("dataStartTimestamp"));
+        }
+        map.put("jobStartTime",jd.getJobDataMap().getString("jobStartTime"));
+        map.put("periodTime",jd.getJobDataMap().getString("periodTime"));
+    }
+
+    @Override
+    public Boolean addJob(String groupName, String jobName, String measureName, SchedulerRequestBody schedulerRequestBody) {
+        Date jobStartTime=null;
+        int periodTime = 0;
+        SimpleDateFormat format=new SimpleDateFormat("YYYYMMdd HH:mm:ss");
+        try{
+            periodTime = Integer.parseInt(schedulerRequestBody.getPeriodTime());
+            jobStartTime=format.parse(schedulerRequestBody.getJobStartTime());
+        }catch (Exception e){
+            LOGGER.info("jobStartTime or periodTime format error! "+e);
+            return false;
+        }
+        try {
+            Scheduler scheduler = factory.getObject();
+            TriggerKey triggerKey = triggerKey(jobName, groupName);
+            if (scheduler.checkExists(triggerKey)) {
+                scheduler.unscheduleJob(triggerKey);
+            }
+            JobKey jobKey = jobKey(jobName, groupName);
+            JobDetail jobDetail;
+            if (scheduler.checkExists(jobKey)) {
+                jobDetail = scheduler.getJobDetail(jobKey);
+                setJobDetail(jobDetail,schedulerRequestBody,measureName,groupName,jobName);
+                scheduler.addJob(jobDetail, true);
+            } else {
+                jobDetail = newJob(SparkSubmitJob.class)
+                        .storeDurably()
+                        .withIdentity(jobKey)
+                        .build();
+                setJobDetail(jobDetail,schedulerRequestBody,measureName,groupName,jobName);
+                scheduler.addJob(jobDetail, false);
+            }
+            Trigger trigger = newTrigger()
+                    .withIdentity(triggerKey)
+                    .forJob(jobDetail)
+//					.withSchedule(CronScheduleBuilder.cronSchedule("0 0/1 0 * * ?"))
+                    .withSchedule(SimpleScheduleBuilder.simpleSchedule()
+                            .withIntervalInSeconds(periodTime)
+                            .repeatForever())
+                    .startAt(jobStartTime)
+                    .build();
+            scheduler.scheduleJob(trigger);
+            return true;
+        } catch (SchedulerException e) {
+            LOGGER.error("", e);
+            return false;
+        }
+    }
+
+    public void setJobDetail(JobDetail jobDetail,SchedulerRequestBody schedulerRequestBody,String measureName,String groupName,String jobName){
+        jobDetail.getJobDataMap().put("measure", measureName);
+        jobDetail.getJobDataMap().put("sourcePat", schedulerRequestBody.getSourcePat());
+        jobDetail.getJobDataMap().put("targetPat", schedulerRequestBody.getTargetPat());
+        jobDetail.getJobDataMap().put("dataStartTimestamp", schedulerRequestBody.getDataStartTimestamp());
+        jobDetail.getJobDataMap().put("jobStartTime", schedulerRequestBody.getJobStartTime());
+        jobDetail.getJobDataMap().put("periodTime", schedulerRequestBody.getPeriodTime());
+        jobDetail.getJobDataMap().put("lastTime", "");
+        jobDetail.getJobDataMap().put("groupName",groupName);
+        jobDetail.getJobDataMap().put("jobName",jobName);
+    }
+
+    @Override
+    public Boolean deleteJob(String group, String name) {
+        try {
+            Scheduler scheduler = factory.getObject();
+            scheduler.deleteJob(new JobKey(name, group));
+            return true;
+        } catch (SchedulerException e) {
+            LOGGER.error(e.getMessage());
+            return false;
+        }
+    }
+
+    @Override
+    public List<ScheduleState> findInstancesOfJob(String group, String name, int page, int size) {
+        Pageable pageRequest=new PageRequest(page,size, Sort.Direction.DESC,"timestamp");
+        return scheduleStateRepo.findByGroupNameAndJobName(group,name,pageRequest);
+    }
+
+    @Override
+    public JobHealth getHealthInfo() throws SchedulerException {
+        Scheduler scheduler=factory.getObject();
+        int jobCount=scheduler.getJobGroupNames().size();
+        int health=0;
+        int invalid=0;
+        for (String groupName : scheduler.getJobGroupNames()){
+            for (JobKey jobKey : scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName))){
+                String jobName=jobKey.getName();
+                String jobGroup=jobKey.getGroup();
+                Pageable pageRequest=new PageRequest(0,1, Sort.Direction.DESC,"timestamp");
+                ScheduleState scheduleState=new ScheduleState();
+                if (scheduleStateRepo.findByGroupNameAndJobName(jobGroup,jobName,pageRequest)!=null
+                        &&scheduleStateRepo.findByGroupNameAndJobName(jobGroup,jobName,pageRequest).size()>0){
+                    scheduleState=scheduleStateRepo.findByGroupNameAndJobName(jobGroup,jobName,pageRequest).get(0);
+                    if(scheduleState.getState().equals("starting")){
+                        health++;
+                    }else{
+                        invalid++;
+                    }
+                }
+            }
+        }
+        JobHealth jobHealth=new JobHealth(health,invalid,jobCount);
+        return jobHealth;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
index ac533f7..f66c599 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.google.gson.Gson;
+import org.apache.commons.lang.StringUtils;
 import org.apache.griffin.core.measure.DataConnector;
 import org.apache.griffin.core.measure.Measure;
 import org.apache.griffin.core.measure.repo.MeasureRepo;
@@ -108,14 +109,14 @@ public class SparkSubmitJob implements Job {
         periodTime = jd.getJobDataMap().getString("periodTime");
         //prepare current system timestamp
         long currentSystemTimestamp = System.currentTimeMillis();
-
-        if (sourcePattern != null && !sourcePattern.equals("")) {
+        logger.info("currentSystemTimestamp: "+currentSystemTimestamp);
+        if (StringUtils.isNotEmpty(sourcePattern)) {
             sourcePatternItemSet = sourcePattern.split("-");
             long currentTimstamp = setCurrentTimestamp(currentSystemTimestamp);
             setDataConnectorPartitions(measure.getSource(), sourcePatternItemSet, partitionItemSet, currentTimstamp);
             jd.getJobDataMap().put("lastTime", currentTimstamp + "");
         }
-        if (targetPattern != null && !targetPattern.equals("")) {
+        if (StringUtils.isNotEmpty(targetPattern)) {
             targetPatternItemSet = targetPattern.split("-");
             long currentTimstamp = setCurrentTimestamp(currentSystemTimestamp);
             setDataConnectorPartitions(measure.getTarget(), targetPatternItemSet, partitionItemSet, currentTimstamp);
@@ -124,10 +125,9 @@ public class SparkSubmitJob implements Job {
         //final String uri = "http://10.9.246.187:8998/batches";
         RestTemplate restTemplate = new RestTemplate();
         setSparkJobDO();
-//        String result = restTemplate.postForObject(uri, sparkJobDO, String.class);
-        logger.info("measure: \n"+measure);
         String result = restTemplate.postForObject(uri, sparkJobDO, String.class);
         logger.info(result);
+        //save result info into DataBase
         ScheduleResult scheduleResult=new ScheduleResult();
         Gson gson=new Gson();
         try {
@@ -135,8 +135,10 @@ public class SparkSubmitJob implements Job {
         }catch (Exception e){
             logger.info("scheduleResult covert error!"+e);
         }
-        ScheduleState scheduleState=new ScheduleState(groupName,jobName,scheduleResult.getId(),scheduleResult.getState(),scheduleResult.getAppId(),System.currentTimeMillis());
-        scheduleStateRepo.save(scheduleState);
+        if(scheduleResult!=null) {
+            ScheduleState scheduleState = new ScheduleState(groupName, jobName, scheduleResult.getId(), scheduleResult.getState(), scheduleResult.getAppId(), System.currentTimeMillis());
+            scheduleStateRepo.save(scheduleState);
+        }
     }
 
     public Map<String, String> genPartitions(String[] patternItemSet, String[] partitionItemSet, long timestamp) {
@@ -170,14 +172,14 @@ public class SparkSubmitJob implements Job {
 
     public long setCurrentTimestamp(long currentSystemTimestamp) {
         long currentTimstamp=0;
-        if (eachJoblastTimestamp != null && !eachJoblastTimestamp.equals("")) {
+        if (StringUtils.isNotEmpty(eachJoblastTimestamp)) {
             try {
                 currentTimstamp = Long.parseLong(eachJoblastTimestamp) + Integer.parseInt(periodTime) * 1000;
             }catch (Exception e){
                 logger.info("lasttime or periodTime format problem! "+e);
             }
         } else {
-            if (dataStartTimestamp != null && !dataStartTimestamp.equals("")) {
+            if (StringUtils.isNotEmpty(dataStartTimestamp)) {
                 try{
                     currentTimstamp = Long.parseLong(dataStartTimestamp);
                 }catch (Exception e){
@@ -225,8 +227,6 @@ public class SparkSubmitJob implements Job {
         sparkJobDO.setJars(jars);
 
         List<String> files = new ArrayList<>();
-//        files.add(props.getProperty("sparkJob.files_1"));
-
         sparkJobDO.setFiles(files);
     }
 
@@ -245,7 +245,7 @@ public class SparkSubmitJob implements Job {
                 throw new FileNotFoundException("property file '" + propFileName + "' not found in the classpath");
             }
         } catch (Exception e) {
-            System.out.println("Exception: " + e);
+            logger.info("Exception: " + e);
         } finally {
             inputStream.close();
         }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/main/resources/application-dev.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/application-dev.properties b/service/src/main/resources/application-dev.properties
index 12f8865..9574b38 100644
--- a/service/src/main/resources/application-dev.properties
+++ b/service/src/main/resources/application-dev.properties
@@ -6,7 +6,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ## Hibernate ddl auto (validate,create, create-drop, update)
 
-spring.jpa.hibernate.ddl-auto = create-drop
+spring.jpa.hibernate.ddl-auto = update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 #

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
new file mode 100644
index 0000000..3da5d6f
--- /dev/null
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java
@@ -0,0 +1,177 @@
+/*-
+ * Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+package org.apache.griffin.core.measure;
+
+import org.apache.griffin.core.util.GriffinOperationMessage;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringRunner.class)
+@WebMvcTest(value=MeasureController.class,secure = false)
+public class MeasureControllerTest {
+    @Autowired
+    private MockMvc mvc;
+
+    @MockBean
+    private MeasureService service;
+
+    @Before
+    public void setup(){
+    }
+
+    @Test
+    public void testGetAllMeasures() throws IOException,Exception{
+        Measure measure = createATestMeasure("viewitem_hourly","bullseye");
+
+        given(service.getAllMeasures()).willReturn(Arrays.asList(measure));
+
+        mvc.perform(get("/measures").contentType(MediaType.APPLICATION_JSON))
+//                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.[0].name",is("viewitem_hourly")))
+        ;
+    }
+
+
+    @Test
+    public void testGetMeasuresById() throws IOException,Exception{
+        Measure measure = createATestMeasure("viewitem_hourly","bullseye");
+
+        given(service.getMeasuresById(1L)).willReturn(measure);
+
+        mvc.perform(get("/measures/1").contentType(MediaType.APPLICATION_JSON))
+//                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.name",is("viewitem_hourly")))
+        ;
+    }
+
+    @Test
+    public void testGetMeasureByName() throws IOException,Exception{
+        Measure measure = createATestMeasure("viewitem_hourly","bullseye");
+
+        given(service.getMeasuresByName("viewitem_hourly")).willReturn(measure);
+
+        mvc.perform(get("/measures/findByName/viewitem_hourly").contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.name",is("viewitem_hourly")))
+        ;
+    }
+    @Test
+    public void testDeleteMeasuresById() throws Exception{
+        Mockito.doNothing().when(service).deleteMeasuresById(1L);
+
+        mvc.perform(delete("/measures/deleteById/1").contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+        ;
+    }
+
+    @Test
+    public void testDeleteMeasuresByName() throws Exception{
+        String measureName="viewitem_hourly";
+        given(service.deleteMeasuresByName(measureName)).willReturn(GriffinOperationMessage.DELETE_MEASURE_BY_NAME_SUCCESS);
+
+        mvc.perform(delete("/measures/deleteByName/"+measureName).contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$",is("DELETE_MEASURE_BY_NAME_SUCCESS")))
+        ;
+    }
+
+    @Test
+    public void testUpdateMeasure() throws Exception{
+        String measureName="viewitem_hourly";
+        String org="bullseye";
+        Measure measure=createATestMeasure(measureName,org);
+        ObjectMapper mapper=new ObjectMapper();
+        String measureJson=mapper.writeValueAsString(measure);
+        given(service.updateMeasure(measure)).willReturn(GriffinOperationMessage.UPDATE_MEASURE_SUCCESS);
+
+        mvc.perform(post("/measures/update").contentType(MediaType.APPLICATION_JSON).content(measureJson))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$",is("UPDATE_MEASURE_SUCCESS")))
+        ;
+    }
+
+    @Test
+    public void testGetAllMeasureNameOfOwner() throws Exception{
+        String Owner="test1";
+        String measureName="viewitem_hourly";
+        given(service.getAllMeasureNameByOwner(Owner)).willReturn(Arrays.asList(measureName));
+
+        mvc.perform(get("/measures/owner/"+Owner).contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.[0]",is("viewitem_hourly")))
+        ;
+    }
+
+    @Test
+    public void testCreateNewMeasure() throws Exception{
+        String measureName="viewitem_hourly";
+        String org="bullseye";
+        Measure measure=createATestMeasure(measureName,org);
+        ObjectMapper mapper=new ObjectMapper();
+        String measureJson=mapper.writeValueAsString(measure);
+        given(service.createNewMeasure(measure)).willReturn(GriffinOperationMessage.CREATE_MEASURE_SUCCESS);
+
+        mvc.perform(post("/measures/add").contentType(MediaType.APPLICATION_JSON).content(measureJson))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$",is("CREATE_MEASURE_SUCCESS")))
+        ;
+    }
+
+    private Measure createATestMeasure(String name,String org)throws IOException,Exception{
+        HashMap<String,String> configMap1=new HashMap<>();
+        configMap1.put("database","default");
+        configMap1.put("table.name","test_data_src");
+        HashMap<String,String> configMap2=new HashMap<>();
+        configMap2.put("database","default");
+        configMap2.put("table.name","test_data_tgt");
+        String configJson1 = new ObjectMapper().writeValueAsString(configMap1);
+        String configJson2 = new ObjectMapper().writeValueAsString(configMap2);
+
+        DataConnector source = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson1);
+        DataConnector target = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson2);
+
+        String rules = "$source.uage > 100 AND $source.uid = $target.uid AND $source.uage + 12 = $target.uage + 10 + 2 AND $source.udes + 11 = $target.udes + 1 + 1";
+
+        EvaluateRule eRule = new EvaluateRule(1,rules);
+
+        Measure measure = new Measure(name,"bevssoj description", Measure.MearuseType.accuracy, org, source, target, eRule,"test1");
+
+        return measure;
+    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ae6a308b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
new file mode 100644
index 0000000..66ff5fe
--- /dev/null
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
@@ -0,0 +1,192 @@
+/*-
+* Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+
+package org.apache.griffin.core.measure;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.griffin.core.measure.repo.MeasureRepo;
+import org.apache.griffin.core.util.GriffinOperationMessage;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+
+@RunWith(SpringRunner.class)
+public class MeasureServiceImplTest {
+
+    @TestConfiguration
+    public static class MeasureServiceImplConfiguration{
+        @Bean
+        public MeasureServiceImpl service(){
+            return new MeasureServiceImpl();
+        }
+    }
+    @MockBean
+    private MeasureRepo measureRepo;
+
+    @Autowired
+    private MeasureServiceImpl service;
+
+    @Before
+    public void setup(){
+    }
+
+    @Test
+    public void testGetAllMeasures(){
+        try {
+            Iterable<Measure> tmp = service.getAllMeasures();
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot get all Measure from dbs");
+        }
+    }
+
+    @Test
+    public void testGetMeasuresById(){
+        try {
+            Measure tmp = service.getMeasuresById(1);
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot get Measure in db By Id: 1");
+        }
+    }
+
+    @Test
+    public void testGetMeasuresByName(){
+        try {
+            Measure tmp = service.getMeasuresByName("viewitem_hourly");
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot get Measure in db By name: viewitem_hourly");
+        }
+    }
+
+    @Test
+    public void testDeleteMeasuresById(){
+        try {
+            service.deleteMeasuresById(1L);
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot delete Measure in db By Id: 1");
+        }
+    }
+
+    @Test
+    public void testDeleteMeasuresByName(){
+        try {
+            String measureName="viewitem_hourly";
+            given(measureRepo.findByName(measureName)).willReturn(null);
+            GriffinOperationMessage message=service.deleteMeasuresByName("viewitem_hourly");
+            assertEquals(message,GriffinOperationMessage.RESOURCE_NOT_FOUND);
+            assertTrue(true);
+
+            String org="bullseye";
+            Measure measure=createATestMeasure(measureName,org);
+            given(measureRepo.findByName(measureName)).willReturn(measure);
+            GriffinOperationMessage message1=service.deleteMeasuresByName("viewitem_hourly");
+            assertEquals(message1,GriffinOperationMessage.DELETE_MEASURE_BY_NAME_SUCCESS);
+        }catch (Throwable t){
+            fail("Cannot delete Measure in db By name: viewitem_hourly");
+        }
+    }
+
+    @Test
+    public void testCreateNewMeasure(){
+        try {
+            String measureName="viewitem_hourly";
+            String org="bullseye";
+            Measure measure=createATestMeasure(measureName,org);
+            given(measureRepo.findByName(measureName)).willReturn(null);
+            GriffinOperationMessage message=service.createNewMeasure(measure);
+            assertEquals(message,GriffinOperationMessage.CREATE_MEASURE_FAIL);
+            assertTrue(true);
+
+            Measure measure1=createATestMeasure(measureName,"bullseye1");
+            given(measureRepo.findByName(measureName)).willReturn(measure1);
+            GriffinOperationMessage message1=service.createNewMeasure(measure);
+            assertEquals(message1,GriffinOperationMessage.CREATE_MEASURE_FAIL_DUPLICATE);
+
+            given(measureRepo.findByName(measureName)).willReturn(null);
+            given(measureRepo.save(measure)).willReturn(measure);
+            GriffinOperationMessage message2=service.createNewMeasure(measure);
+            assertEquals(message2,GriffinOperationMessage.CREATE_MEASURE_SUCCESS);
+        }catch (Throwable t){
+            fail("Cannot create new measure viewitem_hourly");
+        }
+    }
+
+    @Test
+    public void testGetAllMeasureNameByOwner(){
+        try {
+            String measureName="viewitem_hourly";
+            String org="bullseye";
+            Measure measure=createATestMeasure(measureName,org);
+            String owner="test1";
+            given(measureRepo.findAll()).willReturn(Arrays.asList(measure));
+            List<String> namelist=service.getAllMeasureNameByOwner(owner);
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot get all measure name by owner test1");
+        }
+    }
+
+    @Test
+    public void testUpdateMeasure(){
+        try {
+            String measureName="viewitem_hourly";
+            String org="bullseye";
+            Measure measure=createATestMeasure(measureName,org);
+            GriffinOperationMessage message=service.updateMeasure(measure);
+            assertTrue(true);
+        }catch (Throwable t){
+            fail("Cannot create new measure viewitem_hourly");
+        }
+    }
+
+    private Measure createATestMeasure(String name,String org)throws IOException,Exception{
+        HashMap<String,String> configMap1;
+        configMap1 = new HashMap<>();
+        configMap1.put("database","default");
+        configMap1.put("table.name","test_data_src");
+        HashMap<String,String> configMap2=new HashMap<>();
+        configMap2.put("database","default");
+        configMap2.put("table.name","test_data_tgt");
+        String configJson1 = new ObjectMapper().writeValueAsString(configMap1);
+        String configJson2 = new ObjectMapper().writeValueAsString(configMap2);
+        DataConnector source = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson1);
+        DataConnector target = new DataConnector(DataConnector.ConnectorType.HIVE, "1.2", configJson2);
+
+        String rules = "$source.uage > 100 AND $source.uid = $target.uid AND $source.uage + 12 = $target.uage + 10 + 2 AND $source.udes + 11 = $target.udes + 1 + 1";
+        EvaluateRule eRule = new EvaluateRule(1,rules);
+        Measure measure = new Measure(name,"bevssoj description", Measure.MearuseType.accuracy, org, source, target, eRule,"test1");
+        return measure;
+    }
+
+}