more cleanup

Author: kessplas

pom.xml

@@ -112,21 +112,6 @@
       <version>1.2</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <version>2.24.3</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>software.amazon.cryptools</groupId>
-      <artifactId>AmazonCorrettoCryptoProvider</artifactId>
-      <version>[2.0, 3.0)</version>
-      <classifier>linux-x86_64</classifier>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.sun.xml.messaging.saaj</groupId>
       <artifactId>saaj-impl</artifactId>

src/examples/java/software/amazon/encryption/s3/examples/MultipartUploadExample.java

@@ -1,6 +1,5 @@
 package software.amazon.encryption.s3.examples;
 
-import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider;
 import org.apache.commons.io.IOUtils;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -18,8 +17,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.Provider;
-import java.security.Security;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +32,7 @@ public class MultipartUploadExample {
     public static void main(final String[] args) throws IOException {
         BUCKET = args[0];
         LowLevelMultipartUpload();
-//        HighLevelMultipartPutObject();
+        HighLevelMultipartPutObject();
     }
 
     /**
@@ -55,9 +52,6 @@ public static void LowLevelMultipartUpload() throws IOException {
         final InputStream inputStream = new BoundedInputStream(fileSizeLimit);
         final InputStream objectStreamForResult = new BoundedInputStream(fileSizeLimit);
 
-        Security.addProvider(new AmazonCorrettoCryptoProvider());
-        Provider PROVIDER = Security.getProvider(AmazonCorrettoCryptoProvider.PROVIDER_NAME);
-
         // Instantiate the S3 Encryption Client to encrypt and decrypt
         // by specifying a KMS Key with the kmsKeyId builder parameter.
         // enable `enableDelayedAuthenticationMode` parameter to download more than 64MB object or
@@ -68,7 +62,6 @@ public static void LowLevelMultipartUpload() throws IOException {
         S3Client v3Client = S3EncryptionClient.builder()
                 .kmsKeyId(KMS_KEY_ID)
                 .enableDelayedAuthenticationMode(true)
-                .cryptoProvider(PROVIDER)
                 .build();
 
         // Create Multipart upload request to S3

src/main/resources/log4j2.xml

@@ -13,6 +13,7 @@
 import com.amazonaws.services.s3.model.KMSEncryptionMaterialsProvider;
 import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.async.AsyncRequestBody;