refactor

awspring · Oct 20, 2024 · 2968e66 · 2968e66
1 parent 125a19d
commit 2968e66
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 55 deletions.
diff --git a/...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java b/...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java
@@ -81,7 +81,6 @@ S3ClientBuilder s3ClientBuilder(AwsClientBuilderConfigurer awsClientBuilderConfi
 				connectionDetails.getIfAvailable(), configurer.getIfAvailable(), s3ClientCustomizers.orderedStream(),
 				awsSyncClientCustomizers.orderedStream());
 
-
 		if (ClassUtils.isPresent("software.amazon.awssdk.s3accessgrants.plugin.S3AccessGrantsPlugin", null)) {
 			S3AccessGrantsPlugin s3AccessGrantsPlugin = S3AccessGrantsPlugin.builder()
 					.enableFallback(properties.getPlugin().getEnableFallback()).build();
@@ -94,26 +93,6 @@ S3ClientBuilder s3ClientBuilder(AwsClientBuilderConfigurer awsClientBuilderConfi
 		return builder;
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(value = S3EncryptionClient.class )
-	S3EncryptionClient.Builder s3EncrpytionClientBuilder(AwsClientBuilderConfigurer awsClientBuilderConfigurer,
-									ObjectProvider<AwsClientCustomizer<S3EncryptionClient.Builder>> configurer,
-									ObjectProvider<AwsConnectionDetails> connectionDetails,
-									ObjectProvider<S3EncryptionClientCustomizer> s3ClientCustomizers,
-									ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers,
-								ObjectProvider<S3RsaProvider> rsaProvider, ObjectProvider<S3AesProvider> aesProvider) {
-		S3EncryptionClient.Builder builder = awsClientBuilderConfigurer.configureSyncClient(S3EncryptionClient.builder(), this.properties,
-			connectionDetails.getIfAvailable(), configurer. getIfAvailable(), s3ClientCustomizers.orderedStream(),
-			awsSyncClientCustomizers.orderedStream());
-
-		Optional.ofNullable(this.properties.getCrossRegionEnabled()).ifPresent(builder::crossRegionAccessEnabled);
-		builder.serviceConfiguration(this.properties.toS3Configuration());
-
-		configureEncryptionProperties(rsaProvider, aesProvider, builder);
-		return builder;
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(S3Operations.class)
 	@ConditionalOnBean(S3ObjectConverter.class)
@@ -144,17 +123,67 @@ else if (awsProperties.getEndpoint() != null) {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnMissingClass(value = {"software.amazon.encryption.s3.S3EncryptionClient"})
-	S3Client s3Client(S3Properties properties, S3ClientBuilder s3ClientBuilder) {
+	@ConditionalOnMissingClass(value = { "software.amazon.encryption.s3.S3EncryptionClient" })
+	S3Client s3Client(S3ClientBuilder s3ClientBuilder) {
 		return s3ClientBuilder.build();
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = {"software.amazon.encryption.s3.S3EncryptionClient"})
-	S3Client s3EncryptionClient(S3EncryptionClient.Builder s3EncryptionBuilder, S3ClientBuilder s3ClientBuilder) {
-		s3EncryptionBuilder.wrappedClient(s3ClientBuilder.build());
-		return s3EncryptionBuilder.build();
+	@Configuration
+	@ConditionalOnClass(name = { "software.amazon.encryption.s3.S3EncryptionClient" })
+	static class S3EncryptionConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean
+		S3Client s3EncryptionClient(S3EncryptionClient.Builder s3EncryptionBuilder, S3ClientBuilder s3ClientBuilder) {
+			s3EncryptionBuilder.wrappedClient(s3ClientBuilder.build());
+			return s3EncryptionBuilder.build();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		S3EncryptionClient.Builder s3EncrpytionClientBuilder(S3Properties properties,
+				AwsClientBuilderConfigurer awsClientBuilderConfigurer,
+				ObjectProvider<AwsClientCustomizer<S3EncryptionClient.Builder>> configurer,
+				ObjectProvider<AwsConnectionDetails> connectionDetails,
+				ObjectProvider<S3EncryptionClientCustomizer> s3ClientCustomizers,
+				ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers,
+				ObjectProvider<S3RsaProvider> rsaProvider, ObjectProvider<S3AesProvider> aesProvider) {
+			S3EncryptionClient.Builder builder = awsClientBuilderConfigurer.configureSyncClient(
+					S3EncryptionClient.builder(), properties, connectionDetails.getIfAvailable(),
+					configurer.getIfAvailable(), s3ClientCustomizers.orderedStream(),
+					awsSyncClientCustomizers.orderedStream());
+
+			Optional.ofNullable(properties.getCrossRegionEnabled()).ifPresent(builder::crossRegionAccessEnabled);
+			builder.serviceConfiguration(properties.toS3Configuration());
+
+			configureEncryptionProperties(properties, rsaProvider, aesProvider, builder);
+			return builder;
+		}
+
+		private static void configureEncryptionProperties(S3Properties properties,
+				ObjectProvider<S3RsaProvider> rsaProvider, ObjectProvider<S3AesProvider> aesProvider,
+				S3EncryptionClient.Builder builder) {
+			PropertyMapper propertyMapper = PropertyMapper.get();
+			var encryptionProperties = properties.getEncryption();
+
+			propertyMapper.from(encryptionProperties::isEnableDelayedAuthenticationMode)
+					.to(builder::enableDelayedAuthenticationMode);
+			propertyMapper.from(encryptionProperties::isEnableLegacyUnauthenticatedModes)
+					.to(builder::enableLegacyUnauthenticatedModes);
+			propertyMapper.from(encryptionProperties::isEnableMultipartPutObject).to(builder::enableMultipartPutObject);
+
+			if (!StringUtils.hasText(properties.getEncryption().getKeyId())) {
+				if (aesProvider.getIfAvailable() != null) {
+					builder.aesKey(aesProvider.getObject().generateSecretKey());
+				}
+				else {
+					builder.rsaKeyPair(rsaProvider.getObject().generateKeyPair());
+				}
+			}
+			else {
+				propertyMapper.from(encryptionProperties::getKeyId).to(builder::kmsKeyId);
+			}
+		}
 	}
 
 	@Configuration
@@ -176,28 +205,4 @@ S3OutputStreamProvider inMemoryBufferingS3StreamProvider(S3Client s3Client,
 				contentTypeResolver.orElseGet(PropertiesS3ObjectContentTypeResolver::new));
 	}
 
-
-	private void configureEncryptionProperties(ObjectProvider<S3RsaProvider> rsaProvider, ObjectProvider<S3AesProvider> aesProvider, S3EncryptionClient.Builder builder) {
-		PropertyMapper propertyMapper = PropertyMapper.get();
-		var encryptionProperties = properties.getEncryption();
-
-		propertyMapper.from(encryptionProperties::isEnableDelayedAuthenticationMode)
-			.to(builder::enableDelayedAuthenticationMode);
-		propertyMapper.from(encryptionProperties::isEnableLegacyUnauthenticatedModes)
-			.to(builder::enableLegacyUnauthenticatedModes);
-		propertyMapper.from(encryptionProperties::isEnableMultipartPutObject)
-			.to(builder::enableMultipartPutObject);
-
-		if (!StringUtils.hasText(properties.getEncryption().getKeyId())) {
-			if (aesProvider.getIfAvailable() != null) {
-				builder.aesKey(aesProvider.getObject().generateSecretKey());
-				}
-			else {
-				builder.rsaKeyPair(rsaProvider.getObject().generateKeyPair());
-			}
-		} else {
-			propertyMapper.from(encryptionProperties::getKeyId).to(builder::kmsKeyId);
-		}
-	}
-
 }
diff --git a/...spring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java b/...spring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java
@@ -68,7 +68,7 @@ void testCounter() {
 
 		try (ConfigurableApplicationContext context = application.run(
 				"--spring.cloud.aws.endpoint=" + localstack.getEndpoint(),
-			    "--spring.cloud.aws.s3.encryption.keyId=234abcd-12ab-34cd-56ef-1234567890ab",
+				"--spring.cloud.aws.s3.encryption.keyId=234abcd-12ab-34cd-56ef-1234567890ab",
 				"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
 				"--spring.cloud.aws.region.static=us-east-1", "--management.cloudwatch.metrics.export.step=5s",
 				"--management.cloudwatch.metrics.export.namespace=awspring/spring-cloud-aws",

diff --git a/...toconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3ClientCustomizerTests.java b/...toconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3ClientCustomizerTests.java
@@ -46,7 +46,7 @@ class S3ClientCustomizerTests {
 					"spring.cloud.aws.credentials.access-key:noop", "spring.cloud.aws.credentials.secret-key:noop")
 			.withConfiguration(AutoConfigurations.of(AwsAutoConfiguration.class, RegionProviderAutoConfiguration.class,
 					CredentialsProviderAutoConfiguration.class, S3AutoConfiguration.class))
-		.withClassLoader(new FilteredClassLoader(S3EncryptionClient.class));
+			.withClassLoader(new FilteredClassLoader(S3EncryptionClient.class));
 
 	@Test
 	void customClientCustomizer() {