Change if statement

awspring · Sep 18, 2024 · 3734206 · 3734206
1 parent 240f228
commit 3734206
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -122,7 +122,8 @@ S3Client s3Client(S3Properties properties, S3ClientBuilder s3ClientBuilder,
 					  ObjectProvider<S3RsaProvider> rsaProvider, ObjectProvider<S3AesProvider> aesProvider)
 		throws NoSuchAlgorithmException {
 		if (ClassUtils.isPresent("software.amazon.encryption.s3.S3EncryptionClient", null)
-		|| aesProvider.getIfAvailable() != null || rsaProvider.getIfAvailable() != null) {
+		&& (aesProvider.getIfAvailable() != null || rsaProvider.getIfAvailable() != null ||
+			StringUtils.hasText(properties.getEncryption().getKeyId()))) {
 			return s3EncClient(properties, s3ClientBuilder, rsaProvider, aesProvider);
 		}
 		return s3ClientBuilder.build();