From 41edb4d412bead1b9c7e374eeb65a43181eeebf7 Mon Sep 17 00:00:00 2001 From: Mattia Brescia <9354343-mattiabrescia@users.noreply.gitlab.com> Date: Mon, 21 Nov 2022 15:46:40 +0100 Subject: [PATCH] #543: new auto config annotation and factory file --- .../boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java | 4 ++-- .../boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 4 ---- ...ringframework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories create mode 100644 aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java b/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java index 8c182cd0..aac11c34 100644 --- a/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java +++ b/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java @@ -15,14 +15,14 @@ */ package eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import eu.prismacapacity.aws.cloud.meta.spring.ec2.EC2CloudMetaConfiguration; -@Configuration +@AutoConfiguration @Import(EC2CloudMetaConfiguration.class) @ConditionalOnClass(EC2CloudMetaConfiguration.class) @ConditionalOnProperty(name = "aws.cloud.meta.enabled", havingValue = "true") diff --git a/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java b/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java index f9bf3790..82a97956 100644 --- a/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java +++ b/aws-cloud-meta-spring-boot-autoconfigure/src/main/java/eu/prismacapacity/aws/cloud/meta/spring/boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java @@ -15,14 +15,14 @@ */ package eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import eu.prismacapacity.aws.cloud.meta.spring.ecs.ECSCloudMetaConfiguration; -@Configuration +@AutoConfiguration @Import(ECSCloudMetaConfiguration.class) @ConditionalOnClass(ECSCloudMetaConfiguration.class) @ConditionalOnProperty(name = "aws.cloud.meta.enabled", havingValue = "true") diff --git a/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 61d03506..00000000 --- a/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration.ECSCloudMetaAutoConfiguration,\ - eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration.EC2CloudMetaAutoConfiguration\ - diff --git a/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..5deeb77d --- /dev/null +++ b/aws-cloud-meta-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration.ECSCloudMetaAutoConfiguration +eu.prismacapacity.aws.cloud.meta.spring.boot.autoconfiguration.EC2CloudMetaAutoConfiguration +