You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/05/18 03:37:52 UTC
[incubator-inlong] branch master updated: [INLONG-4239][Manager] Remove fastjson dependency (#4242)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new ab8e1e4d4 [INLONG-4239][Manager] Remove fastjson dependency (#4242)
ab8e1e4d4 is described below
commit ab8e1e4d4d90a706c8c6d51b6e3c17a67bb3da27
Author: leosanqing <st...@qq.com>
AuthorDate: Wed May 18 11:37:48 2022 +0800
[INLONG-4239][Manager] Remove fastjson dependency (#4242)
---
inlong-manager/manager-client/pom.xml | 4 ----
.../client/api/auth/DefaultAuthentication.java | 11 ++++++-----
.../client/api/auth/SecretAuthentication.java | 11 ++++++-----
.../client/api/auth/SecretTokenAuthentication.java | 13 +++++++------
.../client/api/auth/TokenAuthentication.java | 9 +++++----
.../client/api/inner/InnerInlongManagerClient.java | 22 ++++++++++++----------
.../inlong/manager/common/util/JsonUtils.java | 2 ++
7 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/inlong-manager/manager-client/pom.xml b/inlong-manager/manager-client/pom.xml
index 8f56edf78..dea4996c4 100644
--- a/inlong-manager/manager-client/pom.xml
+++ b/inlong-manager/manager-client/pom.xml
@@ -47,10 +47,6 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/DefaultAuthentication.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/DefaultAuthentication.java
index fa8fe5426..b1ac8b8d8 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/DefaultAuthentication.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/DefaultAuthentication.java
@@ -17,10 +17,11 @@
package org.apache.inlong.manager.client.api.auth;
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.client.api.util.AssertUtil;
+import org.apache.inlong.manager.common.util.JsonUtils;
import java.util.Map;
@@ -59,9 +60,9 @@ public class DefaultAuthentication implements Authentication {
@Override
public String toString() {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put(USER_NAME, this.getUserName());
- jsonObject.put(PASSWORD, this.getPassword());
- return jsonObject.toString();
+ ObjectNode objectNode = JsonUtils.OBJECT_MAPPER.createObjectNode();
+ objectNode.put(USER_NAME, this.getUserName());
+ objectNode.put(PASSWORD, this.getPassword());
+ return objectNode.toString();
}
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretAuthentication.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretAuthentication.java
index 1fd8ff6af..e43786d32 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretAuthentication.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretAuthentication.java
@@ -17,10 +17,11 @@
package org.apache.inlong.manager.client.api.auth;
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.client.api.util.AssertUtil;
+import org.apache.inlong.manager.common.util.JsonUtils;
import java.util.Map;
@@ -59,9 +60,9 @@ public class SecretAuthentication implements Authentication {
@Override
public String toString() {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put(SECRET_ID, this.getSecretId());
- jsonObject.put(SECRET_KEY, this.getSecretKey());
- return jsonObject.toString();
+ ObjectNode objectNode = JsonUtils.OBJECT_MAPPER.createObjectNode();
+ objectNode.put(SECRET_ID, this.getSecretId());
+ objectNode.put(SECRET_KEY, this.getSecretKey());
+ return objectNode.toString();
}
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretTokenAuthentication.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretTokenAuthentication.java
index d69dd6bd7..40205e1c6 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretTokenAuthentication.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/SecretTokenAuthentication.java
@@ -17,10 +17,11 @@
package org.apache.inlong.manager.client.api.auth;
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.inlong.manager.common.util.JsonUtils;
import java.util.Map;
@@ -55,11 +56,11 @@ public class SecretTokenAuthentication extends SecretAuthentication {
@SneakyThrows
@Override
public String toString() {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put(SECRET_ID, this.getSecretId());
- jsonObject.put(SECRET_KEY, this.getSecretKey());
- jsonObject.put(SECRET_TOKEN, this.getSToken());
- return jsonObject.toString();
+ ObjectNode objectNode = JsonUtils.OBJECT_MAPPER.createObjectNode();
+ objectNode.put(SECRET_ID, this.getSecretId());
+ objectNode.put(SECRET_KEY, this.getSecretKey());
+ objectNode.put(SECRET_TOKEN, this.getSToken());
+ return objectNode.toString();
}
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/TokenAuthentication.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/TokenAuthentication.java
index 953730509..c2d9a844a 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/TokenAuthentication.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/auth/TokenAuthentication.java
@@ -17,10 +17,11 @@
package org.apache.inlong.manager.client.api.auth;
-import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.client.api.util.AssertUtil;
+import org.apache.inlong.manager.common.util.JsonUtils;
import java.util.Map;
@@ -52,8 +53,8 @@ public class TokenAuthentication implements Authentication {
@Override
public String toString() {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put(TOKEN, this.getToken());
- return jsonObject.toString();
+ ObjectNode objectNode = JsonUtils.OBJECT_MAPPER.createObjectNode();
+ objectNode.put(TOKEN, this.getToken());
+ return objectNode.toString();
}
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
index 04a503128..a74dcc054 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
@@ -17,8 +17,9 @@
package org.apache.inlong.manager.client.api.inner;
-import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
@@ -167,12 +168,12 @@ public class InnerInlongManagerClient {
pageNum = 1;
}
- JSONObject groupQuery = new JSONObject();
+ ObjectNode groupQuery = JsonUtils.OBJECT_MAPPER.createObjectNode();
groupQuery.put("keyword", keyword);
groupQuery.put("status", status);
groupQuery.put("pageNum", pageNum);
groupQuery.put("pageSize", pageSize);
- String operationData = GsonUtil.toJson(groupQuery);
+ String operationData = groupQuery.toString();
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), operationData);
String path = HTTP_PATH + "/group/list";
@@ -756,17 +757,18 @@ public class InnerInlongManagerClient {
public WorkflowResult startInlongGroup(int taskId,
Pair<InlongGroupApproveRequest, List<InlongStreamApproveRequest>> initMsg) {
- JSONObject workflowTaskOperation = new JSONObject();
- workflowTaskOperation.put("transferTo", Lists.newArrayList());
+ ObjectMapper objectMapper = JsonUtils.OBJECT_MAPPER;
+ ObjectNode workflowTaskOperation = objectMapper.createObjectNode();
+ workflowTaskOperation.putPOJO("transferTo", Lists.newArrayList());
workflowTaskOperation.put("remark", "approved by system");
- JSONObject inlongGroupApproveForm = new JSONObject();
- inlongGroupApproveForm.put("groupApproveInfo", initMsg.getKey());
- inlongGroupApproveForm.put("streamApproveInfoList", initMsg.getValue());
+ ObjectNode inlongGroupApproveForm = objectMapper.createObjectNode();
+ inlongGroupApproveForm.putPOJO("groupApproveInfo", initMsg.getKey());
+ inlongGroupApproveForm.putPOJO("streamApproveInfoList", initMsg.getValue());
inlongGroupApproveForm.put("formName", "InlongGroupApproveForm");
- workflowTaskOperation.put("form", inlongGroupApproveForm);
+ workflowTaskOperation.set("form", inlongGroupApproveForm);
- String operationData = GsonUtil.toJson(workflowTaskOperation);
+ String operationData = workflowTaskOperation.toString();
final String path = HTTP_PATH + "/workflow/approve/" + taskId;
final String url = formatUrl(path);
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/JsonUtils.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/JsonUtils.java
index 5aa6bccb7..af36f6c34 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/JsonUtils.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/JsonUtils.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.exceptions.JsonException;
@@ -38,6 +39,7 @@ import java.util.Map;
* JSON utils
*/
@Slf4j
+@UtilityClass
public class JsonUtils {
public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();