From d59c25fb41ecee974def61a45e4c24017ee7ab88 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 4 Jan 2024 16:56:27 -0500 Subject: [PATCH] Fix metadata auto-config for optional SC-AWS dep --- .../metadata/store/MetadataStoreAutoConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java b/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java index a989feee..7af1f1d0 100644 --- a/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java +++ b/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.cloud.fn.common.metadata.store; import com.hazelcast.core.HazelcastInstance; import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer; -import io.awspring.cloud.autoconfigure.dynamodb.DynamoDbAutoConfiguration; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.RetryForever; @@ -56,8 +55,10 @@ import org.springframework.jdbc.core.JdbcTemplate; * @author Corneil du Plessis * @since 2.0.2 */ -@AutoConfiguration(after = { RedisAutoConfiguration.class, MongoAutoConfiguration.class, - HazelcastAutoConfiguration.class, JdbcTemplateAutoConfiguration.class, DynamoDbAutoConfiguration.class }) +@AutoConfiguration( + after = { RedisAutoConfiguration.class, MongoAutoConfiguration.class, HazelcastAutoConfiguration.class, + JdbcTemplateAutoConfiguration.class }, + afterName = "io.awspring.cloud.autoconfigure.dynamodb.DynamoDbAutoConfiguration") @ConditionalOnClass(ConcurrentMetadataStore.class) @EnableConfigurationProperties(MetadataStoreProperties.class) public class MetadataStoreAutoConfiguration {