SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed condition for spring.cloud.function.web.export.enabled property

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-05-03 13:25:58 +02:00
parent f2e4cea47d
commit abeb652830
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterAutoConfiguration.java
View File

@@ -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 {
}

3
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/test/FunctionalExporterTests.java
View File

@@ -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

6
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationIntegrationTests.java
View File

@@ -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

3
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/FunctionAutoConfigurationWithRetriesIntegrationTests.java
View File

@@ -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

2
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/source/WebAppIntegrationTests.java
View File

@@ -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 {