chore(ses/s3):Remove v3 signers (#2341)

* chore(ses/s3):Remove v3 signers

* Mark AWS3Signer as deprecated

Author: rjuliano

aws-android-sdk-core/src/main/java/com/amazonaws/auth/AWS3Signer.java

@@ -38,7 +38,9 @@
 
 /**
  * Signer implementation that signs requests with the AWS3 signing protocol.
+ * @deprecated SigV3 is deprecated. Use SigV4 instead via {@link AWS4Signer}
  */
+@Deprecated
 public class AWS3Signer extends AbstractAWSSigner {
     private static final String AUTHORIZATION_HEADER = "X-Amzn-Authorization";
     private static final String NONCE_HEADER = "x-amz-nonce";

aws-android-sdk-core/src/main/java/com/amazonaws/auth/SignerFactory.java

@@ -25,7 +25,6 @@
 public final class SignerFactory {
 
     private static final String QUERY_STRING_SIGNER = "QueryStringSignerType";
-    private static final String VERSION_THREE_SIGNER = "AWS3SignerType";
     private static final String VERSION_FOUR_SIGNER = "AWS4SignerType";
     private static final String NO_OP_SIGNER = "NoOpSignerType";
 
@@ -34,7 +33,6 @@ public final class SignerFactory {
     static {
         // Register the standard signer types.
         SIGNERS.put(QUERY_STRING_SIGNER, QueryStringSigner.class);
-        SIGNERS.put(VERSION_THREE_SIGNER, AWS3Signer.class);
         SIGNERS.put(VERSION_FOUR_SIGNER, AWS4Signer.class);
         SIGNERS.put(NO_OP_SIGNER, NoOpSigner.class);
     }

aws-android-sdk-core/src/main/java/com/amazonaws/internal/config/InternalConfig.java

@@ -157,8 +157,8 @@ private static Map<String, SignerConfig> getDefaultServiceSigners() {
         // map from abbreviated service name to signer type
         final Map<String, SignerConfig> ret = new HashMap<String, SignerConfig>();
         ret.put("ec2", new SignerConfig("QueryStringSignerType"));
-        ret.put("email", new SignerConfig("AWS3SignerType"));
-        ret.put("s3", new SignerConfig("S3SignerType"));
+        ret.put("email", new SignerConfig("AWS4SignerType"));
+        ret.put("s3", new SignerConfig("AWSS3V4SignerType"));
         ret.put("sdb", new SignerConfig("QueryStringSignerType"));
         ret.put("runtime.lex", new SignerConfig("AmazonLexV4Signer"));
         ret.put("polly", new SignerConfig("AmazonPollyCustomPresigner"));

aws-android-sdk-core/src/test/java/com/amazonaws/internal/config/InternalConfigTest.java

@@ -33,13 +33,13 @@ public void s3() throws Exception {
     private void s3Assertions(InternalConfig config) {
         // S3
         SignerConfig signer = config.getSignerConfig("s3");
-        assertEquals("S3SignerType", signer.getSignerType());
+        assertEquals("AWSS3V4SignerType", signer.getSignerType());
         // S3 BJS
         signer = config.getSignerConfig("s3", "cn-north-1");
         assertEquals("AWSS3V4SignerType", signer.getSignerType());
         // S3 us-east-1
         signer = config.getSignerConfig("s3", Regions.US_EAST_1.name());
-        assertEquals("S3SignerType", signer.getSignerType());
+        assertEquals("AWSS3V4SignerType", signer.getSignerType());
     }
 
     @Test

aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java

@@ -169,7 +169,6 @@ public class AmazonS3Client extends AmazonWebServiceClient implements AmazonS3 {
 
     public static final String S3_SERVICE_NAME = "s3";
 
-    private static final String S3_SIGNER = "S3SignerType";
     private static final String S3_V4_SIGNER = "AWSS3V4SignerType";
 
     /** Shared logger for client events */
@@ -180,7 +179,6 @@ public class AmazonS3Client extends AmazonWebServiceClient implements AmazonS3 {
         AwsSdkMetrics.addAll(Arrays.asList(S3ServiceMetric.values()));
 
         // Register S3-specific signers.
-        SignerFactory.registerSigner(S3_SIGNER, S3Signer.class);
         SignerFactory.registerSigner(S3_V4_SIGNER, AWSS3V4Signer.class);
     }