Apply changes to Auto-configuration

See: https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#auto-configuration-registration
zalando · Jun 19, 2023 · f0c2f73 · f0c2f73
1 parent 47ced1a
commit f0c2f73
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/...e/src/main/java/org/zalando/riptide/autoconfigure/OpenTracingFlowIdAutoConfiguration.java b/...e/src/main/java/org/zalando/riptide/autoconfigure/OpenTracingFlowIdAutoConfiguration.java
@@ -3,6 +3,7 @@
 import io.opentracing.Tracer;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apiguardian.api.API;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -22,7 +23,7 @@
  * We use org.zalando.riptide.autoconfigure.FlowHttpRequestInterceptor, that is adapted to Apache HttpClient 5.x.
  */
 @API(status = STABLE)
-@Configuration
+@AutoConfiguration
 @ConditionalOnBean(Tracer.class)
 @AutoConfigureAfter(name = {
         "org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration",

diff --git a/...toconfigure/src/main/java/org/zalando/riptide/autoconfigure/RiptideAutoConfiguration.java b/...toconfigure/src/main/java/org/zalando/riptide/autoconfigure/RiptideAutoConfiguration.java
@@ -1,16 +1,16 @@
 package org.zalando.riptide.autoconfigure;
 
 import org.apiguardian.api.API;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 @API(status = STABLE)
-@Configuration
+@AutoConfiguration
 @AutoConfigureAfter(name = {
         "org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration",
         "org.zalando.logbook.autoconfigure.LogbookAutoConfiguration",

diff --git a/...nfigure/src/main/java/org/zalando/riptide/autoconfigure/RiptideTestAutoConfiguration.java b/...nfigure/src/main/java/org/zalando/riptide/autoconfigure/RiptideTestAutoConfiguration.java
@@ -2,6 +2,7 @@
 
 import org.apiguardian.api.API;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,7 +13,7 @@
 import static org.springframework.test.web.client.MockRestServiceServer.createServer;
 
 @API(status = EXPERIMENTAL)
-@Configuration
+@AutoConfiguration
 @AutoConfigureBefore(RiptideAutoConfiguration.class)
 public class RiptideTestAutoConfiguration {
 

diff --git a/riptide-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/riptide-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 @@
+org.zalando.riptide.autoconfigure.OpenTracingFlowIdAutoConfiguration
+org.zalando.riptide.autoconfigure.RiptideAutoConfiguration
+org.zalando.riptide.autoconfigure.RiptideTestAutoConfiguration