From 989c17c911d2ef7c1f89b90930afc0e7f51eaa5f Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:06:17 +0200 Subject: [PATCH] Revert "Bumping versions" This reverts commit ca61a5b9b63ef335e72b78aff3e9a293bac31e0c. --- .../config/HttpClientVaultRestTemplateFactoryTest.java | 5 +++-- .../ConfigurableHttpConnectionFactoryIntegrationTests.java | 4 ++-- .../config/server/proxy/SchemeBasedRoutePlannerTest.java | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) 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 fd2308a2..f4da00d5 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,11 +107,12 @@ 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); @@ -137,7 +138,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 afaff3fb..60af4288 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 12512709..0ac241b5 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,8 +33,7 @@ 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()); @@ -56,8 +55,7 @@ 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());