From 31ee1e4fe3b6593b5b1a31f04f585ff8df92534d Mon Sep 17 00:00:00 2001 From: icanci Date: Thu, 26 Jan 2023 09:30:15 +0800 Subject: [PATCH 1/2] MockCallUtils --- .../amc/cloud/common/utils/MockCallUtils.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java b/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java index 5cd54ad..2823b6c 100644 --- a/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java +++ b/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java @@ -1,12 +1,5 @@ package cn.icanci.loopstack.amc.cloud.common.utils; -import cn.hutool.http.Method; -import cn.hutool.json.JSONUtil; -import cn.icanci.loopstack.amc.cloud.common.request.MockCallRequest; -import cn.icanci.loopstack.amc.cloud.common.response.MockCallResponse; -import cn.icanci.loopstack.api.client.Client; -import cn.icanci.loopstack.api.client.http.HttpClientImpl; - import java.util.Map; import java.util.concurrent.TimeUnit; @@ -15,6 +8,13 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Maps; +import cn.hutool.http.Method; +import cn.hutool.json.JSONUtil; +import cn.icanci.loopstack.amc.cloud.common.request.MockCallRequest; +import cn.icanci.loopstack.amc.cloud.common.response.MockCallResponse; +import cn.icanci.loopstack.api.client.Client; +import cn.icanci.loopstack.api.client.http.HttpClientImpl; + /** * Mock Call Utils * @@ -38,7 +38,7 @@ public class MockCallUtils { * @param amcUrl 请求的 AMC Cloud 服务地址 * @return 返回MockCallResponse */ - public MockCallResponse doMockCall(MockCallRequest request, String amcUrl) { + public static MockCallResponse doMockCall(MockCallRequest request, String amcUrl) { Client.RpcRequest rpcRequest = new Client.RpcRequest(amcUrl, request, Maps.newHashMap(), Method.POST, 3, TimeUnit.SECONDS, 0); logger.info("[MockCallUtils][doMockCall] req:{}", JSONUtil.toJsonStr(request)); MockCallResponse call = HTTP_CLIENT.call(rpcRequest, MockCallResponse.class); @@ -58,7 +58,7 @@ public class MockCallUtils { * @param readTimeout 请求超时时间 * @return 返回MockCallResponse */ - public MockCallResponse doMockCall(MockCallRequest request, String amcUrl, Map headers, Method method, int readTimeout) { + public static MockCallResponse doMockCall(MockCallRequest request, String amcUrl, Map headers, Method method, int readTimeout) { Client.RpcRequest rpcRequest = new Client.RpcRequest(amcUrl, request, headers, method, readTimeout, TimeUnit.SECONDS, 0); logger.info("[MockCallUtils][doMockCall] req:{}", JSONUtil.toJsonStr(request)); MockCallResponse call = HTTP_CLIENT.call(rpcRequest, MockCallResponse.class); -- Gitee From 86fa1b55397fd8b2b03095dfac8388e397555a8d Mon Sep 17 00:00:00 2001 From: icanci Date: Thu, 26 Jan 2023 09:30:44 +0800 Subject: [PATCH 2/2] MockCallUtils --- .../amc/cloud/common/utils/MockCallUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java b/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java index 2823b6c..13b75c6 100644 --- a/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java +++ b/common/src/main/java/cn/icanci/loopstack/amc/cloud/common/utils/MockCallUtils.java @@ -1,5 +1,12 @@ package cn.icanci.loopstack.amc.cloud.common.utils; +import cn.hutool.http.Method; +import cn.hutool.json.JSONUtil; +import cn.icanci.loopstack.amc.cloud.common.request.MockCallRequest; +import cn.icanci.loopstack.amc.cloud.common.response.MockCallResponse; +import cn.icanci.loopstack.api.client.Client; +import cn.icanci.loopstack.api.client.http.HttpClientImpl; + import java.util.Map; import java.util.concurrent.TimeUnit; @@ -8,13 +15,6 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Maps; -import cn.hutool.http.Method; -import cn.hutool.json.JSONUtil; -import cn.icanci.loopstack.amc.cloud.common.request.MockCallRequest; -import cn.icanci.loopstack.amc.cloud.common.response.MockCallResponse; -import cn.icanci.loopstack.api.client.Client; -import cn.icanci.loopstack.api.client.http.HttpClientImpl; - /** * Mock Call Utils * -- Gitee