Hooking up max connections (#304)

* Hooking up max connections to S3 client.

* Updating aws-c-s3 submodule.

Author: rccarper

crt/aws-c-s3

@@ -23,20 +23,26 @@ public class S3NativeClient implements AutoCloseable {
     private final S3Client s3Client;
     private final String signingRegion;
 
-    public S3NativeClient(final String signingRegion, final S3Client s3Client) {
-        this.signingRegion = signingRegion;
-        this.s3Client = s3Client;
-    }
-
     public S3NativeClient(final String signingRegion, final ClientBootstrap clientBootstrap,
             final CredentialsProvider credentialsProvider, final long partSizeBytes,
             final double targetThroughputGbps) {
+
+        this(signingRegion, clientBootstrap, credentialsProvider, partSizeBytes, targetThroughputGbps, 0);
+    }
+
+    public S3NativeClient(final String signingRegion, final ClientBootstrap clientBootstrap,
+            final CredentialsProvider credentialsProvider, final long partSizeBytes, final double targetThroughputGbps,
+            final int maxConnections) {
+
+        this(signingRegion, new S3Client(new S3ClientOptions().withClientBootstrap(clientBootstrap)
+                .withCredentialsProvider(credentialsProvider).withRegion(signingRegion).withPartSize(partSizeBytes)
+                .withThroughputTargetGbps(targetThroughputGbps).withMaxConnections(maxConnections)));
+    }
+
+    public S3NativeClient(final String signingRegion, final S3Client s3Client) {
         // keep signing region to construct Host header per-request
         this.signingRegion = signingRegion;
-        final S3ClientOptions clientOptions = new S3ClientOptions().withClientBootstrap(clientBootstrap)
-                .withCredentialsProvider(credentialsProvider).withRegion(signingRegion).withPartSize(partSizeBytes)
-                .withThroughputTargetGbps(targetThroughputGbps);
-        s3Client = new S3Client(clientOptions);
+        this.s3Client = s3Client;
     }
 
     private void addCustomHeaders(List<HttpHeader> headers, HttpHeader[] customHeaders) {

s3-native-client/src/main/java/com/amazonaws/s3/S3NativeClient.java

@@ -22,11 +22,11 @@ public class S3Client extends CrtResource {
     public S3Client(S3ClientOptions options) throws CrtRuntimeException {
         TlsContext tlsCtx = options.getTlsContext();
 
-        acquireNativeHandle(s3ClientNew(this, options.getRegion().getBytes(UTF8), 
+        acquireNativeHandle(s3ClientNew(this, options.getRegion().getBytes(UTF8),
                 options.getEndpoint() != null ? options.getEndpoint().getBytes(UTF8) : null,
                 options.getClientBootstrap().getNativeHandle(), tlsCtx != null ? tlsCtx.getNativeHandle() : 0,
-                options.getCredentialsProvider().getNativeHandle(),
-                options.getPartSize(), options.getThroughputTargetGbps()));
+                options.getCredentialsProvider().getNativeHandle(), options.getPartSize(),
+                options.getThroughputTargetGbps(), options.getMaxConnections()));
 
         addReferenceTo(options.getClientBootstrap());
         addReferenceTo(options.getCredentialsProvider());
@@ -40,13 +40,15 @@ private void onShutdownComplete() {
 
     public S3MetaRequest makeMetaRequest(S3MetaRequestOptions options) {
 
-        if(options.getHttpRequest() == null) {
-            Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client, "S3Client.makeMetaRequest has invalid options; Http Request cannot be null.");
+        if (options.getHttpRequest() == null) {
+            Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client,
+                    "S3Client.makeMetaRequest has invalid options; Http Request cannot be null.");
             return null;
         }
 
-        if(options.getResponseHandler() == null) {
-            Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client, "S3Client.makeMetaRequest has invalid options; Response Handler cannot be null.");
+        if (options.getResponseHandler() == null) {
+            Log.log(Log.LogLevel.Error, Log.LogSubject.S3Client,
+                    "S3Client.makeMetaRequest has invalid options; Response Handler cannot be null.");
             return null;
         }
 
@@ -56,7 +58,6 @@ public S3MetaRequest makeMetaRequest(S3MetaRequestOptions options) {
 
         byte[] httpRequestBytes = options.getHttpRequest().marshalForJni();
 
-
         long metaRequestNativeHandle = s3ClientMakeMetaRequest(getNativeHandle(), metaRequest,
                 options.getMetaRequestType().getNativeValue(), httpRequestBytes,
                 options.getHttpRequest().getBodyStream(), responseHandlerNativeAdapter);
@@ -95,11 +96,12 @@ public CompletableFuture<Void> getShutdownCompleteFuture() {
      * native methods
      ******************************************************************************/
     private static native long s3ClientNew(S3Client thisObj, byte[] region, byte[] endpoint, long clientBootstrap,
-            long tlsContext,
-            long signingConfig, long partSize, double throughputTargetGbps) throws CrtRuntimeException;
+            long tlsContext, long signingConfig, long partSize, double throughputTargetGbps, int maxConnections)
+            throws CrtRuntimeException;
 
     private static native void s3ClientDestroy(long client);
 
     private static native long s3ClientMakeMetaRequest(long clientId, S3MetaRequest metaRequest, int metaRequestType,
-            byte[] httpRequestBytes, HttpRequestBodyStream httpRequestBodyStream, S3MetaRequestResponseHandlerNativeAdapter responseHandlerNativeAdapter);
+            byte[] httpRequestBytes, HttpRequestBodyStream httpRequestBodyStream,
+            S3MetaRequestResponseHandlerNativeAdapter responseHandlerNativeAdapter);
 }

src/main/java/software/amazon/awssdk/crt/s3/S3Client.java

@@ -13,6 +13,7 @@ public class S3ClientOptions {
     private CredentialsProvider credentialsProvider;
     private long partSize;
     private double throughputTargetGbps;
+    private int maxConnections;
 
     public S3ClientOptions() {
 
@@ -80,4 +81,13 @@ public S3ClientOptions withTlsContext(TlsContext tlsContext) {
     public TlsContext getTlsContext() {
         return tlsContext;
     }
+
+    public S3ClientOptions withMaxConnections(int maxConnections) {
+        this.maxConnections = maxConnections;
+        return this;
+    }
+
+    public int getMaxConnections() {
+        return maxConnections;
+    }
 }

src/main/java/software/amazon/awssdk/crt/s3/S3ClientOptions.java

@@ -47,7 +47,8 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
     jlong jni_tls_ctx,
     jlong jni_credentials_provider,
     jlong part_size,
-    jdouble throughput_target_gbps) {
+    jdouble throughput_target_gbps,
+    int max_connections) {
     (void)jni_class;
 
     struct aws_allocator *allocator = aws_jni_get_allocator();
@@ -92,6 +93,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
     }
 
     struct aws_s3_client_config client_config = {
+        .max_active_connections_override = max_connections,
         .region = region,
         .client_bootstrap = client_bootstrap,
         .tls_connection_options = tls_options,