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/08 01:37:05 UTC
[incubator-inlong] branch master updated: [INLONG-4120][Manager] Change the keyWord to keyword in query params (#4122)
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 2766ea71d [INLONG-4120][Manager] Change the keyWord to keyword in query params (#4122)
2766ea71d is described below
commit 2766ea71df50f4dd84b0bdef5c39b6c076155280
Author: ciscozhou <45...@users.noreply.github.com>
AuthorDate: Sun May 8 09:37:00 2022 +0800
[INLONG-4120][Manager] Change the keyWord to keyword in query params (#4122)
---
.../inlong/manager/client/api/inner/InnerInlongManagerClient.java | 2 +-
.../inlong/manager/common/pojo/cluster/ClusterPageRequest.java | 4 ++--
.../inlong/manager/common/pojo/group/InlongGroupPageRequest.java | 4 ++--
.../apache/inlong/manager/common/pojo/sink/SinkPageRequest.java | 4 ++--
.../inlong/manager/common/pojo/source/SourcePageRequest.java | 4 ++--
.../manager/common/pojo/stream/InlongStreamPageRequest.java | 4 ++--
.../src/main/resources/mappers/DataProxyClusterEntityMapper.xml | 4 ++--
.../src/main/resources/mappers/InlongGroupEntityMapper.xml | 4 ++--
.../src/main/resources/mappers/InlongStreamEntityMapper.xml | 8 ++++----
.../src/main/resources/mappers/StreamSinkEntityMapper.xml | 8 ++++----
.../src/main/resources/mappers/StreamSourceEntityMapper.xml | 8 ++++----
11 files changed, 27 insertions(+), 27 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 1e67fa5ad..851449f2b 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
@@ -166,7 +166,7 @@ public class InnerInlongManagerClient {
pageNum = 1;
}
JSONObject groupQuery = new JSONObject();
- groupQuery.put("keyWord", keyword);
+ groupQuery.put("keyword", keyword);
groupQuery.put("status", status);
groupQuery.put("pageNum", pageNum);
groupQuery.put("pageSize", pageSize);
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterPageRequest.java
index adcce3511..7a1b6c171 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterPageRequest.java
@@ -38,8 +38,8 @@ public class ClusterPageRequest extends PageRequest {
@ApiModelProperty(value = "Cluster IP")
private String ip;
- @ApiModelProperty(value = "Keywords, name, description, etc.")
- private String keyWord;
+ @ApiModelProperty(value = "Keyword, name, description, etc.")
+ private String keyword;
@ApiModelProperty(value = "Status")
private Integer status;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
index 8eced0cd4..9c02249ba 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
@@ -33,8 +33,8 @@ import java.util.List;
@ApiModel("Inlong group query request")
public class InlongGroupPageRequest extends PageRequest {
- @ApiModelProperty(value = "Keywords")
- private String keyWord;
+ @ApiModelProperty(value = "Keyword, can be group id or name")
+ private String keyword;
@ApiModelProperty(value = "Inlong group name list")
private List<String> nameList;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
index 55990a534..6ea62c618 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
@@ -43,8 +43,8 @@ public class SinkPageRequest extends PageRequest {
@ApiModelProperty(value = "Sink type, such as HIVE")
private String sinkType;
- @ApiModelProperty(value = "Key word")
- private String keyWord;
+ @ApiModelProperty(value = "Keyword, can be group id, stream id or sink name")
+ private String keyword;
@ApiModelProperty(value = "Status")
private Integer status;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
index 6db1b4249..5b90d747e 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
@@ -43,8 +43,8 @@ public class SourcePageRequest extends PageRequest {
@ApiModelProperty(value = "Source type, such as FILE")
private String sourceType;
- @ApiModelProperty(value = "Key word")
- private String keyWord;
+ @ApiModelProperty(value = "Keyword, can be group id, stream id or source name")
+ private String keyword;
@ApiModelProperty(value = "Status")
private Integer status;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
index c537b2810..88e62eddd 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
@@ -34,8 +34,8 @@ public class InlongStreamPageRequest extends PageRequest {
@ApiModelProperty(value = "Inlong group id")
private String inlongGroupId;
- @ApiModelProperty(value = "Key word")
- private String keyWord;
+ @ApiModelProperty(value = "Keyword, can be stream id or name")
+ private String keyword;
@ApiModelProperty(value = "Source type, including: FILE, DB, AUTO_PUSH (DATA_PROXY_SDK, HTTP)")
private String dataSourceType;
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
index fdece0b37..10d28ffd2 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
@@ -57,8 +57,8 @@
<where>
is_deleted = 0
and find_in_set(#{currentUser,jdbcType=VARCHAR}, in_charges)
- <if test="keyWord != null and keyWord != ''">
- and (name like CONCAT('%', #{keyWord}, '%') or description like CONCAT('%', #{keyWord}, '%'))
+ <if test="keyword != null and keyword != ''">
+ and (name like CONCAT('%', #{keyword}, '%') or description like CONCAT('%', #{keyword}, '%'))
</if>
<if test="status != null and status != ''">
and status = #{status, jdbcType=INTEGER}
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 0be00c488..9dc6e24b7 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -112,8 +112,8 @@
creator = #{currentUser, jdbcType=VARCHAR} or find_in_set(#{currentUser, jdbcType=VARCHAR}, in_charges)
)
</if>
- <if test="keyWord != null and keyWord != ''">
- and (inlong_group_id like CONCAT('%',#{keyWord},'%') or name like CONCAT('%',#{keyWord},'%'))
+ <if test="keyword != null and keyword != ''">
+ and (inlong_group_id like CONCAT('%',#{keyword},'%') or name like CONCAT('%',#{keyword},'%'))
</if>
<if test="groupIdList != null and groupIdList.size() > 0">
and inlong_group_id in
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index 0765be664..ee64e4f3d 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -111,10 +111,10 @@
<if test="request.dataSourceType != null and request.dataSourceType != ''">
and stream.data_source_type = #{request.dataSourceType, jdbcType=VARCHAR}
</if>
- <if test="request.keyWord != null and request.keyWord != ''">
- and (stream.inlong_stream_id like CONCAT('%', #{request.keyWord}, '%')
- or stream.name like CONCAT('%', #{request.keyWord}, '%')
- or stream.description like CONCAT('%', #{request.keyWord}, '%')
+ <if test="request.keyword != null and request.keyword != ''">
+ and (
+ stream.inlong_stream_id like CONCAT('%', #{request.keyword}, '%')
+ or stream.name like CONCAT('%', #{request.keyword}, '%')
)
</if>
<if test="request.status != null and request.status != ''">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
index db1ce3f7d..d7b337a3e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
@@ -84,11 +84,11 @@
<if test="request.inlongStreamId != null and request.inlongStreamId != ''">
and inlong_stream_id = #{request.inlongStreamId, jdbcType=VARCHAR}
</if>
- <if test="request.keyWord != null and request.keyWord != ''">
+ <if test="request.keyword != null and request.keyword != ''">
and (
- inlong_group_id like CONCAT('%', #{request.keyWord}, '%')
- or inlong_stream_id like CONCAT('%', #{request.keyWord}, '%')
- or sink_name like CONCAT('%', #{request.keyWord}, '%')
+ inlong_group_id like CONCAT('%', #{request.keyword}, '%')
+ or inlong_stream_id like CONCAT('%', #{request.keyword}, '%')
+ or sink_name like CONCAT('%', #{request.keyword}, '%')
)
</if>
<if test="request.status != null and request.status != ''">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
index 31e3e65da..6e6c62ac1 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
@@ -110,11 +110,11 @@
<if test="request.sourceType != null and request.sourceType != ''">
and source_type = #{request.sourceType, jdbcType=VARCHAR}
</if>
- <if test="request.keyWord != null and request.keyWord != ''">
+ <if test="request.keyword != null and request.keyword != ''">
and (
- inlong_group_id like CONCAT('%', #{request.keyWord}, '%')
- or inlong_stream_id like CONCAT('%', #{request.keyWord}, '%')
- or source_name like CONCAT('%', #{request.keyWord}, '%')
+ inlong_group_id like CONCAT('%', #{request.keyword}, '%')
+ or inlong_stream_id like CONCAT('%', #{request.keyword}, '%')
+ or source_name like CONCAT('%', #{request.keyword}, '%')
)
</if>
<if test="request.status != null and request.status != ''">