Incorporate feedback

Author: Bennett Lynch

.changes/next-release/feature-AWSSDKforJavav2-0e09833.json

@@ -2,5 +2,5 @@
     "category": "AWS SDK for Java v2", 
     "contributor": "", 
     "type": "feature", 
-    "description": "Add new AsyncResponseTransformer: toPublisher(). This transformer allows users to directly consume a streaming-response payload (i.e., S3 GetObject) without having to buffer to memory or disk. This also allows users of Reactor/RxJava to more easily consume a streaming response (e.g., via Flux#from(Publisher))."
+    "description": "Add new AsyncResponseTransformer: toPublisher(). This transformer makes it more convenient for users to directly consume a streaming-response payload (i.e., S3 GetObject) with async clients. This also allows users of Reactor/RxJava to more easily consume a streaming response (e.g., via Flux#from(Publisher))."
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

@@ -67,7 +67,7 @@
 import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.core.async.listen.TmpUtil;
+import software.amazon.awssdk.core.async.listener.TmpUtil;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java

@@ -31,7 +31,7 @@
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.core.async.listen.TmpUtil;
+import software.amazon.awssdk.core.async.listener.TmpUtil;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java

@@ -30,7 +30,7 @@
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.core.async.listen.TmpUtil;
+import software.amazon.awssdk.core.async.listener.TmpUtil;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;

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

@@ -18,7 +18,7 @@
 import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.core.async.listen.TmpUtil;
+import software.amazon.awssdk.core.async.listener.TmpUtil;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.client.handler.AsyncClientHandler;

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java

@@ -23,7 +23,7 @@
 import software.amazon.awssdk.core.SdkPojoBuilder;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.core.async.listen.TmpUtil;
+import software.amazon.awssdk.core.async.listener.TmpUtil;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java

@@ -24,7 +24,7 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.core.async.listen.PublisherListener;
+import software.amazon.awssdk.core.async.listener.PublisherListener;
 import software.amazon.awssdk.utils.async.BufferingSubscriber;
 import software.amazon.awssdk.utils.async.FilteringSubscriber;
 import software.amazon.awssdk.utils.async.FlatteningSubscriber;

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listen/AsyncResponseTransformerListener.java renamed to core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listener/AsyncResponseTransformerListener.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.async.listen;
+package software.amazon.awssdk.core.async.listener;
 
 import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
 
@@ -22,6 +22,7 @@
 import org.reactivestreams.Subscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
@@ -66,7 +67,7 @@ static <ResponseT, ResultT> AsyncResponseTransformer<ResponseT, ResultT> wrap(
         return new NotifyingAsyncResponseTransformer<>(delegate, listener);
     }
 
-    @SdkProtectedApi
+    @SdkInternalApi
     final class NotifyingAsyncResponseTransformer<ResponseT, ResultT> implements AsyncResponseTransformer<ResponseT, ResultT> {
         private static final Logger log = LoggerFactory.getLogger(NotifyingAsyncResponseTransformer.class);
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listen/PublisherListener.java renamed to core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listener/PublisherListener.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.async.listen;
+package software.amazon.awssdk.core.async.listener;
 
 
 import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
@@ -22,6 +22,7 @@
 import org.reactivestreams.Subscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.utils.FunctionalUtils.UnsafeRunnable;
@@ -48,7 +49,7 @@ static <T> SdkPublisher<T> wrap(SdkPublisher<T> delegate, PublisherListener<T> l
         return new NotifyingPublisher<>(delegate, listener);
     }
 
-    @SdkProtectedApi
+    @SdkInternalApi
     final class NotifyingPublisher<T> implements SdkPublisher<T> {
         private static final Logger log = LoggerFactory.getLogger(NotifyingPublisher.class);
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listen/SubscriberListener.java renamed to core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listener/SubscriberListener.java

@@ -13,14 +13,15 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.async.listen;
+package software.amazon.awssdk.core.async.listener;
 
 import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.utils.FunctionalUtils.UnsafeRunnable;
 import software.amazon.awssdk.utils.Validate;
@@ -64,7 +65,7 @@ static <T> Subscriber<T> wrap(Subscriber<? super T> delegate, SubscriberListener
         return new NotifyingSubscriber<>(delegate, listener);
     }
 
-    @SdkProtectedApi
+    @SdkInternalApi
     final class NotifyingSubscriber<T> implements Subscriber<T> {
         private static final Logger log = LoggerFactory.getLogger(NotifyingSubscriber.class);
 
@@ -104,7 +105,7 @@ static void invoke(UnsafeRunnable runnable, String callbackName) {
             runAndLogError(log, callbackName + " callback failed. This exception will be dropped.", runnable);
         }
 
-        @SdkProtectedApi
+        @SdkInternalApi
         final class NotifyingSubscription implements Subscription {
             private final Subscription delegateSubscription;
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listen/TmpUtil.java renamed to core/sdk-core/src/main/java/software/amazon/awssdk/core/async/listener/TmpUtil.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.async.listen;
+package software.amazon.awssdk.core.async.listener;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
@@ -28,12 +28,12 @@ public class TmpUtil {
      * Wrap a {@link AsyncResponseTransformer} and associate it with a future that is completed upon end-of-stream, regardless of
      * whether the transformer is configured to complete its future upon end-of-response or end-of-stream.
      */
-    public static <A, B> Pair<AsyncResponseTransformer<A, B>, CompletableFuture<Void>> wrapWithEndOfStreamFuture(
-        AsyncResponseTransformer<A, B> responseTransformer) {
+    public static <ResponseT, ResultT> Pair<AsyncResponseTransformer<ResponseT, ResultT>, CompletableFuture<Void>>
+    wrapWithEndOfStreamFuture(AsyncResponseTransformer<ResponseT, ResultT> responseTransformer) {
         CompletableFuture<Void> future = new CompletableFuture<>();
-        AsyncResponseTransformer<A, B> wrapped = AsyncResponseTransformerListener.wrap(
+        AsyncResponseTransformer<ResponseT, ResultT> wrapped = AsyncResponseTransformerListener.wrap(
             responseTransformer,
-            new AsyncResponseTransformerListener<A>() {
+            new AsyncResponseTransformerListener<ResponseT>() {
                 @Override
                 public void transformerExceptionOccurred(Throwable t) {
                     future.completeExceptionally(t);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/progress/TransferProgressUpdater.java

@@ -23,7 +23,7 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.core.async.listen.AsyncResponseTransformerListener;
+import software.amazon.awssdk.core.async.listener.AsyncResponseTransformerListener;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.transfer.s3.CompletedObjectTransfer;
 import software.amazon.awssdk.transfer.s3.TransferObjectRequest;