From d1e13e683a423a7d2e09fadf7932379e63ad93d2 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Thu, 20 Oct 2022 23:23:15 -0500 Subject: [PATCH] [SB3 Update] Fix checkstyle issues from previous AWS S3 commit --- .../cloud/fn/common/aws/s3/AmazonS3Configuration.java | 7 +++---- .../aws/s3/CompatibleStorageAmazonS3Configuration.java | 2 +- .../cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java | 4 ++-- .../fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java index 7729d939..14a8b77c 100644 --- a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java +++ b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java @@ -19,15 +19,14 @@ package org.springframework.cloud.fn.common.aws.s3; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; - -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import io.awspring.cloud.autoconfigure.context.ContextCredentialsAutoConfiguration; import io.awspring.cloud.autoconfigure.context.ContextRegionProviderAutoConfiguration; import io.awspring.cloud.context.annotation.ConditionalOnMissingAmazonClient; import io.awspring.cloud.context.config.annotation.ContextDefaultConfigurationRegistrar; import io.awspring.cloud.core.region.RegionProvider; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; diff --git a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java index a1b7c7ad..bc0fd5e4 100644 --- a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java +++ b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java @@ -24,13 +24,13 @@ import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import io.awspring.cloud.core.env.ResourceIdResolver; +import io.awspring.cloud.core.region.RegionProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import io.awspring.cloud.core.region.RegionProvider; import org.springframework.context.annotation.Bean; import org.springframework.integration.aws.support.S3SessionFactory; import org.springframework.lang.Nullable; diff --git a/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java b/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java index cd2dc053..1bda9ff3 100644 --- a/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java +++ b/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java @@ -21,13 +21,13 @@ import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; +import io.awspring.cloud.core.region.RegionProvider; +import io.awspring.cloud.core.region.StaticRegionProvider; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.context.annotation.UserConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import io.awspring.cloud.core.region.RegionProvider; -import io.awspring.cloud.core.region.StaticRegionProvider; import org.springframework.context.annotation.Bean; /** diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java index 7dbdd2e8..aae01e1f 100644 --- a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java +++ b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java @@ -30,7 +30,6 @@ import com.amazonaws.services.s3.model.PutObjectResult; import com.amazonaws.services.s3.model.SetObjectAclRequest; import com.amazonaws.services.s3.transfer.PersistableTransfer; import com.amazonaws.services.s3.transfer.internal.S3ProgressListener; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.io.TempDir;