RsaKeyring class is now extending RawKeyring and also extending the abstract builder from the RawKeyring

Author: Anirav Kareddy

src/main/java/software/amazon/encryption/s3/materials/RsaKeyring.java

@@ -23,7 +23,7 @@
  * This keyring can wrap keys with the active keywrap algorithm and
  * unwrap with the active and legacy algorithms for RSA keys.
  */
-public class RsaKeyring extends S3Keyring {
+public class RsaKeyring extends RawKeyring {
 
     private final PartialRsaKeyPair _partialRsaKeyPair;
 
@@ -201,9 +201,8 @@ public MaterialsDescription getMaterialsDescription() {
         return _materialsDescription;
   }
 
-  public static class Builder extends S3Keyring.Builder<S3Keyring, Builder> {
+  public static class Builder extends RawKeyring.Builder<RsaKeyring, RsaKeyring.Builder> {
         private PartialRsaKeyPair _partialRsaKeyPair;
-        private boolean _reEncryptInstructionFile = false;
 
         private Builder() {
             super();
@@ -218,10 +217,6 @@ public Builder wrappingKeyPair(final PartialRsaKeyPair partialRsaKeyPair) {
             _partialRsaKeyPair = partialRsaKeyPair;
             return builder();
         }
-        public Builder reEncryptInstructionFile(final boolean reEncryptInstructionFile) {
-            _reEncryptInstructionFile = reEncryptInstructionFile;
-            return builder();
-        }
 
         public RsaKeyring build() {
             return new RsaKeyring(this);