From 238ab0cbaa5237d7ad6aa2ac643ca0c24c5a25a8 Mon Sep 17 00:00:00 2001 From: "jixu.hjx" Date: Thu, 3 Jun 2021 20:04:19 +0800 Subject: [PATCH 1/2] Fixed #1499, append slash to search-locations ending when it is missed. --- .../server/environment/NativeEnvironmentRepository.java | 2 +- .../config/server/resource/ResourceControllerTests.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java index 3159754c..a9a309da 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java @@ -97,7 +97,7 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc this.defaultLabel = properties.getDefaultLabel(); this.failOnError = properties.getFailOnError(); this.order = properties.getOrder(); - this.searchLocations = properties.getSearchLocations(); + setSearchLocations(properties.getSearchLocations()); this.version = properties.getVersion(); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java index 0268bd45..50c5b884 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java @@ -344,4 +344,11 @@ public class ResourceControllerTests { assertThat(resource).isEqualToIgnoringNewLines("foo: dev_bar/spam"); } + @Test + public void setSearchLocationsAppendSlashByConstructor() { + final NativeEnvironmentProperties properties = new NativeEnvironmentProperties(); + properties.setSearchLocations(new String[]{"classpath:/test"}); + NativeEnvironmentRepository repo = new NativeEnvironmentRepository(this.context.getEnvironment(), properties); + assertThat(repo.getSearchLocations()[0]).isEqualTo("classpath:/test/"); + } } From 2aa37701f7e84d220b347e915af0c7194df1ae86 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 10 Dec 2021 11:46:06 -0500 Subject: [PATCH 2/2] formatting --- .../cloud/config/server/resource/ResourceControllerTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java index 50c5b884..257a0058 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerTests.java @@ -347,8 +347,9 @@ public class ResourceControllerTests { @Test public void setSearchLocationsAppendSlashByConstructor() { final NativeEnvironmentProperties properties = new NativeEnvironmentProperties(); - properties.setSearchLocations(new String[]{"classpath:/test"}); + properties.setSearchLocations(new String[] { "classpath:/test" }); NativeEnvironmentRepository repo = new NativeEnvironmentRepository(this.context.getEnvironment(), properties); assertThat(repo.getSearchLocations()[0]).isEqualTo("classpath:/test/"); } + }