You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by jo...@apache.org on 2022/11/30 09:07:36 UTC
[incubator-eventmesh] branch master updated: Delete magic variables (#2311)
This is an automated email from the ASF dual-hosted git repository.
jonyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 8c31f73ff Delete magic variables (#2311)
8c31f73ff is described below
commit 8c31f73ffa7a2ad5e02273cd9d4aa7128bd05a4c
Author: weihubeats <we...@163.com>
AuthorDate: Wed Nov 30 17:07:29 2022 +0800
Delete magic variables (#2311)
* Delete magic variables
* Remove deprecated code
* update constants
* update test
* merge
* merge
---
.../src/main/java/org/apache/eventmesh/common/Constants.java | 2 ++
.../java/org/apache/eventmesh/common/utils/NetUtils.java | 12 +++++++-----
.../client/grpc/consumer/EventMeshGrpcConsumerTest.java | 6 +++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
index 481adb080..29212ca1d 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
@@ -153,6 +153,8 @@ public class Constants {
public static final String AND = "&";
+ public static final String EQ = "=";
+
public static final String EMPTY = "";
public static final int SUCCESS_CODE = 200;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
index 8835e5abb..77e714f21 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/NetUtils.java
@@ -19,6 +19,7 @@ package org.apache.eventmesh.common.utils;
import static org.apache.eventmesh.common.Constants.SUCCESS_CODE;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.enums.HttpMethod;
import org.apache.http.Consts;
@@ -28,6 +29,7 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -56,13 +58,13 @@ public class NetUtils {
if (formData == null || formData.trim().length() == 0) {
return result;
}
- final String[] items = formData.split("&");
+ final String[] items = formData.split(Constants.AND);
Arrays.stream(items).forEach(item -> {
- final String[] keyAndVal = item.split("=");
+ final String[] keyAndVal = item.split(Constants.EQ);
if (keyAndVal.length == 2) {
try {
- final String key = URLDecoder.decode(keyAndVal[0], "utf8");
- final String val = URLDecoder.decode(keyAndVal[1], "utf8");
+ final String key = URLDecoder.decode(keyAndVal[0], StandardCharsets.UTF_8.name());
+ final String val = URLDecoder.decode(keyAndVal[1], StandardCharsets.UTF_8.name());
result.put(key, val);
} catch (UnsupportedEncodingException e) {
logger.warn("formData2Dic:param decode failed...", e);
@@ -78,7 +80,7 @@ public class NetUtils {
}
StringBuilder sb = new StringBuilder();
for (InetSocketAddress addr : clients) {
- sb.append(addr).append("|");
+ sb.append(addr).append(Constants.VERTICAL_LINE);
}
return sb.toString();
}
diff --git a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java
index 68378937f..937ab52b7 100644
--- a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java
+++ b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java
@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import org.apache.eventmesh.client.grpc.config.EventMeshGrpcClientConfig;
@@ -112,7 +112,7 @@ public class EventMeshGrpcConsumerTest {
@Test
public void testSubscribeStreamWithoutListener() {
eventMeshGrpcConsumer.subscribe(Collections.singletonList(buildMockSubscriptionItem()));
- verifyZeroInteractions(consumerAsyncClient);
+ verifyNoMoreInteractions(consumerAsyncClient);
}
@Test
@@ -120,7 +120,7 @@ public class EventMeshGrpcConsumerTest {
List<Object> result = new ArrayList<>();
eventMeshGrpcConsumer.registerListener(new ReceiveMsgHook<Object>() {
@Override
- public Optional<Object> handle(Object msg) throws Throwable {
+ public Optional<Object> handle(Object msg) {
result.add(msg);
return Optional.empty();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org