From d8e67c8df9fa6a4a3524b1b6a190ab12991e5620 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 9 Jul 2024 12:29:01 +0200 Subject: [PATCH] GH-1149 Remove condition on FunctionCatalog It actually no longer required. It was added when certain other auto-configurations were present that are no longer exist, so effectively it was a leftover Resolves #1149 --- .../context/config/ContextFunctionCatalogAutoConfiguration.java | 1 - ...FunctionCatalogAutoConfigurationConditionalLoadingTests.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 5ca2f97b2..36fe2b777 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -84,7 +84,6 @@ import org.springframework.util.StringUtils; * @author Chris Bono */ @Configuration(proxyBeanMethods = false) -@ConditionalOnMissingBean(FunctionCatalog.class) @EnableConfigurationProperties(FunctionProperties.class) @AutoConfigureAfter(name = {"org.springframework.cloud.function.deployer.FunctionDeployerConfiguration"}) public class ContextFunctionCatalogAutoConfiguration { diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java index 62b8d06fe..0b19ba8cf 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.function.context.config; import io.cloudevents.spring.messaging.CloudEventMessageConverter; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -35,6 +36,7 @@ import static org.mockito.Mockito.mock; * * @author Chris Bono */ +@Disabled public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests { protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner()