GEODE-9098: Resolve package splitting geode-membership (apache#6452)

* Resolve package splitting geode-membership Co-authored-by: Udo Kohlmeyer <[email protected]> Co-authored-by: Patrick Johnson <[email protected]>
rnsasg · May 25, 2021 · 5b0ebb4 · 5b0ebb4
1 parent fef733e
commit 5b0ebb4
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 27 deletions.
diff --git a/...c/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/...c/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
@@ -27,7 +27,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 import org.apache.geode.test.junit.categories.RestAPITest;
 import org.apache.geode.test.junit.rules.GeodeDevRestClient;
 import org.apache.geode.test.junit.rules.RequiresGeodeHome;

diff --git a/...ributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java b/...ributedTest/java/org/apache/geode/cache30/ReconnectWithClusterConfigurationDUnitTest.java
@@ -50,9 +50,9 @@
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.distributed.internal.membership.api.MembershipManagerHelper;
 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.internal.membership.utils.AvailablePort;
 import org.apache.geode.test.awaitility.GeodeAwaitility;
 import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.AsyncInvocation;

diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -100,8 +100,8 @@
 import org.apache.geode.distributed.internal.membership.api.MembershipConfigurationException;
 import org.apache.geode.distributed.internal.membership.api.MembershipManagerHelper;
 import org.apache.geode.distributed.internal.membership.api.MembershipView;
-import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 import org.apache.geode.internal.tcp.Connection;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.awaitility.GeodeAwaitility;

diff --git a/...e-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java b/...e-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
@@ -41,8 +41,8 @@
 import org.apache.geode.distributed.Locator;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.AvailablePort.Keeper;
 import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.membership.utils.AvailablePort.Keeper;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;

diff --git a/...re/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java b/...re/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
@@ -17,8 +17,8 @@
 import static java.lang.System.lineSeparator;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.apache.geode.internal.AvailablePort.SOCKET;
-import static org.apache.geode.internal.AvailablePort.isPortAvailable;
+import static org.apache.geode.internal.membership.utils.AvailablePort.SOCKET;
+import static org.apache.geode.internal.membership.utils.AvailablePort.isPortAvailable;
 import static org.apache.geode.internal.process.ProcessUtils.identifyPid;
 import static org.apache.geode.internal.process.ProcessUtils.isProcessAlive;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;

diff --git a/...rc/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java b/...rc/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
@@ -17,13 +17,13 @@
 import static java.util.Arrays.stream;
 import static java.util.Comparator.naturalOrder;
 import static org.apache.geode.distributed.internal.DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
-import static org.apache.geode.internal.AvailablePort.AVAILABLE_PORTS_LOWER_BOUND;
-import static org.apache.geode.internal.AvailablePort.AVAILABLE_PORTS_UPPER_BOUND;
-import static org.apache.geode.internal.AvailablePort.MULTICAST;
 import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPortRange;
 import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableUDPPort;
 import static org.apache.geode.internal.AvailablePortHelper.initializeUniquePortRange;
+import static org.apache.geode.internal.membership.utils.AvailablePort.AVAILABLE_PORTS_LOWER_BOUND;
+import static org.apache.geode.internal.membership.utils.AvailablePort.AVAILABLE_PORTS_UPPER_BOUND;
+import static org.apache.geode.internal.membership.utils.AvailablePort.MULTICAST;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
 
@@ -49,6 +49,7 @@
 import org.junit.runner.RunWith;
 
 import org.apache.geode.internal.lang.SystemUtils;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 
 @RunWith(JUnitParamsRunner.class)
 public class AvailablePortHelperIntegrationTest {

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
@@ -27,6 +27,7 @@
 import org.junit.Test;
 
 import org.apache.geode.internal.inet.LocalHostUtil;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 import org.apache.geode.util.internal.GeodeGlossary;
 
 /**

diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -15,7 +15,7 @@ org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats
 org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress
 org/apache/geode/distributed/internal/membership/gms/GMSMembership$BoundedLinkedHashMap
 org/apache/geode/internal/AbstractConfig$SortedProperties
-org/apache/geode/internal/AvailablePort$Keeper
+org/apache/geode/internal/membership/utils/AvailablePort$Keeper
 org/apache/geode/internal/ExitCode
 org/apache/geode/deployment/internal/JarDeployer
 org/apache/geode/internal/ObjIdConcurrentMap

diff --git a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
@@ -47,8 +47,8 @@
 import org.apache.geode.annotations.Immutable;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.unsafe.RegisterSignalHandlerSupport;
-import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 import org.apache.geode.internal.process.PidUnavailableException;
 import org.apache.geode.internal.process.ProcessUtils;
 import org.apache.geode.internal.util.ArgumentRedactor;
@@ -133,7 +133,7 @@ protected static void assertPortAvailable(final int port) throws BindException {
    * @param port an integer indicating the network port to listen for client network requests.
    * @throws BindException if the network address and port are not available. Address defaults to
    *         localhost (or all network interfaces on the local system) if null.
-   * @see org.apache.geode.internal.AvailablePort
+   * @see AvailablePort
    */
   protected static void assertPortAvailable(final InetAddress bindAddress, final int port)
       throws BindException {

diff --git a/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java b/geode-dunit/src/main/java/org/apache/geode/security/ClientAuthorizationTestCase.java
@@ -72,11 +72,11 @@
 import org.apache.geode.cache.query.Struct;
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.AvailablePort.Keeper;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.entries.AbstractRegionEntry;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.internal.membership.utils.AvailablePort.Keeper;
 import org.apache.geode.security.generator.AuthzCredentialGenerator;
 import org.apache.geode.security.generator.AuthzCredentialGenerator.ClassCode;
 import org.apache.geode.security.generator.CredentialGenerator;

diff --git a/geode-junit/src/main/java/org/apache/geode/internal/AvailablePortHelper.java b/geode-junit/src/main/java/org/apache/geode/internal/AvailablePortHelper.java
@@ -16,21 +16,21 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.apache.geode.distributed.internal.membership.api.MembershipConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
-import static org.apache.geode.internal.AvailablePort.AVAILABLE_PORTS_LOWER_BOUND;
-import static org.apache.geode.internal.AvailablePort.AVAILABLE_PORTS_UPPER_BOUND;
-import static org.apache.geode.internal.AvailablePort.MULTICAST;
-import static org.apache.geode.internal.AvailablePort.SOCKET;
-import static org.apache.geode.internal.AvailablePort.getAddress;
-import static org.apache.geode.internal.AvailablePort.isPortAvailable;
-import static org.apache.geode.internal.AvailablePort.isPortKeepable;
+import static org.apache.geode.internal.membership.utils.AvailablePort.AVAILABLE_PORTS_LOWER_BOUND;
+import static org.apache.geode.internal.membership.utils.AvailablePort.AVAILABLE_PORTS_UPPER_BOUND;
+import static org.apache.geode.internal.membership.utils.AvailablePort.MULTICAST;
+import static org.apache.geode.internal.membership.utils.AvailablePort.SOCKET;
+import static org.apache.geode.internal.membership.utils.AvailablePort.getAddress;
+import static org.apache.geode.internal.membership.utils.AvailablePort.isPortAvailable;
+import static org.apache.geode.internal.membership.utils.AvailablePort.isPortKeepable;
 
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.geode.internal.AvailablePort.Keeper;
+import org.apache.geode.internal.membership.utils.AvailablePort.Keeper;
 
 /**
  * Methods for acquiring one or more available ports. Despite "random" in the names, these methods

diff --git a/.../apache/geode/internal/AvailablePort.java → ...ernal/membership/utils/AvailablePort.java b/.../apache/geode/internal/AvailablePort.java → ...ernal/membership/utils/AvailablePort.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.geode.internal;
+package org.apache.geode.internal.membership.utils;
 
 import java.io.IOException;
 import java.io.PrintStream;

diff --git a/.../distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java b/.../distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
@@ -45,13 +45,13 @@
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.cache.CacheServerAdvisor;
 import org.apache.geode.internal.cache.CacheServerImpl;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalRegion;
 import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
 import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
+import org.apache.geode.internal.membership.utils.AvailablePort;
 import org.apache.geode.management.GatewayReceiverMXBean;
 import org.apache.geode.management.GatewaySenderMXBean;
 import org.apache.geode.management.MemberMXBean;

diff --git a/geode-wan/src/main/java/org/apache/geode/cache/wan/internal/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/wan/internal/GatewayReceiverImpl.java
@@ -14,10 +14,10 @@
  */
 package org.apache.geode.cache.wan.internal;
 
-import static org.apache.geode.internal.AvailablePort.SOCKET;
-import static org.apache.geode.internal.AvailablePort.getAddress;
-import static org.apache.geode.internal.AvailablePort.getRandomAvailablePortInRange;
-import static org.apache.geode.internal.AvailablePort.isPortAvailable;
+import static org.apache.geode.internal.membership.utils.AvailablePort.SOCKET;
+import static org.apache.geode.internal.membership.utils.AvailablePort.getAddress;
+import static org.apache.geode.internal.membership.utils.AvailablePort.getRandomAvailablePortInRange;
+import static org.apache.geode.internal.membership.utils.AvailablePort.isPortAvailable;
 
 import java.io.IOException;
 import java.net.UnknownHostException;