You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/12/06 14:30:55 UTC
[tinkerpop] branch driver-35 updated: Renamed ConnectionPoolImpl to
DefaultConnectionPool
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch driver-35
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/driver-35 by this push:
new eeb8233 Renamed ConnectionPoolImpl to DefaultConnectionPool
eeb8233 is described below
commit eeb8233e0deb6b04ac2cd633a90760ef11c42383
Author: stephen <sp...@gmail.com>
AuthorDate: Fri Dec 6 09:30:10 2019 -0500
Renamed ConnectionPoolImpl to DefaultConnectionPool
We tend not to use the Impl suffix typically....
---
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 ++--
.../{ConnectionPoolImpl.java => DefaultConnectionPool.java} | 8 ++++----
.../driver/ClientSingleRequestConnectionIntegrateTest.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 987948e..764d4be 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -535,7 +535,7 @@ public abstract class Client {
protected void initializeImplementation() {
cluster.allHosts().forEach(host -> {
try {
- final ConnectionPool connectionPool = ConnectionPoolImpl.create(host, cluster);
+ final ConnectionPool connectionPool = DefaultConnectionPool.create(host, cluster);
hostConnectionPools.put(host, connectionPool);
// added a new host to the cluster so let the load-balancer know
@@ -752,7 +752,7 @@ public abstract class Client {
if (hosts.isEmpty()) throw new IllegalStateException("No available host in the cluster");
Collections.shuffle(hosts);
final Host host = hosts.get(0);
- connectionPool = ConnectionPoolImpl.create(host, cluster);
+ connectionPool = DefaultConnectionPool.create(host, cluster);
}
@Override
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/DefaultConnectionPool.java
similarity index 97%
rename from gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java
rename to gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/DefaultConnectionPool.java
index 32bf7d8..fec46e6 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/DefaultConnectionPool.java
@@ -43,8 +43,8 @@ import java.util.concurrent.atomic.AtomicReference;
* Connection pool combines two entities. One is the underlying Netty channel pool and another is
* the Connection whose lifetime is synonymous with a request.
*/
-public class ConnectionPoolImpl implements ConnectionPool {
- private static final Logger logger = LoggerFactory.getLogger(ConnectionPoolImpl.class);
+public class DefaultConnectionPool implements ConnectionPool {
+ private static final Logger logger = LoggerFactory.getLogger(DefaultConnectionPool.class);
private final Host host;
private final Cluster cluster;
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>(null);
@@ -71,7 +71,7 @@ public class ConnectionPoolImpl implements ConnectionPool {
* @return A connection pool which has initialized its internal implementation.
*/
public static ConnectionPool create(final Host host, final Cluster cluster) {
- final ConnectionPoolImpl connPool = new ConnectionPoolImpl(host, cluster);
+ final DefaultConnectionPool connPool = new DefaultConnectionPool(host, cluster);
connPool.init();
logger.info("Created {}", connPool);
@@ -79,7 +79,7 @@ public class ConnectionPoolImpl implements ConnectionPool {
return connPool;
}
- private ConnectionPoolImpl(final Host host, final Cluster cluster) {
+ private DefaultConnectionPool(final Host host, final Cluster cluster) {
this.host = host;
this.cluster = cluster;
this.activeChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java
index 63b4fe1..1dd62f5 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java
@@ -72,7 +72,7 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS
}
if (name.getMethodName().equals("testGracefulClose") || name.getMethodName().equals("testAbruptClose")) {
- final org.apache.log4j.Logger connectionPoolLogger = org.apache.log4j.Logger.getLogger(ConnectionPoolImpl.class);
+ final org.apache.log4j.Logger connectionPoolLogger = org.apache.log4j.Logger.getLogger(DefaultConnectionPool.class);
previousLogLevel = connectionPoolLogger.getLevel();
connectionPoolLogger.setLevel(Level.INFO);
}
@@ -95,7 +95,7 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS
}
if (name.getMethodName().equals("testGracefulClose") || name.getMethodName().equals("testAbruptClose")) {
- final org.apache.log4j.Logger connectionLogger = org.apache.log4j.Logger.getLogger(ConnectionPoolImpl.class);
+ final org.apache.log4j.Logger connectionLogger = org.apache.log4j.Logger.getLogger(DefaultConnectionPool.class);
connectionLogger.setLevel(previousLogLevel);
}