Handled comments

Author: joviegas

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntityTest.java

@@ -26,12 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
@@ -181,6 +176,7 @@ void isRepeatable_WithNonMarkSupportedStream_ReturnsFalse() {
             public int read() {
                 return -1;
             }
+
             @Override
             public boolean markSupported() {
                 return false;
@@ -208,7 +204,7 @@ void writeTo_FirstAttempt_DoesNotResetStream() throws IOException {
         AtomicInteger resetCallCount = new AtomicInteger(0);
         ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
             @Override
-            public synchronized void reset()  {
+            public synchronized void reset() {
                 resetCallCount.incrementAndGet();
                 super.reset();
             }
@@ -239,7 +235,7 @@ void writeTo_SubsequentAttemptWithRepeatableStream_ResetsStream() throws IOExcep
         AtomicInteger resetCallCount = new AtomicInteger(0);
         ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
             @Override
-            public synchronized void reset()  {
+            public synchronized void reset() {
                 resetCallCount.incrementAndGet();
                 super.reset();
             }
@@ -452,8 +448,8 @@ void writeTo_MultipleWrites_AllSucceed() throws IOException {
     }
 
     @Test
-    @DisplayName("Entity should handle mixed headers correctly")
-    void constructor_WithMixedHeaders_HandlesAllCorrectly() {
+    @DisplayName("Entity should handle multiple headers correctly")
+    void constructor_WithMultiHeaders_HandlesAllCorrectly() {
         // Given
         SdkHttpRequest httpRequest = httpRequestBuilder
             .putHeader("Content-Length", "2048")
@@ -548,8 +544,8 @@ public boolean markSupported() {
     }
 
     @Test
-    @DisplayName("Entity should handle partial stream reads")
-    void writeTo_PartialReads_CompletesSuccessfully() throws IOException {
+    @DisplayName("Entity should handle non repeatable data arriving in chunks")
+    void writeTo_withChunkedReads_CompletesSuccessfully() throws IOException {
         // Given - Stream that returns data in small chunks
         String content = "This is a test content that will be read in chunks";
         InputStream chunkingStream = new InputStream() {
@@ -650,7 +646,6 @@ public synchronized void reset() throws IOException {
         entity.writeTo(output1);
         entity.writeTo(output2);
 
-
         assertEquals(content, output1.toString());
         assertEquals(content, output2.toString());
     }

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

@@ -148,8 +148,6 @@ private ConnectionManagerAwareHttpClient createClient(Apache5HttpClient.DefaultB
         ApacheConnectionManagerFactory cmFactory = new ApacheConnectionManagerFactory();
 
         HttpClientBuilder builder = HttpClients.custom();
-        //This is done to keep backward compatibility with Apache 4.x
-        builder.disableRedirectHandling();
 
         // Note that it is important we register the original connection manager with the
         // IdleConnectionReaper as it's required for the successful deregistration of managers
@@ -166,7 +164,9 @@ private ConnectionManagerAwareHttpClient createClient(Apache5HttpClient.DefaultB
                .disableContentCompression()
                .setKeepAliveStrategy(buildKeepAliveStrategy(standardOptions))
                .setUserAgent("") // SDK will set the user agent header in the pipeline. Don't let Apache waste time
-               .setConnectionManager(ClientConnectionManagerFactory.wrap(cm));
+               .setConnectionManager(ClientConnectionManagerFactory.wrap(cm))
+               //This is done to keep backward compatibility with Apache 4.x
+               .disableRedirectHandling();
 
         addProxyConfig(builder, configuration);
 

http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/internal/RepeatableInputStreamRequestEntityTest.java

@@ -448,8 +448,8 @@ void writeTo_MultipleWrites_AllSucceed() throws IOException {
     }
 
     @Test
-    @DisplayName("Entity should handle mixed headers correctly")
-    void constructor_WithMixedHeaders_HandlesAllCorrectly() {
+    @DisplayName("Entity should handle multiple headers correctly")
+    void constructor_WithMultiHeaders_HandlesAllCorrectly() {
         // Given
         SdkHttpRequest httpRequest = httpRequestBuilder
             .putHeader("Content-Length", "2048")
@@ -548,8 +548,8 @@ public boolean markSupported() {
     }
 
     @Test
-    @DisplayName("Entity should handle partial stream reads")
-    void writeTo_PartialReads_CompletesSuccessfully() throws IOException {
+    @DisplayName("Entity should handle non repeatable data arriving in chunks")
+    void writeTo_withChunkedReads_CompletesSuccessfully() throws IOException {
         // Given - Stream that returns data in small chunks
         String content = "This is a test content that will be read in chunks";
         InputStream chunkingStream = new InputStream() {
@@ -594,10 +594,7 @@ public boolean markSupported() {
         entity = new RepeatableInputStreamRequestEntity(request);
         ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-
         entity.writeTo(output);
-
-
         assertEquals(content, output.toString());
     }