You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/12/21 13:32:16 UTC
[shenyu] branch master updated: [type:refactor] modify the deprecated parse method of JsonParser to parseString (#4278)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new b248e8df5 [type:refactor] modify the deprecated parse method of JsonParser to parseString (#4278)
b248e8df5 is described below
commit b248e8df59975a628c190b92d22781cd55acae1d
Author: class <53...@users.noreply.github.com>
AuthorDate: Wed Dec 21 21:32:05 2022 +0800
[type:refactor] modify the deprecated parse method of JsonParser to parseString (#4278)
---
.../register/ShenyuClientRegisterDivideServiceImplTest.java | 3 +--
.../service/register/ShenyuClientRegisterDubboServiceImplTest.java | 3 +--
.../service/register/ShenyuClientRegisterGrpcServiceImplTest.java | 3 +--
.../service/register/ShenyuClientRegisterSofaServiceImplTest.java | 3 +--
.../register/ShenyuClientRegisterSpringCloudServiceImplTest.java | 3 +--
.../service/register/ShenyuClientRegisterTarsServiceImplTest.java | 3 +--
.../test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java | 7 +++----
.../test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java | 5 ++---
.../java/org/apache/shenyu/plugin/cryptor/utils/CryptorUtil.java | 2 +-
9 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImplTest.java
index 16f23589e..e1628ecb7 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDivideServiceImplTest.java
@@ -117,8 +117,7 @@ public final class ShenyuClientRegisterDivideServiceImplTest {
when(selectorDO.getHandle()).thenReturn(returnStr);
doReturn(false).when(shenyuClientRegisterDivideService).doSubmit(any(), any());
String actual = shenyuClientRegisterDivideService.buildHandle(list, selectorDO);
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse(expected.replaceAll("\\d{13}", "0")), parser.parse(actual.replaceAll("\\d{13}", "0")));
+ assertEquals(JsonParser.parseString(expected.replaceAll("\\d{13}", "0")), JsonParser.parseString(actual.replaceAll("\\d{13}", "0")));
List<DivideUpstream> resultList = GsonUtils.getInstance().fromCurrentList(actual, DivideUpstream.class);
assertEquals(resultList.size(), 3);
assertEquals(resultList.stream().filter(r -> list.stream().map(dto -> CommonUpstreamUtils.buildUrl(dto.getHost(), dto.getPort()))
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDubboServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDubboServiceImplTest.java
index b80cb9cd0..7e44ea2fa 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDubboServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterDubboServiceImplTest.java
@@ -116,8 +116,7 @@ public final class ShenyuClientRegisterDubboServiceImplTest {
when(selectorDO.getHandle()).thenReturn(returnStr);
doReturn(false).when(shenyuClientRegisterDubboService).doSubmit(any(), any());
String actual = shenyuClientRegisterDubboService.buildHandle(list, selectorDO);
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse(expected.replaceAll("\\d{13}", "0")), parser.parse(actual.replaceAll("\\d{13}", "0")));
+ assertEquals(JsonParser.parseString(expected.replaceAll("\\d{13}", "0")), JsonParser.parseString(actual.replaceAll("\\d{13}", "0")));
List<DubboUpstream> resultList = GsonUtils.getInstance().fromCurrentList(actual, DubboUpstream.class);
assertEquals(resultList.size(), 2);
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImplTest.java
index 247b64246..e52624b8a 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterGrpcServiceImplTest.java
@@ -115,8 +115,7 @@ public final class ShenyuClientRegisterGrpcServiceImplTest {
when(selectorDO.getHandle()).thenReturn(returnStr);
doReturn(false).when(shenyuClientRegisterGrpcService).doSubmit(any(), any());
String actual = shenyuClientRegisterGrpcService.buildHandle(list, selectorDO);
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse(expected), parser.parse(actual));
+ assertEquals(JsonParser.parseString(expected), JsonParser.parseString(actual));
List<GrpcUpstream> resultList = GsonUtils.getInstance().fromCurrentList(actual, GrpcUpstream.class);
assertEquals(resultList.size(), 2);
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImplTest.java
index a64cdbf56..9cbc6e991 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImplTest.java
@@ -68,8 +68,7 @@ public final class ShenyuClientRegisterSofaServiceImplTest {
@Test
public void testRuleHandler() {
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse("{\"retries\":0,\"loadBalance\":\"random\",\"timeout\":3000}"), parser.parse(shenyuClientRegisterSofaService.ruleHandler()));
+ assertEquals(JsonParser.parseString("{\"retries\":0,\"loadBalance\":\"random\",\"timeout\":3000}"), JsonParser.parseString(shenyuClientRegisterSofaService.ruleHandler()));
}
@Test
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSpringCloudServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSpringCloudServiceImplTest.java
index 7921cac16..32ef12707 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSpringCloudServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSpringCloudServiceImplTest.java
@@ -118,8 +118,7 @@ public final class ShenyuClientRegisterSpringCloudServiceImplTest {
doReturn(false).when(shenyuClientRegisterSpringCloudService).doSubmit(any(), any());
when(selectorDO.getHandle()).thenReturn(returnStr);
String actual = shenyuClientRegisterSpringCloudService.buildHandle(list, selectorDO);
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse(expected.replaceAll("\\d{13}", "0")), parser.parse(actual.replaceAll("\\d{13}", "0")));
+ assertEquals(JsonParser.parseString(expected.replaceAll("\\d{13}", "0")), JsonParser.parseString(actual.replaceAll("\\d{13}", "0")));
SpringCloudSelectorHandle handle = GsonUtils.getInstance().fromJson(actual, SpringCloudSelectorHandle.class);
assertEquals(handle.getDivideUpstreams().size(), 2);
assertEquals(handle.getDivideUpstreams().stream().filter(r -> list.stream().map(dto -> CommonUpstreamUtils.buildUrl(dto.getHost(), dto.getPort()))
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterTarsServiceImplTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterTarsServiceImplTest.java
index f0d07337b..c0b2b855d 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterTarsServiceImplTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterTarsServiceImplTest.java
@@ -114,8 +114,7 @@ public final class ShenyuClientRegisterTarsServiceImplTest {
when(selectorDO.getHandle()).thenReturn(returnStr);
doReturn(false).when(shenyuClientRegisterTarsService).doSubmit(any(), any());
String actual = shenyuClientRegisterTarsService.buildHandle(list, selectorDO);
- JsonParser parser = new JsonParser();
- assertEquals(parser.parse(expected.replaceAll("\\d{13}", "0")), parser.parse(actual.replaceAll("\\d{13}", "0")));
+ assertEquals(JsonParser.parseString(expected.replaceAll("\\d{13}", "0")), JsonParser.parseString(actual.replaceAll("\\d{13}", "0")));
List<TarsUpstream> resultList = GsonUtils.getInstance().fromCurrentList(actual, TarsUpstream.class);
assertEquals(resultList.size(), 2);
assertEquals(resultList.stream().filter(r -> list.stream().map(dto -> CommonUpstreamUtils.buildUrl(dto.getHost(), dto.getPort()))
diff --git a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
index 562a7aa37..1c4cb3b49 100644
--- a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
+++ b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/GsonUtilsTest.java
@@ -69,9 +69,8 @@ public class GsonUtilsTest {
@Test
public void testToJson() {
TestObject testObject = generateTestObject();
- JsonParser parser = new JsonParser();
- JsonElement expectedJson = parser.parse(EXPECTED_JSON);
- JsonElement objectJson = parser.parse(GsonUtils.getInstance().toJson(testObject));
+ JsonElement expectedJson = JsonParser.parseString(EXPECTED_JSON);
+ JsonElement objectJson = JsonParser.parseString(GsonUtils.getInstance().toJson(testObject));
assertEquals(expectedJson, objectJson);
}
@@ -83,7 +82,7 @@ public class GsonUtilsTest {
public void testFromJsonAboutJsonElement() {
TestObject testObject = generateTestObject();
- JsonObject jsonObject = new JsonParser().parse(EXPECTED_JSON).getAsJsonObject();
+ JsonObject jsonObject = JsonParser.parseString(EXPECTED_JSON).getAsJsonObject();
TestObject parseObject = GsonUtils.getInstance().fromJson(jsonObject, TestObject.class);
assertEquals(testObject, parseObject);
diff --git a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
index cbbb1266f..8190baa86 100644
--- a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
+++ b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/JsonUtilsTest.java
@@ -75,9 +75,8 @@ public final class JsonUtilsTest {
}
})
.build();
- JsonParser parser = new JsonParser();
- JsonElement expectedJson = parser.parse(EXPECTED_JSON);
- JsonElement objectJson = parser.parse(JsonUtils.toJson(object));
+ JsonElement expectedJson = JsonParser.parseString(EXPECTED_JSON);
+ JsonElement objectJson = JsonParser.parseString(JsonUtils.toJson(object));
assertEquals(expectedJson, objectJson);
Object o = new Object();
diff --git a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/CryptorUtil.java b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/CryptorUtil.java
index baed78db9..ffd8c77a5 100644
--- a/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/CryptorUtil.java
+++ b/shenyu-plugin/shenyu-plugin-cryptor/src/main/java/org/apache/shenyu/plugin/cryptor/utils/CryptorUtil.java
@@ -72,7 +72,7 @@ public final class CryptorUtil {
}
AtomicInteger initDeep = new AtomicInteger();
initDeep.set(0);
- JsonElement je = new JsonParser().parse(originalBody);
+ JsonElement je = JsonParser.parseString(originalBody);
JsonElement resultJe = JsonUtil.replaceJsonNode(je,
initDeep,
modifiedBody,