fix: s3 auto configuration should only activate when spting-content-s…

…3 is on the classpath (#1356) (#1359)
paulcwarren · Apr 12, 2023 · d639e11 · d639e11
1 parent 1a64616
commit d639e11
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...org/springframework/content/fs/boot/autoconfigure/FilesystemContentAutoConfiguration.java b/...org/springframework/content/fs/boot/autoconfigure/FilesystemContentAutoConfiguration.java
@@ -24,7 +24,6 @@
 @Configuration
 @AutoConfigureAfter({ JpaVersionsAutoConfiguration.class })
 @ConditionalOnClass(FilesystemStoreRegistrar.class)
-
 @ConditionalOnProperty(
         prefix="spring.content.storage.type",
         name = "default",

diff --git a/...nternal/org/springframework/content/s3/boot/autoconfigure/S3ContentAutoConfiguration.java b/...nternal/org/springframework/content/s3/boot/autoconfigure/S3ContentAutoConfiguration.java
@@ -25,7 +25,7 @@
 
 @Configuration
 @AutoConfigureAfter({ JpaVersionsAutoConfiguration.class })
-@ConditionalOnClass(S3Client.class)
+@ConditionalOnClass({S3StoreConfiguration.class, S3Client.class})
 @ConditionalOnProperty(
         prefix="spring.content.storage.type",
         name = "default",