[incubator-eventmesh] branch master updated: fix issue2710

[mikexue]

This is an automated email from the ASF dual-hosted git repository.

mikexue 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 9b990b8fd fix issue2710
     new 29ef880df Merge pull request #2748 from jonyangx/issue2710
9b990b8fd is described below

commit 9b990b8fd81381bfdf62eca6edc98369fd189a00
Author: jonyangx <yangjun1...@gmail.com>
AuthorDate: Sat Dec 31 11:09:38 2022 +0800

    fix issue2710
---
 .../eventmesh/runtime/util/RemotingHelper.java     | 32 +++++++++-------------
 .../eventmesh/runtime/util/RemotingHelperTest.java |  3 +-
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git 
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
 
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
index d4e8462f2..27ae75178 100644
--- 
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
+++ 
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
@@ -24,21 +24,19 @@ import org.apache.commons.lang3.ArrayUtils;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-
 import io.netty.channel.Channel;
 
 
-public class RemotingHelper {
+public abstract class RemotingHelper {
 
     public static String exceptionSimpleDesc(final Throwable e) {
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
         if (e != null) {
             sb.append(e);
 
-            StackTraceElement[] stackTrace = e.getStackTrace();
+            final StackTraceElement[] stackTrace = e.getStackTrace();
             if (ArrayUtils.isNotEmpty(stackTrace)) {
-                StackTraceElement elment = stackTrace[0];
-                sb.append(", ").append(elment);
+                sb.append(", ").append(stackTrace[0]);
             }
         }
 
@@ -46,22 +44,21 @@ public class RemotingHelper {
     }
 
     public static SocketAddress string2SocketAddress(final String addr) {
-        int split = addr.lastIndexOf(":");
-        String host = addr.substring(0, split);
-        String port = addr.substring(split + 1);
-        InetSocketAddress isa = new InetSocketAddress(host, 
Integer.parseInt(port));
-        return isa;
+        final int split = addr.lastIndexOf(':');
+        final String host = addr.substring(0, split);
+        final String port = addr.substring(split + 1);
+        return new InetSocketAddress(host, Integer.parseInt(port));
     }
 
     public static String parseChannelRemoteAddr(final Channel channel) {
         if (null == channel) {
             return "";
         }
-        SocketAddress remote = channel.remoteAddress();
-        final String addr = remote != null ? remote.toString() : "";
+
+        final String addr = channel.remoteAddress() != null ? 
channel.remoteAddress().toString() : "";
 
         if (addr.length() > 0) {
-            int index = addr.lastIndexOf("/");
+            final int index = addr.lastIndexOf('/');
             if (index >= 0) {
                 return addr.substring(index + 1);
             }
@@ -72,11 +69,8 @@ public class RemotingHelper {
         return "";
     }
 
-    public static String parseSocketAddressAddr(InetSocketAddress 
socketAddress) {
-        if (socketAddress != null) {
-            return socketAddress.getAddress().getHostAddress() + ":" + 
socketAddress.getPort();
-        }
-        return "";
+    public static String parseSocketAddressAddr(final InetSocketAddress 
socketAddress) {
+        return socketAddress != null ? 
socketAddress.getAddress().getHostAddress() + ":" + socketAddress.getPort() : 
"";
     }
 
 }
diff --git 
a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
 
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
index bfc51d437..8258d386f 100644
--- 
a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
+++ 
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
@@ -37,8 +37,9 @@ public class RemotingHelperTest {
     @Test
     public void testString2SocketAddress() {
         String addr = "10.1.1.1:11002";
-        SocketAddress address = RemotingHelper.string2SocketAddress(addr);
+        InetSocketAddress address = (InetSocketAddress) 
RemotingHelper.string2SocketAddress(addr);
         Assert.assertNotNull(address);
+        Assert.assertEquals("10.1.1.1:11002", address.getHostString() + ":" + 
address.getPort());
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@eventmesh.apache.org
For additional commands, e-mail: commits-h...@eventmesh.apache.org