fix: correct conditional for S3CrtAsyncClientAutoConfiguration (#970)

Co-authored-by: Iuliia Sobolevska <isobolevska@netflix.com>
awspring · Dec 1, 2023 · de5d2f3 · de5d2f3
1 parent bea0e01
commit de5d2f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...e/src/main/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfiguration.java b/...e/src/main/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfiguration.java
@@ -42,7 +42,7 @@
  * @since 3.0
  */
 @AutoConfiguration
-@ConditionalOnClass({ S3Client.class })
+@ConditionalOnClass({ S3Client.class, S3AsyncClient.class })
 @EnableConfigurationProperties({ S3Properties.class })
 @ConditionalOnProperty(name = "spring.cloud.aws.s3.enabled", havingValue = "true", matchIfMissing = true)
 @AutoConfigureBefore(S3TransferManagerAutoConfiguration.class)

diff --git a/.../test/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfigurationTests.java b/.../test/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfigurationTests.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
@@ -92,6 +93,14 @@ void setsPropertiesOnClient() {
 				});
 	}
 
+	@Test
+	void handlesMissingS3AsyncClient() {
+		contextRunner.withClassLoader(new FilteredClassLoader(S3AsyncClient.class)).run(context -> {
+			assertThat(context).hasNotFailed();
+			assertThat(context).doesNotHaveBean(S3AsyncClient.class);
+		});
+	}
+
 	private static S3NativeClientConfiguration s3NativeClientConfiguration(S3AsyncClient client) {
 		ConfiguredAwsClient configuredClient = new ConfiguredAwsClient(client);
 		SdkAsyncHttpClient sdkAsyncHttpClient = configuredClient.getAsyncHttpClient();