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

Break @ConfigurationProperties out to type level

Browse Source
This commit is contained in:
Dave Syer
2014-11-17 14:35:52 +00:00
parent 4669102be6
commit 03d827b432
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
View File

@@ -194,6 +194,7 @@ public class ConfigClientProperties {
public void setServiceId(String serviceId) {
this.serviceId = serviceId;
}
}
public ConfigClientProperties override(

8
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java
View File

@@ -17,7 +17,6 @@ package org.springframework.cloud.config.server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -37,8 +36,7 @@ public class ConfigServerConfiguration {
@Profile("native")
protected static class NativeRepositoryConfiguration {
@Bean
@ConfigurationProperties("spring.cloud.config.server.native")
public SpringApplicationEnvironmentRepository repository() {
public SpringApplicationEnvironmentRepository EnvironmentRepository() {
return new SpringApplicationEnvironmentRepository();
}
}
@@ -50,9 +48,9 @@ public class ConfigServerConfiguration {
private ConfigurableEnvironment environment;
@Bean
@ConfigurationProperties("spring.cloud.config.server.git")
public JGitEnvironmentRepository repository() {
public JGitEnvironmentRepository EnvironmentRepository() {
return new JGitEnvironmentRepository(environment);
}
}
}

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java
View File

@@ -42,6 +42,7 @@ import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.OpenSshConfig.Host;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.config.Environment;
import org.springframework.cloud.config.PropertySource;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -55,6 +56,7 @@ import com.jcraft.jsch.Session;
* @author Dave Syer
*
*/
@ConfigurationProperties("spring.cloud.config.server.git")
public class JGitEnvironmentRepository implements EnvironmentRepository {
public static final String DEFAULT_URI = "https://github.com/spring-cloud-samples/config-repo";

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.MapPropertySource;
@@ -38,6 +39,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
*
*/
@ConfigurationProperties("spring.cloud.config.server.native")
public class SpringApplicationEnvironmentRepository implements EnvironmentRepository {
private String[] locations;