add Nonnull annotation to contentLength, also remove some dead code around legacy wrapping mode in GetEncryptedObjectPipeline

Author: J Plasmeier

src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java

@@ -90,7 +90,6 @@ public <T> CompletableFuture<T> getObject(GetObjectRequest getObjectRequest,
         GetEncryptedObjectPipeline pipeline = GetEncryptedObjectPipeline.builder()
                 .s3AsyncClient(_wrappedClient)
                 .cryptoMaterialsManager(_cryptoMaterialsManager)
-                .enableLegacyWrappingAlgorithms(_enableLegacyWrappingAlgorithms)
                 .enableLegacyUnauthenticatedModes(_enableLegacyUnauthenticatedModes)
                 .enableDelayedAuthentication(_enableDelayedAuthenticationMode)
                 .build();

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

@@ -133,7 +133,6 @@ public <T> T getObject(GetObjectRequest getObjectRequest,
         GetEncryptedObjectPipeline pipeline = GetEncryptedObjectPipeline.builder()
                 .s3AsyncClient(_wrappedClient)
                 .cryptoMaterialsManager(_cryptoMaterialsManager)
-                .enableLegacyWrappingAlgorithms(_enableLegacyWrappingAlgorithms)
                 .enableLegacyUnauthenticatedModes(_enableLegacyUnauthenticatedModes)
                 .enableDelayedAuthentication(_enableDelayedAuthenticationMode)
                 .build();

src/main/java/software/amazon/encryption/s3/internal/BufferedCipherSubscriber.java

@@ -6,6 +6,7 @@
 import software.amazon.encryption.s3.S3EncryptionClientException;
 import software.amazon.encryption.s3.S3EncryptionClientSecurityException;
 
+import javax.annotation.Nonnull;
 import javax.crypto.Cipher;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
@@ -35,10 +36,10 @@ public class BufferedCipherSubscriber implements Subscriber<ByteBuffer> {
     private byte[] outputBuffer;
     private final Queue<ByteBuffer> buffers = new ConcurrentLinkedQueue<>();
 
-    BufferedCipherSubscriber(Subscriber<? super ByteBuffer> wrappedSubscriber, Cipher cipher, Long contentLength) {
+    BufferedCipherSubscriber(Subscriber<? super ByteBuffer> wrappedSubscriber, Cipher cipher, @Nonnull Long contentLength) {
         this.wrappedSubscriber = wrappedSubscriber;
         this.cipher = cipher;
-        if (contentLength == null || contentLength > BUFFERED_MAX_CONTENT_LENGTH_BYTES) {
+        if (contentLength > BUFFERED_MAX_CONTENT_LENGTH_BYTES) {
             throw new S3EncryptionClientException(String.format("The object you are attempting to decrypt exceeds the maximum content " +
                     "length allowed in default mode. Please enable Delayed Authentication mode to decrypt objects larger" +
                     "than %d", BUFFERED_MAX_CONTENT_LENGTH_MiB));

src/main/java/software/amazon/encryption/s3/internal/GetEncryptedObjectPipeline.java

@@ -35,10 +35,7 @@
 public class GetEncryptedObjectPipeline {
     private final S3AsyncClient _s3AsyncClient;
     private final CryptographicMaterialsManager _cryptoMaterialsManager;
-    private final boolean _enableLegacyWrappingAlgorithms;
-
     private final boolean _enableLegacyUnauthenticatedModes;
-    // TODO: Find a way to use for async client
     private final boolean _enableDelayedAuthentication;
 
     public static Builder builder() {
@@ -48,7 +45,6 @@ public static Builder builder() {
     private GetEncryptedObjectPipeline(Builder builder) {
         this._s3AsyncClient = builder._s3AsyncClient;
         this._cryptoMaterialsManager = builder._cryptoMaterialsManager;
-        this._enableLegacyWrappingAlgorithms = builder._enableLegacyWrappingAlgorithms;
         this._enableLegacyUnauthenticatedModes = builder._enableLegacyUnauthenticatedModes;
         this._enableDelayedAuthentication = builder._enableDelayedAuthentication;
     }
@@ -170,7 +166,6 @@ public void onStream(SdkPublisher<ByteBuffer> ciphertextPublisher) {
     public static class Builder {
         private S3AsyncClient _s3AsyncClient;
         private CryptographicMaterialsManager _cryptoMaterialsManager;
-        private boolean _enableLegacyWrappingAlgorithms;
         private boolean _enableLegacyUnauthenticatedModes;
         private boolean _enableDelayedAuthentication;
 
@@ -192,11 +187,6 @@ public Builder cryptoMaterialsManager(CryptographicMaterialsManager cryptoMateri
             return this;
         }
 
-        public Builder enableLegacyWrappingAlgorithms(boolean enableLegacyWrappingAlgorithms) {
-            this._enableLegacyWrappingAlgorithms = enableLegacyWrappingAlgorithms;
-            return this;
-        }
-
         public Builder enableLegacyUnauthenticatedModes(boolean enableLegacyUnauthenticatedModes) {
             this._enableLegacyUnauthenticatedModes = enableLegacyUnauthenticatedModes;
             return this;

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

@@ -1,14 +1,13 @@
 package software.amazon.encryption.s3.materials;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.encryption.s3.algorithms.AlgorithmSuite;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.encryption.s3.algorithms.AlgorithmSuite;
-
 public class DecryptMaterialsRequest {
 
     private final GetObjectRequest _s3Request;