From 83980d34e1b6ed45931573380136aabf9d0f4ba7 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 22 Sep 2022 17:01:33 +0200 Subject: [PATCH] Add new spring-boot .imports files and move auto-configuration classes there --- .../src/main/resources/META-INF/spring.factories | 7 +------ ...gframework.boot.autoconfigure.AutoConfiguration.imports | 4 ++++ .../src/main/resources/META-INF/spring.factories | 3 +-- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 5 +---- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../src/main/resources/META-INF/spring.factories | 4 ---- ...gframework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ 10 files changed, 14 insertions(+), 18 deletions(-) create mode 100644 spring-cloud-function-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-function-deployer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-function-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-function-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-function-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-function-context/src/main/resources/META-INF/spring.factories b/spring-cloud-function-context/src/main/resources/META-INF/spring.factories index ca1caf4a9..98a7ced06 100644 --- a/spring-cloud-function-context/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-context/src/main/resources/META-INF/spring.factories @@ -1,9 +1,4 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration,\ -org.springframework.cloud.function.cloudevent.CloudEventsFunctionExtensionConfiguration,\ -org.springframework.cloud.function.context.config.KotlinLambdaToFunctionAutoConfiguration,\ -org.springframework.cloud.function.context.config.FunctionsEndpointAutoConfiguration org.springframework.cloud.function.context.WrapperDetector=\ org.springframework.cloud.function.context.config.FluxWrapperDetector org.springframework.context.ApplicationContextInitializer=\ -org.springframework.cloud.function.context.config.ContextFunctionCatalogInitializer \ No newline at end of file +org.springframework.cloud.function.context.config.ContextFunctionCatalogInitializer diff --git a/spring-cloud-function-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-function-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..cdfdf65cd --- /dev/null +++ b/spring-cloud-function-context/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration +org.springframework.cloud.function.cloudevent.CloudEventsFunctionExtensionConfiguration +org.springframework.cloud.function.context.config.KotlinLambdaToFunctionAutoConfiguration +org.springframework.cloud.function.context.config.FunctionsEndpointAutoConfiguration diff --git a/spring-cloud-function-deployer/src/main/resources/META-INF/spring.factories b/spring-cloud-function-deployer/src/main/resources/META-INF/spring.factories index d69fbcc61..55304d26b 100644 --- a/spring-cloud-function-deployer/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-deployer/src/main/resources/META-INF/spring.factories @@ -1,2 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.function.deployer.FunctionDeployerConfiguration -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.cloud.function.deployer.FunctionDeployerConfiguration$LegacyPropertyEnvironmentPostProcessor \ No newline at end of file +org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.cloud.function.deployer.FunctionDeployerConfiguration$LegacyPropertyEnvironmentPostProcessor diff --git a/spring-cloud-function-deployer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-function-deployer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..c792ab9e6 --- /dev/null +++ b/spring-cloud-function-deployer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.function.deployer.FunctionDeployerConfiguration diff --git a/spring-cloud-function-observability/src/main/resources/META-INF/spring.factories b/spring-cloud-function-observability/src/main/resources/META-INF/spring.factories index b50aa16e2..e69de29bb 100644 --- a/spring-cloud-function-observability/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-observability/src/main/resources/META-INF/spring.factories @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.observability.ObservationAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-function-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-function-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..c23cf1c76 --- /dev/null +++ b/spring-cloud-function-observability/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.function.observability.ObservationAutoConfiguration diff --git a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories index 3a566621f..8b1378917 100644 --- a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories @@ -1,4 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.rsocket.RSocketAutoConfiguration,\ -org.springframework.cloud.function.rsocket.RSocketCustomizerConfiguration,\ -org.springframework.cloud.function.rsocket.RSocketRoutingAutoConfiguration + diff --git a/spring-cloud-function-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..fdb2838db --- /dev/null +++ b/spring-cloud-function-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +org.springframework.cloud.function.rsocket.RSocketAutoConfiguration +org.springframework.cloud.function.rsocket.RSocketCustomizerConfiguration diff --git a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories index 62f7b592b..71cbc9fa1 100644 --- a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories @@ -1,7 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.web.flux.ReactorAutoConfiguration,\ -org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration,\ -org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc=\ org.springframework.cloud.function.web.flux.ReactorAutoConfiguration,\ org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration diff --git a/spring-cloud-function-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-function-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..74c853d0b --- /dev/null +++ b/spring-cloud-function-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.springframework.cloud.function.web.flux.ReactorAutoConfiguration +org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration +org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration