From b10135c1eec9c637183735e92bbfe52fc45a41f4 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 Jun 2018 13:56:16 -0400 Subject: [PATCH] Fixing compile errors after merge --- .../JGitEnvironmentRepository.java | 10 ---------- ...EnvironmentRepositoryIntegrationTests.java | 20 ------------------- 2 files changed, 30 deletions(-) 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 251d44ec..9e430330 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 @@ -100,16 +100,6 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository */ private long lastRefresh; - /** - * Time (in seconds) between refresh of the git repository - */ - private int refreshRate = 0; - - /** - * Time of the last refresh of the git repository - */ - private long lastRefresh; - /** * Flag to indicate that the repository should be cloned on startup (not on demand). * Generally leads to slower startup but faster first query. 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 afac3530..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 @@ -125,26 +125,6 @@ public class MultipleJGitEnvironmentRepositoryIntegrationTests { assertEquals(((MultipleJGitEnvironmentRepository) repository).getRepos().get("test1").getRefreshRate(), 30); } - @Test - public void mappingRepoWithRefreshRate() throws IOException { - String defaultRepoUri = ConfigServerTestUtils.prepareLocalRepo("config-repo"); - String test1RepoUri = ConfigServerTestUtils.prepareLocalRepo("test1-config-repo"); - - 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) - .properties("spring.cloud.config.server.git.uri:" + defaultRepoUri) - .properties(repoMapping).run(); - EnvironmentRepository repository = this.context - .getBean(EnvironmentRepository.class); - repository.findOne("test1-svc", "staging", "master"); - Environment environment = repository.findOne("test1-svc", "staging", "master"); - assertEquals(2, environment.getPropertySources().size()); - assertEquals(((MultipleJGitEnvironmentRepository) repository).getRepos().get("test1").getRefreshRate(), 30); - } - @Test public void mappingRepoWithProfile() throws IOException { String defaultRepoUri = ConfigServerTestUtils.prepareLocalRepo("config-repo");