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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-21 15:40:19 -05:00
parent 16974e0302 383338c56d
commit 871a883615
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java
View File

@@ -89,13 +89,13 @@ public class CloudFoundryReactiveDiscoveryClientConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns", @ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns",
havingValue = "true") havingValue = "true")
public static class DnsBasedCloudFoundryReactiveDiscoveryClientConfig { public static class DnsConfig {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnProperty( @ConditionalOnProperty(
value = "spring.cloud.cloudfoundry.discovery.use-container-ip", value = "spring.cloud.cloudfoundry.discovery.use-container-ip",
havingValue = "true") havingValue = "true")
public static class CloudFoundrySimpleDnsBasedReactiveDiscoveryClientConfig { public static class SimpleDnsConfig {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@@ -130,7 +130,7 @@ public class CloudFoundryReactiveDiscoveryClientConfiguration {
@ConditionalOnProperty( @ConditionalOnProperty(
value = "spring.cloud.cloudfoundry.discovery.use-container-ip", value = "spring.cloud.cloudfoundry.discovery.use-container-ip",
havingValue = "false", matchIfMissing = true) havingValue = "false", matchIfMissing = true)
public static class CloudFoundryAppServiceReactiveDiscoveryClientConfig { public static class AppServiceConfig {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean