This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 262efd9e2 [INLONG-4487][Manager] Fix JSON parse exception for stream
source and stream sink #4496
262efd9e2 is described below
commit 262efd9e228f03bb886be8f3937e176c1f1ac17a
Author: kipshi <[email protected]>
AuthorDate: Thu Jun 2 17:22:04 2022 +0800
[INLONG-4487][Manager] Fix JSON parse exception for stream source and
stream sink #4496
---
.../manager/client/api/inner/InnerInlongManagerClient.java | 4 ++--
.../apache/inlong/manager/common/pojo/sink/SinkListResponse.java | 3 +++
.../org/apache/inlong/manager/common/pojo/sink/StreamSink.java | 9 +++++++--
.../inlong/manager/common/pojo/source/SourceListResponse.java | 3 +++
.../apache/inlong/manager/common/pojo/source/StreamSource.java | 3 +++
5 files changed, 18 insertions(+), 4 deletions(-)
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 bedf54468..6d2c6bba5 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
@@ -463,7 +463,7 @@ public class InnerInlongManagerClient {
public WorkflowResult initInlongGroup(InlongGroupRequest groupInfo) {
return this.sendPost(
formatUrl(HTTP_PATH + "/group/startProcess/" +
groupInfo.getInlongGroupId()),
- null,
+ "",
WorkflowResult.class
);
}
@@ -656,7 +656,7 @@ public class InnerInlongManagerClient {
private <T> Response<T> executeRequestForResponse(String method, String
url, String content, Class<T> clazz) {
Builder requestBuilder = new Builder().url(url);
- if (StringUtils.isBlank(content)) {
+ if (content == null) {
requestBuilder.method(method, null);
} else {
requestBuilder.method(method, RequestBody.create(APPLICATION_JSON,
content));
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkListResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkListResponse.java
index 4842f3e26..c8f86d1c9 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkListResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkListResponse.java
@@ -18,6 +18,8 @@
package org.apache.inlong.manager.common.pojo.sink;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -34,6 +36,7 @@ import java.util.Map;
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
+@JsonTypeInfo(use = Id.NAME, visible = true, property = "sinkType")
public class SinkListResponse {
@ApiModelProperty(value = "Primary key")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
index 3a78ff195..b0a5bd5db 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
@@ -19,6 +19,10 @@ package org.apache.inlong.manager.common.pojo.sink;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -45,6 +49,7 @@ import java.util.Map;
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel("Stream sink info")
+@JsonTypeInfo(use = Id.NAME, visible = true, property = "sinkType")
public abstract class StreamSink extends StreamNode {
@ApiModelProperty("Sink id")
@@ -103,10 +108,10 @@ public abstract class StreamSink extends StreamNode {
private Date modifyTime;
@ApiModelProperty("Sink field list")
- private List<SinkField> fieldList;
+ private List<SinkField> fieldList = Lists.newArrayList();
@ApiModelProperty("Properties for sink")
- private Map<String, Object> properties;
+ private Map<String, Object> properties = Maps.newHashMap();
@JsonIgnore
@ApiModelProperty("Data format type for stream sink")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceListResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceListResponse.java
index 22f23e8c5..17b123432 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceListResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceListResponse.java
@@ -18,6 +18,8 @@
package org.apache.inlong.manager.common.pojo.source;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -33,6 +35,7 @@ import java.util.Date;
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
+@JsonTypeInfo(use = Id.NAME, visible = true, property = "sourceType")
public class SourceListResponse {
@ApiModelProperty(value = "Primary key")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
index 10235e91c..a3ae0c089 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
@@ -18,6 +18,8 @@
package org.apache.inlong.manager.common.pojo.source;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -40,6 +42,7 @@ import java.util.List;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@ApiModel("Stream source info")
+@JsonTypeInfo(use = Id.NAME, visible = true, property = "sourceType")
public abstract class StreamSource extends StreamNode {
@ApiModelProperty("Source id")
