diff --git a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java index 5eb69759..dbe13ed0 100644 --- a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java +++ b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java @@ -20,16 +20,16 @@ import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.cloud.aws.context.annotation.ConditionalOnMissingAmazonClient; import org.springframework.cloud.aws.core.region.RegionProvider; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * @author Artem Bilan */ -@Configuration +@AutoConfiguration @ConditionalOnMissingAmazonClient(AmazonS3.class) public class AmazonS3Configuration { diff --git a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java index 73b66836..cd93eb91 100644 --- a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java +++ b/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java @@ -24,6 +24,7 @@ import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -31,7 +32,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.cloud.aws.core.env.ResourceIdResolver; import org.springframework.cloud.aws.core.region.RegionProvider; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.integration.aws.support.S3SessionFactory; import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; @@ -40,10 +40,9 @@ import org.springframework.util.StringUtils; * @author Timo Salm * @author David Turanski */ -@Configuration +@AutoConfiguration @EnableConfigurationProperties(AmazonS3Properties.class) @AutoConfigureBefore(AmazonS3Configuration.class) - public class CompatibleStorageAmazonS3Configuration { @Bean diff --git a/common/aws-s3-common/src/main/resources/META-INF/spring.factories b/common/aws-s3-common/src/main/resources/META-INF/spring.factories index c3d0c35d..f8276c3c 100644 --- a/common/aws-s3-common/src/main/resources/META-INF/spring.factories +++ b/common/aws-s3-common/src/main/resources/META-INF/spring.factories @@ -1,5 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.common.aws.s3.CompatibleStorageAmazonS3Configuration,\ - org.springframework.cloud.fn.common.aws.s3.AmazonS3Configuration org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.fn.common.aws.s3.AutoConfigurationExclusionEnvironmentPostProcessor diff --git a/common/aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..9966a9e5 --- /dev/null +++ b/common/aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +org.springframework.cloud.fn.common.aws.s3.CompatibleStorageAmazonS3Configuration +org.springframework.cloud.fn.common.aws.s3.AmazonS3Configuration diff --git a/common/cdc-debezium-boot-starter/src/main/java/org/springframework/cloud/fn/common/cdc/CdcAutoConfiguration.java b/common/cdc-debezium-boot-starter/src/main/java/org/springframework/cloud/fn/common/cdc/CdcAutoConfiguration.java index d4627b68..8c7db92f 100644 --- a/common/cdc-debezium-boot-starter/src/main/java/org/springframework/cloud/fn/common/cdc/CdcAutoConfiguration.java +++ b/common/cdc-debezium-boot-starter/src/main/java/org/springframework/cloud/fn/common/cdc/CdcAutoConfiguration.java @@ -25,15 +25,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.kafka.connect.source.SourceRecord; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; /** * @author Christian Tzolov */ -@Configuration +@AutoConfiguration @Import(CdcCommonConfiguration.class) public class CdcAutoConfiguration { diff --git a/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring.factories b/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index cc6cecc9..00000000 --- a/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.fn.common.cdc.CdcAutoConfiguration diff --git a/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..5cafc4ed --- /dev/null +++ b/common/cdc-debezium-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.common.cdc.CdcAutoConfiguration diff --git a/common/config-common/src/main/resources/META-INF/spring.factories b/common/config-common/src/main/resources/META-INF/spring.factories deleted file mode 100644 index b41d7bb4..00000000 --- a/common/config-common/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.common.config.SpelExpressionConverterConfiguration diff --git a/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java b/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java index ac081c5a..f6ab135f 100644 --- a/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java +++ b/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java @@ -28,12 +28,12 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.mongodb.core.MongoTemplate; @@ -55,7 +55,7 @@ import org.springframework.jdbc.core.JdbcTemplate; * @author David Turanski * @since 2.0.2 */ -@Configuration +@AutoConfiguration @ConditionalOnClass(ConcurrentMetadataStore.class) @EnableConfigurationProperties(MetadataStoreProperties.class) public class MetadataStoreAutoConfiguration { diff --git a/common/metadata-store-common/src/main/resources/META-INF/spring.factories b/common/metadata-store-common/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f9789086..00000000 --- a/common/metadata-store-common/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.common.metadata.store.MetadataStoreAutoConfiguration diff --git a/common/metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..77a75edd --- /dev/null +++ b/common/metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.common.metadata.store.MetadataStoreAutoConfiguration diff --git a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java b/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java index ed2f7ec3..6bc87f85 100644 --- a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java +++ b/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -49,7 +50,7 @@ import org.springframework.messaging.MessageChannel; /** * @author Artem Bilan */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration @EnableConfigurationProperties(AggregatorFunctionProperties.class) public class AggregatorFunctionConfiguration { diff --git a/function/aggregator-function/src/main/resources/META-INF/spring.factories b/function/aggregator-function/src/main/resources/META-INF/spring.factories index 55a57ec9..7211caa4 100644 --- a/function/aggregator-function/src/main/resources/META-INF/spring.factories +++ b/function/aggregator-function/src/main/resources/META-INF/spring.factories @@ -1,4 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.aggregator.AggregatorFunctionConfiguration org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.fn.aggregator.ExcludeStoresAutoConfigurationEnvironmentPostProcessor diff --git a/function/aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..8c697c53 --- /dev/null +++ b/function/aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.aggregator.AggregatorFunctionConfiguration diff --git a/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java b/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java index 53a0c7c4..89179722 100644 --- a/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java +++ b/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java @@ -20,9 +20,9 @@ import java.util.function.Function; import reactor.core.publisher.Flux; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.integration.transformer.ExpressionEvaluatingTransformer; import org.springframework.messaging.Message; @@ -30,7 +30,7 @@ import org.springframework.messaging.Message; * @author Artem Bilan * @author David Turanski */ -@Configuration(proxyBeanMethods = false) +@AutoConfiguration @EnableConfigurationProperties(FilterFunctionProperties.class) public class FilterFunctionConfiguration { diff --git a/function/filter-function/src/main/resources/META-INF/spring.factories b/function/filter-function/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 4823a19e..00000000 --- a/function/filter-function/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.filter.FilterFunctionConfiguration diff --git a/function/filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..8973856f --- /dev/null +++ b/function/filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.filter.FilterFunctionConfiguration diff --git a/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java b/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java index 85c8eedf..20e4da31 100644 --- a/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java +++ b/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java @@ -24,10 +24,10 @@ import java.util.function.Function; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; import org.springframework.integration.transformer.HeaderEnricher; import org.springframework.integration.transformer.support.ExpressionEvaluatingHeaderValueMessageProcessor; @@ -38,7 +38,7 @@ import org.springframework.messaging.Message; * @author Christian Tzolov * @author Soby Chacko */ -@Configuration +@AutoConfiguration @EnableConfigurationProperties(HeaderEnricherFunctionProperties.class) @ConditionalOnProperty(prefix = "header.enricher", value = "headers") public class HeaderEnricherFunctionConfiguration { diff --git a/function/header-enricher-function/src/main/resources/META-INF/spring.factories b/function/header-enricher-function/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 15c09a96..00000000 --- a/function/header-enricher-function/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.header.enricher.HeaderEnricherFunctionConfiguration diff --git a/function/header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..9e5532de --- /dev/null +++ b/function/header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.header.enricher.HeaderEnricherFunctionConfiguration diff --git a/function/spel-function/src/main/resources/META-INF/spring.factories b/function/spel-function/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 3c101209..00000000 --- a/function/spel-function/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.spel.SpelFunctionConfiguration diff --git a/function/spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..6cd2fda3 --- /dev/null +++ b/function/spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.spel.SpelFunctionConfiguration diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java b/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java index a341e484..475c1402 100644 --- a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java +++ b/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.BeanFactory; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; @@ -46,7 +46,7 @@ import org.springframework.util.StringUtils; * * @author David Turanski **/ -@Configuration +@AutoConfiguration @EnableConfigurationProperties(TaskLaunchRequestFunctionProperties.class) public class TaskLaunchRequestFunctionConfiguration { diff --git a/function/task-launch-request-function/src/main/resources/META-INF/spring.factories b/function/task-launch-request-function/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 15653c2d..00000000 --- a/function/task-launch-request-function/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springframework.cloud.fn.task.launch.request.TaskLaunchRequestFunctionConfiguration diff --git a/function/task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..a8ac8f00 --- /dev/null +++ b/function/task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.fn.task.launch.request.TaskLaunchRequestFunctionConfiguration