CRT HTTP/1 GA - Surface Area Updates - readBufferSizeInBytes takes long (#3714)

* readBufferSizeInBytes takes long

* Fixed review comments

Author: dave-fn

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java

@@ -76,7 +76,7 @@ public final class AwsCrtAsyncHttpClient implements SdkAsyncHttpClient {
     private static final Logger log = Logger.loggerFor(AwsCrtAsyncHttpClient.class);
 
     private static final String AWS_COMMON_RUNTIME = "AwsCommonRuntime";
-    private static final int DEFAULT_STREAM_WINDOW_SIZE = 16 * 1024 * 1024; // 16 MB
+    private static final long DEFAULT_STREAM_WINDOW_SIZE = 16L * 1024L * 1024L; // 16 MB
 
     private final Map<URI, HttpClientConnectionManager> connectionPools = new ConcurrentHashMap<>();
     private final LinkedList<CrtResource> ownedSubResources = new LinkedList<>();
@@ -86,7 +86,7 @@ public final class AwsCrtAsyncHttpClient implements SdkAsyncHttpClient {
     private final HttpProxyOptions proxyOptions;
     private final HttpMonitoringOptions monitoringOptions;
     private final long maxConnectionIdleInMilliseconds;
-    private final int readBufferSize;
+    private final long readBufferSize;
     private final int maxConnectionsPerEndpoint;
     private boolean isClosed = false;
 
@@ -107,7 +107,7 @@ private AwsCrtAsyncHttpClient(DefaultBuilder builder, AttributeMap config) {
             this.bootstrap = registerOwnedResource(clientBootstrap);
             this.socketOptions = registerOwnedResource(clientSocketOptions);
             this.tlsContext = registerOwnedResource(clientTlsContext);
-            this.readBufferSize = builder.readBufferSize == null ?  DEFAULT_STREAM_WINDOW_SIZE : builder.readBufferSize;
+            this.readBufferSize = builder.readBufferSize == null ? DEFAULT_STREAM_WINDOW_SIZE : builder.readBufferSize;
             this.maxConnectionsPerEndpoint = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
             this.monitoringOptions = revolveHttpMonitoringOptions(builder.connectionHealthConfiguration);
             this.maxConnectionIdleInMilliseconds = config.get(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).toMillis();
@@ -213,7 +213,7 @@ private HttpClientConnectionManager createConnectionPool(URI uri) {
                 .withSocketOptions(socketOptions)
                 .withTlsContext(tlsContext)
                 .withUri(uri)
-                .withWindowSize(readBufferSize)
+                .withWindowSize(NumericUtils.saturatedCast(readBufferSize))
                 .withMaxConnections(maxConnectionsPerEndpoint)
                 .withManualWindowManagement(true)
                 .withProxyOptions(proxyOptions)
@@ -326,12 +326,11 @@ public interface Builder extends SdkAsyncHttpClient.Builder<AwsCrtAsyncHttpClien
          * client before we stop reading from the underlying TCP socket and wait for the Subscriber
          * to read more data.
          *
-         * @param readBufferSize The number of bytes that can be buffered
+         * @param readBufferSize The number of bytes that can be buffered. The maximum buffering size value is
+         *                       capped at {@code Integer.MAX}.
          * @return The builder of the method chaining.
-         *
-         * TODO: This is also used for the write buffer size. Should we rename it?
          */
-        Builder readBufferSizeInBytes(Integer readBufferSize);
+        Builder readBufferSizeInBytes(Long readBufferSize);
 
         /**
          * Sets the http proxy configuration to use for this client.
@@ -427,7 +426,7 @@ Builder tcpKeepAliveConfiguration(Consumer<TcpKeepAliveConfiguration.Builder>
      */
     private static final class DefaultBuilder implements Builder {
         private final AttributeMap.Builder standardOptions = AttributeMap.builder();
-        private Integer readBufferSize;
+        private Long readBufferSize;
         private ProxyConfiguration proxyConfiguration;
         private ConnectionHealthConfiguration connectionHealthConfiguration;
         private TcpKeepAliveConfiguration tcpKeepAliveConfiguration;
@@ -456,7 +455,7 @@ public Builder maxConcurrency(Integer maxConcurrency) {
         }
 
         @Override
-        public Builder readBufferSizeInBytes(Integer readBufferSize) {
+        public Builder readBufferSizeInBytes(Long readBufferSize) {
             Validate.isPositiveOrNull(readBufferSize, "readBufferSize");
             this.readBufferSize = readBufferSize;
             return this;

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestContext.java

@@ -23,7 +23,7 @@
 @SdkInternalApi
 public final class CrtRequestContext {
     private final AsyncExecuteRequest request;
-    private final int readBufferSize;
+    private final long readBufferSize;
     private final HttpClientConnectionManager crtConnPool;
     private final MetricCollector metricCollector;
 
@@ -42,7 +42,7 @@ public AsyncExecuteRequest sdkRequest() {
         return request;
     }
 
-    public int readBufferSize() {
+    public long readBufferSize() {
         return readBufferSize;
     }
 
@@ -56,7 +56,7 @@ public MetricCollector metricCollector() {
 
     public static class Builder {
         private AsyncExecuteRequest request;
-        private int readBufferSize;
+        private long readBufferSize;
         private HttpClientConnectionManager crtConnPool;
 
         private Builder() {
@@ -67,7 +67,7 @@ public Builder request(AsyncExecuteRequest request) {
             return this;
         }
 
-        public Builder readBufferSize(int readBufferSize) {
+        public Builder readBufferSize(long readBufferSize) {
             this.readBufferSize = readBufferSize;
             return this;
         }

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/request/CrtRequestBodyAdapter.java

@@ -27,7 +27,7 @@ final class CrtRequestBodyAdapter implements HttpRequestBodyStream {
     private final SdkHttpContentPublisher requestPublisher;
     private final ByteBufferStoringSubscriber requestBodySubscriber;
 
-    CrtRequestBodyAdapter(SdkHttpContentPublisher requestPublisher, int readLimit) {
+    CrtRequestBodyAdapter(SdkHttpContentPublisher requestPublisher, long readLimit) {
         this.requestPublisher = requestPublisher;
         this.requestBodySubscriber = new ByteBufferStoringSubscriber(readLimit);
         requestPublisher.subscribe(requestBodySubscriber);