Spotless

Author: DaveCTurner

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -14,11 +14,8 @@
 import software.amazon.awssdk.services.s3.model.ListMultipartUploadsRequest;
 import software.amazon.awssdk.services.s3.model.MultipartUpload;
 
-import com.amazonaws.http.AmazonHttpClient;
-import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
 import com.amazonaws.services.s3.model.ListMultipartUploadsRequest;
 import com.amazonaws.services.s3.model.MultipartUpload;
-import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RetryingInputStreamTests.java

@@ -11,18 +11,17 @@
 
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.http.AbortableInputStream;
+import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
 
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.repositories.blobstore.RequestedRangeNotSatisfiedException;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESTestCase;
 
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import software.amazon.awssdk.services.s3.model.S3Exception;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -144,22 +143,20 @@ private S3RetryingInputStream createInputStream(final byte[] data, @Nullable fin
 
             // NOMERGE: I think blobStore.getMetricPublisher(operation, purpose) needs to be defined, to fix the NPE. I didn't get that far.
             // TODO NOMERGE: revisit AbortableInputStream, I just threw it on to see if that fixed the NPE.
-            ResponseInputStream<GetObjectResponse> objectResponse =
-                new ResponseInputStream<>(
-                    GetObjectResponse.builder().build(),//.contentLength(length.longValue()).build(),
-                    AbortableInputStream.create(new ByteArrayInputStream(data, position, length))
-                );
+            ResponseInputStream<GetObjectResponse> objectResponse = new ResponseInputStream<>(
+                GetObjectResponse.builder().build(),// .contentLength(length.longValue()).build(),
+                AbortableInputStream.create(new ByteArrayInputStream(data, position, length))
+            );
             when(client.getObject(any(GetObjectRequest.class))).thenReturn(objectResponse);
             return new S3RetryingInputStream(randomPurpose(), blobStore, "_blob", position, Math.addExact(position, length - 1));
         }
 
         // NOMERGE: I think blobStore.getMetricPublisher(operation, purpose) needs to be defined, to fix the NPE. I didn't get that far.
         // TODO NOMERGE: revisit AbortableInputStream, I just threw it on to see if that fixed the NPE.
-        ResponseInputStream<GetObjectResponse> objectResponse =
-            new ResponseInputStream<>(
-                GetObjectResponse.builder().build(),//.contentLength(Long.valueOf(data.length)).build(),
-                AbortableInputStream.create(new ByteArrayInputStream(data))
-            );
+        ResponseInputStream<GetObjectResponse> objectResponse = new ResponseInputStream<>(
+            GetObjectResponse.builder().build(),// .contentLength(Long.valueOf(data.length)).build(),
+            AbortableInputStream.create(new ByteArrayInputStream(data))
+        );
         when(client.getObject(any(GetObjectRequest.class))).thenReturn(objectResponse);
         return new S3RetryingInputStream(randomPurpose(), blobStore, "_blob");
     }