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 4eea8d3d9 [INLONG-7938][Manager] Fix consume list interface does not
filter by request (#7939)
4eea8d3d9 is described below
commit 4eea8d3d9b3569cfc2623956673118c651b0a234
Author: vernedeng <deng...@pku.edu.cn>
AuthorDate: Thu May 4 15:57:56 2023 +0800
[INLONG-7938][Manager] Fix consume list interface does not filter by
request (#7939)
---
.../manager/client/api/inner/client/InlongConsumeClient.java | 10 ++--------
.../inlong/manager/client/api/service/InlongConsumeApi.java | 8 +++-----
.../manager/client/api/inner/InlongConsumeClientTest.java | 2 +-
.../inlong/manager/web/controller/InlongConsumeController.java | 4 ++--
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongConsumeClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongConsumeClient.java
index 4021e09f2..9c0b53f28 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongConsumeClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongConsumeClient.java
@@ -17,12 +17,10 @@
package org.apache.inlong.manager.client.api.inner.client;
-import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.inlong.manager.client.api.ClientConfiguration;
import org.apache.inlong.manager.client.api.service.InlongConsumeApi;
import org.apache.inlong.manager.client.api.util.ClientUtils;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.common.Response;
@@ -33,8 +31,6 @@ import
org.apache.inlong.manager.pojo.consume.InlongConsumePageRequest;
import org.apache.inlong.manager.pojo.consume.InlongConsumeRequest;
import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
-import java.util.Map;
-
/**
* Client for {@link InlongConsumeApi}.
*/
@@ -96,12 +92,10 @@ public class InlongConsumeClient {
* @return inlong consume list
*/
public PageResult<InlongConsumeBriefInfo> list(InlongConsumePageRequest
request) {
- Map<String, Object> requestMap =
JsonUtils.OBJECT_MAPPER.convertValue(request,
- new TypeReference<Map<String, Object>>() {
- });
+ Preconditions.expectNotNull(request, "inlong consume request cannot be
null");
Response<PageResult<InlongConsumeBriefInfo>> response =
ClientUtils.executeHttpCall(
- inlongConsumeApi.list(requestMap));
+ inlongConsumeApi.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/InlongConsumeApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongConsumeApi.java
index d78dd5a5a..7f560ba27 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongConsumeApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongConsumeApi.java
@@ -22,6 +22,7 @@ import org.apache.inlong.manager.pojo.common.Response;
import org.apache.inlong.manager.pojo.consume.InlongConsumeBriefInfo;
import org.apache.inlong.manager.pojo.consume.InlongConsumeCountInfo;
import org.apache.inlong.manager.pojo.consume.InlongConsumeInfo;
+import org.apache.inlong.manager.pojo.consume.InlongConsumePageRequest;
import org.apache.inlong.manager.pojo.consume.InlongConsumeRequest;
import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
import retrofit2.Call;
@@ -30,9 +31,6 @@ import retrofit2.http.DELETE;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-import java.util.Map;
public interface InlongConsumeApi {
@@ -45,8 +43,8 @@ public interface InlongConsumeApi {
@GET("consume/countStatus")
Call<Response<InlongConsumeCountInfo>> countStatusByUser();
- @GET("consume/list")
- Call<Response<PageResult<InlongConsumeBriefInfo>>> list(@Query("request")
Map<String, Object> request);
+ @POST("consume/list")
+ Call<Response<PageResult<InlongConsumeBriefInfo>>> list(@Body
InlongConsumePageRequest request);
@POST("consume/update")
Call<Response<Integer>> update(@Body InlongConsumeRequest request);
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java
index f134f2f81..defb3c269 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java
@@ -108,7 +108,7 @@ public class InlongConsumeClientTest extends
ClientFactoryTest {
.build());
stubFor(
- get(urlMatching("/inlong/manager/api/consume/list.*"))
+ post(urlMatching("/inlong/manager/api/consume/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(responses))))));
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongConsumeController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongConsumeController.java
index 98e1686b9..380c3b169 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongConsumeController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongConsumeController.java
@@ -80,9 +80,9 @@ public class InlongConsumeController {
return
Response.success(consumeService.countStatus(LoginUserUtils.getLoginUser().getName()));
}
- @GetMapping("/consume/list")
+ @PostMapping("/consume/list")
@ApiOperation(value = "List inlong consume by pagination")
- public Response<PageResult<InlongConsumeBriefInfo>>
list(InlongConsumePageRequest request) {
+ public Response<PageResult<InlongConsumeBriefInfo>> list(@RequestBody
InlongConsumePageRequest request) {
request.setCurrentUser(LoginUserUtils.getLoginUser().getName());
request.setIsAdminRole(LoginUserUtils.getLoginUser().getRoles().contains(UserTypeEnum.ADMIN.name()));
return Response.success(consumeService.list(request));
