Add SdkAnnotation to service module

Author: zoewangg

build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml

@@ -31,10 +31,6 @@
     <suppress checks="MissingSdkAnnotationCheck"
               files=".(codegen|test)[\\/].+\.java$"/>
 
-    <!-- TODO: Remove this once we add the annotations on the services-->
-    <suppress checks="MissingSdkAnnotationCheck"
-              files=".(services)[\\/].+\.java$"/>
-
     <!-- TODO want to contribute this back to Netty -->
     <suppress checks=".*"
               files=".*BetterFixedChannelPool\.java$"/>

core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/GlobalServiceExecutionInterceptor.java

@@ -28,7 +28,7 @@
  * doesn't support non-global regions.
  */
 @SdkProtectedApi
-public class GlobalServiceExecutionInterceptor implements ExecutionInterceptor {
+public final class GlobalServiceExecutionInterceptor implements ExecutionInterceptor {
     @Override
     public void onExecutionFailure(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
         if (hasCause(context.exception(), UnknownHostException.class) &&

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

@@ -15,11 +15,13 @@
 
 package software.amazon.awssdk.services.apigateway.internal;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 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
 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

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.services.cloudsearchdomain;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -26,7 +27,8 @@
 /**
  * Ensures that all SearchRequests use <code>POST</code> instead of <code>GET</code>, moving the query parameters to be form data.
  */
-public class SwitchToPostInterceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class SwitchToPostInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         SdkHttpFullRequest request = context.httpRequest();

services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/EC2Interceptor.java renamed to services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/Ec2Interceptor.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.interceptor.Context;
@@ -41,7 +42,8 @@
 import software.amazon.awssdk.services.ec2.model.SpotInstanceRequest;
 import software.amazon.awssdk.utils.BinaryUtils;
 
-public class EC2Interceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class Ec2Interceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         SdkHttpFullRequest request = context.httpRequest();

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

@@ -18,6 +18,7 @@
 import static software.amazon.awssdk.auth.signer.internal.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
 
 import java.net.URI;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
@@ -37,7 +38,8 @@
  * 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?
  */
-public class GeneratePreSignUrlInterceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class GeneratePreSignUrlInterceptor implements ExecutionInterceptor {
 
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {

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

@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -30,6 +31,7 @@
  * RequestSpotFleet and DescribeSpotFleetRequestHistory, which don't expect
  * timestamps to be so precise.
  */
+@SdkProtectedApi
 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,3 +1,3 @@
 software.amazon.awssdk.services.ec2.transform.GeneratePreSignUrlInterceptor
 software.amazon.awssdk.services.ec2.transform.TimestampFormatInterceptor
-software.amazon.awssdk.services.ec2.transform.EC2Interceptor
+software.amazon.awssdk.services.ec2.transform.Ec2Interceptor

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

@@ -15,11 +15,13 @@
 
 package software.amazon.awssdk.services.glacier.internal;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 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
 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,6 +15,7 @@
 
 package software.amazon.awssdk.services.glacier.internal;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -23,7 +24,8 @@
 import software.amazon.awssdk.services.glacier.model.GetJobOutputRequest;
 import software.amazon.awssdk.services.glacier.model.UploadMultipartPartRequest;
 
-public class GlacierExecutionInterceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class GlacierExecutionInterceptor implements ExecutionInterceptor {
 
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {

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

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

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

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

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

@@ -17,6 +17,7 @@
 
 import java.util.UUID;
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -32,8 +33,9 @@
  * 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
 @ReviewBeforeRelease("They should be using the idempotency trait")
-public class RandomIdInterceptor implements ExecutionInterceptor {
+public final class RandomIdInterceptor implements ExecutionInterceptor {
 
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {

services/rds/src/main/java/software/amazon/awssdk/services/rds/CopyDbSnapshotPresignInterceptor.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.services.rds;
 
 import java.time.Clock;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.core.Request;
 import software.amazon.awssdk.services.rds.model.CopyDbSnapshotRequest;
@@ -24,7 +25,8 @@
 /**
  * Handler for pre-signing {@link CopyDbSnapshotRequest}.
  */
-public class CopyDbSnapshotPresignInterceptor extends RdsPresignInterceptor<CopyDbSnapshotRequest> {
+@SdkProtectedApi
+public final class CopyDbSnapshotPresignInterceptor extends RdsPresignInterceptor<CopyDbSnapshotRequest> {
 
     public CopyDbSnapshotPresignInterceptor() {
         super(CopyDbSnapshotRequest.class);

services/rds/src/main/java/software/amazon/awssdk/services/rds/CreateDbInstanceReadReplicaPresignInterceptor.java

@@ -15,14 +15,17 @@
 
 package software.amazon.awssdk.services.rds;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.Request;
 import software.amazon.awssdk.services.rds.model.CreateDbInstanceReadReplicaRequest;
 import software.amazon.awssdk.services.rds.transform.CreateDbInstanceReadReplicaRequestMarshaller;
 
 /**
  * Handler for pre-signing {@link CreateDbInstanceReadReplicaRequest}.
  */
-public class CreateDbInstanceReadReplicaPresignInterceptor extends RdsPresignInterceptor<CreateDbInstanceReadReplicaRequest> {
+@SdkProtectedApi
+public final class CreateDbInstanceReadReplicaPresignInterceptor extends
+                                                                 RdsPresignInterceptor<CreateDbInstanceReadReplicaRequest> {
     public CreateDbInstanceReadReplicaPresignInterceptor() {
         super(CreateDbInstanceReadReplicaRequest.class);
     }

services/rds/src/main/java/software/amazon/awssdk/services/rds/RdsPresignInterceptor.java

@@ -19,6 +19,7 @@
 
 import java.net.URI;
 import java.time.Clock;
+import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
@@ -43,13 +44,14 @@
  *
  * @param <T> The request type.
  */
-abstract class RdsPresignInterceptor<T extends RdsRequest> implements ExecutionInterceptor {
+@SdkPublicApi
+public abstract class RdsPresignInterceptor<T extends RdsRequest> implements ExecutionInterceptor {
     private static final String SERVICE_NAME = "rds";
     private static final String PARAM_SOURCE_REGION = "SourceRegion";
     private static final String PARAM_DESTINATION_REGION = "DestinationRegion";
     private static final String PARAM_PRESIGNED_URL = "PreSignedUrl";
 
-    protected interface PresignableRequest {
+    public interface PresignableRequest {
         String getSourceRegion();
 
         Request<?> marshall();
@@ -59,17 +61,18 @@ protected interface PresignableRequest {
 
     private final Clock signingOverrideClock;
 
-    RdsPresignInterceptor(Class<T> requestClassToPreSign) {
+    public RdsPresignInterceptor(Class<T> requestClassToPreSign) {
         this(requestClassToPreSign, null);
     }
 
-    RdsPresignInterceptor(Class<T> requestClassToPreSign, Clock signingOverrideClock) {
+    public RdsPresignInterceptor(Class<T> requestClassToPreSign, Clock signingOverrideClock) {
         this.requestClassToPreSign = requestClassToPreSign;
         this.signingOverrideClock = signingOverrideClock;
     }
 
     @Override
-    public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
+    public final SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context,
+                                                      ExecutionAttributes executionAttributes) {
         SdkHttpFullRequest request = context.httpRequest();
         SdkRequest originalRequest = context.request();
         if (!requestClassToPreSign.isInstance(originalRequest)) {
@@ -115,6 +118,12 @@ public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, E
                       .build();
     }
 
+    /**
+     * Adapts the request to the {@link PresignableRequest}.
+     *
+     * @param originalRequest the original request
+     * @return a PresignableRequest
+     */
     protected abstract PresignableRequest adaptRequest(T originalRequest);
 
     private SdkHttpFullRequest presignRequest(SdkHttpFullRequest request,

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

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

services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Configuration.java

@@ -17,12 +17,14 @@
 
 import software.amazon.awssdk.annotations.Immutable;
 import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.ServiceConfiguration;
 import software.amazon.awssdk.services.s3.model.PutBucketAccelerateConfigurationRequest;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
+@SdkPublicApi
 @Immutable
 @ThreadSafe
 public final class S3Configuration implements ServiceConfiguration, ToCopyableBuilder<S3Configuration.Builder, S3Configuration> {

services/s3/src/main/java/software/amazon/awssdk/services/s3/TaggingAdapter.java

@@ -15,12 +15,14 @@
 
 package software.amazon.awssdk.services.s3;
 
+import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.adapter.TypeAdapter;
 import software.amazon.awssdk.services.s3.model.Tag;
 import software.amazon.awssdk.services.s3.model.Tagging;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
-public class TaggingAdapter implements TypeAdapter<Tagging, String> {
+@SdkPublicApi
+public final class TaggingAdapter implements TypeAdapter<Tagging, String> {
 
     @Override
     public String adapt(Tagging tagging) {

services/s3/src/main/java/software/amazon/awssdk/services/s3/handlers/CreateBucketInterceptor.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.services.s3.handlers;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.awscore.AwsExecutionAttribute;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.interceptor.Context;
@@ -25,7 +26,8 @@
 import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 
-public class CreateBucketInterceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class CreateBucketInterceptor implements ExecutionInterceptor {
 
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {

services/s3/src/main/java/software/amazon/awssdk/services/s3/handlers/DecodeUrlEncodedResponseInterceptor.java

@@ -22,11 +22,13 @@
 //import software.amazon.awssdk.Response;
 
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 //import software.amazon.awssdk.services.s3.model.ListObjectVersionsResponse;
 //import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 //import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
 
+@SdkProtectedApi
 @ReviewBeforeRelease("Finish this and hook it up")
 public class DecodeUrlEncodedResponseInterceptor implements ExecutionInterceptor {
 

services/s3/src/main/java/software/amazon/awssdk/services/s3/handlers/DisableDoubleUrlEncodingInterceptor.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.services.s3.handlers;
 
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.auth.signer.internal.AwsSignerExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -24,7 +25,8 @@
  * Don't double-url-encode path elements for S3. S3 expects path elements to be encoded only once in
  * the canonical URI.
  */
-public class DisableDoubleUrlEncodingInterceptor implements ExecutionInterceptor {
+@SdkProtectedApi
+public final class DisableDoubleUrlEncodingInterceptor implements ExecutionInterceptor {
 
     @Override
     public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes executionAttributes) {