diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java index 667827fc..18814ad6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java @@ -58,8 +58,7 @@ public class GenericResourceRepository String[] locations = this.service.getLocations(application, profile, label) .getLocations(); ArrayList locationResources = new ArrayList<>(); - for (int i = locations.length; i-- > 0;) { - String location = locations[i]; + for (String location : locations) { if (!PathUtils.isInvalidEncodedLocation(location)) { locationResources.add(this.resourceLoader.getResource(location)); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java index c122999a..fe7d5cc2 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeIntegrationTests.java @@ -85,19 +85,15 @@ public class CompositeIntegrationTests { @Test public void resourceEndpointsWork() { - // This request will get the file from the Git Repo + // This request will get the file from the Git Repo because its order is first + // The SVN repo should have the content foo: bar String text = new TestRestTemplate() .getForObject( "http://localhost:" + this.port + "/foo/development/composite/bar.properties", String.class); - String expected = "foo: bar"; - assertThat(expected).isEqualTo(text).as("invalid content"); - - // This request will get the file from the SVN Repo - text = new TestRestTemplate().getForObject("http://localhost:" + this.port - + "/foo/development/composite/bar.properties", String.class); + String expected = "foo: barconfig\n"; assertThat(expected).isEqualTo(text).as("invalid content"); } @@ -154,7 +150,7 @@ public class CompositeIntegrationTests { + "/foo/development/composite/bar.properties", String.class); - String expected = "foo: bar"; + String expected = "foo: barconfig\n"; assertThat(expected).isEqualTo(text).as("invalid content"); // This request will get the file from the SVN Repo diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG b/spring-cloud-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG index c8fcd951..eb578650 100644 --- a/spring-cloud-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG +++ b/spring-cloud-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG @@ -1 +1 @@ -Updated +updating bar diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/index b/spring-cloud-config-server/src/test/resources/config-repo/git/index index eaa4dce2..b87224c7 100644 Binary files a/spring-cloud-config-server/src/test/resources/config-repo/git/index and b/spring-cloud-config-server/src/test/resources/config-repo/git/index differ diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD index 337958de..56ea8388 100644 --- a/spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD +++ b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/HEAD @@ -4,3 +4,6 @@ 7df4a26d5437d9d4090cd5809967f870444cde8f 7df4a26d5437d9d4090cd5809967f870444cde8f Ryan Baxter 1481905544 -0500 checkout: moving from raw to composite 7df4a26d5437d9d4090cd5809967f870444cde8f 7df4a26d5437d9d4090cd5809967f870444cde8f Ryan Baxter 1481905552 -0500 checkout: moving from composite to raw 7df4a26d5437d9d4090cd5809967f870444cde8f 2921d46f948329996d3eb4a3d11aaaff6ccda84f Marcin Grzejszczak 1549357696 +0100 commit: Updated +2921d46f948329996d3eb4a3d11aaaff6ccda84f 7df4a26d5437d9d4090cd5809967f870444cde8f Ryan Baxter 1617653453 -0400 checkout: moving from raw to composite +7df4a26d5437d9d4090cd5809967f870444cde8f e488193e654487b7f43e38f0865860529cb2ec79 Ryan Baxter 1617653500 -0400 commit: updating bar +e488193e654487b7f43e38f0865860529cb2ec79 2921d46f948329996d3eb4a3d11aaaff6ccda84f Ryan Baxter 1617653549 -0400 checkout: moving from composite to raw diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/composite b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/composite index 67ab67c5..1434ecae 100644 --- a/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/composite +++ b/spring-cloud-config-server/src/test/resources/config-repo/git/logs/refs/heads/composite @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 7df4a26d5437d9d4090cd5809967f870444cde8f Ryan Baxter 1481905474 -0500 branch: Created from raw +7df4a26d5437d9d4090cd5809967f870444cde8f e488193e654487b7f43e38f0865860529cb2ec79 Ryan Baxter 1617653500 -0400 commit: updating bar diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/objects/8f/263e4c6e65fd3fb975fddba84231fe95416b66 b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/8f/263e4c6e65fd3fb975fddba84231fe95416b66 new file mode 100644 index 00000000..f5275fdd Binary files /dev/null and b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/8f/263e4c6e65fd3fb975fddba84231fe95416b66 differ diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/objects/b5/45f7dec7feab3006c2e73969ee704a9a4def78 b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/b5/45f7dec7feab3006c2e73969ee704a9a4def78 new file mode 100644 index 00000000..1beccf94 Binary files /dev/null and b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/b5/45f7dec7feab3006c2e73969ee704a9a4def78 differ diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/objects/e4/88193e654487b7f43e38f0865860529cb2ec79 b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/e4/88193e654487b7f43e38f0865860529cb2ec79 new file mode 100644 index 00000000..e1ee09a2 Binary files /dev/null and b/spring-cloud-config-server/src/test/resources/config-repo/git/objects/e4/88193e654487b7f43e38f0865860529cb2ec79 differ diff --git a/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/composite b/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/composite index 4389eb3a..43dbfb84 100644 --- a/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/composite +++ b/spring-cloud-config-server/src/test/resources/config-repo/git/refs/heads/composite @@ -1 +1 @@ -7df4a26d5437d9d4090cd5809967f870444cde8f +e488193e654487b7f43e38f0865860529cb2ec79