Change "LiveLocator", "ActiveLocator" to "OnlineLocator".
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/61f676b0 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/61f676b0 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/61f676b0 Branch: refs/heads/feature/GEODE-2900 Commit: 61f676b0187e8918ca62f4a2ec9b6bd3baa942d3 Parents: 8239e6f Author: masaki.yamakawa <[email protected]> Authored: Fri May 5 03:27:45 2017 +0900 Committer: Bruce Schuchardt <[email protected]> Committed: Thu May 11 09:15:27 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/geode/cache/client/Pool.java | 2 +- .../client/internal/AutoConnectionSourceImpl.java | 14 +++++++------- .../geode/cache/client/internal/ConnectionSource.java | 6 +++--- .../client/internal/ExplicitConnectionSourceImpl.java | 2 +- .../apache/geode/cache/client/internal/PoolImpl.java | 4 ++-- .../apache/geode/internal/cache/PoolFactoryImpl.java | 2 +- .../internal/AutoConnectionSourceDUnitTest.java | 2 +- .../internal/AutoConnectionSourceImplJUnitTest.java | 2 +- .../cache/client/internal/QueueManagerJUnitTest.java | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java index e37fef2..69cec87 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/Pool.java @@ -207,7 +207,7 @@ public interface Pool { * The returned locator list may be slightly old information. If the locator does not exist, an * empty list is returned. */ - public java.util.List<InetSocketAddress> getLiveLocators(); + public java.util.List<InetSocketAddress> getOnlineLocators(); /** * Returns an unmodifiable list of {@link java.net.InetSocketAddress} of the servers this pool is http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java index 822f449..1e807ee 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java @@ -89,7 +89,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource { protected final List<InetSocketAddress> initialLocators; private final String serverGroup; private AtomicReference<LocatorList> locators = new AtomicReference<LocatorList>(); - private AtomicReference<LocatorList> liveLocators = new AtomicReference<LocatorList>(); + private AtomicReference<LocatorList> onlineLocators = new AtomicReference<LocatorList>(); protected InternalPool pool; private final int connectionTimeout; private long pingInterval; @@ -111,7 +111,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource { int handshakeTimeout) { ArrayList<InetSocketAddress> tmpContacts = new ArrayList<InetSocketAddress>(contacts); this.locators.set(new LocatorList(tmpContacts)); - this.liveLocators.set(new LocatorList(Collections.emptyList())); + this.onlineLocators.set(new LocatorList(Collections.emptyList())); this.initialLocators = Collections.unmodifiableList(tmpContacts); this.connectionTimeout = handshakeTimeout; this.serverGroup = serverGroup; @@ -193,11 +193,11 @@ public class AutoConnectionSourceImpl implements ConnectionSource { } @Override - public List<InetSocketAddress> getLiveLocators() { + public List<InetSocketAddress> getOnlineLocators() { if (PoolImpl.TEST_DURABLE_IS_NET_DOWN) { return Collections.emptyList(); } - return Collections.unmodifiableList(new ArrayList<>(liveLocators.get().getLocators())); + return Collections.unmodifiableList(new ArrayList<>(onlineLocators.get().getLocators())); } @@ -263,7 +263,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource { List<ServerLocation> locatorResponse = response.getLocators(); List<InetSocketAddress> newLocators = new ArrayList<InetSocketAddress>(locatorResponse.size()); - List<InetSocketAddress> activeLocators = + List<InetSocketAddress> newOnlineLocators = new ArrayList<InetSocketAddress>(locatorResponse.size()); Set<InetSocketAddress> badLocators = new HashSet<InetSocketAddress>(initialLocators); @@ -271,7 +271,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource { ServerLocation locator = itr.next(); InetSocketAddress address = new InetSocketAddress(locator.getHostName(), locator.getPort()); newLocators.add(address); - activeLocators.add(address); + newOnlineLocators.add(address); badLocators.remove(address); } @@ -300,7 +300,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource { } LocatorList newLocatorList = new LocatorList(newLocators); locators.set(newLocatorList); - liveLocators.set(new LocatorList(activeLocators)); + onlineLocators.set(new LocatorList(newOnlineLocators)); pool.getStats().setLocatorCount(newLocators.size()); } http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java index 64bc7d8..58b715f 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java @@ -76,9 +76,9 @@ public interface ConnectionSource { List<ServerLocation> getAllServers(); /** - * get the list of live locators + * get the list of online locators * - * @return a list of live locators + * @return a list of online locators */ - List<InetSocketAddress> getLiveLocators(); + List<InetSocketAddress> getOnlineLocators(); } http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java index 1a679ce..59dac22 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java @@ -265,7 +265,7 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource { } @Override - public List<InetSocketAddress> getLiveLocators() { + public List<InetSocketAddress> getOnlineLocators() { return Collections.emptyList(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java index 6f63557..a8dbcd3 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java @@ -443,8 +443,8 @@ public class PoolImpl implements InternalPool { } @Override - public List<InetSocketAddress> getLiveLocators() { - return this.source.getLiveLocators(); + public List<InetSocketAddress> getOnlineLocators() { + return this.source.getOnlineLocators(); } public List<InetSocketAddress> getServers() { http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java index 1af748e..48b763b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolFactoryImpl.java @@ -464,7 +464,7 @@ public class PoolFactoryImpl implements PoolFactory { } @Override - public List<InetSocketAddress> getLiveLocators() { + public List<InetSocketAddress> getOnlineLocators() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java index d944f2d..789d326 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java @@ -523,7 +523,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase { Assert.assertEquals(expectedOne, locator); } - List<InetSocketAddress> locators = pool.getLiveLocators(); + List<InetSocketAddress> locators = pool.getOnlineLocators(); Assert.assertEquals(expected.length, locators.size()); Arrays.sort(expected, Comparator.comparing(InetSocketAddress::getPort)); for (int i = 0; i < locators.size(); i++) { http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java index 1bb332f..385569c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java @@ -368,7 +368,7 @@ public class AutoConnectionSourceImplJUnitTest { return new ArrayList(); } - public List/* <InetSocketAddress> */ getLiveLocators() { + public List/* <InetSocketAddress> */ getOnlineLocators() { return new ArrayList(); } http://git-wip-us.apache.org/repos/asf/geode/blob/61f676b0/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java index 081ad8c..6afb501 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java @@ -377,7 +377,7 @@ public class QueueManagerJUnitTest { return null; } - public List getLiveLocators() { + public List getOnlineLocators() { return new ArrayList(); } @@ -604,7 +604,7 @@ public class QueueManagerJUnitTest { } @Override - public List<InetSocketAddress> getLiveLocators() { + public List<InetSocketAddress> getOnlineLocators() { return Collections.emptyList(); } }
