This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 844f2a75cacfce0b42f42a37a12819612f00b3e5 Author: Ernest Burghardt <[email protected]> AuthorDate: Wed May 5 10:56:08 2021 -0700 spA changes --- .../geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java | 8 +++++++- .../InternalLocatorClusterManagementServiceIntegrationTest.java | 1 + .../distributed/internal/InternalLocatorIntegrationTest.java | 4 +--- .../main/java/org/apache/geode/internal/net/SocketCreator.java | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java index b67bc55..d6925d1 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.io.IOException; import java.io.Serializable; +import java.nio.file.Paths; import java.util.List; import java.util.Properties; import java.util.concurrent.TimeUnit; @@ -39,6 +40,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; @@ -50,6 +52,7 @@ import org.apache.geode.distributed.internal.membership.api.MembershipManagerHel import org.apache.geode.distributed.internal.tcpserver.HostAddress; import org.apache.geode.internal.AvailablePort; import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.internal.inet.LocalHostUtil; import org.apache.geode.test.awaitility.GeodeAwaitility; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.dunit.AsyncInvocation; @@ -70,9 +73,11 @@ public class ReconnectWithClusterConfigurationDUnitTest implements Serializable @Rule public DistributedRule distributedRule = DistributedRule.builder().withVMCount(NUM_VMS).build(); + @Rule + public transient TemporaryFolder temporaryFolder = new TemporaryFolder(); @Before - public void setup() { + public void setup() throws IOException { List<AvailablePort.Keeper> randomAvailableTCPPortKeepers = AvailablePortHelper.getRandomAvailableTCPPortKeepers(NUM_LOCATORS); for (int i = 0; i < NUM_LOCATORS; i++) { @@ -82,6 +87,7 @@ public class ReconnectWithClusterConfigurationDUnitTest implements Serializable final int[] locPorts = locatorPorts; Invoke.invokeInEveryVM("set locator ports", () -> locatorPorts = locPorts); for (int i = 0; i < NUM_LOCATORS; i++) { + final String workingDir = temporaryFolder.newFolder().getAbsolutePath(); final int locatorNumber = i; randomAvailableTCPPortKeepers.get(locatorNumber).release(); VM.getVM(i).invoke("start locator", () -> { diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorClusterManagementServiceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorClusterManagementServiceIntegrationTest.java index e4b67af..58598c0 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorClusterManagementServiceIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorClusterManagementServiceIntegrationTest.java @@ -28,6 +28,7 @@ import java.net.URISyntaxException; import java.util.Optional; import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.apache.geode.cache.RegionShortcut; diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java index 0f3de29..f5041d4 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java @@ -21,8 +21,6 @@ import static org.mockito.Mockito.when; import java.io.File; import java.io.IOException; -import java.net.InetAddress; -import java.nio.charset.Charset; import java.nio.file.Path; import java.util.Properties; @@ -38,8 +36,8 @@ import org.mockito.junit.MockitoRule; import org.mockito.quality.Strictness; import org.apache.geode.distributed.Locator; -import org.apache.geode.internal.logging.InternalLogWriter; import org.apache.geode.distributed.internal.tcpserver.HostAddress; +import org.apache.geode.internal.logging.InternalLogWriter; import org.apache.geode.internal.security.SecurableCommunicationChannel; import org.apache.geode.logging.internal.LoggingSession; diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java index b147a5f..4ac863b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java @@ -62,7 +62,6 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509ExtendedKeyManager; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.validator.routines.InetAddressValidator; import org.apache.logging.log4j.Logger; import org.apache.geode.GemFireConfigException;
