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 5cc613d75 [INLONG-3710][Manager] Update the import package for
ObjectMapper (#3711)
5cc613d75 is described below
commit 5cc613d754061aaf3b0ff3cbb1fda98a3223606c
Author: healchow <[email protected]>
AuthorDate: Thu Apr 14 20:12:16 2022 +0800
[INLONG-3710][Manager] Update the import package for ObjectMapper (#3711)
---
.../apache/inlong/manager/client/api/source/AutoPushSource.java | 9 ++++-----
.../org/apache/inlong/manager/client/api/util/InlongParser.java | 4 ++--
.../manager/common/pojo/source/autopush/AutoPushSourceDTO.java | 3 +--
.../common/pojo/source/autopush/AutoPushSourceListResponse.java | 3 +--
.../common/pojo/source/autopush/AutoPushSourceRequest.java | 3 +--
.../common/pojo/source/autopush/AutoPushSourceResponse.java | 7 +++----
.../manager/service/source/autopush/AutoPushSourceOperation.java | 2 +-
.../src/main/resources/sql/apache_inlong_manager.sql | 4 ++--
inlong-manager/manager-web/sql/apache_inlong_manager.sql | 4 ++--
9 files changed, 17 insertions(+), 22 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/source/AutoPushSource.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/source/AutoPushSource.java
index b1c016ec0..8a6a14da8 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/source/AutoPushSource.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/source/AutoPushSource.java
@@ -31,19 +31,18 @@ import org.apache.inlong.manager.common.enums.SourceType;
@EqualsAndHashCode(callSuper = true)
@AllArgsConstructor
@NoArgsConstructor
-@ApiModel("Base configuration for DataProxy SDK collection")
+@ApiModel("Base configuration for AutoPush collection")
public class AutoPushSource extends StreamSource {
@ApiModelProperty(value = "DataSource type", required = true)
private SourceType sourceType = SourceType.AUTO_PUSH;
- @ApiModelProperty("SyncType for Kafka")
+ @ApiModelProperty("SyncType")
private SyncType syncType = SyncType.INCREMENT;
- @ApiModelProperty("Data format type for kafka")
+ @ApiModelProperty("Data format type")
private DataFormat dataFormat = DataFormat.NONE;
- @ApiModelProperty(value = "DataProxy group name, "
- + "the name used for local configuration when the user enables
local configuration")
+ @ApiModelProperty(value = "DataProxy group name, used when the user
enables local configuration")
private String dataProxyGroup;
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
index 3fb14328c..ba100dcc2 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
@@ -149,7 +149,7 @@ public class InlongParser {
sourceResponses.add(autoPushSourceResponse);
break;
default:
- throw new RuntimeException(String.format("Unsupport
sourceType=%s for Inlong", sourceType));
+ throw new RuntimeException(String.format("Unsupported
sourceType=%s for Inlong", sourceType));
}
}
@@ -183,7 +183,7 @@ public class InlongParser {
sinkResponses.add(clickHouseSinkResponse);
break;
default:
- throw new RuntimeException(String.format("Unsupport
sinkType=%s for Inlong", sinkType));
+ throw new RuntimeException(String.format("Unsupported
sinkType=%s for Inlong", sinkType));
}
}
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceDTO.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceDTO.java
index af60f86d1..9d8fcad45 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceDTO.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceDTO.java
@@ -40,8 +40,7 @@ public class AutoPushSourceDTO {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
- @ApiModelProperty(value = "DataProxy group name, "
- + "the name used for local configuration when the user enables
local configuration")
+ @ApiModelProperty(value = "DataProxy group name, used when the user
enables local configuration")
private String dataProxyGroup;
public static AutoPushSourceDTO getFromRequest(AutoPushSourceRequest
request) {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceListResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceListResponse.java
index e4746c603..d619c2d28 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceListResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceListResponse.java
@@ -28,7 +28,6 @@ import
org.apache.inlong.manager.common.pojo.source.SourceListResponse;
@ApiModel("Response of DataProxy SDK source paging list")
public class AutoPushSourceListResponse extends SourceListResponse {
- @ApiModelProperty(value = "DataProxy group name, "
- + "the name used for local configuration when the user enables
local configuration")
+ @ApiModelProperty(value = "DataProxy group name, used when the user
enables local configuration")
private String dataProxyGroup;
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceRequest.java
index 07b580c13..2b7a81fbf 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceRequest.java
@@ -36,8 +36,7 @@ import org.apache.inlong.manager.common.util.JsonTypeDefine;
@JsonTypeDefine(value = SourceType.SOURCE_AUTO_PUSH)
public class AutoPushSourceRequest extends SourceRequest {
- @ApiModelProperty(value = "DataProxy group name, "
- + "the name used for local configuration when the user enables
local configuration")
+ @ApiModelProperty(value = "DataProxy group name, used when the user
enables local configuration")
private String dataProxyGroup;
public AutoPushSourceRequest() {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceResponse.java
index 43760e2dd..2ee962f68 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/autopush/AutoPushSourceResponse.java
@@ -34,11 +34,10 @@ import
org.apache.inlong.manager.common.pojo.source.SourceResponse;
@ApiModel(value = "Response of DataProxy SDK source")
public class AutoPushSourceResponse extends SourceResponse {
+ @ApiModelProperty(value = "DataProxy group name, used when the user
enables local configuration")
+ private String dataProxyGroup;
+
public AutoPushSourceResponse() {
this.setSourceType(SourceType.AUTO_PUSH.name());
}
-
- @ApiModelProperty(value = "DataProxy group name, "
- + "the name used for local configuration when the user enables
local configuration")
- private String dataProxyGroup;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/autopush/AutoPushSourceOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/autopush/AutoPushSourceOperation.java
index 0726d9f8d..cea98743f 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/autopush/AutoPushSourceOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/autopush/AutoPushSourceOperation.java
@@ -17,6 +17,7 @@
package org.apache.inlong.manager.service.source.autopush;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.enums.SourceType;
import org.apache.inlong.manager.common.exceptions.BusinessException;
@@ -29,7 +30,6 @@ import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.StreamSourceEntity;
import org.apache.inlong.manager.service.source.AbstractSourceOperation;
-import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git
a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
index 4e1b9f639..4322e502f 100644
---
a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
+++
b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
@@ -299,9 +299,9 @@ CREATE TABLE `inlong_stream`
`name` varchar(64) DEFAULT NULL COMMENT 'The name
of the inlong stream page display, can be Chinese',
`description` varchar(256) DEFAULT '' COMMENT
'Introduction to inlong stream',
`mq_resource_obj` varchar(128) DEFAULT NULL COMMENT 'MQ
resource object, in the inlong stream, Tube is inlong_stream_id, Pulsar is
Topic',
- `data_source_type` varchar(32) DEFAULT 'FILE' COMMENT 'Data
source type, including: FILE, DB, Auto-Push (DATA_PROXY_SDK, HTTP)',
+ `data_source_type` varchar(32) DEFAULT 'FILE' COMMENT 'Data
source type, including: FILE, BINLOG, AUTO_PUSH, etc.',
`storage_period` int(11) DEFAULT '1' COMMENT 'The
storage period of data in MQ, unit: day',
- `data_type` varchar(20) DEFAULT 'TEXT' COMMENT 'Data
type, there are: TEXT, KEY-VALUE, PB, BON, TEXT and BON should be treated
differently',
+ `data_type` varchar(20) DEFAULT NULL COMMENT 'Data
type, including: CSV, KEY-VALUE, JSON, AVRO, etc.',
`data_encoding` varchar(8) DEFAULT 'UTF-8' COMMENT 'Data
encoding format, including: UTF-8, GBK',
`data_separator` varchar(8) DEFAULT NULL COMMENT 'The
source data field separator, stored as ASCII code',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source
data field escape character, the default is NULL (NULL), stored as 1 character',
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index d3f2c384b..0a2f70b1d 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -317,9 +317,9 @@ CREATE TABLE `inlong_stream`
`name` varchar(64) DEFAULT NULL COMMENT 'The name
of the inlong stream page display, can be Chinese',
`description` varchar(256) DEFAULT '' COMMENT
'Introduction to inlong stream',
`mq_resource_obj` varchar(128) DEFAULT NULL COMMENT 'MQ
resource object, in the inlong stream, Tube is inlong_stream_id, Pulsar is
Topic',
- `data_source_type` varchar(32) DEFAULT 'FILE' COMMENT 'Data
source type, including: FILE, DB, Auto-Push (DATA_PROXY_SDK, HTTP)',
+ `data_source_type` varchar(32) DEFAULT 'FILE' COMMENT 'Data
source type, including: FILE, BINLOG, AUTO_PUSH, etc.',
`storage_period` int(11) DEFAULT '1' COMMENT 'The
storage period of data in MQ, unit: day',
- `data_type` varchar(20) DEFAULT 'TEXT' COMMENT 'Data
type, there are: TEXT, KEY-VALUE, PB, BON, TEXT and BON should be treated
differently',
+ `data_type` varchar(20) DEFAULT NULL COMMENT 'Data
type, including: CSV, KEY-VALUE, JSON, AVRO, etc.',
`data_encoding` varchar(8) DEFAULT 'UTF-8' COMMENT 'Data
encoding format, including: UTF-8, GBK',
`data_separator` varchar(8) DEFAULT NULL COMMENT 'The
source data field separator, stored as ASCII code',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source
data field escape character, the default is NULL (NULL), stored as 1 character',
