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

Adds multi-repo shortcut support back.

Browse Source 
fixes gh-1055
This commit is contained in:
Spencer Gibb
2018-06-11 13:14:33 -04:00
parent 247e280410
commit f352ecf5f3
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentProperties.java
View File

@@ -58,6 +58,13 @@ public class MultipleJGitEnvironmentProperties extends JGitEnvironmentProperties
*/
private String name;
public PatternMatchingJGitEnvironmentProperties() {
}
public PatternMatchingJGitEnvironmentProperties(String uri) {
setUri(uri);
}
public String[] getPattern() {
return pattern;
}

17
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java
View File

@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
import org.assertj.core.api.Assertions;
import org.eclipse.jgit.util.FileUtils;
import org.junit.After;
import org.junit.Before;
@@ -222,6 +223,22 @@ public class MultipleJGitEnvironmentRepositoryIntegrationTests {
.run();
}
@Test
public void patternMatchingShortcutSyntax() throws IOException {
String defaultRepoUri = ConfigServerTestUtils.prepareLocalRepo("config-repo");
String test1RepoUri = ConfigServerTestUtils.prepareLocalRepo("test1-config-repo");
this.context = new SpringApplicationBuilder(TestConfiguration.class)
.web(WebApplicationType.NONE)
.properties("spring.cloud.config.server.git.repos.admin:" + test1RepoUri,
"spring.cloud.config.server.git.uri:" + defaultRepoUri)
.run();
MultipleJGitEnvironmentProperties properties = this.context.getBean(MultipleJGitEnvironmentProperties.class);
Assertions.assertThat(properties.getRepos()).hasSize(1)
.containsOnlyKeys("admin");
}
@Configuration
@EnableConfigurationProperties(ConfigServerProperties.class)
@Import({ PropertyPlaceholderAutoConfiguration.class,