[#9915] Replace SocketUtils in springframework

pinpoint-apm · Apr 28, 2023 · 0953cde · 0953cde
1 parent 433a9d6
commit 0953cde
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 585 deletions.
diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java
@@ -44,7 +44,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.util.SocketUtils;
+import org.springframework.test.util.TestSocketUtils;
 
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
@@ -243,11 +243,11 @@ private DataReceiverGroupProperties createMockProperties(boolean tcpEnable, bool
 
         when(properties.isTcpEnable()).thenReturn(tcpEnable);
         when(properties.getTcpBindIp()).thenReturn("0.0.0.0");
-        when(properties.getTcpBindPort()).thenReturn(SocketUtils.findAvailableTcpPort(19099));
+        when(properties.getTcpBindPort()).thenReturn(TestSocketUtils.findAvailableTcpPort());
 
         when(properties.isUdpEnable()).thenReturn(udpEnable);
         when(properties.getUdpBindIp()).thenReturn("0.0.0.0");
-        when(properties.getUdpBindPort()).thenReturn(SocketUtils.findAvailableTcpPort(29099));
+        when(properties.getUdpBindPort()).thenReturn(TestSocketUtils.findAvailableTcpPort());
         when(properties.getUdpReceiveBufferSize()).thenReturn(65535);
 
         when(properties.getWorkerThreadSize()).thenReturn(2);

diff --git a/.../test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java b/.../test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java
@@ -29,7 +29,7 @@
 import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.SocketUtils;
+import org.springframework.test.util.TestSocketUtils;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -44,7 +44,7 @@
 @Disabled
 public class NettyUdpReceiverTest {
 
-    public static final int PORT = SocketUtils.findAvailableUdpPort(30011);
+    public static final int PORT = TestSocketUtils.findAvailableTcpPort();
     private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final CountDownLatch latch = new CountDownLatch(1);

diff --git a/...r/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java b/...r/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-import org.springframework.util.SocketUtils;
+import org.springframework.test.util.TestSocketUtils;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -66,7 +66,7 @@ public void receive(DatagramSocket localSocket, PooledObject<DatagramPacket> pac
 
     @BeforeEach
     public void setUp() throws Exception {
-        this.port = SocketUtils.findAvailableUdpPort(10999);
+        this.port = TestSocketUtils.findAvailableTcpPort();
     }
 
     @Test

diff --git a/.../src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java b/.../src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java
@@ -16,7 +16,6 @@
 
 package com.navercorp.pinpoint.common.server.cluster.zookeeper;
 
-import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import org.apache.curator.test.TestingServer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -30,6 +29,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.util.TestSocketUtils;
 
 import java.util.concurrent.TimeUnit;
 
@@ -55,7 +55,7 @@ private ConditionFactory awaitility() {
 
     @BeforeAll
     public static void setUp() throws Exception {
-        zookeeperPort = SocketUtils.findAvailableTcpPort();
+        zookeeperPort = TestSocketUtils.findAvailableTcpPort();
         ts = createTestingServer();
     }
 

diff --git a/...va/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java b/...va/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java
@@ -18,7 +18,6 @@
 
 import com.navercorp.pinpoint.common.server.cluster.zookeeper.exception.BadOperationException;
 import com.navercorp.pinpoint.common.server.cluster.zookeeper.exception.PinpointZookeeperException;
-import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import org.apache.curator.test.TestingServer;
 import org.apache.curator.utils.ZKPaths;
 import org.apache.logging.log4j.LogManager;
@@ -37,6 +36,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.util.TestSocketUtils;
 
 import java.io.IOException;
 import java.util.List;
@@ -68,7 +68,7 @@ private ConditionFactory awaitility() {
 
     @BeforeAll
     public static void setUpClass() throws Exception {
-        int availablePort = SocketUtils.findAvailableTcpPort();
+        int availablePort = TestSocketUtils.findAvailableTcpPort();
         ts = new TestingServer(availablePort);
 
         eventHoldingZookeeperEventWatcher = new EventHoldingZookeeperEventWatcher();

diff --git a/...ogle-grpc-it/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldSimpleServer.java b/...ogle-grpc-it/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldSimpleServer.java
@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.plugin.grpc;
 
 import com.navercorp.pinpoint.common.util.CpuUtils;
-import com.navercorp.pinpoint.pluginit.utils.SocketUtils;
+import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import io.grpc.Server;
 import io.grpc.examples.helloworld.GreeterGrpc;
 import io.grpc.examples.helloworld.HelloReply;

diff --git a/...ogle-grpc-it/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldStreamServer.java b/...ogle-grpc-it/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldStreamServer.java
@@ -17,8 +17,8 @@
 package com.navercorp.pinpoint.plugin.grpc;
 
 import com.navercorp.pinpoint.common.util.CpuUtils;
-import com.navercorp.pinpoint.pluginit.utils.SocketUtils;
 
+import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import io.grpc.Server;
 import io.grpc.Status;
 import io.grpc.examples.manualflowcontrol.HelloReply;

diff --git a/...gle-grpc-it2/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldSimpleServer.java b/...gle-grpc-it2/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldSimpleServer.java
@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.plugin.grpc;
 
 import com.navercorp.pinpoint.common.util.CpuUtils;
-import com.navercorp.pinpoint.pluginit.utils.SocketUtils;
+import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import io.grpc.Server;
 import io.grpc.examples.helloworld.GreeterGrpc;
 import io.grpc.examples.helloworld.HelloReply;

diff --git a/...gle-grpc-it2/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldStreamServer.java b/...gle-grpc-it2/src/test/java/com/navercorp/pinpoint/plugin/grpc/HelloWorldStreamServer.java
@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.plugin.grpc;
 
 import com.navercorp.pinpoint.common.util.CpuUtils;
-import com.navercorp.pinpoint.pluginit.utils.SocketUtils;
+import com.navercorp.pinpoint.testcase.util.SocketUtils;
 import io.grpc.Server;
 import io.grpc.Status;
 import io.grpc.examples.manualflowcontrol.HelloReply;

diff --git a/plugins-it/plugins-it-utils/pom.xml b/plugins-it/plugins-it-utils/pom.xml
@@ -36,6 +36,11 @@
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-testcase</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.nanohttpd</groupId>
             <artifactId>nanohttpd</artifactId>