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 e3b4cc40bd [INLONG-8832][Manager] Fix the problem of The request type
for transform/list in the client does not match the actual one (#8833)
e3b4cc40bd is described below
commit e3b4cc40bd0c4146722aa700e3b8dbd7cedc9d49
Author: fuweng11 <[email protected]>
AuthorDate: Tue Sep 5 19:12:03 2023 +0800
[INLONG-8832][Manager] Fix the problem of The request type for
transform/list in the client does not match the actual one (#8833)
---
.../apache/inlong/manager/client/cli/DescribeCommand.java | 2 +-
.../org/apache/inlong/manager/client/cli/ListCommand.java | 2 +-
.../manager/client/api/impl/DefaultInlongStreamBuilder.java | 2 +-
.../inlong/manager/client/api/impl/InlongStreamImpl.java | 3 ++-
.../client/api/inner/client/StreamTransformClient.java | 13 ++++++++-----
.../manager/client/api/service/StreamTransformApi.java | 10 ++++------
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
index ec50e2e04e..446ace8bea 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
@@ -194,7 +194,7 @@ public class DescribeCommand extends AbstractCommand {
try {
ClientUtils.initClientFactory();
StreamTransformClient transformClient =
ClientUtils.clientFactory.getTransformClient();
- List<TransformResponse> transforms =
transformClient.listTransform(groupId, streamId);
+ List<TransformResponse> transforms =
transformClient.listTransform(groupId, streamId).getList();
transforms.forEach(PrintUtils::printJson);
} catch (Exception e) {
System.out.println(e.getMessage());
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
index af334e52cc..ad7ea69232 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
@@ -222,7 +222,7 @@ public class ListCommand extends AbstractCommand {
try {
ClientUtils.initClientFactory();
StreamTransformClient transformClient =
ClientUtils.clientFactory.getTransformClient();
- List<TransformResponse> transformResponses =
transformClient.listTransform(groupId, streamId);
+ List<TransformResponse> transformResponses =
transformClient.listTransform(groupId, streamId).getList();
PrintUtils.print(transformResponses, TransformInfo.class);
} catch (Exception e) {
System.out.println(e.getMessage());
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DefaultInlongStreamBuilder.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DefaultInlongStreamBuilder.java
index e3b4502162..856b8c88f3 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DefaultInlongStreamBuilder.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/DefaultInlongStreamBuilder.java
@@ -180,7 +180,7 @@ public class DefaultInlongStreamBuilder extends
InlongStreamBuilder {
InlongStreamInfo streamInfo = streamContext.getStreamInfo();
final String groupId = streamInfo.getInlongGroupId();
final String streamId = streamInfo.getInlongStreamId();
- List<TransformResponse> transformResponses =
transformClient.listTransform(groupId, streamId);
+ List<TransformResponse> transformResponses =
transformClient.listTransform(groupId, streamId).getList();
List<String> updateTransformNames = Lists.newArrayList();
for (TransformResponse transformResponse : transformResponses) {
StreamTransform transform =
StreamTransformTransfer.parseStreamTransform(transformResponse);
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
index 46fd49b7e6..d605a8b387 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
@@ -339,7 +339,8 @@ public class InlongStreamImpl implements InlongStream {
}
private void initOrUpdateTransform(InlongStreamInfo streamInfo) {
- List<TransformResponse> transformResponses =
transformClient.listTransform(inlongGroupId, inlongStreamId);
+ List<TransformResponse> transformResponses =
+ transformClient.listTransform(inlongGroupId,
inlongStreamId).getList();
List<String> updateTransformNames = Lists.newArrayList();
for (TransformResponse transformResponse : transformResponses) {
StreamTransform transform =
StreamTransformTransfer.parseStreamTransform(transformResponse);
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/StreamTransformClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/StreamTransformClient.java
index 815aca85bb..9d7fb2b5a3 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/StreamTransformClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/StreamTransformClient.java
@@ -22,14 +22,14 @@ import
org.apache.inlong.manager.client.api.service.StreamTransformApi;
import org.apache.inlong.manager.client.api.util.ClientUtils;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
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.transform.TransformPageRequest;
import org.apache.inlong.manager.pojo.transform.TransformRequest;
import org.apache.inlong.manager.pojo.transform.TransformResponse;
import org.apache.commons.lang3.tuple.Pair;
-import java.util.List;
-
/**
* Client for {@link StreamTransformApi}.
*/
@@ -53,9 +53,12 @@ public class StreamTransformClient {
/**
* Get all conversion function info.
*/
- public List<TransformResponse> listTransform(String groupId, String
streamId) {
- Response<List<TransformResponse>> response =
ClientUtils.executeHttpCall(
- streamTransformApi.listTransform(groupId, streamId));
+ public PageResult<TransformResponse> listTransform(String groupId, String
streamId) {
+ TransformPageRequest transformPageRequest = new TransformPageRequest();
+ transformPageRequest.setInlongGroupId(groupId);
+ transformPageRequest.setInlongStreamId(streamId);
+ Response<PageResult<TransformResponse>> response =
ClientUtils.executeHttpCall(
+ streamTransformApi.listTransform(transformPageRequest));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/StreamTransformApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/StreamTransformApi.java
index b712f4b83d..bd9c686e5d 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/StreamTransformApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/StreamTransformApi.java
@@ -17,27 +17,25 @@
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.transform.TransformPageRequest;
import org.apache.inlong.manager.pojo.transform.TransformRequest;
import org.apache.inlong.manager.pojo.transform.TransformResponse;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.DELETE;
-import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Query;
-import java.util.List;
-
public interface StreamTransformApi {
@POST("transform/save")
Call<Response<Integer>> createTransform(@Body TransformRequest request);
- @GET("transform/list")
- Call<Response<List<TransformResponse>>>
listTransform(@Query("inlongGroupId") String groupId,
- @Query("inlongStreamId") String streamId);
+ @POST("transform/list")
+ Call<Response<PageResult<TransformResponse>>> listTransform(@Body
TransformPageRequest request);
@POST("transform/update")
Call<Response<Boolean>> updateTransform(@Body TransformRequest request);
