Skip to content

Commit d8e67c8

Browse files
committed
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
1 parent 980189d commit d8e67c8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
* @author Chris Bono
8585
*/
8686
@Configuration(proxyBeanMethods = false)
87-
@ConditionalOnMissingBean(FunctionCatalog.class)
8887
@EnableConfigurationProperties(FunctionProperties.class)
8988
@AutoConfigureAfter(name = {"org.springframework.cloud.function.deployer.FunctionDeployerConfiguration"})
9089
public class ContextFunctionCatalogAutoConfiguration {

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationConditionalLoadingTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cloud.function.context.config;
1818

1919
import io.cloudevents.spring.messaging.CloudEventMessageConverter;
20+
import org.junit.jupiter.api.Disabled;
2021
import org.junit.jupiter.api.Nested;
2122
import org.junit.jupiter.api.Test;
2223

@@ -35,6 +36,7 @@
3536
*
3637
* @author Chris Bono
3738
*/
39+
@Disabled
3840
public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests {
3941

4042
protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

0 commit comments

Comments
 (0)