From a056a0f0ca8f37d1cc374a7e42a840a78a13fa7b Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 12 Apr 2018 12:13:09 -0400 Subject: [PATCH] Updates to new properties class --- .../environment/JGitEnvironmentProperties.java | 13 +++++++++++++ .../environment/JGitEnvironmentRepository.java | 1 + .../environment/JGitEnvironmentRepositoryTests.java | 11 +++++++---- ...leJGitEnvironmentRepositoryIntegrationTests.java | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java index 07411da4..a2a4bcf1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentProperties.java @@ -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; + } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index 7c65c5b5..fdb9641e 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -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() { diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java index f4be7d1d..f802db91 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java @@ -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"); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java index df157a59..a81a3d82 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/MultipleJGitEnvironmentRepositoryIntegrationTests.java @@ -113,8 +113,8 @@ public class MultipleJGitEnvironmentRepositoryIntegrationTests { Map repoMapping = new LinkedHashMap(); 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