Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove usage of SocketUtils in test code.

Browse Source 
See #1228
This commit is contained in:
Mark Paluch
2022-03-17 15:30:22 +01:00
parent 3a93a83b17
commit 0dd8398873
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/util/CassandraDelegate.java
View File

@@ -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() {