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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 864e8ff20 [INLONG-6080][Manager] Change the DataNodeResponse to
DataNodeInfo (#6081)
864e8ff20 is described below
commit 864e8ff20a5db9c33a750efa4c565f66222579e5
Author: healchow <[email protected]>
AuthorDate: Sat Oct 8 15:39:58 2022 +0800
[INLONG-6080][Manager] Change the DataNodeResponse to DataNodeInfo (#6081)
---
.../apache/inlong/manager/client/api/DataNode.java | 6 +-
.../manager/client/api/impl/DataNodeImpl.java | 6 +-
.../client/api/inner/client/DataNodeClient.java | 10 +--
.../manager/client/api/service/DataNodeApi.java | 6 +-
.../client/api/inner/ClientFactoryTest.java | 21 +++---
.../inlong/manager/pojo/node/DataNodeInfo.java | 2 +
.../inlong/manager/pojo/node/DataNodeResponse.java | 85 ----------------------
.../manager/pojo/node/hive/HiveDataNodeInfo.java | 4 +
.../manager/pojo/node/mysql/MySQLDataNodeInfo.java | 4 +
.../web/controller/DataNodeControllerTest.java | 4 +-
10 files changed, 36 insertions(+), 112 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/DataNode.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/DataNode.java
index 9c5c31eb1..0cb8296e1 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/DataNode.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/DataNode.java
@@ -18,8 +18,8 @@
package org.apache.inlong.manager.client.api;
import org.apache.inlong.manager.pojo.common.PageResult;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
public interface DataNode {
@@ -37,7 +37,7 @@ public interface DataNode {
* @param id node id
* @return node info
*/
- DataNodeResponse get(Integer id);
+ DataNodeInfo get(Integer id);
/**
* Paging query nodes according to conditions.
@@ -45,7 +45,7 @@ public interface DataNode {
* @param request page request conditions
* @return node list
*/
- PageResult<DataNodeResponse> list(DataNodeRequest request);
+ PageResult<DataNodeInfo> list(DataNodeRequest request);
/**
* Update data node.
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DataNodeImpl.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DataNodeImpl.java
index 87fa11bf6..b1c6ec340 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DataNodeImpl.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DataNodeImpl.java
@@ -24,8 +24,8 @@ import
org.apache.inlong.manager.client.api.inner.client.DataNodeClient;
import org.apache.inlong.manager.client.api.util.ClientUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.pojo.common.PageResult;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
public class DataNodeImpl implements DataNode {
@@ -45,13 +45,13 @@ public class DataNodeImpl implements DataNode {
}
@Override
- public DataNodeResponse get(Integer id) {
+ public DataNodeInfo get(Integer id) {
Preconditions.checkNotNull(id, "data node id cannot be null");
return dataNodeClient.get(id);
}
@Override
- public PageResult<DataNodeResponse> list(DataNodeRequest request) {
+ public PageResult<DataNodeInfo> list(DataNodeRequest request) {
Preconditions.checkNotNull(request, "request cannot be null");
return dataNodeClient.list(request);
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/DataNodeClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/DataNodeClient.java
index b2248d31c..1ca4a4b61 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/DataNodeClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/DataNodeClient.java
@@ -23,8 +23,8 @@ import org.apache.inlong.manager.client.api.util.ClientUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.common.Response;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
/**
* Client for {@link DataNodeApi}.
@@ -58,9 +58,9 @@ public class DataNodeClient {
* @param id node id
* @return node info
*/
- public DataNodeResponse get(Integer id) {
+ public DataNodeInfo get(Integer id) {
Preconditions.checkNotNull(id, "data node id cannot be null");
- Response<DataNodeResponse> response =
ClientUtils.executeHttpCall(dataNodeApi.get(id));
+ Response<DataNodeInfo> response =
ClientUtils.executeHttpCall(dataNodeApi.get(id));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
@@ -71,9 +71,9 @@ public class DataNodeClient {
* @param request page request conditions
* @return node list
*/
- public PageResult<DataNodeResponse> list(DataNodeRequest request) {
+ public PageResult<DataNodeInfo> list(DataNodeRequest request) {
Preconditions.checkNotNull(request, "request cannot be null");
- Response<PageResult<DataNodeResponse>> response =
ClientUtils.executeHttpCall(dataNodeApi.list(request));
+ Response<PageResult<DataNodeInfo>> response =
ClientUtils.executeHttpCall(dataNodeApi.list(request));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/DataNodeApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/DataNodeApi.java
index 69e13dead..eb16bd528 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/DataNodeApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/DataNodeApi.java
@@ -19,8 +19,8 @@ package org.apache.inlong.manager.client.api.service;
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.common.Response;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.DELETE;
@@ -34,10 +34,10 @@ public interface DataNodeApi {
Call<Response<Integer>> save(@Body DataNodeRequest request);
@GET("node/get/{id}")
- Call<Response<DataNodeResponse>> get(@Path("id") Integer id);
+ Call<Response<DataNodeInfo>> get(@Path("id") Integer id);
@POST("node/list")
- Call<Response<PageResult<DataNodeResponse>>> list(@Body DataNodeRequest
request);
+ Call<Response<PageResult<DataNodeInfo>>> list(@Body DataNodeRequest
request);
@POST("node/update")
Call<Response<Boolean>> update(@Body DataNodeRequest request);
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
index 1c88b943f..dad6734bf 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
@@ -63,7 +63,8 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupResetRequest;
import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
import org.apache.inlong.manager.pojo.group.pulsar.InlongPulsarInfo;
import org.apache.inlong.manager.pojo.group.pulsar.InlongPulsarRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
+import org.apache.inlong.manager.pojo.node.hive.HiveDataNodeInfo;
import org.apache.inlong.manager.pojo.node.hive.HiveDataNodeRequest;
import org.apache.inlong.manager.pojo.sink.StreamSink;
import org.apache.inlong.manager.pojo.sink.ck.ClickHouseSink;
@@ -111,10 +112,8 @@ import static
com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
class ClientFactoryTest {
private static final int SERVICE_PORT = 8085;
- private static WireMockServer wireMockServer;
-
static ClientFactory clientFactory;
-
+ private static WireMockServer wireMockServer;
private static InlongGroupClient groupClient;
private static InlongStreamClient streamClient;
private static StreamSourceClient sourceClient;
@@ -979,7 +978,7 @@ class ClientFactoryTest {
@Test
void testGetDataNode() {
- DataNodeResponse response = DataNodeResponse.builder()
+ HiveDataNodeInfo dataNodeInfo = HiveDataNodeInfo.builder()
.id(1)
.name("test_node")
.type(DataNodeType.HIVE)
@@ -988,17 +987,17 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/node/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(response))
+ Response.success(dataNodeInfo))
))
);
- DataNodeResponse nodeInfo = dataNodeClient.get(1);
+ DataNodeInfo nodeInfo = dataNodeClient.get(1);
Assertions.assertEquals(1, nodeInfo.getId());
}
@Test
void testListDataNode() {
- List<DataNodeResponse> nodeResponses = Lists.newArrayList(
- DataNodeResponse.builder()
+ List<DataNodeInfo> nodeResponses = Lists.newArrayList(
+ HiveDataNodeInfo.builder()
.id(1)
.name("test_node")
.type(DataNodeType.HIVE)
@@ -1014,8 +1013,8 @@ class ClientFactoryTest {
HiveDataNodeRequest request = new HiveDataNodeRequest();
request.setName("test_hive_node");
- PageResult<DataNodeResponse> nodePageInfo =
dataNodeClient.list(request);
-
Assertions.assertEquals(JsonUtils.toJsonString(nodePageInfo.getList()),
JsonUtils.toJsonString(nodeResponses));
+ PageResult<DataNodeInfo> pageInfo = dataNodeClient.list(request);
+ Assertions.assertEquals(JsonUtils.toJsonString(pageInfo.getList()),
JsonUtils.toJsonString(nodeResponses));
}
@Test
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
index d17569e14..64aa7c4aa 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeInfo.java
@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
import java.util.Date;
@@ -31,6 +32,7 @@ import java.util.Date;
* Data node info
*/
@Data
+@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("Data node info")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeResponse.java
deleted file mode 100644
index 699c2433d..000000000
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/DataNodeResponse.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.pojo.node;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * Data node response
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("Data node response")
-public class DataNodeResponse {
-
- @ApiModelProperty(value = "Primary key")
- private Integer id;
-
- @ApiModelProperty(value = "Node name")
- private String name;
-
- @ApiModelProperty(value = "Node type, including MYSQL, HIVE, KAFKA, ES,
etc.")
- private String type;
-
- @ApiModelProperty(value = "Node url")
- private String url;
-
- @ApiModelProperty(value = "Node username")
- private String username;
-
- @ApiModelProperty(value = "Node token")
- private String token;
-
- @ApiModelProperty(value = "Extended params")
- private String extParams;
-
- @ApiModelProperty(value = "Description of the data node")
- private String description;
-
- @ApiModelProperty(value = "Name of in charges, separated by commas")
- private String inCharges;
-
- @ApiModelProperty(value = "Cluster status")
- private Integer status;
-
- @ApiModelProperty(value = "Name of in creator")
- private String creator;
-
- @ApiModelProperty(value = "Name of in modifier")
- private String modifier;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date modifyTime;
-
- @ApiModelProperty(value = "Version number")
- private Integer version;
-
-}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/hive/HiveDataNodeInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/hive/HiveDataNodeInfo.java
index 8602762e4..5c9bbc2fb 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/hive/HiveDataNodeInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/hive/HiveDataNodeInfo.java
@@ -19,9 +19,11 @@ package org.apache.inlong.manager.pojo.node.hive;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
+import lombok.experimental.SuperBuilder;
import org.apache.inlong.manager.common.consts.DataNodeType;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.common.util.JsonTypeDefine;
@@ -31,6 +33,8 @@ import org.apache.inlong.manager.pojo.node.DataNodeInfo;
* Hive data node info
*/
@Data
+@SuperBuilder
+@AllArgsConstructor
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@JsonTypeDefine(value = DataNodeType.HIVE)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/mysql/MySQLDataNodeInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/mysql/MySQLDataNodeInfo.java
index 22c03e28f..2ea7c1421 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/mysql/MySQLDataNodeInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/mysql/MySQLDataNodeInfo.java
@@ -19,9 +19,11 @@ package org.apache.inlong.manager.pojo.node.mysql;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
+import lombok.experimental.SuperBuilder;
import org.apache.inlong.manager.common.consts.DataNodeType;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.common.util.JsonTypeDefine;
@@ -31,6 +33,8 @@ import org.apache.inlong.manager.pojo.node.DataNodeInfo;
* MySQL data node info
*/
@Data
+@SuperBuilder
+@AllArgsConstructor
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
@JsonTypeDefine(value = DataNodeType.MYSQL)
diff --git
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/DataNodeControllerTest.java
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/DataNodeControllerTest.java
index ba7b10353..7d1c74a2d 100644
---
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/DataNodeControllerTest.java
+++
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/DataNodeControllerTest.java
@@ -22,8 +22,8 @@ import
org.apache.inlong.manager.common.consts.InlongConstants;
import org.apache.inlong.manager.dao.entity.DataNodeEntity;
import org.apache.inlong.manager.dao.mapper.DataNodeEntityMapper;
import org.apache.inlong.manager.pojo.common.Response;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
-import org.apache.inlong.manager.pojo.node.DataNodeResponse;
import org.apache.inlong.manager.pojo.node.hive.HiveDataNodeRequest;
import org.apache.inlong.manager.web.WebBaseTest;
import org.junit.jupiter.api.Assertions;
@@ -71,7 +71,7 @@ class DataNodeControllerTest extends WebBaseTest {
// get
MvcResult getResult = getForSuccessMvcResult("/api/node/get/{id}",
dataNodeId);
- DataNodeResponse dataNode = getResBodyObj(getResult,
DataNodeResponse.class);
+ DataNodeInfo dataNode = getResBodyObj(getResult, DataNodeInfo.class);
Assertions.assertNotNull(dataNode);
Assertions.assertEquals(getHiveDataNodeRequest().getName(),
dataNode.getName());
