getObjectTorrentAsBytes(software.amazon.awssdk.services.s3.model.GetObjectTorrentRequest p0) throws AwsServiceException, SdkClientException {
return executeInBucketRegion(p0.bucket(), s3Client -> s3Client.getObjectTorrentAsBytes(p0));
@@ -570,12 +570,12 @@ public software.amazon.awssdk.services.s3.model.PutBucketWebsiteResponse putBuck
}
@Override
- public software.amazon.awssdk.services.s3.model.PutObjectResponse putObject(software.amazon.awssdk.services.s3.model.PutObjectRequest p0, java.nio.file.Path p1) throws AwsServiceException, SdkClientException {
+ public software.amazon.awssdk.services.s3.model.PutObjectResponse putObject(software.amazon.awssdk.services.s3.model.PutObjectRequest p0, software.amazon.awssdk.core.sync.RequestBody p1) throws AwsServiceException, SdkClientException {
return executeInBucketRegion(p0.bucket(), s3Client -> s3Client.putObject(p0, p1));
}
@Override
- public software.amazon.awssdk.services.s3.model.PutObjectResponse putObject(software.amazon.awssdk.services.s3.model.PutObjectRequest p0, software.amazon.awssdk.core.sync.RequestBody p1) throws AwsServiceException, SdkClientException {
+ public software.amazon.awssdk.services.s3.model.PutObjectResponse putObject(software.amazon.awssdk.services.s3.model.PutObjectRequest p0, java.nio.file.Path p1) throws AwsServiceException, SdkClientException {
return executeInBucketRegion(p0.bucket(), s3Client -> s3Client.putObject(p0, p1));
}
@@ -615,12 +615,12 @@ public software.amazon.awssdk.services.s3.model.RestoreObjectResponse restoreObj
}
@Override
- public software.amazon.awssdk.services.s3.model.UploadPartResponse uploadPart(software.amazon.awssdk.services.s3.model.UploadPartRequest p0, software.amazon.awssdk.core.sync.RequestBody p1) throws AwsServiceException, SdkClientException {
+ public software.amazon.awssdk.services.s3.model.UploadPartResponse uploadPart(software.amazon.awssdk.services.s3.model.UploadPartRequest p0, java.nio.file.Path p1) throws AwsServiceException, SdkClientException {
return executeInBucketRegion(p0.bucket(), s3Client -> s3Client.uploadPart(p0, p1));
}
@Override
- public software.amazon.awssdk.services.s3.model.UploadPartResponse uploadPart(software.amazon.awssdk.services.s3.model.UploadPartRequest p0, java.nio.file.Path p1) throws AwsServiceException, SdkClientException {
+ public software.amazon.awssdk.services.s3.model.UploadPartResponse uploadPart(software.amazon.awssdk.services.s3.model.UploadPartRequest p0, software.amazon.awssdk.core.sync.RequestBody p1) throws AwsServiceException, SdkClientException {
return executeInBucketRegion(p0.bucket(), s3Client -> s3Client.uploadPart(p0, p1));
}
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
index de656de88..1ffc89715 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientTests.java
@@ -13,13 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3.crossregion;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
import java.util.HashMap;
import java.util.Map;
-
-import io.awspring.cloud.s3.crossregion.CrossRegionS3Client;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Answers;
@@ -32,17 +37,9 @@
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.S3Exception;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-
/**
- * Unit tests for {@link CrossRegionS3Client}. Integration testing with Localstack is not
- * possible due to: https://github.com/localstack/localstack/issues/5748
+ * Unit tests for {@link CrossRegionS3Client}. Integration testing with Localstack is not possible due to:
+ * https://github.com/localstack/localstack/issues/5748
*
* @author Maciej Walkowiak
*/
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStream.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStream.java
index 23b0b3053..7080e3348 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStream.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStream.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.io.BufferedOutputStream;
@@ -26,24 +25,21 @@
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
/**
- * {@link S3OutputStream} implementation, that first uploads to a local file in tmp folder
- * and then flushes file to S3.
+ * {@link S3OutputStream} implementation, that first uploads to a local file in tmp folder and then flushes file to S3.
*
* Originally developed in
- * https://github.com/Alluxio/alluxio/blob/master/underfs/s3a/src/main/java/alluxio/underfs/s3a/S3AOutputStream.java
- * and adopted to Spring Cloud AWS needs.
+ * https://github.com/Alluxio/alluxio/blob/master/underfs/s3a/src/main/java/alluxio/underfs/s3a/S3AOutputStream.java and
+ * adopted to Spring Cloud AWS needs.
*
* @author Maciej Walkowiak
* @since 3.0
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamProvider.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamProvider.java
index 8dde3ee1f..9422052a4 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamProvider.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamProvider.java
@@ -13,14 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.io.IOException;
-
-import software.amazon.awssdk.services.s3.S3Client;
-
import org.springframework.lang.Nullable;
+import software.amazon.awssdk.services.s3.S3Client;
/**
* Creates {@link DiskBufferingS3OutputStream}.
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/Location.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/Location.java
index e590352a5..38bf7799a 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/Location.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/Location.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import org.springframework.lang.Nullable;
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/ObjectMetadata.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/ObjectMetadata.java
index 738fffc1e..7c4a20b04 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/ObjectMetadata.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/ObjectMetadata.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
-
+import org.springframework.lang.Nullable;
import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
import software.amazon.awssdk.services.s3.model.ObjectLockLegalHoldStatus;
@@ -29,11 +28,8 @@
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
import software.amazon.awssdk.services.s3.model.StorageClass;
-import org.springframework.lang.Nullable;
-
/**
- * Container for S3 Object Metadata. For information about each field look at
- * {@link PutObjectRequest} Javadocs.
+ * Container for S3 Object Metadata. For information about each field look at {@link PutObjectRequest} Javadocs.
*
* @author Maciej Walkowiak
* @since 3.0
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStream.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStream.java
index 0ee4201fe..bb104b7b1 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStream.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStream.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.io.OutputStream;
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStreamProvider.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStreamProvider.java
index d6196c008..8e6a5f37e 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStreamProvider.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3OutputStreamProvider.java
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.io.IOException;
import java.io.OutputStream;
-
import org.springframework.lang.Nullable;
/**
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3ProtocolResolver.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3ProtocolResolver.java
index bf19e839a..574711144 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3ProtocolResolver.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3ProtocolResolver.java
@@ -13,13 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.s3.S3Client;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -30,10 +27,11 @@
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.lang.Nullable;
+import software.amazon.awssdk.services.s3.S3Client;
/**
- * Resolves {@link S3Resource} for resources paths starting from s3://. Registers resolver
- * for S3 protocol in {@link ResourceLoader}.
+ * Resolves {@link S3Resource} for resources paths starting from s3://. Registers resolver for S3 protocol in
+ * {@link ResourceLoader}.
*
* @author Agim Emruli
* @author Alain Sahli
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Resource.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Resource.java
index 788e71233..037ca6964 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Resource.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Resource.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import java.io.File;
@@ -24,14 +23,12 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
-
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
-import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
-
import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.WritableResource;
import org.springframework.lang.Nullable;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
/**
* {@link org.springframework.core.io.Resource} implementation for S3 objects.
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/UploadFailedException.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/UploadFailedException.java
index a04bc122d..bfa78c344 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/UploadFailedException.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/UploadFailedException.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
import org.springframework.lang.Nullable;
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamTests.java
index 420bf34a7..fb41060aa 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/DiskBufferingS3OutputStreamTests.java
@@ -13,12 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import software.amazon.awssdk.core.sync.RequestBody;
@@ -26,13 +31,6 @@
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.S3Exception;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
/**
* Unit tests for {@link DiskBufferingS3OutputStream}.
*
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java
index 70ed5c1b3..23e50e4f5 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
-import java.time.Instant;
+import static org.assertj.core.api.Assertions.assertThat;
+import java.time.Instant;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
@@ -27,8 +27,6 @@
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
import software.amazon.awssdk.services.s3.model.StorageClass;
-import static org.assertj.core.api.Assertions.assertThat;
-
/**
* Unit tests for {@link ObjectMetadata}.
*
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ProtocolResolverTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ProtocolResolverTests.java
index ddcf12c46..5f9f73603 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ProtocolResolverTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ProtocolResolverTests.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import software.amazon.awssdk.services.s3.S3Client;
-
import org.springframework.aop.framework.Advised;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -33,9 +33,7 @@
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+import software.amazon.awssdk.services.s3.S3Client;
/**
* Tests for {@link S3ProtocolResolverTests}.
@@ -44,7 +42,8 @@
*/
@ExtendWith(SpringExtension.class)
@ContextConfiguration
-// context must be cleaned up before each method to make sure that for each use case
+// context must be cleaned up before each method to make sure that for each use
+// case
// protocol resolver is registered before resource is requested
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
class S3ProtocolResolverTests {
diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceTests.java
index ee3ed366e..65ee1a1dc 100644
--- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceTests.java
+++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceTests.java
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.amazonaws.auth.AWSCredentials;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -24,8 +27,6 @@
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
-
-import com.amazonaws.auth.AWSCredentials;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -44,9 +45,6 @@
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.StorageClass;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
/**
* Integration tests for {@link S3Resource}.
*
@@ -63,7 +61,8 @@ class S3ResourceTests {
@BeforeAll
static void beforeAll() {
- // region and credentials are irrelevant for test, but must be added to make test
+ // region and credentials are irrelevant for test, but must be added to make
+ // test
// work on
// environments without AWS cli configured
AWSCredentials localstackCredentials = localstack.getDefaultCredentialsProvider().getCredentials();
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/java/io/awspring/cloud/parameterstore/sample/SpringCloudAwsParameterStoreSample.java b/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/java/io/awspring/cloud/parameterstore/sample/SpringCloudAwsParameterStoreSample.java
index 2f61bc784..12148506e 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/java/io/awspring/cloud/parameterstore/sample/SpringCloudAwsParameterStoreSample.java
+++ b/spring-cloud-aws-samples/spring-cloud-aws-parameter-store-sample/src/main/java/io/awspring/cloud/parameterstore/sample/SpringCloudAwsParameterStoreSample.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.parameterstore.sample;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/app/src/main/java/io/awspring/cloud/s3/sample/SpringCloudAwsS3Sample.java b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/app/src/main/java/io/awspring/cloud/s3/sample/SpringCloudAwsS3Sample.java
index 737e28792..d811c5cf4 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/app/src/main/java/io/awspring/cloud/s3/sample/SpringCloudAwsS3Sample.java
+++ b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/app/src/main/java/io/awspring/cloud/s3/sample/SpringCloudAwsS3Sample.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3.sample;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Scanner;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.s3.S3Client;
-
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
@@ -33,6 +29,7 @@
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.WritableResource;
+import software.amazon.awssdk.services.s3.S3Client;
@SpringBootApplication
public class SpringCloudAwsS3Sample {
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureApp.java b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureApp.java
index da33eb005..bacdd005d 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureApp.java
+++ b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureApp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3.sample.infrastructure;
import software.amazon.awscdk.App;
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureStack.java b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureStack.java
index dd1838a4c..97e8f7b16 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureStack.java
+++ b/spring-cloud-aws-samples/spring-cloud-aws-s3-sample/infrastructure/src/main/java/io/awspring/cloud/s3/sample/infrastructure/InfrastructureStack.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.s3.sample.infrastructure;
import java.util.Arrays;
-
import software.amazon.awscdk.Stack;
import software.amazon.awscdk.StackProps;
import software.amazon.awscdk.services.s3.Bucket;
diff --git a/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/java/io/awspring/cloud/samples/secretsmanager/App.java b/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/java/io/awspring/cloud/samples/secretsmanager/App.java
index 650ddf1c8..ed9e6f4f3 100644
--- a/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/java/io/awspring/cloud/samples/secretsmanager/App.java
+++ b/spring-cloud-aws-samples/spring-cloud-aws-secrets-manager-sample/src/main/java/io/awspring/cloud/samples/secretsmanager/App.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.samples.secretsmanager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
@@ -28,9 +26,8 @@
import org.springframework.core.env.Environment;
/**
- * Secrets from the Secret Manager are added to the {@link Environment} and can be
- * retrieved using: - {@link Value} annotation - {@link Environment#getProperty(String)} -
- * or bound to {@link ConfigurationProperties} annotated classes.
+ * Secrets from the Secret Manager are added to the {@link Environment} and can be retrieved using: - {@link Value}
+ * annotation - {@link Environment#getProperty(String)} - or bound to {@link ConfigurationProperties} annotated classes.
*
* @author Maciej Walkowiak
*/
diff --git a/spring-cloud-aws-secrets-manager/src/main/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySource.java b/spring-cloud-aws-secrets-manager/src/main/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySource.java
index 40165c7f6..3df58734d 100644
--- a/spring-cloud-aws-secrets-manager/src/main/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySource.java
+++ b/spring-cloud-aws-secrets-manager/src/main/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySource.java
@@ -13,29 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.secretsmanager;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.lang.Nullable;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
-import org.springframework.core.env.EnumerablePropertySource;
-import org.springframework.lang.Nullable;
-
/**
- * Retrieves secret value under the given context / path from the AWS Secrets Manager
- * using the provided Secrets Manager client.
+ * Retrieves secret value under the given context / path from the AWS Secrets Manager using the provided Secrets Manager
+ * client.
*
* @author Fabio Maia
* @author Maciej Walkowiak
@@ -59,8 +56,7 @@ public SecretsManagerPropertySource(String context, SecretsManagerClient smClien
/**
* Loads properties from the Secrets Manager secret.
- * @throws ResourceNotFoundException if specified secret does not exist in the AWS
- * Secret Manager service.
+ * @throws ResourceNotFoundException if specified secret does not exist in the AWS Secret Manager service.
*/
public void init() {
readSecretValue(GetSecretValueRequest.builder().secretId(context).build());
diff --git a/spring-cloud-aws-secrets-manager/src/test/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySourceTest.java b/spring-cloud-aws-secrets-manager/src/test/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySourceTest.java
index 8402a2511..bbd2b0f34 100644
--- a/spring-cloud-aws-secrets-manager/src/test/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySourceTest.java
+++ b/spring-cloud-aws-secrets-manager/src/test/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySourceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,21 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.secretsmanager;
-import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
-import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
-import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
-import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
+import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
+
/**
* Tests for {@link SecretsManagerPropertySource}.
*
diff --git a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java
index 892da238c..fbc799a9a 100644
--- a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java
+++ b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.ses;
import java.io.ByteArrayOutputStream;
@@ -24,20 +23,12 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-
import javax.activation.FileTypeMap;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.ses.SesClient;
-import software.amazon.awssdk.services.ses.model.RawMessage;
-import software.amazon.awssdk.services.ses.model.SendRawEmailRequest;
-import software.amazon.awssdk.services.ses.model.SendRawEmailResponse;
-
import org.springframework.beans.BeanUtils;
import org.springframework.lang.Nullable;
import org.springframework.mail.MailException;
@@ -50,11 +41,16 @@
import org.springframework.mail.javamail.MimeMessagePreparator;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.services.ses.SesClient;
+import software.amazon.awssdk.services.ses.model.RawMessage;
+import software.amazon.awssdk.services.ses.model.SendRawEmailRequest;
+import software.amazon.awssdk.services.ses.model.SendRawEmailResponse;
/**
- * {@link JavaMailSender} implementation that allows to send {@link MimeMessage} using the
- * Simple E-Mail Service. In contrast to {@link SimpleEmailServiceMailSender} this class
- * also allows the use of attachment and other mime parts inside mail messages.
+ * {@link JavaMailSender} implementation that allows to send {@link MimeMessage} using the Simple E-Mail Service. In
+ * contrast to {@link SimpleEmailServiceMailSender} this class also allows the use of attachment and other mime parts
+ * inside mail messages.
*
* @author Agim Emruli
* @author Eddú Meléndez
@@ -83,11 +79,9 @@ public SimpleEmailServiceJavaMailSender(SesClient sesClient) {
}
/**
- * Allow Map access to the JavaMail properties of this sender, with the option to add
- * or override specific entries.
+ * Allow Map access to the JavaMail properties of this sender, with the option to add or override specific entries.
*
- * Useful for specifying entries directly, for example via
- * "javaMailProperties[mail.from]".
+ * Useful for specifying entries directly, for example via "javaMailProperties[mail.from]".
* @return java mail properties
*/
protected Properties getJavaMailProperties() {
@@ -108,8 +102,7 @@ public void setJavaMailProperties(Properties javaMailProperties) {
}
/**
- * Return the JavaMail {@code Session}, lazily initializing it if hasn't been
- * specified explicitly.
+ * Return the JavaMail {@code Session}, lazily initializing it if hasn't been specified explicitly.
* @return cached session or a new one from java mail properties
*/
@Nullable
@@ -123,11 +116,10 @@ protected Session getSession() {
/**
* Set the JavaMail {@code Session}, possibly pulled from JNDI.
*
- * Default is a new {@code Session} without defaults, that is completely configured
- * via this instance's properties.
+ * Default is a new {@code Session} without defaults, that is completely configured via this instance's properties.
*
- * If using a pre-configured {@code Session}, non-default properties in this instance
- * will override the settings in the {@code Session}.
+ * If using a pre-configured {@code Session}, non-default properties in this instance will override the settings in
+ * the {@code Session}.
* @param session JavaMail session
* @see #setJavaMailProperties
*/
@@ -137,8 +129,7 @@ public void setSession(Session session) {
}
/**
- * Set the default encoding to use for {@link MimeMessage MimeMessages} created by
- * this instance.
+ * Set the default encoding to use for {@link MimeMessage MimeMessages} created by this instance.
*
* Such an encoding will be auto-detected by {@link MimeMessageHelper}.
* @param defaultEncoding default encoding for mime messages
@@ -148,18 +139,15 @@ public void setDefaultEncoding(String defaultEncoding) {
}
/**
- * Set the default Java Activation {@link FileTypeMap} to use for {@link MimeMessage
- * MimeMessages} created by this instance.
+ * Set the default Java Activation {@link FileTypeMap} to use for {@link MimeMessage MimeMessages} created by this
+ * instance.
*
- * A {@code FileTypeMap} specified here will be autodetected by
- * {@link MimeMessageHelper}, avoiding the need to specify the {@code FileTypeMap} for
- * each {@code MimeMessageHelper} instance.
+ * A {@code FileTypeMap} specified here will be autodetected by {@link MimeMessageHelper}, avoiding the need to
+ * specify the {@code FileTypeMap} for each {@code MimeMessageHelper} instance.
*
- * For example, you can specify a custom instance of Spring's
- * {@link ConfigurableMimeFileTypeMap} here. If not explicitly specified, a default
- * {@code ConfigurableMimeFileTypeMap} will be used, containing an extended set of
- * MIME type mappings (as defined by the {@code mime.types} file contained in the
- * Spring jar).
+ * For example, you can specify a custom instance of Spring's {@link ConfigurableMimeFileTypeMap} here. If not
+ * explicitly specified, a default {@code ConfigurableMimeFileTypeMap} will be used, containing an extended set of
+ * MIME type mappings (as defined by the {@code mime.types} file contained in the Spring jar).
* @param defaultFileTypeMap Java Activation file type map
* @see MimeMessageHelper#setFileTypeMap
*/
diff --git a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java
index 1f04f40a8..94af9d85b 100644
--- a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java
+++ b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,14 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.ses;
import java.util.HashMap;
import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.mail.MailException;
+import org.springframework.mail.MailSendException;
+import org.springframework.mail.MailSender;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.util.StringUtils;
import software.amazon.awssdk.services.ses.SesClient;
import software.amazon.awssdk.services.ses.model.Body;
import software.amazon.awssdk.services.ses.model.Content;
@@ -30,18 +34,10 @@
import software.amazon.awssdk.services.ses.model.SendEmailResponse;
import software.amazon.awssdk.services.ses.model.SesException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.mail.MailException;
-import org.springframework.mail.MailSendException;
-import org.springframework.mail.MailSender;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.util.StringUtils;
-
/**
- * Simple MailSender implementation to send E-Mails with the Amazon Simple Email Service.
- * This implementation has no dependencies to the Java Mail API. It can be used to send
- * simple mail messages that doesn't have any attachment and therefore only consist of a
- * text body and a subject line.
+ * Simple MailSender implementation to send E-Mails with the Amazon Simple Email Service. This implementation has no
+ * dependencies to the Java Mail API. It can be used to send simple mail messages that doesn't have any attachment and
+ * therefore only consist of a text body and a subject line.
*
* @author Agim Emruli
* @author Eddú Meléndez
diff --git a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java
index 182eeefae..9efce76ef 100644
--- a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java
+++ b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,9 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.ses;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,34 +29,24 @@
import java.io.OutputStream;
import java.util.Objects;
import java.util.Properties;
-
import javax.activation.FileTypeMap;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
-import software.amazon.awssdk.services.ses.SesClient;
-import software.amazon.awssdk.services.ses.model.SendRawEmailRequest;
-import software.amazon.awssdk.services.ses.model.SendRawEmailResponse;
-import software.amazon.awssdk.services.ses.model.SesException;
-
import org.springframework.mail.MailParseException;
import org.springframework.mail.MailPreparationException;
import org.springframework.mail.MailSendException;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.mail.javamail.MimeMessagePreparator;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import software.amazon.awssdk.services.ses.SesClient;
+import software.amazon.awssdk.services.ses.model.SendRawEmailRequest;
+import software.amazon.awssdk.services.ses.model.SendRawEmailResponse;
+import software.amazon.awssdk.services.ses.model.SesException;
/**
* Tests for class {@link SimpleEmailServiceJavaMailSender}.
diff --git a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java
index 82991a123..b529e2264 100644
--- a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java
+++ b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,29 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package io.awspring.cloud.ses;
-import java.util.Objects;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.util.Objects;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
+import org.springframework.mail.MailSendException;
+import org.springframework.mail.SimpleMailMessage;
import software.amazon.awssdk.services.ses.SesClient;
import software.amazon.awssdk.services.ses.model.SendEmailRequest;
import software.amazon.awssdk.services.ses.model.SendEmailResponse;
import software.amazon.awssdk.services.ses.model.SesException;
-import org.springframework.mail.MailSendException;
-import org.springframework.mail.SimpleMailMessage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
/**
* Tests for {@link SimpleEmailServiceMailSender}.
*