summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author刘永强 <[email protected]>2020-08-31 09:44:51 +0800
committer刘永强 <[email protected]>2020-08-31 09:44:51 +0800
commit24972d92fe595de4ced0b3716bb328a615067a94 (patch)
treed213e29912f75da8ffc5370edc11de0f22f9de39
parentcab3c04e75fd19d823b2cd4a2c357525cca89b5c (diff)
update TestCaseService
-rw-r--r--galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java18
-rw-r--r--galaxy-data-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java (renamed from galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/TestSqlServiceImpl.java)5
2 files changed, 12 insertions, 11 deletions
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java b/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
index 64f87dc..88b5633 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
+++ b/galaxy-data-engine/src/main/java/com/mesalab/engine/controller/TestCaseController.java
@@ -3,7 +3,7 @@ package com.mesalab.engine.controller;
import com.mesalab.common.dto.results.BaseResult;
import com.mesalab.common.util.BaseResultUtil;
import com.mesalab.engine.component.configuration.ProjectProperties;
-import com.mesalab.engine.service.impl.TestSqlServiceImpl;
+import com.mesalab.engine.service.TestCaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@@ -14,8 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
/**
- * 测试Controller
- * 使用@RestController可以不需要使用@ResponseBody注解,方法会自动处理成json格式返回
+ * 测试案例控制层
*
* @author darnell
* @date 2019/5/13
@@ -25,12 +24,12 @@ import java.util.Arrays;
@RequestMapping(value = "test")
public class TestCaseController {
- private final ProjectProperties projectProperties;
+ ProjectProperties projectProperties;
- private final Environment environment;
+ Environment environment;
@Autowired
- TestSqlServiceImpl testSqlService;
+ TestCaseService testCaseService;
@Autowired
public TestCaseController(ProjectProperties projectProperties, Environment environment) {
@@ -101,11 +100,12 @@ public class TestCaseController {
/**
* 运行测试用例
+ *
* @return
*/
@GetMapping(value = "runSql")
- public BaseResult runSql(){
- BaseResult result = testSqlService.runSql();
+ public BaseResult runSql() {
+ BaseResult result = testCaseService.runSql();
return result;
}
@@ -116,7 +116,7 @@ public class TestCaseController {
*/
@GetMapping(value = "runSchema")
public BaseResult runSchema() {
- BaseResult result = testSqlService.runSchema();
+ BaseResult result = testCaseService.runSchema();
return result;
}
diff --git a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/TestSqlServiceImpl.java b/galaxy-data-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java
index d40afe1..2956530 100644
--- a/galaxy-data-engine/src/main/java/com/mesalab/engine/service/impl/TestSqlServiceImpl.java
+++ b/galaxy-data-engine/src/main/java/com/mesalab/engine/service/TestCaseService.java
@@ -1,4 +1,4 @@
-package com.mesalab.engine.service.impl;
+package com.mesalab.engine.service;
import com.google.common.collect.Maps;
import com.mesalab.common.dto.results.BaseResult;
@@ -9,6 +9,7 @@ import com.mesalab.engine.component.SchemaCache;
import com.mesalab.engine.component.config.ClickHouseConfig;
import com.mesalab.engine.component.config.DruidConfig;
import com.mesalab.engine.service.HttpClientService;
+import com.mesalab.engine.service.impl.SqlEngineServiceImpl;
import com.zdjizhi.utils.Encodes;
import com.zdjizhi.utils.JsonMapper;
import com.zdjizhi.utils.StringUtil;
@@ -33,7 +34,7 @@ import java.util.*;
@Slf4j
@Service
-public class TestSqlServiceImpl {
+public class TestCaseService {
@Autowired
HttpClientService httpClientService;