Move CrtRequestBodyAdapter to crt-core

Author: dagnir

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/CrtRequestBodyAdapter.java renamed to core/crt-core/src/main/java/software/amazon/awssdk/crtcore/CrtRequestBodyAdapter.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.http.auth.aws.crt.internal.signer;
+package software.amazon.awssdk.crtcore;
 
 import java.nio.ByteBuffer;
 import org.reactivestreams.Publisher;
@@ -29,10 +29,14 @@ public final class CrtRequestBodyAdapter implements HttpRequestBodyStream {
     private final long contentLength;
     private ByteBufferStoringSubscriber requestBodySubscriber;
 
-    public CrtRequestBodyAdapter(Publisher<ByteBuffer> requestPublisher, long contentLength) {
+    public CrtRequestBodyAdapter(Publisher<ByteBuffer> requestPublisher, long contentLength, long readLimit) {
         this.requestPublisher = requestPublisher;
         this.contentLength = contentLength;
-        this.requestBodySubscriber = new ByteBufferStoringSubscriber(BUFFER_SIZE);
+        this.requestBodySubscriber = new ByteBufferStoringSubscriber(readLimit);
+    }
+
+    public CrtRequestBodyAdapter(Publisher<ByteBuffer> requestPublisher, long contentLength) {
+        this(requestPublisher, contentLength, BUFFER_SIZE);
     }
 
     @Override

core/http-auth-aws/pom.xml

@@ -69,6 +69,12 @@
             <artifactId>checksums</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>crt-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>http-auth-aws-crt</artifactId>

core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtHttpRequestConverter.java

@@ -28,10 +28,10 @@
 import software.amazon.awssdk.crt.http.HttpHeader;
 import software.amazon.awssdk.crt.http.HttpRequest;
 import software.amazon.awssdk.crt.http.HttpRequestBodyStream;
+import software.amazon.awssdk.crtcore.CrtRequestBodyAdapter;
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.crt.internal.io.CrtInputStream;
-import software.amazon.awssdk.http.auth.aws.crt.internal.signer.CrtRequestBodyAdapter;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
 import software.amazon.awssdk.utils.uri.SdkUri;

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

@@ -22,10 +22,12 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.crt.http.HttpHeader;
 import software.amazon.awssdk.crt.http.HttpRequest;
+import software.amazon.awssdk.crtcore.CrtRequestBodyAdapter;
 import software.amazon.awssdk.http.Header;
 import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkHttpContentPublisher;
 import software.amazon.awssdk.http.crt.internal.CrtAsyncRequestContext;
 import software.amazon.awssdk.http.crt.internal.CrtRequestContext;
 
@@ -50,10 +52,13 @@ public static HttpRequest toAsyncCrtRequest(CrtAsyncRequestContext request) {
 
         HttpHeader[] crtHeaderArray = asArray(createAsyncHttpHeaderList(sdkRequest.getUri(), sdkExecuteRequest));
 
+        SdkHttpContentPublisher contentPublisher = sdkExecuteRequest.requestContentPublisher();
+
         return new HttpRequest(method,
                                encodedPath + encodedQueryString,
                                crtHeaderArray,
-                               new CrtRequestBodyAdapter(sdkExecuteRequest.requestContentPublisher(),
+                               new CrtRequestBodyAdapter(contentPublisher,
+                                                         contentPublisher.contentLength().orElse(0L),
                                                          request.readBufferSize()));
     }