Cleanup ReviewBeforeRelease

Author: zoewangg

core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.awscore.client.handler;
 
 import software.amazon.awssdk.annotations.Immutable;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.awscore.internal.client.config.AwsClientOptionValidation;
@@ -38,7 +37,6 @@
  */
 @ThreadSafe
 @Immutable
-@ReviewBeforeRelease("This looks identical to the Sdk version, revisit when we add APIG back")
 @SdkProtectedApi
 public final class AwsSyncClientHandler extends SdkSyncClientHandler implements SyncClientHandler {
 

core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java

@@ -18,7 +18,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import software.amazon.awssdk.annotations.NotThreadSafe;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadata;
@@ -29,8 +28,8 @@
  */
 @NotThreadSafe
 @SdkProtectedApi
-@ReviewBeforeRelease("We may not need this anymore, we should default to AWS partition when resolving"
-                     + "a region we don't know about yet.")
+// TODO We may not need this anymore, we should default to AWS partition when resolving
+// a region we don't know about yet.
 public final class DefaultServiceEndpointBuilder {
 
     private final String serviceName;

core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java

@@ -29,7 +29,6 @@
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -38,7 +37,6 @@
 import org.reactivestreams.Subscription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
@@ -166,17 +164,6 @@ public class EventStreamAsyncResponseTransformer<ResponseT, EventT>
      */
     private String extendedRequestId = null;
 
-    @Deprecated
-    @ReviewBeforeRelease("Remove this on full GA of 2.0.0")
-    public EventStreamAsyncResponseTransformer(
-        EventStreamResponseHandler<ResponseT, EventT> eventStreamResponseHandler,
-        HttpResponseHandler<? extends ResponseT> initialResponseHandler,
-        HttpResponseHandler<? extends EventT> eventResponseHandler,
-        HttpResponseHandler<? extends Throwable> exceptionResponseHandler) {
-        this(eventStreamResponseHandler, initialResponseHandler, eventResponseHandler, exceptionResponseHandler,
-             Executors.newSingleThreadScheduledExecutor(), new CompletableFuture<>(), "");
-    }
-
     private EventStreamAsyncResponseTransformer(
         EventStreamResponseHandler<ResponseT, EventT> eventStreamResponseHandler,
         HttpResponseHandler<? extends ResponseT> initialResponseHandler,

core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHostNameUtils.java

@@ -18,12 +18,11 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.regions.Region;
 
 @SdkProtectedApi
-@ReviewBeforeRelease("This isn't used for as many services as it supports. Can we simplify or remove it?")
+//TODO This isn't used for as many services as it supports. Can we simplify or remove it?
 public final class AwsHostNameUtils {
 
     private static final Pattern S3_ENDPOINT_PATTERN =

core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonErrorCodeParser.java

@@ -17,7 +17,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
@@ -28,7 +27,7 @@
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonType;
 
-@ReviewBeforeRelease("Clean up ION parser")
+//TODO Clean up ION parser
 @SdkInternalApi
 class IonErrorCodeParser implements ErrorCodeParser {
     private static final Logger log = LoggerFactory.getLogger(IonErrorCodeParser.class);

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContent.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.protocols.json.internal.dom.JsonDomParser;
@@ -32,7 +31,7 @@
  * Simple struct like class to hold both the raw json string content and it's parsed JsonNode
  */
 @SdkProtectedApi
-@ReviewBeforeRelease("Do we need this? It isn't well encapsulated because of storing non-copied arrays.")
+//TODO Do we need this? It isn't well encapsulated because of storing non-copied arrays.
 public class JsonContent {
 
     private static final Logger LOG = LoggerFactory.getLogger(JsonContent.class);

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/SdkJsonGenerator.java

@@ -23,7 +23,6 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.time.Instant;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.utils.BinaryUtils;
@@ -198,7 +197,7 @@ public StructuredJsonGenerator writeValue(ByteBuffer bytes) {
     }
 
     @Override
-    @ReviewBeforeRelease("This date formatting is coupled to AWS's format. Should we generalize it?")
+    //TODO: This date formatting is coupled to AWS's format. Should generalize it
     public StructuredJsonGenerator writeValue(Instant instant) {
         try {
             generator.writeNumber(DateUtils.formatUnixTimestampInstant(instant));

core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ConnectionUtils.java

@@ -20,12 +20,10 @@
 import java.net.Proxy;
 import java.net.URI;
 import java.util.Map;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 
 @SdkInternalApi
-@ReviewBeforeRelease("Refactor to use SDK HTTP client instead of URL connection, also consider putting EC2MetadataClient into "
-                     + "its own module")
+//TODO: Refactor to use SDK HTTP client instead of URL connection, also consider putting EC2MetadataClient in its own module
 public class ConnectionUtils {
 
     public static ConnectionUtils create() {

core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java

@@ -34,7 +34,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -61,7 +60,7 @@
  * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html">Amazon
  * EC2 User Guide: Instance Metadata</a>
  */
-@ReviewBeforeRelease("Cleanup")
+//TODO: cleanup
 @SdkInternalApi
 public final class EC2MetadataUtils {
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.core.client.config;
 
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.signer.Signer;
 
@@ -34,13 +33,11 @@ public class SdkAdvancedClientOption<T> extends ClientOption<T> {
     /**
      * Set the prefix of the user agent that is sent with each request to AWS.
      */
-    @ReviewBeforeRelease("This should either be changed when we refactor metrics, or the comment should be expanded upon.")
     public static final SdkAdvancedClientOption<String> USER_AGENT_PREFIX = new SdkAdvancedClientOption<>(String.class);
 
     /**
      * Set the suffix of the user agent that is sent with each request to AWS.
      */
-    @ReviewBeforeRelease("This should either be changed when we refactor metrics, or the comment should be expanded upon.")
     public static final SdkAdvancedClientOption<String> USER_AGENT_SUFFIX = new SdkAdvancedClientOption<>(String.class);
 
     /**

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.core.client.handler;
 
 import software.amazon.awssdk.annotations.NotThreadSafe;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
@@ -33,7 +32,6 @@
  */
 @SdkProtectedApi
 @NotThreadSafe
-@ReviewBeforeRelease("Using old style withers/getters")
 public final class ClientExecutionParams<InputT extends SdkRequest, OutputT> {
 
     private InputT input;

core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkInterruptedException.java

@@ -17,12 +17,10 @@
 
 import java.io.InputStream;
 import java.util.Optional;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 
 @SdkPublicApi
-@ReviewBeforeRelease("Consider combining this with AbortedException")
 public final class SdkInterruptedException extends InterruptedException {
 
     private static final long serialVersionUID = 8194951388566545094L;

core/sdk-core/src/main/java/software/amazon/awssdk/core/http/ExecutionContext.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.core.http;
 
 import software.amazon.awssdk.annotations.NotThreadSafe;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
@@ -52,8 +51,8 @@ public InterceptorContext interceptorContext() {
         return interceptorContext;
     }
 
-    @ReviewBeforeRelease("We should switch to fully immutable execution contexts. Currently, we mutate it for the interceptor "
-                         + "context, credential providers, etc.")
+    //TODO: We should switch to fully immutable execution contexts. Currently, we mutate it for the interceptor
+    //context, credential providers, etc
     public ExecutionContext interceptorContext(InterceptorContext interceptorContext) {
         this.interceptorContext = interceptorContext;
         return this;

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.internal.util.ClassLoaderHelper;
@@ -136,7 +135,6 @@ private ExecutionInterceptor createExecutionInterceptor(String interceptorClassN
         }
     }
 
-    @ReviewBeforeRelease("Can we hard-code our required global and service interceptors and just have this log a warning?")
     private ClassLoader classLoader() {
         return Validate.notNull(ClassLoaderHelper.classLoader(),
                                 "Failed to load the classloader for the current thread or the system.");

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java

@@ -18,7 +18,6 @@
 import static software.amazon.awssdk.core.internal.http.pipeline.RequestPipelineBuilder.async;
 
 import java.util.concurrent.CompletableFuture;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.SdkRequest;
@@ -51,7 +50,7 @@
 
 @ThreadSafe
 @SdkInternalApi
-@ReviewBeforeRelease("come up with better name")
+//TODO: come up with better name
 public final class AmazonAsyncHttpClient implements SdkAutoCloseable {
     private final HttpClientDependencies httpClientDependencies;
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.core.internal.http;
 
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.SdkRequest;
@@ -54,8 +53,7 @@
 
 @ThreadSafe
 @SdkInternalApi
-@ReviewBeforeRelease("come up with better name, Also this can be moved to an internal package if we "
-                     + "deal with HttpTestUtils.")
+// TODO come up with better name
 public final class AmazonSyncHttpClient implements SdkAutoCloseable {
     private final HttpClientDependencies httpClientDependencies;
 
@@ -174,7 +172,7 @@ private class RequestExecutionBuilderImpl implements RequestExecutionBuilder {
         private ExecutionContext executionContext;
 
         @Override
-        @ReviewBeforeRelease("This is duplicating information in the interceptor context. Can they be consolidated?")
+        // This is duplicating information in the interceptor context. Can they be consolidated?
         public RequestExecutionBuilder request(SdkHttpFullRequest request) {
             this.request = request;
             return this;

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/RequestExecutionContext.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.core.internal.http;
 
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
@@ -71,8 +70,6 @@ public ExecutionAttributes executionAttributes() {
         return executionContext.executionAttributes();
     }
 
-    @ReviewBeforeRelease("We should combine RequestExecutionContext and ExecutionContext. There's no benefit to both of "
-                         + "these. Once that's done, this won't be needed.")
     public ExecutionContext executionContext() {
         return executionContext;
     }

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java

@@ -18,7 +18,6 @@
 import java.util.Iterator;
 import java.util.Optional;
 import java.util.ServiceLoader;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.core.SdkSystemSetting;
@@ -46,7 +45,6 @@ final class ClasspathSdkHttpServiceProvider<T> implements SdkHttpServiceProvider
     }
 
     @Override
-    @ReviewBeforeRelease("Add some links to doc topics on configuring HTTP impl")
     public Optional<T> loadService() {
         Iterator<T> httpServices = serviceLoader.loadServices(serviceClass);
         if (!httpServices.hasNext()) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HandleResponseStage.java

@@ -19,7 +19,6 @@
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkStandardLogger;
 import software.amazon.awssdk.core.exception.RetryableException;
@@ -38,7 +37,7 @@
  *
  * @param <OutputT> Type of successful unmarshalled POJO.
  */
-@ReviewBeforeRelease("Should this be broken up? It's doing quite a lot...")
+// TODO: Should this be broken up? It's doing quite a lot...
 @SdkInternalApi
 public class HandleResponseStage<OutputT> implements RequestPipeline<SdkHttpFullResponse, Response<OutputT>> {
     private static final Logger log = LoggerFactory.getLogger(HandleResponseStage.class);

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStage.java

@@ -20,7 +20,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
@@ -30,8 +29,7 @@
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
 @SdkInternalApi
-@ReviewBeforeRelease("Might only need to do this for certain protocols - ie query?")
-// TODO how is this going to work with streaming input posts in asyncland
+//TODO Might only need to do this for certain protocols - ie query?
 public final class MoveParametersToBodyStage implements MutableRequestToRequestPipeline {
     @Override
     public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder input, RequestExecutionContext context) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/package-info.java

@@ -30,13 +30,12 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 
 /**
  * {@link ChannelPool} implementation that takes another {@link ChannelPool} implementation and enforce a maximum
  * number of concurrent connections.
  */
-@ReviewBeforeRelease("Contribute me back to Netty")
+//TODO: Contribute me back to Netty
 public class BetterFixedChannelPool implements ChannelPool {
     private static final IllegalStateException FULL_EXCEPTION = ThrowableUtil.unknownStackTrace(
         new IllegalStateException("Too many outstanding acquire operations"),