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

Switch to @EnableConfigurationProperties to make override predictable

Browse Source
This commit is contained in:
Dave Syer
2016-04-24 14:08:11 +01:00
parent 9c4624389e
commit 8c8d218f71
1 changed files with 1 additions and 5 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/CloudFoundryDiscoveryClientConfiguration.java
View File

@@ -34,9 +34,9 @@ import org.springframework.core.env.Environment;
* @author Josh Long
*/
@Configuration
@EnableConfigurationProperties
@ConditionalOnClass(CloudFoundryClient.class)
@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.enabled", matchIfMissing = true)
@EnableConfigurationProperties(CloudFoundryDiscoveryProperties.class)
public class CloudFoundryDiscoveryClientConfiguration {
@Autowired
@@ -74,8 +74,4 @@ public class CloudFoundryDiscoveryClientConfiguration {
return new CloudFoundryDiscoveryClient(cloudFoundryClient, environment);
}
@Bean
public CloudFoundryDiscoveryProperties cloudFoundryDiscoveryProperties() {
return new CloudFoundryDiscoveryProperties();
}
}