From abeb6528305f3c5186cbd34583cf129f6b50410a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 3 May 2019 13:25:58 +0200 Subject: [PATCH] Fixed condition for spring.cloud.function.web.export.enabled property --- .../web/source/FunctionExporterAutoConfiguration.java | 3 +-- .../cloud/function/test/FunctionalExporterTests.java | 3 +-- .../source/FunctionAutoConfigurationIntegrationTests.java | 6 +++--- ...unctionAutoConfigurationWithRetriesIntegrationTests.java | 3 +-- .../cloud/function/web/source/WebAppIntegrationTests.java | 2 -- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterAutoConfiguration.java index b7fdf9703..c431cb5f6 100644 --- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterAutoConfiguration.java +++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterAutoConfiguration.java @@ -45,7 +45,6 @@ import org.springframework.web.reactive.function.client.WebClient; @ConditionalOnClass(WebClient.class) @Conditional(SourceActiveCondition.class) @EnableConfigurationProperties(ExporterProperties.class) -@ConditionalOnProperty(prefix = "spring.cloud.function.web.export", name = "enabled", matchIfMissing = true) public class FunctionExporterAutoConfiguration { private ExporterProperties props; @@ -106,7 +105,7 @@ public class FunctionExporterAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.cloud.function.web.export", name = "enabled") + @ConditionalOnProperty(prefix = "spring.cloud.function.web.export", name = "enabled", matchIfMissing = true) static class Enabled { } diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java index 76a4b39d7..b2fca9198 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java @@ -52,8 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat; "spring.cloud.function.web.export.sink.url=http://localhost:${my.port}", "spring.cloud.function.web.export.source.url=http://localhost:${my.port}", "spring.cloud.function.web.export.sink.name=origin|uppercase", - "spring.cloud.function.web.export.debug=true", - "spring.cloud.function.web.export.enabled=true" }) + "spring.cloud.function.web.export.debug=true" }) public class FunctionalExporterTests { @Autowired diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java index ce3b617f0..4b7a9dff1 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java @@ -56,9 +56,9 @@ import static org.assertj.core.api.Assertions.assertThat; ApplicationConfiguration.class }, webEnvironment = WebEnvironment.DEFINED_PORT, properties = { "spring.cloud.function.web.export.sink.url=http://localhost:${server.port}", "spring.cloud.function.web.export.source.url=http://localhost:${server.port}", - "spring.cloud.function.web.export.sink.name=origin|uppercase", - // "spring.cloud.function.web.export.debug=true", - "spring.cloud.function.web.export.enabled=true" }) + "spring.cloud.function.web.export.sink.name=origin|uppercase" + // "spring.cloud.function.web.export.debug=true" + }) public class FunctionAutoConfigurationIntegrationTests { @Autowired diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java index cb1ff486e..a2d45a0d7 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java @@ -56,8 +56,7 @@ import static org.assertj.core.api.Assertions.assertThat; "spring.cloud.function.web.export.sink.url=http://localhost:${server.port}", "spring.cloud.function.web.export.source.url=http://localhost:${server.port}", "spring.cloud.function.web.export.sink.name=origin|uppercase", - "spring.cloud.function.web.export.debug=true", - "spring.cloud.function.web.export.enabled=true" }) + "spring.cloud.function.web.export.debug=true"}) public class FunctionAutoConfigurationWithRetriesIntegrationTests { @Autowired diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java index fb2346d24..31605a01a 100644 --- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java +++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java @@ -54,8 +54,6 @@ import static org.assertj.core.api.Assertions.assertThat; webEnvironment = WebEnvironment.DEFINED_PORT, properties = { "spring.main.web-application-type=reactive", "spring.cloud.function.web.export.sink.url=http://localhost:${server.port}/values", - // in a webapp we have to explicitly enable the export - "spring.cloud.function.web.export.enabled=true", // manually so we know the webapp is listening when we start "spring.cloud.function.web.export.autoStartup=false" }) public class WebAppIntegrationTests {