Skip to content

[bugfix] implemented try-with-resources for instances of Closeable #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dk2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[bugfix] implemented try-with-resources for instances of Closeable #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ppconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/utils/HttpUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public static Response httpClientHandleBase(String actionUrl, RequestBody reques

public static String httpClientHandle(String actionUrl, RequestBody requestBody, Map<String, String> urlMap) throws Exception{
String returnData = "";
try {
Response response = httpClientHandleBase(actionUrl, requestBody, urlMap);
try (Response response = httpClientHandleBase(actionUrl, requestBody, urlMap)) {
returnData = response.body().string();
logger.info("mask interface return message：" + returnData);
} catch (IOException e) {
Expand All @@ -80,8 +79,7 @@ public static String httpClientHandle(String actionUrl) throws Exception{
.build();
Call call = okHttpClient.newCall(request);
String returnData = "";
try {
Response response = call.execute();
try (Response response = call.execute()) {
returnData = response.body().string();
logger.info("interface return message：" + returnData);
} catch (IOException e) {
Expand Down
68 changes: 35 additions & 33 deletions ...onn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/utils/QualitisUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,24 @@ public String submitTask(long groupId, String createUser, String executionUser)
.build();

Call call = okHttpClient.newCall(request);
Response response = call.execute();
String resultJson = response.body().string();
logger.info("Response Json: " + resultJson);
if (StringUtils.isNotEmpty(resultJson)) {
Map<String, Object> resultMap = DSSCommonUtils.COMMON_GSON.fromJson(resultJson,Map.class);
logger.info(String.valueOf(resultMap));
String code = (String) resultMap.get("code");
if ("200".equals(code)) {
applicationId = (String) ((Map<String, Object>) resultMap.get("data")).get(
"application_id");
logger.info(resultMap.get("message").toString());
} else {
throw new RuntimeException(resultMap.get("message").toString());
try (Response response = call.execute()) {
String resultJson = response.body().string();
logger.info("Response Json: " + resultJson);
if (StringUtils.isNotEmpty(resultJson)) {
Map<String, Object> resultMap = DSSCommonUtils.COMMON_GSON.fromJson(resultJson, Map.class);
logger.info(String.valueOf(resultMap));
String code = (String) resultMap.get("code");
if ("200".equals(code)) {
applicationId = (String) ((Map<String, Object>) resultMap.get("data")).get(
"application_id");
logger.info(resultMap.get("message").toString());
return applicationId;
} else {
throw new RuntimeException(resultMap.get("message").toString());
}
}
}
return applicationId;
return null;
}

public String createAndSubmitRule(CheckDataObject dataObject,String projectName,String ruleName,String user) throws IOException {
Expand Down Expand Up @@ -161,24 +163,26 @@ public String createAndSubmitRule(CheckDataObject dataObject,String projectName,
.build();

Call call = okHttpClient.newCall(request);
Response response = call.execute();
String resultJson = response.body().string();
logger.info("call qualitis end,Response Json:{} " , resultJson);
if (StringUtils.isNotEmpty(resultJson)) {
Map<String, Object> resultMap = DSSCommonUtils.COMMON_GSON.fromJson(resultJson,Map.class);
String code = (String) resultMap.get("code");
if ("200".equals(code)) {
Map<String, Object> applicationDetail = (Map<String, Object>) ((Map<String, Object>) (resultMap.get(
"data"))).get("application_detail");
Map<String, Object> project_application = ((List<Map<String, Object>>) (applicationDetail.get(
"project_applications"))).get(0);
applicationId = (String) project_application.get("application_id");
logger.info(resultMap.get("message").toString());
} else {
throw new RuntimeException(resultMap.get("message").toString());
try (Response response = call.execute()) {
String resultJson = response.body().string();
logger.info("call qualitis end,Response Json:{} ", resultJson);
if (StringUtils.isNotEmpty(resultJson)) {
Map<String, Object> resultMap = DSSCommonUtils.COMMON_GSON.fromJson(resultJson, Map.class);
String code = (String) resultMap.get("code");
if ("200".equals(code)) {
Map<String, Object> applicationDetail = (Map<String, Object>) ((Map<String, Object>) (resultMap.get(
"data"))).get("application_detail");
Map<String, Object> project_application = ((List<Map<String, Object>>) (applicationDetail.get(
"project_applications"))).get(0);
applicationId = (String) project_application.get("application_id");
logger.info(resultMap.get("message").toString());
return applicationId;
} else {
throw new RuntimeException(resultMap.get("message").toString());
}
}
}
return applicationId;
return null;
}

/**
Expand Down Expand Up @@ -215,11 +219,9 @@ public String getTaskStatus(String applicationId){
.build();

Call call = okHttpClient.newCall(request);
Response response = null;
String resultJson = "";
String status = "";
try {
response = call.execute();
try (Response response = call.execute()) {
resultJson = response.body().string();
logger.info("Response Json: " + resultJson);
if (StringUtils.isNotEmpty(resultJson)) {
Expand Down
111 changes: 57 additions & 54 deletions ...rc/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,34 +144,36 @@ public String uploadAppConnResourceNew(String userName, String projectName, DSSF
logger.info("nodeResourcePath:{}", nodeResourcePath);
File file = new File(nodeResourcePath);
if (file.exists()) {
InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, nodeResourcePath);
Supplier<Map<String, Object>> bmlResourceMap = () -> {
BmlResource resource = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json",
projectName);
return ImmutableMap.of(
"resourceId", resource.getResourceId(),
"version", resource.getVersion()
);
};
Supplier<Map<String, Object>> streamResourceMap = () -> MapUtils.newCommonMap(ImportRequestRef.INPUT_STREAM_KEY, resourceInputStream);
try {
nodeExportContent = nodeService.importNode(userName, appConnNode, bmlResourceMap, streamResourceMap, orcVersion);
} catch (ExternalOperationFailedException e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(e.getErrCode(), e.getMessage());
} catch (Exception e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(90011, e.getMessage());
}
if (nodeExportContent != null) {
if (nodeExportContent.get("project_id") != null) {
Long newProjectId = Long.parseLong(nodeExportContent.get("project_id").toString());
logger.warn(String.format("new appConn node add into dss,dssProjectId: %s,newProjectId: %s", appConnNode.getProjectId(), newProjectId));
nodeExportContent.remove("project_id");
try (InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, nodeResourcePath)) {
Supplier<Map<String, Object>> bmlResourceMap = () -> {
BmlResource resource = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json",
projectName);
return ImmutableMap.of(
"resourceId", resource.getResourceId(),
"version", resource.getVersion()
);
};

Supplier<Map<String, Object>> streamResourceMap = () -> MapUtils.newCommonMap(ImportRequestRef.INPUT_STREAM_KEY, resourceInputStream);
try {
nodeExportContent = nodeService.importNode(userName, appConnNode, bmlResourceMap, streamResourceMap, orcVersion);
} catch (ExternalOperationFailedException e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(e.getErrCode(), e.getMessage());
} catch (Exception e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(90011, e.getMessage());
}
if (nodeExportContent != null) {
if (nodeExportContent.get("project_id") != null) {
Long newProjectId = Long.parseLong(nodeExportContent.get("project_id").toString());
logger.warn(String.format("new appConn node add into dss,dssProjectId: %s,newProjectId: %s", appConnNode.getProjectId(), newProjectId));
nodeExportContent.remove("project_id");
}
nodeJsonMap.replace("jobContent", nodeExportContent);
appConnNode.setJobContent(nodeExportContent);
return BDPJettyServerHelper.jacksonJson().writeValueAsString(nodeJsonMap);
}
nodeJsonMap.replace("jobContent", nodeExportContent);
appConnNode.setJobContent(nodeExportContent);
return BDPJettyServerHelper.jacksonJson().writeValueAsString(nodeJsonMap);
}
} else {
logger.warn("appConn node resource file does not exists. nodeId: {}" + nodeId);
Expand Down Expand Up @@ -209,34 +211,35 @@ public String uploadAppConnResource(String userName, String projectName, DSSFlow
logger.info("nodeResourcePath:{}", nodeResourcePath);
File file = new File(nodeResourcePath);
if (file.exists()) {
InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, nodeResourcePath);
Supplier<Map<String, Object>> bmlResourceMap = () -> {
BmlResource resource = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json",
projectName);
return ImmutableMap.of(
"resourceId", resource.getResourceId(),
"version", resource.getVersion()
);
};
Supplier<Map<String, Object>> streamResourceMap = () -> MapUtils.newCommonMap(ImportRequestRef.INPUT_STREAM_KEY, resourceInputStream);
try {
nodeExportContent = nodeService.importNode(userName, appConnNode, bmlResourceMap, streamResourceMap, orcVersion);
} catch (ExternalOperationFailedException e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(e.getErrCode(), e.getMessage());
} catch (Exception e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(90011, e.getMessage());
}
if (nodeExportContent != null) {
if (nodeExportContent.get("project_id") != null) {
Long newProjectId = Long.parseLong(nodeExportContent.get("project_id").toString());
logger.warn(String.format("new appConn node add into dss,dssProjectId: %s,newProjectId: %s", appConnNode.getProjectId(), newProjectId));
nodeExportContent.remove("project_id");
try (InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, nodeResourcePath)) {
Supplier<Map<String, Object>> bmlResourceMap = () -> {
BmlResource resource = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json",
projectName);
return ImmutableMap.of(
"resourceId", resource.getResourceId(),
"version", resource.getVersion()
);
};
Supplier<Map<String, Object>> streamResourceMap = () -> MapUtils.newCommonMap(ImportRequestRef.INPUT_STREAM_KEY, resourceInputStream);
try {
nodeExportContent = nodeService.importNode(userName, appConnNode, bmlResourceMap, streamResourceMap, orcVersion);
} catch (ExternalOperationFailedException e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(e.getErrCode(), e.getMessage());
} catch (Exception e) {
logger.error("failed to import node.", e);
throw new DSSRuntimeException(90011, e.getMessage());
}
if (nodeExportContent != null) {
if (nodeExportContent.get("project_id") != null) {
Long newProjectId = Long.parseLong(nodeExportContent.get("project_id").toString());
logger.warn(String.format("new appConn node add into dss,dssProjectId: %s,newProjectId: %s", appConnNode.getProjectId(), newProjectId));
nodeExportContent.remove("project_id");
}
nodeJsonMap.replace("jobContent", nodeExportContent);
appConnNode.setJobContent(nodeExportContent);
return BDPJettyServerHelper.jacksonJson().writeValueAsString(nodeJsonMap);
}
nodeJsonMap.replace("jobContent", nodeExportContent);
appConnNode.setJobContent(nodeExportContent);
return BDPJettyServerHelper.jacksonJson().writeValueAsString(nodeJsonMap);
}
} else {
logger.warn("appConn node resource file does not exists. nodeId: {}" + nodeId);
Expand Down