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

AbstractScmAccessor should apply logic from setBasedir. (#1471)

Browse Source
This commit is contained in:
Henryk Konsek
2020-01-13 21:13:55 +01:00
committed by Spencer Gibb
parent 707c496e4f
commit 3729648e5a
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AbstractScmAccessor.java
View File

@@ -94,8 +94,8 @@ public abstract class AbstractScmAccessor implements ResourceLoaderAware {
public AbstractScmAccessor(ConfigurableEnvironment environment,
AbstractScmAccessorProperties properties) {
this.environment = environment;
this.basedir = properties.getBasedir() == null ? createBaseDir()
: properties.getBasedir();
this.setBasedir(properties.getBasedir() == null ? createBaseDir()
: properties.getBasedir());
this.passphrase = properties.getPassphrase();
this.password = properties.getPassword();
this.searchPaths = properties.getSearchPaths();

12
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryTests.java
View File

@@ -336,6 +336,18 @@ public class MultipleJGitEnvironmentRepositoryTests {
this.repository.afterPropertiesSet();
}
@Test
public void exceptionNotThrownIfRelativeBasedirIsPassedByProperties()
throws Exception {
MultipleJGitEnvironmentProperties props = new MultipleJGitEnvironmentProperties();
props.setBasedir(new File("relative"));
this.repository = new MultipleJGitEnvironmentRepository(this.environment, props);
String defaultUri = ConfigServerTestUtils.prepareLocalRepo("config-repo");
this.repository.setUri(defaultUri);
this.repository.setRepos(createRepositories());
this.repository.afterPropertiesSet();
}
private String getUri(String pattern) {
String uri = null;