Reclassifying execution interceptors and moving to internal package

Author: shorea

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

@@ -38,8 +38,8 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
-import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonMarshaller;
 import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
+import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonMarshaller;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;

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

@@ -15,12 +15,12 @@
 import software.amazon.awssdk.auth.signer.EventStreamAws4Signer;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
+import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
 import software.amazon.awssdk.awscore.eventstream.EventStreamAsyncResponseTransformer;
 import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonMarshaller;
 import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionPojoSupplier;
 import software.amazon.awssdk.awscore.eventstream.RestEventStreamAsyncResponseTransformer;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
 import software.amazon.awssdk.core.ApiName;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
@@ -824,3 +824,4 @@ private HttpResponseHandler<AwsServiceException> createErrorResponseHandler(Base
         return protocolFactory.createErrorResponseHandler(operationMetadata);
     }
 }
+

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

@@ -26,10 +26,10 @@
 import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
 import software.amazon.awssdk.core.client.handler.SdkSyncClientHandler;
 import software.amazon.awssdk.core.client.handler.SyncClientHandler;
+import software.amazon.awssdk.core.http.Crc32Validation;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.http.Crc32Validation;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 

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

@@ -27,11 +27,11 @@
 import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.http.Crc32Validation;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
-import software.amazon.awssdk.core.http.Crc32Validation;
 import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
 import software.amazon.awssdk.core.internal.http.async.SyncResponseHandlerAdapter;
 import software.amazon.awssdk.core.internal.util.ThrowableUtils;

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptions.java

@@ -20,7 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
 
 @SdkInternalApi
 public final class SdkChannelOptions {

services/apigateway/src/main/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptor.java

@@ -15,13 +15,13 @@
 
 package software.amazon.awssdk.services.apigateway.internal;
 
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 
-@SdkProtectedApi
+@SdkInternalApi
 public final class AcceptJsonInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {

services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/SwitchToPostInterceptor.java renamed to services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java

@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudsearchdomain;
+package software.amazon.awssdk.services.cloudsearchdomain.internal;
 
 import static java.util.Collections.singletonList;
 import static software.amazon.awssdk.utils.StringUtils.lowerCase;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -32,7 +32,7 @@
 /**
  * Ensures that all SearchRequests use <code>POST</code> instead of <code>GET</code>, moving the query parameters to be form data.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class SwitchToPostInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {

services/cloudsearchdomain/src/main/resources/software/amazon/awssdk/services/cloudsearchdomain/execution.interceptors

@@ -1 +1 @@
-software.amazon.awssdk.services.cloudsearchdomain.SwitchToPostInterceptor
+software.amazon.awssdk.services.cloudsearchdomain.internal.SwitchToPostInterceptor

services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/GeneratePreSignUrlInterceptor.java renamed to services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java

@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.ec2.transform;
+package software.amazon.awssdk.services.ec2.transform.internal;
 
 import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
 
 import java.net.URI;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
@@ -35,12 +35,13 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.ec2.Ec2Client;
 import software.amazon.awssdk.services.ec2.model.CopySnapshotRequest;
+import software.amazon.awssdk.services.ec2.transform.CopySnapshotRequestMarshaller;
 
 /**
  * ExecutionInterceptor that generates a pre-signed URL for copying encrypted snapshots
  * TODO: Is this actually right? What if a different interceptor modifies the message? Should this be treated as a signer?
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class GeneratePreSignUrlInterceptor implements ExecutionInterceptor {
 
     private static final AwsEc2ProtocolFactory PROTOCOL_FACTORY = AwsEc2ProtocolFactory

services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/TimestampFormatInterceptor.java renamed to services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/TimestampFormatInterceptor.java

@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.ec2.transform;
+package software.amazon.awssdk.services.ec2.transform.internal;
 
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -31,7 +31,7 @@
  * RequestSpotFleet and DescribeSpotFleetRequestHistory, which don't expect
  * timestamps to be so precise.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class TimestampFormatInterceptor implements ExecutionInterceptor {
 
     private static final Pattern PATTERN = Pattern.compile("\\.\\d\\d\\dZ");

services/ec2/src/main/resources/software/amazon/awssdk/services/ec2/execution.interceptors

@@ -1,2 +1,2 @@
-software.amazon.awssdk.services.ec2.transform.GeneratePreSignUrlInterceptor
-software.amazon.awssdk.services.ec2.transform.TimestampFormatInterceptor
+software.amazon.awssdk.services.ec2.transform.internal.GeneratePreSignUrlInterceptor
+software.amazon.awssdk.services.ec2.transform.internal.TimestampFormatInterceptor

services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/AcceptJsonInterceptor.java

@@ -15,13 +15,13 @@
 
 package software.amazon.awssdk.services.glacier.internal;
 
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 
-@SdkProtectedApi
+@SdkInternalApi
 public final class AcceptJsonInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {

services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java

@@ -15,7 +15,7 @@
 
 package software.amazon.awssdk.services.glacier.internal;
 
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -24,7 +24,7 @@
 import software.amazon.awssdk.services.glacier.model.GetJobOutputRequest;
 import software.amazon.awssdk.services.glacier.model.UploadMultipartPartRequest;
 
-@SdkProtectedApi
+@SdkInternalApi
 public final class GlacierExecutionInterceptor implements ExecutionInterceptor {
 
     @Override

services/glacier/src/main/java/software/amazon/awssdk/services/glacier/transform/DefaultAccountIdSupplier.java

@@ -16,9 +16,9 @@
 package software.amazon.awssdk.services.glacier.transform;
 
 import java.util.function.Supplier;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 
-@SdkProtectedApi
+@SdkInternalApi
 public final class DefaultAccountIdSupplier {
 
     /**

services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/PredictEndpointInterceptor.java

@@ -17,7 +17,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -30,7 +30,7 @@
  * extracts the PredictRequest's PredictEndpoint "parameter" and swaps it in as
  * the endpoint to send the request to.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class PredictEndpointInterceptor implements ExecutionInterceptor {
 
     @Override

services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/RandomIdInterceptor.java

@@ -17,7 +17,7 @@
 
 import java.util.UUID;
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -33,7 +33,7 @@
  * CreateXxx API calls require a unique (for all time!) ID parameter for
  * idempotency. If the user doesn't specify one, fill in a GUID.
  */
-@SdkProtectedApi
+@SdkInternalApi
 @ReviewBeforeRelease("They should be using the idempotency trait")
 public final class RandomIdInterceptor implements ExecutionInterceptor {
 

services/rds/src/main/java/software/amazon/awssdk/services/rds/CopyDbSnapshotPresignInterceptor.java renamed to services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CopyDbSnapshotPresignInterceptor.java

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.rds;
+package software.amazon.awssdk.services.rds.internal;
 
 import java.time.Clock;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.services.rds.model.CopyDbSnapshotRequest;
@@ -25,7 +25,7 @@
 /**
  * Handler for pre-signing {@link CopyDbSnapshotRequest}.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class CopyDbSnapshotPresignInterceptor extends RdsPresignInterceptor<CopyDbSnapshotRequest> {
 
     public static final CopyDbSnapshotRequestMarshaller MARSHALLER = new CopyDbSnapshotRequestMarshaller(PROTOCOL_FACTORY);
@@ -35,8 +35,8 @@ public CopyDbSnapshotPresignInterceptor() {
     }
 
     @SdkTestInternalApi
-    CopyDbSnapshotPresignInterceptor(Clock signingOverrideClock) {
-        super(CopyDbSnapshotRequest.class, signingOverrideClock);
+    CopyDbSnapshotPresignInterceptor(Clock signingDateOverride) {
+        super(CopyDbSnapshotRequest.class, signingDateOverride);
     }
 
     @Override

services/rds/src/main/java/software/amazon/awssdk/services/rds/CreateDbInstanceReadReplicaPresignInterceptor.java renamed to services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CreateDbInstanceReadReplicaPresignInterceptor.java

@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.rds;
+package software.amazon.awssdk.services.rds.internal;
 
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.services.rds.model.CreateDbInstanceReadReplicaRequest;
 import software.amazon.awssdk.services.rds.transform.CreateDbInstanceReadReplicaRequestMarshaller;
 
 /**
  * Handler for pre-signing {@link CreateDbInstanceReadReplicaRequest}.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class CreateDbInstanceReadReplicaPresignInterceptor extends
                                                                  RdsPresignInterceptor<CreateDbInstanceReadReplicaRequest> {
 

services/rds/src/main/java/software/amazon/awssdk/services/rds/RdsPresignInterceptor.java renamed to services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/RdsPresignInterceptor.java

@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.rds;
+package software.amazon.awssdk.services.rds.internal;
 
 import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
 
 import java.net.URI;
 import java.time.Clock;
-import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
@@ -44,7 +44,7 @@
  *
  * @param <T> The request type.
  */
-@SdkPublicApi
+@SdkInternalApi
 public abstract class RdsPresignInterceptor<T extends RdsRequest> implements ExecutionInterceptor {
 
     protected static final AwsQueryProtocolFactory PROTOCOL_FACTORY = AwsQueryProtocolFactory

services/rds/src/main/resources/software/amazon/awssdk/services/rds/execution.interceptors

@@ -1,2 +1,2 @@
-software.amazon.awssdk.services.rds.CopyDbSnapshotPresignInterceptor
-software.amazon.awssdk.services.rds.CreateDbInstanceReadReplicaPresignInterceptor
+software.amazon.awssdk.services.rds.internal.CopyDbSnapshotPresignInterceptor
+software.amazon.awssdk.services.rds.internal.CreateDbInstanceReadReplicaPresignInterceptor

services/rds/src/test/java/software/amazon/awssdk/services/rds/PresignRequestHandlerTest.java renamed to services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.rds;
+package software.amazon.awssdk.services.rds.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -39,10 +39,11 @@
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.rds.internal.CopyDbSnapshotPresignInterceptor;
+import software.amazon.awssdk.services.rds.internal.RdsPresignInterceptor;
 import software.amazon.awssdk.services.rds.model.CopyDbSnapshotRequest;
 import software.amazon.awssdk.services.rds.model.RdsRequest;
 import software.amazon.awssdk.services.rds.transform.CopyDbSnapshotRequestMarshaller;
-import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
 /**
  * Unit Tests for {@link RdsPresignInterceptor}

services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java

@@ -16,7 +16,7 @@
 package software.amazon.awssdk.services.route53.internal;
 
 import java.util.stream.Collectors;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -47,7 +47,7 @@
  * cannot be included, otherwise requests fail. This handler removes those
  * partial resource path elements from IDs returned by Route 53.
  */
-@SdkProtectedApi
+@SdkInternalApi
 public final class Route53IdInterceptor implements ExecutionInterceptor {
     @Override
     public SdkResponse modifyResponse(Context.ModifyResponse context, ExecutionAttributes executionAttributes) {

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AddContentMd5HeaderInterceptor.java

@@ -22,7 +22,7 @@
 import java.io.UncheckedIOException;
 import java.util.Arrays;
 import java.util.List;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -32,7 +32,7 @@
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Md5Utils;
 
-@SdkProtectedApi
+@SdkInternalApi
 public class AddContentMd5HeaderInterceptor implements ExecutionInterceptor {
 
     // List of operations that should be ignored by this interceptor.