This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new e338d0a41 [ISSUE-3065][Improve] Improve streampark-console module base
on [3.2 Constant Variables Definition] #3065 (#3251)
e338d0a41 is described below
commit e338d0a41be0456b5d0630086991e57dc8c78410
Author: jaslou <[email protected]>
AuthorDate: Wed Oct 18 21:15:47 2023 +0800
[ISSUE-3065][Improve] Improve streampark-console module base on [3.2
Constant Variables Definition] #3065 (#3251)
* [ISSUE-3075][Improve] Improve streampark-console module base on [5 Log]
#3075
* Improve streampark-console module base on [3.2 Constant Variables
Definition] #3065
---------
Co-authored-by: jaslou <jaslouxzhlqq.com>
---
.../core/controller/FlinkSqlController.java | 14 +++++++----
.../core/service/impl/ResourceServiceImpl.java | 27 ++++++++++++----------
.../system/service/impl/MenuServiceImpl.java | 14 +++++++----
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
index 512aefb4d..6e92cea06 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
@@ -50,6 +50,10 @@ import java.util.List;
@RequestMapping("flink/sql")
public class FlinkSqlController {
+ public static final String TYPE = "type";
+ public static final String START = "start";
+ public static final String END = "end";
+
@Autowired private FlinkSqlService flinkSqlService;
@Autowired private VariableService variableService;
@@ -68,14 +72,14 @@ public class FlinkSqlController {
RestResponse.success()
.data(false)
.message(exception)
- .put("type",
flinkSqlValidationResult.failedType().getFailedType())
- .put("start", flinkSqlValidationResult.lineStart())
- .put("end", flinkSqlValidationResult.lineEnd());
+ .put(TYPE, flinkSqlValidationResult.failedType().getFailedType())
+ .put(START, flinkSqlValidationResult.lineStart())
+ .put(END, flinkSqlValidationResult.lineEnd());
if (flinkSqlValidationResult.errorLine() > 0) {
response
- .put("start", flinkSqlValidationResult.errorLine())
- .put("end", flinkSqlValidationResult.errorLine() + 1);
+ .put(START, flinkSqlValidationResult.errorLine())
+ .put(END, flinkSqlValidationResult.errorLine() + 1);
}
return response;
} else {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
index 26c46d8d0..47b113616 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
@@ -91,6 +91,9 @@ import java.util.stream.Collectors;
public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource>
implements ResourceService {
+ public static final String STATE = "state";
+ public static final String EXCEPTION = "exception";
+
@Autowired private ApplicationManageService applicationManageService;
@Autowired private CommonService commonService;
@Autowired private FlinkSqlService flinkSqlService;
@@ -273,7 +276,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
public RestResponse checkResource(Resource resourceParam) throws
JsonProcessingException {
ResourceTypeEnum type = resourceParam.getResourceType();
Map<String, Serializable> resp = new HashMap<>(0);
- resp.put("state", 0);
+ resp.put(STATE, 0);
switch (type) {
case FLINK_APP:
// check main.
@@ -282,8 +285,8 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
jarFile = getResourceJar(resourceParam);
} catch (Exception e) {
// get jarFile error
- resp.put("state", 1);
- resp.put("exception", ExceptionUtils.stringifyException(e));
+ resp.put(STATE, 1);
+ resp.put(EXCEPTION, ExceptionUtils.stringifyException(e));
return RestResponse.success().data(resp);
}
if (jarFile.getName().endsWith(ConfigConst.PYTHON_SUFFIX())) {
@@ -294,7 +297,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
if (mainClass == null) {
// main class is null
- resp.put("state", 2);
+ resp.put(STATE, 2);
return RestResponse.success().data(resp);
}
return RestResponse.success().data(resp);
@@ -319,8 +322,8 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
jars = MavenTool.resolveArtifacts(artifact);
} catch (Exception e) {
// connector download is null
- resp.put("state", 1);
- resp.put("exception", ExceptionUtils.stringifyException(e));
+ resp.put(STATE, 1);
+ resp.put(EXCEPTION, ExceptionUtils.stringifyException(e));
return RestResponse.success().data(resp);
}
String fileName = String.format("%s-%s.jar", artifact.artifactId(),
artifact.version());
@@ -341,8 +344,8 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
factories = getConnectorFactory(connector);
} catch (Exception e) {
// flink connector invalid
- resp.put("state", 2);
- resp.put("exception", ExceptionUtils.stringifyException(e));
+ resp.put(STATE, 2);
+ resp.put(EXCEPTION, ExceptionUtils.stringifyException(e));
return RestResponse.success().data(resp);
}
@@ -350,7 +353,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
connectorResource = getConnectorResource(jars, factories);
if (connectorResource == null) {
// connector is null
- resp.put("state", 3);
+ resp.put(STATE, 3);
return RestResponse.success().data(resp);
}
@@ -358,7 +361,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
boolean exists =
existsFlinkConnector(resourceParam.getId(),
connectorResource.getFactoryIdentifier());
if (exists) {
- resp.put("state", 4);
+ resp.put(STATE, 4);
resp.put("name", connectorResource.getFactoryIdentifier());
return RestResponse.success(resp);
}
@@ -366,11 +369,11 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
if (resourceParam.getId() != null) {
Resource resource = getById(resourceParam.getId());
if
(!resource.getResourceName().equals(connectorResource.getFactoryIdentifier())) {
- resp.put("state", 5);
+ resp.put(STATE, 5);
return RestResponse.success().data(resp);
}
}
- resp.put("state", 0);
+ resp.put(STATE, 0);
resp.put("connector", JacksonUtils.write(connectorResource));
return RestResponse.success().data(resp);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index 1ff3beedf..0f01a38aa 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -51,6 +51,10 @@ import java.util.stream.Collectors;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true,
rollbackFor = Exception.class)
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements
MenuService {
+ public static final String IDS = "ids";
+ public static final String ROWS = "rows";
+ public static final String TOTAL = "total";
+
@Autowired private UserService userService;
@Autowired private RoleMenuServie roleMenuServie;
@@ -111,14 +115,14 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
ids.add(m.getMenuId().toString());
trees.add(new RouterTree(m));
});
- result.put("ids", ids);
- result.put("total", menus.size());
+ result.put(IDS, ids);
+ result.put(TOTAL, menus.size());
RouterTree<Menu> routerTree = VueRouterUtils.buildRouterTree(trees);
- result.put("rows", routerTree);
+ result.put(ROWS, routerTree);
} catch (Exception e) {
log.error("Failed to query menu", e);
- result.put("rows", null);
- result.put("total", 0);
+ result.put(ROWS, null);
+ result.put(TOTAL, 0);
}
return result;
}
