Minor refactoring to rename variables (#6763)

zoewangg · web-flow · commit c447fe362c5f · 2026-03-05T17:35:11.000-08:00
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
@@ -92,9 +92,9 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
          * we have a pool and no one can destroy it underneath us until we've finished submitting the
          * request)
          */
-        HttpStreamManager crtConnPool = getOrCreateConnectionPool(poolKey(asyncRequest.request()));
+        HttpStreamManager streamManager = getOrCreateConnectionPool(poolKey(asyncRequest.request()));
         CrtAsyncRequestContext context = CrtAsyncRequestContext.builder()
-                                                               .crtConnPool(crtConnPool)
+                                                               .streamManager(streamManager)
                                                                .readBufferSize(this.readBufferSize)
                                                                .request(asyncRequest)
                                                                .protocol(this.protocol)
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClient.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClient.java
@@ -95,9 +95,9 @@ public ExecutableHttpRequest prepareRequest(HttpExecuteRequest request) {
          * we have a pool and no one can destroy it underneath us until we've finished submitting the
          * request)
          */
-        HttpStreamManager crtConnPool = getOrCreateConnectionPool(poolKey(request.httpRequest()));
+        HttpStreamManager streamManager = getOrCreateConnectionPool(poolKey(request.httpRequest()));
         CrtRequestContext context = CrtRequestContext.builder()
-                                                     .crtConnPool(crtConnPool)
+                                                     .streamManager(streamManager)
                                                      .readBufferSize(this.readBufferSize)
                                                      .request(request)
                                                      .build();
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestContext.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestContext.java
@@ -25,14 +25,14 @@
 public final class CrtAsyncRequestContext {
     private final AsyncExecuteRequest request;
     private final long readBufferSize;
-    private final HttpStreamManager crtConnPool;
+    private final HttpStreamManager streamManager;
     private final MetricCollector metricCollector;
     private final Protocol protocol;
 
     private CrtAsyncRequestContext(Builder builder) {
         this.request = builder.request;
         this.readBufferSize = builder.readBufferSize;
-        this.crtConnPool = builder.crtConnPool;
+        this.streamManager = builder.streamManager;
         this.metricCollector = request.metricCollector().orElse(null);
         this.protocol = builder.protocol;
     }
@@ -53,8 +53,8 @@ public Protocol protocol() {
         return protocol;
     }
 
-    public HttpStreamManager crtConnPool() {
-        return crtConnPool;
+    public HttpStreamManager streamManager() {
+        return streamManager;
     }
 
     public MetricCollector metricCollector() {
@@ -64,7 +64,7 @@ public MetricCollector metricCollector() {
     public static final class Builder {
         private AsyncExecuteRequest request;
         private long readBufferSize;
-        private HttpStreamManager crtConnPool;
+        private HttpStreamManager streamManager;
         private Protocol protocol;
 
         private Builder() {
@@ -80,8 +80,8 @@ public Builder readBufferSize(long readBufferSize) {
             return this;
         }
 
-        public Builder crtConnPool(HttpStreamManager crtConnPool) {
-            this.crtConnPool = crtConnPool;
+        public Builder streamManager(HttpStreamManager streamManager) {
+            this.streamManager = streamManager;
             return this;
         }
 
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestExecutor.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestExecutor.java
@@ -71,13 +71,13 @@ private void doExecute(CrtAsyncRequestContext executionContext,
             CrtResponseAdapter.toCrtResponseHandler(requestFuture, asyncRequest.responseHandler());
 
         CompletableFuture<HttpStreamBase> streamFuture =
-            executionContext.crtConnPool().acquireStream(crtRequest, crtResponseHandler);
+            executionContext.streamManager().acquireStream(crtRequest, crtResponseHandler);
 
         long finalAcquireStartTime = acquireStartTime;
 
         streamFuture.whenComplete((stream, throwable) -> {
             if (shouldPublishMetrics) {
-                reportMetrics(executionContext.crtConnPool(), metricCollector, finalAcquireStartTime);
+                reportMetrics(executionContext.streamManager(), metricCollector, finalAcquireStartTime);
             }
 
             if (throwable != null) {
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestContext.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestContext.java
@@ -24,13 +24,13 @@
 public final class CrtRequestContext {
     private final HttpExecuteRequest request;
     private final long readBufferSize;
-    private final HttpStreamManager crtConnPool;
+    private final HttpStreamManager streamManager;
     private final MetricCollector metricCollector;
 
     private CrtRequestContext(Builder builder) {
         this.request = builder.request;
         this.readBufferSize = builder.readBufferSize;
-        this.crtConnPool = builder.crtConnPool;
+        this.streamManager = builder.streamManager;
         this.metricCollector = request.metricCollector().orElse(null);
     }
 
@@ -46,8 +46,8 @@ public long readBufferSize() {
         return readBufferSize;
     }
 
-    public HttpStreamManager crtConnPool() {
-        return crtConnPool;
+    public HttpStreamManager streamManager() {
+        return streamManager;
     }
 
     public MetricCollector metricCollector() {
@@ -57,7 +57,7 @@ public MetricCollector metricCollector() {
     public static final class Builder {
         private HttpExecuteRequest request;
         private long readBufferSize;
-        private HttpStreamManager crtConnPool;
+        private HttpStreamManager streamManager;
 
         private Builder() {
         }
@@ -72,8 +72,8 @@ public Builder readBufferSize(long readBufferSize) {
             return this;
         }
 
-        public Builder crtConnPool(HttpStreamManager crtConnPool) {
-            this.crtConnPool = crtConnPool;
+        public Builder streamManager(HttpStreamManager streamManager) {
+            this.streamManager = streamManager;
             return this;
         }
 
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutor.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutor.java
@@ -62,13 +62,13 @@ private void doExecute(CrtRequestContext executionContext, CompletableFuture<Sdk
         HttpRequest crtRequest = CrtRequestAdapter.toCrtRequest(executionContext);
 
         CompletableFuture<HttpStreamBase> streamFuture =
-            executionContext.crtConnPool().acquireStream(crtRequest, crtResponseHandler);
+            executionContext.streamManager().acquireStream(crtRequest, crtResponseHandler);
 
         long finalAcquireStartTime = acquireStartTime;
 
         streamFuture.whenComplete((streamBase, throwable) -> {
             if (shouldPublishMetrics) {
-                reportMetrics(executionContext.crtConnPool(), metricCollector, finalAcquireStartTime);
+                reportMetrics(executionContext.streamManager(), metricCollector, finalAcquireStartTime);
             }
 
             if (throwable != null) {
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtUtils.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtUtils.java
@@ -38,14 +38,19 @@
 @SdkInternalApi
 public final class CrtUtils {
     public static final int CRT_TLS_NEGOTIATION_ERROR_CODE = 1029;
+    /**
+     * Corresponds to CRT error: AWS_IO_SOCKET_TIMEOUT
+     */
     public static final int CRT_SOCKET_TIMEOUT = 1048;
 
+
     private CrtUtils() {
     }
 
     public static Throwable wrapWithIoExceptionIfRetryable(HttpException httpException) {
         Throwable toThrow = httpException;
 
+        // TODO: switch to Crt.awsIsTransientError once https://github.com/awslabs/aws-crt-java/pull/972 is merged
         if (HttpClientConnection.isErrorRetryable(httpException)) {
             // IOExceptions get retried, and if the CRT says this error is retryable,
             // it's semantically an IOException anyway.
diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H2ErrorTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/H2ErrorTest.java
@@ -49,6 +49,7 @@
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
 import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import org.junit.jupiter.api.AfterEach;
@@ -95,6 +96,20 @@ public void serverSendsRstStream_shouldThrowIOException() throws Exception {
         }
     }
 
+    @Test
+    public void tcpConnectFailure_shouldThrowIOException() throws Exception {
+        int unusedPort;
+        try (ServerSocket ss = new ServerSocket(0)) {
+            unusedPort = ss.getLocalPort();
+        }
+
+        CompletableFuture<?> request = sendGetRequest(unusedPort, client);
+        assertThatThrownBy(request::join)
+            .isInstanceOf(CompletionException.class)
+            .hasCauseInstanceOf(IOException.class)
+            .hasMessageContaining("An exception occurred");
+    }
+
     @Test
     public void serverSendsGoAway_shouldThrowIOException() throws Exception {
         H2ErrorServer server = new H2ErrorServer(ErrorType.GOAWAY);
diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestExecutorTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/CrtAsyncRequestExecutorTest.java
@@ -83,7 +83,7 @@ public void teardown() {
     @Test
     public void execute_requestConversionFails_invokesOnError() {
         CrtAsyncRequestContext context = CrtAsyncRequestContext.builder()
-                                                               .crtConnPool(streamManager)
+                                                               .streamManager(streamManager)
                                                                .request(AsyncExecuteRequest.builder()
                                                                                            .responseHandler(responseHandler)
                                                                                            .build())
@@ -210,7 +210,7 @@ private CrtAsyncRequestContext crtAsyncRequestContext() {
         SdkHttpFullRequest request = createRequest(URI.create("http://localhost"));
         return CrtAsyncRequestContext.builder()
                                      .readBufferSize(2000)
-                                     .crtConnPool(streamManager)
+                                     .streamManager(streamManager)
                                      .request(AsyncExecuteRequest.builder()
                                                             .request(request)
                                                             .requestContentPublisher(createProvider(""))
diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutorTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutorTest.java
@@ -83,7 +83,7 @@ public void teardown() {
     @Test
     public void execute_requestConversionFails_failsFuture() {
         CrtRequestContext context = CrtRequestContext.builder()
-                                                     .crtConnPool(streamManager)
+                                                     .streamManager(streamManager)
                                                      .request(HttpExecuteRequest.builder().build())
                                                      .build();
 
@@ -154,7 +154,7 @@ private CrtRequestContext crtRequestContext() {
         SdkHttpFullRequest request = createRequest(URI.create("http://localhost"));
         return CrtRequestContext.builder()
                                 .readBufferSize(2000)
-                                .crtConnPool(streamManager)
+                                .streamManager(streamManager)
                                 .request(HttpExecuteRequest.builder()
                                                            .request(request)
                                                            .contentStreamProvider(SdkBytes.fromUtf8String("test").asContentStreamProvider())
