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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2022-02-24 02:37:29 +00:00
parent 4ae403148e
commit de84be1011
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java
View File

@@ -71,7 +71,8 @@ public class ConfigServerConfigDataLocationResolver
ConfigClientProperties configClientProperties;
if (context.getBootstrapContext().isRegistered(ConfigClientProperties.class)) {
configClientProperties = new ConfigClientProperties();
BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), configClientProperties);
BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class),
configClientProperties);
}
else {
configClientProperties = binder

4
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java
View File

@@ -189,9 +189,9 @@ public class ConfigServerConfigDataLocationResolverTests {
when(bootstrapContext.get(eq(ConfigClientProperties.class))).thenReturn(configClientProperties);
when(context.getBootstrapContext()).thenReturn(bootstrapContext);
List<ConfigServerConfigDataResource> resources1 = this.resolver.resolveProfileSpecific(context,
ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class));
ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class));
List<ConfigServerConfigDataResource> resources2 = this.resolver.resolveProfileSpecific(context,
ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class));
ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class));
assertThat(resources1).hasSize(1);
assertThat(resources2).hasSize(1);
verify(bootstrapContext, times(2)).get(eq(ConfigClientProperties.class));