Merge pull request #544 from prisma-capacity/issue543

#543: new auto config annotation and factory file
prisma-capacity · Nov 24, 2022 · 594dc13 · 594dc13
2 parents bac59a1 + 41edb4d
commit 594dc13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...acapacity/aws/cloud/meta/spring/boot/autoconfiguration/EC2CloudMetaAutoConfiguration.java b/...acapacity/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/...acapacity/aws/cloud/meta/spring/boot/autoconfiguration/ECSCloudMetaAutoConfiguration.java b/...acapacity/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
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/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
+