From 0dd83988736b365002c37961cd6ca6ab23deddfa Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Thu, 17 Mar 2022 15:30:22 +0100
Subject: [PATCH] Remove usage of SocketUtils in test code.

See #1228
---
 .../test/util/CassandraDelegate.java          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraDelegate.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraDelegate.java
index 57334ab5e..63d735869 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraDelegate.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraDelegate.java
@@ -24,16 +24,16 @@ import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CassandraContainer;
 
 import org.springframework.data.cassandra.core.cql.SessionCallback;
 import org.springframework.data.cassandra.support.CassandraConnectionProperties;
 import org.springframework.data.cassandra.support.CqlDataSet;
 import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
-import org.springframework.util.SocketUtils;
 import org.springframework.util.StringUtils;
 
+import org.testcontainers.containers.CassandraContainer;
+
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.CqlSessionBuilder;
@@ -85,8 +85,8 @@ class CassandraDelegate {
 	/**
 	 * Create a new {@link CassandraDelegate} allowing the use of a config file.
 	 *
-	 * @param yamlConfigurationResource {@link String name} of the configuration resource;
-	 * must not be {@literal null} or {@literal empty}.
+	 * @param yamlConfigurationResource {@link String name} of the configuration resource; must not be {@literal null} or
+	 *          {@literal empty}.
 	 * @see #CassandraDelegate(String, long)
 	 */
 	public CassandraDelegate(@NonNull String yamlConfigurationResource) {
@@ -258,7 +258,7 @@ class CassandraDelegate {
 	private void configureRemoteJmxPort() {
 
 		if (!System.getProperties().containsKey("com.sun.management.jmxremote.port")) {
-			System.setProperty("com.sun.management.jmxremote.port", String.valueOf(SocketUtils.findAvailableTcpPort(1024)));
+			System.setProperty("com.sun.management.jmxremote.port", "1024");
 		}
 	}
 
@@ -273,9 +273,7 @@ class CassandraDelegate {
 
 		if (container == null) {
 
-			container = getCassandraDockerImageName()
-				.map(CassandraContainer::new)
-				.orElseGet(CassandraContainer::new);
+			container = getCassandraDockerImageName().map(CassandraContainer::new).orElseGet(CassandraContainer::new);
 
 			container.start();
 
@@ -289,14 +287,13 @@ class CassandraDelegate {
 
 	private Optional<String> getCassandraDockerImageName() {
 
-		return resolveCassandraVersion()
-			.map(cassandraVersion -> String.format("cassandra:%s", cassandraVersion));
+		return resolveCassandraVersion().map(cassandraVersion -> String.format("cassandra:%s", cassandraVersion));
 	}
 
 	private Optional<String> resolveCassandraVersion() {
 
 		return Optional.ofNullable(System.getProperty("cassandra.version", System.getenv("CASSANDRA_VERSION")))
-			.filter(StringUtils::hasText);
+				.filter(StringUtils::hasText);
 	}
 
 	private synchronized void initializeConnection() {