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 44f2b04677 [INLONG-9793][Manager] Fix the problem of Manager client
workflowApi.listprocess failed to pass parameters correctly (#9794)
44f2b04677 is described below
commit 44f2b0467700690cd452dbfee7ed0c7f6ded8bb9
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Mon Mar 11 14:27:17 2024 +0800
[INLONG-9793][Manager] Fix the problem of Manager client
workflowApi.listprocess failed to pass parameters correctly (#9794)
---
.../manager/client/api/inner/client/WorkflowApproverClient.java | 2 ++
.../inlong/manager/client/api/inner/client/WorkflowClient.java | 3 +++
.../inlong/manager/client/api/inner/client/WorkflowEventClient.java | 3 ++-
.../org/apache/inlong/manager/client/api/service/WorkflowApi.java | 5 +++--
.../inlong/manager/client/api/service/WorkflowApproverApi.java | 4 ++--
.../apache/inlong/manager/client/api/service/WorkflowEventApi.java | 3 ++-
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowApproverClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowApproverClient.java
index 200f6ac707..37c6a9d167 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowApproverClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowApproverClient.java
@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Client for {@link
org.apache.inlong.manager.client.api.service.WorkflowApproverApi}.
@@ -95,6 +96,7 @@ public class WorkflowApproverClient {
Map<String, Object> requestMap =
JsonUtils.OBJECT_MAPPER.convertValue(request,
new TypeReference<Map<String, Object>>() {
});
+ requestMap.entrySet().removeIf(entry ->
Objects.isNull(entry.getValue()));
Response<PageResult<ApproverResponse>> response =
ClientUtils.executeHttpCall(
workflowApproverApi.listByCondition(requestMap));
ClientUtils.assertRespSuccess(response);
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java
index 962e742d23..7c503df7c5 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowClient.java
@@ -39,6 +39,7 @@ import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
+import java.util.Objects;
/**
* Client for {@link WorkflowApi}.
@@ -185,6 +186,7 @@ public class WorkflowClient {
Map<String, Object> requestMap =
JsonUtils.OBJECT_MAPPER.convertValue(request,
new TypeReference<Map<String, Object>>() {
});
+ requestMap.entrySet().removeIf(entry ->
Objects.isNull(entry.getValue()));
Response<PageResult<ProcessResponse>> response =
ClientUtils.executeHttpCall(
workflowApi.listProcess(requestMap));
ClientUtils.assertRespSuccess(response);
@@ -203,6 +205,7 @@ public class WorkflowClient {
Map<String, Object> requestMap =
JsonUtils.OBJECT_MAPPER.convertValue(request,
new TypeReference<Map<String, Object>>() {
});
+ requestMap.entrySet().removeIf(entry ->
Objects.isNull(entry.getValue()));
Response<PageResult<TaskResponse>> response =
ClientUtils.executeHttpCall(workflowApi.listTask(requestMap));
ClientUtils.assertRespSuccess(response);
return response.getData();
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowEventClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowEventClient.java
index d65b2d7e5a..edfcb1f31b 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowEventClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/WorkflowEventClient.java
@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Client for {@link
org.apache.inlong.manager.client.api.service.WorkflowEventApi}.
@@ -56,7 +57,7 @@ public class WorkflowEventClient {
Map<String, Object> requestMap =
JsonUtils.OBJECT_MAPPER.convertValue(request,
new TypeReference<Map<String, Object>>() {
});
-
+ requestMap.entrySet().removeIf(entry ->
Objects.isNull(entry.getValue()));
Response<PageResult<EventLogResponse>> response =
ClientUtils.executeHttpCall(
workflowEventApi.list(requestMap));
ClientUtils.assertRespSuccess(response);
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java
index 1183242af0..bd3ae81a41 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApi.java
@@ -32,6 +32,7 @@ import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Path;
import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
import java.util.Map;
@@ -61,9 +62,9 @@ public interface WorkflowApi {
Call<Response<ProcessDetailResponse>> detail(@Path("processId") Integer
processId, @Query("taskId") Integer taskId);
@GET("workflow/listProcess")
- Call<Response<PageResult<ProcessResponse>>> listProcess(@Query("query")
Map<String, Object> query);
+ Call<Response<PageResult<ProcessResponse>>> listProcess(@QueryMap
Map<String, Object> query);
@GET("workflow/listTask")
- Call<Response<PageResult<TaskResponse>>> listTask(@Query("query")
Map<String, Object> query);
+ Call<Response<PageResult<TaskResponse>>> listTask(@QueryMap Map<String,
Object> query);
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApproverApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApproverApi.java
index 0835227878..20dc697747 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApproverApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowApproverApi.java
@@ -27,7 +27,7 @@ import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Path;
-import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
import java.util.Map;
@@ -40,7 +40,7 @@ public interface WorkflowApproverApi {
Call<Response<ApproverResponse>> get(@Path("id") Integer id);
@GET("workflow/approver/list")
- Call<Response<PageResult<ApproverResponse>>> listByCondition(@Query("map")
Map<String, Object> map);
+ Call<Response<PageResult<ApproverResponse>>> listByCondition(@QueryMap
Map<String, Object> map);
@POST("workflow/approver/update")
Call<Response<Integer>> update(@Body ApproverRequest request);
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowEventApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowEventApi.java
index 2b3e755bfa..2880093814 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowEventApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/WorkflowEventApi.java
@@ -28,6 +28,7 @@ import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Path;
import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
import java.util.Map;
@@ -37,7 +38,7 @@ public interface WorkflowEventApi {
* Get event list by paginating
*/
@GET("workflow/event/list")
- Call<Response<PageResult<EventLogResponse>>> list(@Query("map")
Map<String, Object> map);
+ Call<Response<PageResult<EventLogResponse>>> list(@QueryMap Map<String,
Object> map);
/**
* Execute the listener based on the event log ID
