From 744a7587d30c5719f70003fbb55e63cde521c9c5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 1 Apr 2019 15:50:57 +0100 Subject: [PATCH] Narrow condition for function exporter in AWS custom runtime --- .../function/adapter/aws/CustomRuntimeAutoConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeAutoConfiguration.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeAutoConfiguration.java index 20fdf3769..27a3ef2aa 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeAutoConfiguration.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeAutoConfiguration.java @@ -18,7 +18,9 @@ package org.springframework.cloud.function.adapter.aws; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.function.web.source.DestinationResolver; import org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration; import org.springframework.context.annotation.Bean; @@ -29,6 +31,8 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @AutoConfigureBefore(FunctionExporterAutoConfiguration.class) +@ConditionalOnClass(DestinationResolver.class) +@ConditionalOnProperty(prefix = "spring.cloud.function.web.export", name = "enabled", matchIfMissing = true) public class CustomRuntimeAutoConfiguration { @Bean