Skip to content

Commit a2daeb7

Browse files
committed
Rename QuicConnection#createStream to QuicConnection#openStream.
1 parent 570db1c commit a2daeb7

File tree

8 files changed

+20
-25
lines changed

8 files changed

+20
-25
lines changed

vertx-core/src/main/java/io/vertx/core/net/QuicConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ public interface QuicConnection {
5555
QuicConnection closeHandler(Handler<Void> handler);
5656

5757
/**
58-
* Create a bidirectional stream to the remote endpoint.
58+
* Open a bidirectional stream to the remote endpoint.
5959
*
6060
* @return a Quic stream as a future
6161
*/
62-
default Future<QuicStream> createStream() {
63-
return createStream(true);
62+
default Future<QuicStream> openStream() {
63+
return openStream(true);
6464
}
6565

6666
/**
67-
* Create a stream to the remote endpoint.
67+
* Open a stream to the remote endpoint with {@code bidirectional parameter} specifying its directionality.
6868
*
6969
* @param bidirectional whether the stream is unidirectional or bidirectional
7070
* @return A Quic stream as a future
7171
*/
72-
Future<QuicStream> createStream(boolean bidirectional);
72+
Future<QuicStream> openStream(boolean bidirectional);
7373

7474
/**
7575
* Set a handler called with the datagram addressed to this connection.

vertx-core/src/main/java/io/vertx/core/net/impl/quic/QuicConnectionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public Future<QuicStream> createStream(ContextInternal context) {
202202
}
203203

204204
@Override
205-
public Future<QuicStream> createStream(boolean bidirectional) {
205+
public Future<QuicStream> openStream(boolean bidirectional) {
206206
return createStream(vertx.getOrCreateContext(), bidirectional);
207207
}
208208

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public void testStreamLevel() {
200200
QuicClient client = QuicClient.create(vertx, clientOptions);
201201
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
202202
QuicConnectionInternal connection = (QuicConnectionInternal) client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
203-
QuicStreamInternal stream = (QuicStreamInternal) connection.createStream().await();
203+
QuicStreamInternal stream = (QuicStreamInternal) connection.openStream().await();
204204
ChannelPipeline pipeline = stream.channelHandlerContext().pipeline();
205205
pipeline.addBefore("handler", "http", new HttpClientCodec());
206206
pipeline.addBefore("handler", "aggregator", new HttpObjectAggregator(1014));

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicClientTest.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
*/
1111
package io.vertx.tests.net.quic;
1212

13-
import io.netty.channel.nio.NioEventLoopGroup;
14-
import io.netty.util.NetUtil;
1513
import io.vertx.core.Future;
1614
import io.vertx.core.buffer.Buffer;
1715
import io.vertx.core.net.*;
@@ -23,7 +21,6 @@
2321
import org.junit.runner.RunWith;
2422

2523
import javax.net.ssl.SSLHandshakeException;
26-
import java.net.InetSocketAddress;
2724
import java.time.Duration;
2825
import java.util.ArrayList;
2926
import java.util.Collections;
@@ -120,7 +117,7 @@ public void testCreateStream() throws Exception {
120117
server.bind(SocketAddress.inetSocketAddress(9999, "localhost")).await();
121118
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
122119
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
123-
QuicStream stream = connection.createStream().await();
120+
QuicStream stream = connection.openStream().await();
124121
List<Buffer> received = Collections.synchronizedList(new ArrayList<>());
125122
stream.handler(buff -> received.add(buff));
126123
CountDownLatch latch = new CountDownLatch(1);
@@ -151,7 +148,7 @@ public void testServerReset() {
151148

152149
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
153150
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
154-
QuicStream stream = connection.createStream().await();
151+
QuicStream stream = connection.openStream().await();
155152

156153
stream.exceptionHandler(t -> complete());
157154
stream.closeHandler(v -> complete());
@@ -179,7 +176,7 @@ public void testClientReset() {
179176

180177
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
181178
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
182-
QuicStream stream = connection.createStream().await();
179+
QuicStream stream = connection.openStream().await();
183180

184181
AtomicBoolean isReset = new AtomicBoolean();
185182
Buffer buffer = Buffer.buffer();
@@ -225,7 +222,7 @@ public void testClientResetHandler() {
225222

226223
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
227224
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
228-
QuicStream stream = connection.createStream().await();
225+
QuicStream stream = connection.openStream().await();
229226

230227
stream.exceptionHandler(t -> fail());
231228
stream.resetHandler(code -> {
@@ -275,7 +272,7 @@ public void testShutdown(boolean shutdownConnection) throws Exception {
275272

276273
AtomicInteger shutdownCount = new AtomicInteger();
277274
for (int i = 0;i < numStreams;i++) {
278-
QuicStream stream = connection.createStream().await();
275+
QuicStream stream = connection.openStream().await();
279276
stream.shutdownHandler(v -> {
280277
shutdownCount.incrementAndGet();
281278
vertx.setTimer(100, id -> {

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicContextTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void testServerConnectionScoped() {
7777
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
7878
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
7979
QuicStream stream = connection
80-
.createStream().await();
80+
.openStream().await();
8181
stream.end(Buffer.buffer("ping")).await();
8282
await();
8383
}
@@ -104,7 +104,7 @@ public void testServerStreamScoped() {
104104
Future.future(p -> workerContext.runOnContext(v -> server.bind(SocketAddress.inetSocketAddress(9999, "localhost")).onComplete(p))).await();
105105
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
106106
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
107-
QuicStream stream = connection.createStream().await();
107+
QuicStream stream = connection.openStream().await();
108108
stream.end(Buffer.buffer("ping")).await();
109109
await();
110110
}
@@ -145,7 +145,7 @@ public void testClientStreamScoped() {
145145

146146
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
147147

148-
QuicStream stream = Future.<QuicStream>future(p -> workerContext.runOnContext(v -> connection.createStream().onComplete(p))).await();
148+
QuicStream stream = Future.<QuicStream>future(p -> workerContext.runOnContext(v -> connection.openStream().onComplete(p))).await();
149149

150150
AtomicInteger cnt = new AtomicInteger();
151151
stream.handler(buff -> {
@@ -187,7 +187,7 @@ public void testStreamContextProvider() {
187187
server.bind(SocketAddress.inetSocketAddress(9999, "localhost")).await();
188188
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
189189
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
190-
QuicStream stream = connection.createStream().await();
190+
QuicStream stream = connection.openStream().await();
191191
stream.end(Buffer.buffer("ping")).await();
192192
await();
193193
}

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicFlowControlTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
package io.vertx.tests.net.quic;
1212

1313
import io.netty.buffer.ByteBuf;
14-
import io.netty.handler.codec.http.*;
15-
import io.netty.handler.codec.http3.*;
1614
import io.vertx.core.Completable;
1715
import io.vertx.core.buffer.Buffer;
1816
import io.vertx.core.internal.buffer.BufferInternal;
@@ -75,7 +73,7 @@ public void testFlowControl() {
7573
client.bind(SocketAddress.inetSocketAddress(0, "localhost")).await();
7674
QuicConnection connection = client.connect(SocketAddress.inetSocketAddress(9999, "localhost")).await();
7775
connection
78-
.createStream()
76+
.openStream()
7977
.onComplete(onSuccess2(stream -> {
8078
stream.pause();
8179
QuicStreamInternal streamInternal = (QuicStreamInternal) stream;

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicMetricsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private void testMetrics(int numberOfServers) throws Exception {
8989
FakeQuicEndpointMetrics clientMetrics = FakeTransportMetrics.getMetrics(client);
9090
assertEquals(1, clientMetrics.connectionCount());
9191
SocketMetric clientConnectionMetric = clientMetrics.firstMetric(clientConnection.remoteAddress());
92-
QuicStream clientStream = clientConnection.createStream().await();
92+
QuicStream clientStream = clientConnection.openStream().await();
9393
List<Buffer> received = Collections.synchronizedList(new ArrayList<>());
9494
clientStream.handler(buff -> received.add(buff));
9595
CountDownLatch latch = new CountDownLatch(1);

vertx-core/src/test/java/io/vertx/tests/net/quic/QuicServerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void testServerConnectionClose() throws Exception {
207207
public void testServerCreatesStream() throws Exception {
208208
QuicServer server = QuicServer.create(vertx, serverOptions());
209209
server.handler(conn -> {
210-
conn.createStream().onComplete(onSuccess2(stream -> {
210+
conn.openStream().onComplete(onSuccess2(stream -> {
211211
stream.write("ping");
212212
stream.handler(buff -> {
213213
assertEquals("pong", buff.toString());
@@ -235,7 +235,7 @@ public void testServerCreatesUniStream() throws Exception {
235235
disableThreadChecks();
236236
QuicServer server = QuicServer.create(vertx, serverOptions());
237237
server.handler(conn -> {
238-
conn.createStream(false).onComplete(onSuccess2(stream -> {
238+
conn.openStream(false).onComplete(onSuccess2(stream -> {
239239
assertFalse(stream.isBidirectional());
240240
assertTrue(stream.isLocalCreated());
241241
stream.write("ping");

0 commit comments

Comments
 (0)