Removing unnecessary changes

Author: RanVaknin

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/waiters/query-async-waiter-class.java

@@ -164,4 +164,4 @@ public QueryAsyncWaiter build() {
             return new DefaultQueryAsyncWaiter(this);
         }
     }
-}
+}

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/waiters/query-async-waiter-interface.java

@@ -34,7 +34,7 @@ public interface QueryAsyncWaiter extends SdkAutoCloseable {
      *         desired state.
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(
-        APostOperationRequest aPostOperationRequest) {
+            APostOperationRequest aPostOperationRequest) {
         throw new UnsupportedOperationException();
     }
 
@@ -51,7 +51,7 @@ default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostO
      *         with the waiter success condition
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(
-        Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
+            Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
         return waitUntilPostOperationSuccess(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build());
     }
 
@@ -67,7 +67,7 @@ default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostO
      *         condition
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(
-        APostOperationRequest aPostOperationRequest, WaiterOverrideConfiguration overrideConfig) {
+            APostOperationRequest aPostOperationRequest, WaiterOverrideConfiguration overrideConfig) {
         throw new UnsupportedOperationException();
     }
 
@@ -86,10 +86,10 @@ default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostO
      *         condition
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(
-        Consumer<APostOperationRequest.Builder> aPostOperationRequest,
-        Consumer<WaiterOverrideConfiguration.Builder> overrideConfig) {
+            Consumer<APostOperationRequest.Builder> aPostOperationRequest,
+            Consumer<WaiterOverrideConfiguration.Builder> overrideConfig) {
         return waitUntilPostOperationSuccess(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build(),
-                                             WaiterOverrideConfiguration.builder().applyMutation(overrideConfig).build());
+                WaiterOverrideConfiguration.builder().applyMutation(overrideConfig).build());
     }
 
     /**
@@ -171,4 +171,4 @@ default Builder overrideConfiguration(Consumer<WaiterOverrideConfiguration.Build
          */
         QueryAsyncWaiter build();
     }
-}
+}

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/waiters/query-sync-waiter-class.java

@@ -138,4 +138,4 @@ public QueryWaiter build() {
             return new DefaultQueryWaiter(this);
         }
     }
-}
+}

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/waiters/query-sync-waiter-interface.java

@@ -47,7 +47,7 @@ default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(APo
      *         condition
      */
     default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(
-        Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
+            Consumer<APostOperationRequest.Builder> aPostOperationRequest) {
         return waitUntilPostOperationSuccess(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build());
     }
 
@@ -63,7 +63,7 @@ default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(
      *         condition
      */
     default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(APostOperationRequest aPostOperationRequest,
-                                                                                 WaiterOverrideConfiguration overrideConfig) {
+            WaiterOverrideConfiguration overrideConfig) {
         throw new UnsupportedOperationException();
     }
 
@@ -82,10 +82,10 @@ default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(APo
      *         condition
      */
     default WaiterResponse<APostOperationResponse> waitUntilPostOperationSuccess(
-        Consumer<APostOperationRequest.Builder> aPostOperationRequest,
-        Consumer<WaiterOverrideConfiguration.Builder> overrideConfig) {
+            Consumer<APostOperationRequest.Builder> aPostOperationRequest,
+            Consumer<WaiterOverrideConfiguration.Builder> overrideConfig) {
         return waitUntilPostOperationSuccess(APostOperationRequest.builder().applyMutation(aPostOperationRequest).build(),
-                                             WaiterOverrideConfiguration.builder().applyMutation(overrideConfig).build());
+                WaiterOverrideConfiguration.builder().applyMutation(overrideConfig).build());
     }
 
     /**
@@ -155,4 +155,4 @@ default Builder overrideConfiguration(Consumer<WaiterOverrideConfiguration.Build
          */
         QueryWaiter build();
     }
-}
+}

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryStrategySetupUsingRetryMode.java

@@ -53,8 +53,7 @@ public void sdkRetryStrategyDoesNotRetryOnAWSRetryableErrors() {
         ProtocolRestJsonClient client =
             client(b -> b.overrideConfiguration(o -> o.retryStrategy(SdkDefaultRetryStrategy.standardRetryStrategy())));
         assertThrows(ProtocolRestJsonException.class, () -> callAllTypes(client));
-        // One request, i.e.,ere were retries.
-        //         verifyRequestCount(3); no retries.
+        // One request, i.e., no retries.
         verifyRequestCount(1);
     }
 

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java

@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import java.util.ArrayList;
 import java.util.List;
 import org.assertj.core.util.Arrays;