Adjust the Waiters related javadocs

Author: Quanzzzz

codegen/src/main/java/software/amazon/awssdk/codegen/docs/WaiterDocs.java

@@ -42,8 +42,12 @@ public static CodeBlock waiterOperationJavadoc(ClassName className, Map.Entry<St
                                                                  + "enter into the desired state")
                                                     .param(operationModel.getInput().getVariableName(), "the request to be used"
                                                                                                         + " for polling")
-                                                    .returns("WaiterResponse containing either a response or an exception that "
-                                                             + "has matched with the waiter success condition")
+                                                    .returns(className.simpleName().contains("Async") ?
+                                                             "CompletableFuture of the WaiterResponse containing either a "
+                                                             + "response or an exception that has matched with the waiter "
+                                                             + "success condition"
+                                                             : "WaiterResponse containing either a response or an exception that"
+                                                             + " has matched with the waiter success condition")
                                                     .build();
         return CodeBlock.builder()
                         .add(javadocs, className, operationModel.getMethodName(), waiterDefinition.getKey())
@@ -64,8 +68,12 @@ public static CodeBlock waiterOperationConsumerBuilderJavadoc(ClassName clientCl
                                                                  + "to create one manually using {@link $T.builder()} ")
                                                     .param(operationModel.getInput().getVariableName(), "the request to be used"
                                                                                                         + " for polling")
-                                                    .returns("WaiterResponse containing either a response or an exception that "
-                                                             + "has matched with the waiter success condition")
+                                                    .returns(clientClassName.simpleName().contains("Async") ?
+                                                             "CompletableFuture of the WaiterResponse containing either a "
+                                                             + "response or an exception that has matched with the waiter "
+                                                             + "success condition"
+                                                             : "WaiterResponse containing either a response or an exception that"
+                                                             + " has matched with the waiter success condition")
                                                     .build();
         return CodeBlock.builder()
                         .add(javadocs, clientClassName, operationModel.getMethodName(), waiterDefinition.getKey(),

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

@@ -25,7 +25,7 @@ public interface QueryAsyncWaiter extends SdkAutoCloseable {
      *
      * @param aPostOperationRequest
      *        the request to be used for polling
-     * @return WaiterResponse containing either a response or an exception that has matched with the waiter success
+     * @return CompletableFuture of the WaiterResponse containing either a response or an exception that has matched with the waiter success
      *         condition
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(
@@ -42,7 +42,7 @@ default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostO
      *
      * @param aPostOperationRequest
      *        the request to be used for polling
-     * @return WaiterResponse containing either a response or an exception that has matched with the waiter success
+     * @return CompletableFuture of the WaiterResponse containing either a response or an exception that has matched with the waiter success
      *         condition
      */
     default CompletableFuture<WaiterResponse<APostOperationResponse>> waitUntilPostOperationSuccess(

core/sdk-core/src/main/java/software/amazon/awssdk/core/waiters/WaiterOverrideConfiguration.java

@@ -22,8 +22,8 @@
 import software.amazon.awssdk.utils.Validate;
 
 /**
- * Configuration values for the {@link Waiter}. All values are optional, and not specifying them
- * will use the default values.
+ * Configuration values for the {@link Waiter}. All values are optional, and the default values will be used
+ * if they are not specified.
  */
 @SdkPublicApi
 public final class WaiterOverrideConfiguration {