Skip to content

Commit

Permalink
GH-1149 Remove condition on FunctionCatalog
Browse files Browse the repository at this point in the history
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
  • Loading branch information
olegz committed Jul 9, 2024
1 parent 980189d commit d8e67c8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
* @author Chris Bono
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(FunctionCatalog.class)
@EnableConfigurationProperties(FunctionProperties.class)
@AutoConfigureAfter(name = {"org.springframework.cloud.function.deployer.FunctionDeployerConfiguration"})
public class ContextFunctionCatalogAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -35,6 +36,7 @@
*
* @author Chris Bono
*/
@Disabled
public class ContextFunctionCatalogAutoConfigurationConditionalLoadingTests {

protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
Expand Down

0 comments on commit d8e67c8

Please sign in to comment.