diff --git a/src/main/java/org/redkale/net/AsyncGroup.java b/src/main/java/org/redkale/net/AsyncGroup.java index 7c5fc0803..07882eee5 100644 --- a/src/main/java/org/redkale/net/AsyncGroup.java +++ b/src/main/java/org/redkale/net/AsyncGroup.java @@ -34,45 +34,47 @@ public abstract class AsyncGroup { return new AsyncIOGroup(threadNameFormat, workExecutor, safeBufferPool); } - public CompletableFuture createTCPClient(final SocketAddress address) { - return createTCPClient(address, 0); + public CompletableFuture createTCPClientConnection(final SocketAddress address) { + return AsyncGroup.this.createTCPClientConnection(address, 0); } /** * 创建TCP连接 * - * @see org.redkale.net.AsyncIOGroup#createTCPClient(java.net.SocketAddress, int) + * @see org.redkale.net.AsyncIOGroup#createTCPClientConnection(java.net.SocketAddress, int) * * @param address 地址 * @param connectTimeoutSeconds 连接超时 * @return AsyncConnection */ - public abstract CompletableFuture createTCPClient( + public abstract CompletableFuture createTCPClientConnection( SocketAddress address, int connectTimeoutSeconds); - public CompletableFuture createUDPClient(final SocketAddress address) { - return createUDPClient(address, 0); + public CompletableFuture createUDPClientConnection(final SocketAddress address) { + return AsyncGroup.this.createUDPClientConnection(address, 0); } /** * 创建UDP连接 * - * @see org.redkale.net.AsyncIOGroup#createUDPClient(java.net.SocketAddress, int) + * @see org.redkale.net.AsyncIOGroup#createUDPClientConnection(java.net.SocketAddress, int) * * @param address 地址 * @param connectTimeoutSeconds 连接超时 * @return AsyncConnection */ - public abstract CompletableFuture createUDPClient( + public abstract CompletableFuture createUDPClientConnection( SocketAddress address, int connectTimeoutSeconds); - public CompletableFuture createClient(final boolean tcp, final SocketAddress address) { - return tcp ? createTCPClient(address) : createUDPClient(address); + public CompletableFuture createClientConnection(final boolean tcp, final SocketAddress address) { + return tcp ? createTCPClientConnection(address) : createUDPClientConnection(address); } - public CompletableFuture createClient( + public CompletableFuture createClientConnection( boolean tcp, SocketAddress address, int connectTimeoutSeconds) { - return tcp ? createTCPClient(address, connectTimeoutSeconds) : createUDPClient(address, connectTimeoutSeconds); + return tcp + ? AsyncGroup.this.createTCPClientConnection(address, connectTimeoutSeconds) + : createUDPClientConnection(address, connectTimeoutSeconds); } /** diff --git a/src/main/java/org/redkale/net/AsyncIOGroup.java b/src/main/java/org/redkale/net/AsyncIOGroup.java index b49404cea..d2f4c82f3 100644 --- a/src/main/java/org/redkale/net/AsyncIOGroup.java +++ b/src/main/java/org/redkale/net/AsyncIOGroup.java @@ -246,7 +246,7 @@ public class AsyncIOGroup extends AsyncGroup { } @Override - public CompletableFuture createTCPClient(SocketAddress address, int connectTimeoutSeconds) { + public CompletableFuture createTCPClientConnection(SocketAddress address, int connectTimeoutSeconds) { Objects.requireNonNull(address); AsyncNioTcpConnection conn; try { @@ -322,7 +322,7 @@ public class AsyncIOGroup extends AsyncGroup { } @Override - public CompletableFuture createUDPClient(SocketAddress address, int connectTimeoutSeconds) { + public CompletableFuture createUDPClientConnection(SocketAddress address, int connectTimeoutSeconds) { AsyncNioUdpConnection conn; try { conn = newUDPClientConnection(address); diff --git a/src/main/java/org/redkale/net/Transport.java b/src/main/java/org/redkale/net/Transport.java index ce4b95a29..b6c318c4c 100644 --- a/src/main/java/org/redkale/net/Transport.java +++ b/src/main/java/org/redkale/net/Transport.java @@ -289,14 +289,14 @@ public final class Transport { try { if (!tcp) { // UDP SocketAddress udpaddr = rand ? nodes[0].address : addr; - return asyncGroup.createUDPClient(udpaddr, 6); + return asyncGroup.createUDPClientConnection(udpaddr, 6); } if (!rand) { // 指定地址 TransportNode node = findTransportNode(addr); if (node == null) { - return asyncGroup.createTCPClient(addr, 6); + return asyncGroup.createTCPClientConnection(addr, 6); } - return pollAsync(node, addr, () -> asyncGroup.createTCPClient(addr, 6)); + return pollAsync(node, addr, () -> asyncGroup.createTCPClientConnection(addr, 6)); } // ---------------------随机取地址------------------------ @@ -323,7 +323,7 @@ public final class Transport { } } return pollAsync(one, one.getAddress(), () -> { - return asyncGroup.createTCPClient(one.address, 6).whenComplete((c, t) -> { + return asyncGroup.createTCPClientConnection(one.address, 6).whenComplete((c, t) -> { one.disabletime = t == null ? 0 : System.currentTimeMillis(); }); }); @@ -345,7 +345,7 @@ public final class Transport { if (future.isDone()) { return future; } - asyncGroup.createTCPClient(node.address, 6).whenComplete((c, t) -> { + asyncGroup.createTCPClientConnection(node.address, 6).whenComplete((c, t) -> { if (c != null && !future.complete(c)) { node.connQueue.offer(c); } diff --git a/src/main/java/org/redkale/net/TransportFactory.java b/src/main/java/org/redkale/net/TransportFactory.java index 0f903ee9c..eadc0b91d 100644 --- a/src/main/java/org/redkale/net/TransportFactory.java +++ b/src/main/java/org/redkale/net/TransportFactory.java @@ -354,7 +354,7 @@ public class TransportFactory { continue; // 可用 } CompletableFuture future = - Utility.orTimeout(asyncGroup.createTCPClient(node.address), null, 2, TimeUnit.SECONDS); + Utility.orTimeout(asyncGroup.createTCPClientConnection(node.address), null, 2, TimeUnit.SECONDS); future.whenComplete((r, t) -> { node.disabletime = t == null ? 0 : System.currentTimeMillis(); if (r != null) { diff --git a/src/main/java/org/redkale/net/client/Client.java b/src/main/java/org/redkale/net/client/Client.java index 084c97b9f..f4d571a2f 100644 --- a/src/main/java/org/redkale/net/client/Client.java +++ b/src/main/java/org/redkale/net/client/Client.java @@ -347,7 +347,7 @@ public abstract class Client, R extends ClientR } final Queue> waitQueue = entry.connAcquireWaitings; if (!pool || entry.connOpenState.compareAndSet(false, true)) { - CompletableFuture future = group.createClient(tcp, addr, connectTimeoutSeconds) + CompletableFuture future = group.createClientConnection(tcp, addr, connectTimeoutSeconds) .thenApply(c -> (C) createClientConnection(c).setConnEntry(entry).setMaxPipelines(maxPipelines)); R virtualReq = createVirtualRequestAfterConnect();