Address deprecation and rawtypes warnings

gaul · gaul · commit e2afed1fd9b1 · 2025-04-02T21:50:56.000-07:00
diff --git a/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java b/src/main/java/org/gaul/s3proxy/EncryptedBlobStore.java
@@ -349,7 +349,9 @@ private String getBlobStoreType() {
 
     private String generateUploadId(String container, String blobName) {
         String path = container + "/" + blobName;
-        return Hashing.md5().hashBytes(path.getBytes(StandardCharsets.UTF_8)).toString();
+        @SuppressWarnings("deprecation")
+        var hash = Hashing.md5();
+        return hash.hashBytes(path.getBytes(StandardCharsets.UTF_8)).toString();
     }
 
     @Override
diff --git a/src/main/java/org/gaul/s3proxy/azureblob/AzureBlobApiMetadata.java b/src/main/java/org/gaul/s3proxy/azureblob/AzureBlobApiMetadata.java
@@ -28,6 +28,7 @@
 import org.jclouds.rest.internal.BaseHttpApiMetadata;
 
 
+@SuppressWarnings("rawtypes")
 public final class AzureBlobApiMetadata extends BaseHttpApiMetadata {
     public AzureBlobApiMetadata() {
         this(builder());
diff --git a/src/main/java/org/gaul/s3proxy/azureblob/AzureBlobStore.java b/src/main/java/org/gaul/s3proxy/azureblob/AzureBlobStore.java
@@ -386,8 +386,8 @@ public String putBlob(String container, Blob blob, PutOptions options) {
                     contentMetadata.getContentEncoding());
             blobHttpHeaders.setContentLanguage(
                     contentMetadata.getContentLanguage());
-            blobHttpHeaders.setContentMd5(
-                    contentMetadata.getContentMD5());
+            var hash = contentMetadata.getContentMD5AsHashCode();
+            blobHttpHeaders.setContentMd5(hash != null ? hash.asBytes() : null);
             blobHttpHeaders.setContentType(contentMetadata.getContentType());
             azureOptions.setHeaders(blobHttpHeaders);
             if (blob.getMetadata().getTier() != Tier.STANDARD) {
diff --git a/src/main/java/org/gaul/s3proxy/nio2blob/AbstractNio2BlobStore.java b/src/main/java/org/gaul/s3proxy/nio2blob/AbstractNio2BlobStore.java
@@ -45,6 +45,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 import com.google.common.hash.HashingInputStream;
 import com.google.common.io.BaseEncoding;
@@ -111,8 +112,10 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
     private static final String XATTR_USER_METADATA_PREFIX =
             "user.user-metadata.";
     private static final String MULTIPART_PREFIX = ".mpus-";
+    @SuppressWarnings("deprecation")
+    private static final HashFunction md5 = Hashing.md5();
     private static final byte[] DIRECTORY_MD5 =
-            Hashing.md5().hashBytes(new byte[0]).asBytes();
+            md5.hashBytes(new byte[0]).asBytes();
 
     private final Supplier<Set<? extends Location>> locations;
     private final Path root;
@@ -469,6 +472,7 @@ public final Blob getBlob(String container, String key, GetOptions options) {
             if (options.getIfModifiedSince() != null) {
                 Date modifiedSince = options.getIfModifiedSince();
                 if (lastModifiedTime.before(modifiedSince)) {
+                    @SuppressWarnings("rawtypes")
                     HttpResponse.Builder response = HttpResponse.builder().statusCode(Status.NOT_MODIFIED.getStatusCode());
                     if (eTag != null) {
                         response.addHeader(HttpHeaders.ETAG, eTag);
@@ -480,6 +484,7 @@ public final Blob getBlob(String container, String key, GetOptions options) {
             if (options.getIfUnmodifiedSince() != null) {
                 Date unmodifiedSince = options.getIfUnmodifiedSince();
                 if (lastModifiedTime.after(unmodifiedSince)) {
+                    @SuppressWarnings("rawtypes")
                     HttpResponse.Builder response = HttpResponse.builder().statusCode(Status.PRECONDITION_FAILED.getStatusCode());
                     if (eTag != null) {
                         response.addHeader(HttpHeaders.ETAG, eTag);
@@ -571,7 +576,7 @@ public final String putBlob(String container, Blob blob, PutOptions options) {
         }
 
         var metadata = blob.getMetadata().getContentMetadata();
-        try (var is = new HashingInputStream(Hashing.md5(), blob.getPayload().openStream());
+        try (var is = new HashingInputStream(md5, blob.getPayload().openStream());
              var os = Files.newOutputStream(tmpPath)) {
             var count = is.transferTo(os);
             var actualHashCode = is.hash();
@@ -845,7 +850,7 @@ public final void abortMultipartUpload(MultipartUpload mpu) {
     public final String completeMultipartUpload(MultipartUpload mpu, List<MultipartPart> parts) {
         var metas = ImmutableList.<BlobMetadata>builder();
         long contentLength = 0;
-        var md5Hasher = Hashing.md5().newHasher();
+        var md5Hasher = md5.newHasher();
 
         for (var part : parts) {
             var meta = blobMetadata(mpu.containerName(), MULTIPART_PREFIX + mpu.id() + "-" + mpu.blobName() + "-" + part.partNumber());
diff --git a/src/main/java/org/gaul/s3proxy/nio2blob/FilesystemNio2BlobApiMetadata.java b/src/main/java/org/gaul/s3proxy/nio2blob/FilesystemNio2BlobApiMetadata.java
@@ -24,6 +24,7 @@
 import org.jclouds.reflect.Reflection2;
 import org.jclouds.rest.internal.BaseHttpApiMetadata;
 
+@SuppressWarnings("rawtypes")
 public final class FilesystemNio2BlobApiMetadata extends BaseHttpApiMetadata {
     public FilesystemNio2BlobApiMetadata() {
         this(builder());
diff --git a/src/main/java/org/gaul/s3proxy/nio2blob/TransientNio2BlobApiMetadata.java b/src/main/java/org/gaul/s3proxy/nio2blob/TransientNio2BlobApiMetadata.java
@@ -24,6 +24,7 @@
 import org.jclouds.reflect.Reflection2;
 import org.jclouds.rest.internal.BaseHttpApiMetadata;
 
+@SuppressWarnings("rawtypes")
 public final class TransientNio2BlobApiMetadata extends BaseHttpApiMetadata {
     public TransientNio2BlobApiMetadata() {
         this(builder());
diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkAnonymousTest.java
@@ -30,6 +30,7 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.internal.SkipMd5CheckStrategy;
+import com.amazonaws.services.s3.model.ListBucketsPaginatedRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
 import com.google.common.io.ByteSource;
@@ -104,7 +105,7 @@ public void tearDown() throws Exception {
 
     @Test
     public void testListBuckets() throws Exception {
-        client.listBuckets();
+        client.listBuckets(new ListBucketsPaginatedRequest());
     }
 
     @Test
diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java
@@ -69,6 +69,7 @@
 import com.amazonaws.services.s3.model.HeadBucketRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
+import com.amazonaws.services.s3.model.ListBucketsPaginatedRequest;
 import com.amazonaws.services.s3.model.ListMultipartUploadsRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ListObjectsV2Request;
@@ -850,7 +851,7 @@ public void testHttpClient() throws Exception {
     @Test
     public void testListBuckets() throws Exception {
         var builder = ImmutableList.<String>builder();
-        for (Bucket bucket : client.listBuckets()) {
+        for (Bucket bucket : client.listBuckets(new ListBucketsPaginatedRequest()).getBuckets()) {
             builder.add(bucket.getName());
         }
         assertThat(builder.build()).contains(containerName);
@@ -1687,7 +1688,7 @@ public Map.Entry<String, BlobStore> locateBlobStore(
         });
 
         // check first access key
-        List<Bucket> buckets = client.listBuckets();
+        var buckets = client.listBuckets(new ListBucketsPaginatedRequest()).getBuckets();
         assertThat(buckets).hasSize(1);
         assertThat(buckets.get(0).getName()).isEqualTo(containerName);
 
@@ -1700,7 +1701,7 @@ public Map.Entry<String, BlobStore> locateBlobStore(
                                 "credential")))
                 .withEndpointConfiguration(s3EndpointConfig)
                 .build();
-        buckets = client.listBuckets();
+        buckets = client.listBuckets(new ListBucketsPaginatedRequest()).getBuckets();
         assertThat(buckets).isEmpty();
 
         // check invalid access key
@@ -1710,7 +1711,7 @@ public Map.Entry<String, BlobStore> locateBlobStore(
                 .withEndpointConfiguration(s3EndpointConfig)
                 .build();
         try {
-            client.listBuckets();
+            client.listBuckets(new ListBucketsPaginatedRequest());
             Fail.failBecauseExceptionWasNotThrown(AmazonS3Exception.class);
         } catch (AmazonS3Exception e) {
             assertThat(e.getErrorCode()).isEqualTo("InvalidAccessKeyId");
diff --git a/src/test/java/org/gaul/s3proxy/junit/S3ProxyExtensionTest.java b/src/test/java/org/gaul/s3proxy/junit/S3ProxyExtensionTest.java
@@ -27,6 +27,7 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.ListBucketsPaginatedRequest;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -67,7 +68,7 @@ public final void setUp() throws Exception {
 
     @Test
     public final void listBucket() {
-        List<Bucket> buckets = s3Client.listBuckets();
+        List<Bucket> buckets = s3Client.listBuckets(new ListBucketsPaginatedRequest()).getBuckets();
         assertThat(buckets).hasSize(1);
         assertThat(buckets.get(0).getName())
                 .isEqualTo(MY_TEST_BUCKET);
diff --git a/src/test/java/org/gaul/s3proxy/junit/S3ProxyRuleTest.java b/src/test/java/org/gaul/s3proxy/junit/S3ProxyRuleTest.java
@@ -27,6 +27,7 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.ListBucketsPaginatedRequest;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 
 import org.junit.Before;
@@ -68,7 +69,7 @@ public final void setUp() throws Exception {
 
     @Test
     public final void listBucket() {
-        List<Bucket> buckets = s3Client.listBuckets();
+        List<Bucket> buckets = s3Client.listBuckets(new ListBucketsPaginatedRequest()).getBuckets();
         assertThat(buckets).hasSize(1);
         assertThat(buckets.get(0).getName())
             .isEqualTo(MY_TEST_BUCKET);

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,9 @@ private String getBlobStoreType() {`
`349`	`349`
`350`	`350`	`private String generateUploadId(String container, String blobName) {`
`351`	`351`	`String path = container + "/" + blobName;`
`352`		`- return Hashing.md5().hashBytes(path.getBytes(StandardCharsets.UTF_8)).toString();`
	`352`	`+ @SuppressWarnings("deprecation")`
	`353`	`+ var hash = Hashing.md5();`
	`354`	`+ return hash.hashBytes(path.getBytes(StandardCharsets.UTF_8)).toString();`
`353`	`355`	`}`
`354`	`356`
`355`	`357`	`@Override`