diff --git a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TestSocketUtils.java b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TestSocketUtils.java
deleted file mode 100644
index e22d07897..000000000
--- a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.processor.twitter.trend;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java
index 740341025..723027e36 100644
--- a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java
+++ b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java
@@ -46,6 +46,7 @@
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/location/TestTwitterTrendLocationProcessorApplication.java b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/location/TestTwitterTrendLocationProcessorApplication.java
index 1ccbc361a..bd58df968 100644
--- a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/location/TestTwitterTrendLocationProcessorApplication.java
+++ b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/location/TestTwitterTrendLocationProcessorApplication.java
@@ -29,10 +29,10 @@
import org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties;
import org.springframework.cloud.fn.common.twitter.util.TwitterTestUtils;
import org.springframework.cloud.fn.twitter.trend.TwitterTrendFunctionConfiguration;
-import org.springframework.cloud.stream.app.processor.twitter.trend.TestSocketUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
+import org.springframework.test.util.TestSocketUtils;
import static org.mockserver.matchers.Times.exactly;
import static org.mockserver.model.HttpResponse.response;
diff --git a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TestSocketUtils.java b/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TestSocketUtils.java
deleted file mode 100644
index 39bf98249..000000000
--- a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.sink.twitter.message;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java b/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java
index ad1f999b5..736febcd2 100644
--- a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java
+++ b/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java
@@ -44,6 +44,7 @@
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.unlimited;
diff --git a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TestSocketUtils.java b/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TestSocketUtils.java
deleted file mode 100644
index 8f6bccd08..000000000
--- a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.sink.twitter.update;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java b/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java
index 58ad660a1..9ed84dd7c 100644
--- a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java
+++ b/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java
@@ -43,6 +43,7 @@
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.unlimited;
diff --git a/applications/sink/zeromq-sink/README.adoc b/applications/sink/zeromq-sink/README.adoc
index 782f5235b..25253041d 100644
--- a/applications/sink/zeromq-sink/README.adoc
+++ b/applications/sink/zeromq-sink/README.adoc
@@ -19,7 +19,7 @@ The **$$zeromq$$** $$sink$$ has the following options:
//tag::configuration-properties[]
$$zeromq.consumer.connect-url$$:: $$Connection URL for connecting to the ZeroMQ Socket.$$ *($$String$$, default: `$$$$`)*
-$$zeromq.consumer.socket-type$$:: $$The Socket Type the connection should establish.$$ *($$SocketType$$, default: `$$$$`, possible values: `PAIR`,`PUB`,`SUB`,`REQ`,`REP`,`DEALER`,`ROUTER`,`PULL`,`PUSH`,`XPUB`,`XSUB`,`STREAM`)*
+$$zeromq.consumer.socket-type$$:: $$The Socket Type the connection should establish.$$ *($$SocketType$$, default: `$$$$`, possible values: `PAIR`,`PUB`,`SUB`,`REQ`,`REP`,`DEALER`,`ROUTER`,`PULL`,`PUSH`,`XPUB`,`XSUB`,`STREAM`,`CLIENT`,`SERVER`,`RADIO`,`DISH`,`CHANNEL`,`PEER`,`RAW`,`SCATTER`,`GATHER`)*
$$zeromq.consumer.topic$$:: $$A Topic SpEL expression to evaluate a topic before sending messages to subscribers.$$ *($$Expression$$, default: `$$$$`)*
//end::configuration-properties[]
diff --git a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TestSocketUtils.java b/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TestSocketUtils.java
deleted file mode 100644
index 62a18e248..000000000
--- a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.source.twitter.message;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java b/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java
index a7df257b6..66216d7d5 100644
--- a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java
+++ b/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java
@@ -47,6 +47,7 @@
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.Message;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TestSocketUtils.java b/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TestSocketUtils.java
deleted file mode 100644
index cf7968d5c..000000000
--- a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.source.twitter.search;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java b/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java
index c0485b395..2ade8a0b9 100644
--- a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java
+++ b/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java
@@ -47,6 +47,7 @@
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.Message;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TestSocketUtils.java b/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TestSocketUtils.java
deleted file mode 100644
index 4dffa4cff..000000000
--- a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.source.twitter.stream;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java b/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java
index 658789790..3fea18778 100644
--- a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java
+++ b/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java
@@ -43,6 +43,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/applications/source/zeromq-source/README.adoc b/applications/source/zeromq-source/README.adoc
index e63ea85a3..387a4343a 100644
--- a/applications/source/zeromq-source/README.adoc
+++ b/applications/source/zeromq-source/README.adoc
@@ -21,7 +21,7 @@ The **$$zeromq$$** $$source$$ has the following options:
$$zeromq.supplier.bind-port$$:: $$Bind Port for creating a ZeroMQ Socket; 0 selects a random port.$$ *($$Integer$$, default: `$$0$$`)*
$$zeromq.supplier.connect-url$$:: $$Connection URL for to the ZeroMQ Socket.$$ *($$String$$, default: `$$$$`)*
$$zeromq.supplier.consume-delay$$:: $$The delay to consume from the ZeroMQ Socket when no data received.$$ *($$Duration$$, default: `$$1s$$`)*
-$$zeromq.supplier.socket-type$$:: $$The Socket Type the connection should make.$$ *($$SocketType$$, default: `$$$$`, possible values: `PAIR`,`PUB`,`SUB`,`REQ`,`REP`,`DEALER`,`ROUTER`,`PULL`,`PUSH`,`XPUB`,`XSUB`,`STREAM`)*
+$$zeromq.supplier.socket-type$$:: $$The Socket Type the connection should make.$$ *($$SocketType$$, default: `$$$$`, possible values: `PAIR`,`PUB`,`SUB`,`REQ`,`REP`,`DEALER`,`ROUTER`,`PULL`,`PUSH`,`XPUB`,`XSUB`,`STREAM`,`CLIENT`,`SERVER`,`RADIO`,`DISH`,`CHANNEL`,`PEER`,`RAW`,`SCATTER`,`GATHER`)*
$$zeromq.supplier.topics$$:: $$The Topics to subscribe to.$$ *($$String[]$$, default: `$$[]$$`)*
//end::configuration-properties[]
diff --git a/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainerTestUtils.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainerTestUtils.java
index 0d01fb195..6a17ffb69 100644
--- a/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainerTestUtils.java
+++ b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/StreamAppContainerTestUtils.java
@@ -22,6 +22,7 @@
import java.net.UnknownHostException;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.util.TestSocketUtils;
/**
* Support utility for stream application integration testing .
@@ -61,6 +62,6 @@ public static final File resourceAsFile(String path) {
}
public static final int findAvailablePort() {
- return TestSocketUtils.findAvailableTcpPort(10000, 20000);
+ return TestSocketUtils.findAvailableTcpPort();
}
}
diff --git a/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestSocketUtils.java b/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestSocketUtils.java
deleted file mode 100644
index 957ce0d10..000000000
--- a/applications/stream-applications-core/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/integration/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.app.test.integration;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/TestSocketUtils.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/TestSocketUtils.java
deleted file mode 100644
index 5f120653d..000000000
--- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.fn.twitter;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java
index 11aca1157..e3b50e79c 100644
--- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java
+++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java
@@ -39,7 +39,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties;
import org.springframework.cloud.fn.common.twitter.util.TwitterTestUtils;
-import org.springframework.cloud.fn.twitter.TestSocketUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
@@ -47,6 +46,7 @@
import org.springframework.messaging.Message;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.TestSocketUtils;
import org.springframework.util.MimeTypeUtils;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java
index 6bba32649..bcd49d9da 100644
--- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java
+++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java
@@ -34,7 +34,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties;
import org.springframework.cloud.fn.common.twitter.util.TwitterTestUtils;
-import org.springframework.cloud.fn.twitter.TestSocketUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
@@ -42,6 +41,7 @@
import org.springframework.messaging.Message;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java
index 626b92c16..8417d8e46 100644
--- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java
+++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java
@@ -37,7 +37,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties;
import org.springframework.cloud.fn.common.twitter.util.TwitterTestUtils;
-import org.springframework.cloud.fn.twitter.TestSocketUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
@@ -45,6 +44,7 @@
import org.springframework.messaging.Message;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;
diff --git a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TestSocketUtils.java b/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TestSocketUtils.java
deleted file mode 100644
index 8aa519b15..000000000
--- a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TestSocketUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.fn.supplier.twitter.status.stream;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility methods for working with network sockets — for example,
- * for finding available ports on {@code localhost}.
- *
- * Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- *
{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- */
-@Deprecated
-public final class TestSocketUtils {
-
- /**
- * The default minimum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MIN = 1024;
-
- /**
- * The default maximum value for port ranges used when finding an available
- * socket port.
- */
- public static final int PORT_RANGE_MAX = 65535;
-
- private static final Random random = new Random(System.nanoTime());
-
- private TestSocketUtils() {
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort() {
- return findAvailableTcpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort) {
- return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available TCP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available TCP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableTcpPort(int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested) {
- return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available TCP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available TCP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort() {
- return findAvailableUdpPort(PORT_RANGE_MIN);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@value #PORT_RANGE_MAX}].
- * @param minPort the minimum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort) {
- return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
- }
-
- /**
- * Find an available UDP port randomly selected from the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available UDP port number
- * @throws IllegalStateException if no available port could be found
- */
- public static int findAvailableUdpPort(int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePort(minPort, maxPort);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
- * @param numRequested the number of available ports to find
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested) {
- return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
- }
-
- /**
- * Find the requested number of available UDP ports, each randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available UDP port numbers
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- public static SortedSet findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
- return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
- }
-
-
- private enum SocketType {
-
- TCP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
- port, 1, InetAddress.getByName("localhost"));
- serverSocket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- },
-
- UDP {
- @Override
- protected boolean isPortAvailable(int port) {
- try {
- DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
- socket.close();
- return true;
- }
- catch (Exception ex) {
- return false;
- }
- }
- };
-
- /**
- * Determine if the specified port for this {@code SocketType} is
- * currently available on {@code localhost}.
- */
- protected abstract boolean isPortAvailable(int port);
-
- /**
- * Find a pseudo-random port number within the range
- * [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a random port number within the specified range
- */
- private int findRandomPort(int minPort, int maxPort) {
- int portRange = maxPort - minPort;
- return minPort + random.nextInt(portRange + 1);
- }
-
- /**
- * Find an available port for this {@code SocketType}, randomly selected
- * from the range [{@code minPort}, {@code maxPort}].
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return an available port number for this socket type
- * @throws IllegalStateException if no available port could be found
- */
- int findAvailablePort(int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
- int portRange = maxPort - minPort;
- int candidatePort;
- int searchCounter = 0;
- do {
- if (searchCounter > portRange) {
- throw new IllegalStateException(String.format(
- "Could not find an available %s port in the range [%d, %d] after %d attempts",
- name(), minPort, maxPort, searchCounter));
- }
- candidatePort = findRandomPort(minPort, maxPort);
- searchCounter++;
- }
- while (!isPortAvailable(candidatePort));
-
- return candidatePort;
- }
-
- /**
- * Find the requested number of available ports for this {@code SocketType},
- * each randomly selected from the range [{@code minPort}, {@code maxPort}].
- * @param numRequested the number of available ports to find
- * @param minPort the minimum port number
- * @param maxPort the maximum port number
- * @return a sorted set of available port numbers for this socket type
- * @throws IllegalStateException if the requested number of available ports could not be found
- */
- SortedSet findAvailablePorts(int numRequested, int minPort, int maxPort) {
- Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
- Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
- Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
- Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
- Assert.isTrue((maxPort - minPort) >= numRequested,
- "'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
- SortedSet availablePorts = new TreeSet<>();
- int attemptCount = 0;
- while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
- availablePorts.add(findAvailablePort(minPort, maxPort));
- }
-
- if (availablePorts.size() != numRequested) {
- throw new IllegalStateException(String.format(
- "Could not find %d available %s ports in the range [%d, %d]",
- numRequested, name(), minPort, maxPort));
- }
-
- return availablePorts;
- }
- }
-
-}
diff --git a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java b/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java
index 2e4fc7eb0..d6bc2b550 100644
--- a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java
+++ b/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java
@@ -44,6 +44,7 @@
import org.springframework.messaging.Message;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.TestSocketUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockserver.matchers.Times.exactly;