Merge branch 'feature/master/apache5x' into joviegas/post-surface-api-review

Author: joviegas

.changes/next-release/bugfix-AWSSDKforJavav2-1c39709.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Improve error message for the error case where a request using RequestBody#fromInputStream failed to retry due to lack of mark and reset support. See [#6174](https://github.com/aws/aws-sdk-java-v2/issues/6174)"
+}

.changes/next-release/feature-AWSSDKforJavav2-65d4de2.json

@@ -1,6 +1,6 @@
 {
     "type": "feature",
-    "category": "AWS SDK for Java v2",
+    "category": "Apache HTTP Client 5",
     "contributor": "",
     "description": "Preview Release of AWS SDK Apache5 HttpClient with Apache HttpClient 5.5.x"
 }

core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/RequestBody.java

@@ -38,7 +38,6 @@
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.Header;
 import software.amazon.awssdk.utils.BinaryUtils;
-import software.amazon.awssdk.utils.IoUtils;
 
 /**
  * Represents the body of an HTTP request. Must be provided for operations that have a streaming input.
@@ -120,38 +119,29 @@ public static RequestBody fromFile(File file) {
      * Creates a {@link RequestBody} from an input stream. {@value Header#CONTENT_LENGTH} must
      * be provided so that the SDK does not have to make two passes of the data.
      * <p>
-     * The stream will not be closed by the SDK. It is up to to caller of this method to close the stream. The stream
-     * should not be read outside of the SDK (by another thread) as it will change the state of the {@link InputStream} and
+     * The stream will not be closed by the SDK. It is up to caller of this method to close the stream. The stream
+     * should not be read outside the SDK (by another thread) as it will change the state of the {@link InputStream} and
      * could tamper with the sending of the request.
      * <p>
      * To support resetting via {@link ContentStreamProvider}, this uses {@link InputStream#reset()} and uses a read limit of
      * 128 KiB. If you need more control, use {@link #fromContentProvider(ContentStreamProvider, long, String)} or
      * {@link #fromContentProvider(ContentStreamProvider, String)}.
      *
+     * <p>
+     * It is recommended to provide a stream that supports mark and reset for retry. If the stream does not support mark and
+     * reset, an {@link IllegalStateException} will be thrown during retry.
+     *
      * @param inputStream   Input stream to send to the service. The stream will not be closed by the SDK.
      * @param contentLength Content length of data in input stream. If a content length smaller than the actual size of the
      *                      object is set, the client will truncate the stream to the specified content length and only send
      *                      exactly the number of bytes equal to the content length.
      * @return RequestBody instance.
      */
     public static RequestBody fromInputStream(InputStream inputStream, long contentLength) {
-        IoUtils.markStreamWithMaxReadLimit(inputStream);
-        InputStream nonCloseable = nonCloseableInputStream(inputStream);
-        ContentStreamProvider provider = new ContentStreamProvider() {
-            @Override
-            public InputStream newStream() {
-                if (nonCloseable.markSupported()) {
-                    invokeSafely(nonCloseable::reset);
-                }
-                return nonCloseable;
-            }
-
-            @Override
-            public String name() {
-                return ProviderType.STREAM.getName();
-            }
-        };
-        return fromContentProvider(provider, contentLength, Mimetype.MIMETYPE_OCTET_STREAM);
+        ContentStreamProvider contentStreamProvider = ContentStreamProvider.fromInputStream(
+            nonCloseableInputStream(inputStream));
+        return fromContentProvider(contentStreamProvider,
+                                   contentLength, Mimetype.MIMETYPE_OCTET_STREAM);
     }
 
     /**

core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java

@@ -39,6 +39,7 @@
 import software.amazon.awssdk.checksums.SdkChecksum;
 import software.amazon.awssdk.core.internal.sync.BufferingContentStreamProvider;
 import software.amazon.awssdk.core.internal.util.Mimetype;
+import software.amazon.awssdk.testutils.RandomInputStream;
 import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.StringInputStream;
@@ -163,6 +164,17 @@ public void fromInputStream_streamSupportsReset_resetsTheStream() {
         assertThat(getCrc32(requestBody.contentStreamProvider().newStream())).isEqualTo(streamCrc32);
     }
 
+    @Test
+    public void fromInputStream_streamNotSupportReset_shouldThrowException() {
+        RandomInputStream stream = new RandomInputStream(100);
+        assertThat(stream.markSupported()).isFalse();
+        RequestBody requestBody = RequestBody.fromInputStream(stream, 100);
+        IoUtils.drainInputStream(requestBody.contentStreamProvider().newStream());
+        assertThatThrownBy(() -> requestBody.contentStreamProvider().newStream())
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Content input stream does not support mark/reset");
+    }
+
     private static String getCrc32(InputStream inputStream) {
         byte[] buff = new byte[1024];
         int read;

http-clients/apache5-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService

@@ -13,34 +13,4 @@
 # permissions and limitations under the License.
 #
 
-#
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-#  http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file is distributed
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-# express or implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-
-#
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-#  http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file is distributed
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-# express or implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-
 software.amazon.awssdk.http.apache5.Apache5SdkHttpService

pom.xml

@@ -825,7 +825,7 @@
                 <spotbugs.skip>true</spotbugs.skip>
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
-                <japicmp.skip>false</japicmp.skip>
+                <japicmp.skip>true</japicmp.skip>
                 <maven.javadoc.skip>true</maven.javadoc.skip>
             </properties>
         </profile>