From de84be10116e4b0c1a36692a9c4fa5bd5033f03d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 02:37:29 +0000 Subject: [PATCH] Bumping versions --- .../client/ConfigServerConfigDataLocationResolver.java | 3 ++- .../client/ConfigServerConfigDataLocationResolverTests.java | 4 ++-- .../config/HttpClientVaultRestTemplateFactoryTest.java | 5 ++--- .../ConfigurableHttpConnectionFactoryIntegrationTests.java | 4 ++-- .../config/server/proxy/SchemeBasedRoutePlannerTest.java | 6 ++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index 523ffba8..434b514f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -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 diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java index faf74039..12d569ea 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java @@ -189,9 +189,9 @@ public class ConfigServerConfigDataLocationResolverTests { when(bootstrapContext.get(eq(ConfigClientProperties.class))).thenReturn(configClientProperties); when(context.getBootstrapContext()).thenReturn(bootstrapContext); List resources1 = this.resolver.resolveProfileSpecific(context, - ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); + ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); List 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)); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java index f4da00d5..fd2308a2 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java @@ -107,12 +107,11 @@ public class HttpClientVaultRestTemplateFactoryTest { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(null, HTTPS_PROXY); RestTemplate restTemplate = this.factory.build(properties); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTPS_PROXY.getHost())))); + hasProperty("message", containsString(HTTPS_PROXY.getHost())))); restTemplate.getForObject("http://somehost", String.class); } - @Test public void authenticatedHttpProxy() throws Exception { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(AUTHENTICATED_HTTP_PROXY, null); @@ -138,7 +137,7 @@ public class HttpClientVaultRestTemplateFactoryTest { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(HTTP_PROXY, null); RestTemplate restTemplate = this.factory.build(properties); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTP_PROXY.getHost())))); + hasProperty("message", containsString(HTTP_PROXY.getHost())))); restTemplate.getForObject("https://somehost", String.class); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java index 60af4288..afaff3fb 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java @@ -141,7 +141,7 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests { .properties(gitProperties(repoUrl, null, HTTPS_PROXY)).run(); HttpClient httpClient = getHttpClientForUrl(repoUrl); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTPS_PROXY.getHost())))); + hasProperty("message", containsString(HTTPS_PROXY.getHost())))); makeRequest(httpClient, "http://somehost"); } @@ -188,7 +188,7 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests { .properties(gitProperties(repoUrl, HTTP_PROXY, null)).run(); HttpClient httpClient = getHttpClientForUrl(repoUrl); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTP_PROXY.getHost())))); + hasProperty("message", containsString(HTTP_PROXY.getHost())))); makeRequest(httpClient, "https://somehost"); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java index 0ac241b5..12512709 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java @@ -33,7 +33,8 @@ class SchemeBasedRoutePlannerTest { @Test void determineProxy_should_return_https_proxy_when_target_scheme_name_is_https_and_https_proxy_provided() { - SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, UNSECURED_PROXY_PROPERTIES); + SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, + UNSECURED_PROXY_PROPERTIES); final HttpHost result = planner.determineProxy(target("https"), anyRequest(), anyContext()); @@ -55,7 +56,8 @@ class SchemeBasedRoutePlannerTest { @Test void determineProxy_should_return_http_proxy_when_target_scheme_name_is_http_and_http_proxy_provided() { - SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, UNSECURED_PROXY_PROPERTIES); + SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, + UNSECURED_PROXY_PROPERTIES); final HttpHost result = planner.determineProxy(target("http"), anyRequest(), anyContext());