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

Updates to new properties class

Browse Source
This commit is contained in:
Spencer Gibb
2018-04-12 12:13:09 -04:00
parent 83bbfb76f8
commit a056a0f0ca
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java
View File

@@ -28,6 +28,11 @@ public class JGitEnvironmentProperties extends AbstractScmAccessorProperties {
private int timeout = 5;
private boolean deleteUntrackedBranches = false;
/**
* Time (in seconds) between refresh of the git repository
*/
private int refreshRate = 0;
public JGitEnvironmentProperties() {
super();
setDefaultLabel(DEFAULT_LABEL);
@@ -64,4 +69,12 @@ public class JGitEnvironmentProperties extends AbstractScmAccessorProperties {
public void setDeleteUntrackedBranches(boolean deleteUntrackedBranches) {
this.deleteUntrackedBranches = deleteUntrackedBranches;
}
public int getRefreshRate() {
return refreshRate;
}
public void setRefreshRate(int refreshRate) {
this.refreshRate = refreshRate;
}
}

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

@@ -139,6 +139,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
this.forcePull = properties.isForcePull();
this.timeout = properties.getTimeout();
this.deleteUntrackedBranches = properties.isDeleteUntrackedBranches();
this.refreshRate = properties.getRefreshRate();
}
public boolean isCloneOnStart() {

11
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
View File

@@ -347,10 +347,12 @@ public class JGitEnvironmentRepositoryTests {
when(statusCommand.call()).thenReturn(status);
when(status.isClean()).thenReturn(true);
JGitEnvironmentRepository repo = new JGitEnvironmentRepository(this.environment);
JGitEnvironmentProperties properties = new JGitEnvironmentProperties();
properties.setRefreshRate(2);
JGitEnvironmentRepository repo = new JGitEnvironmentRepository(this.environment, properties);
repo.setLastRefresh(System.currentTimeMillis() - 5000);
repo.setRefreshRate(2);
boolean shouldPull = repo.shouldPull(git);
@@ -382,9 +384,10 @@ public class JGitEnvironmentRepositoryTests {
when(statusCommand.call()).thenReturn(status);
when(status.isClean()).thenReturn(true);
JGitEnvironmentRepository repo = new JGitEnvironmentRepository(this.environment);
JGitEnvironmentProperties properties = new JGitEnvironmentProperties();
properties.setRefreshRate(1000);
JGitEnvironmentRepository repo = new JGitEnvironmentRepository(this.environment, properties);
repo.setRefreshRate(1000);
repo.setLastRefresh(0);
repo.fetch(git, "master");

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

@@ -113,8 +113,8 @@ public class MultipleJGitEnvironmentRepositoryIntegrationTests {
Map<String, Object> repoMapping = new LinkedHashMap<String, Object>();
repoMapping.put("spring.cloud.config.server.git.repos[test1].pattern", "*test1*");
repoMapping.put("spring.cloud.config.server.git.repos[test1].uri", test1RepoUri);
repoMapping.put("spring.cloud.config.server.git.refreshRate", "30");
this.context = new SpringApplicationBuilder(TestConfiguration.class).web(false)
repoMapping.put("spring.cloud.config.server.git.refresh-rate", "30");
this.context = new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE)
.properties("spring.cloud.config.server.git.uri:" + defaultRepoUri)
.properties(repoMapping).run();
EnvironmentRepository repository = this.context