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

Revert "Bumping versions"

Browse Source 
This reverts commit ca61a5b9b6.
This commit is contained in:
Olga Maciaszek-Sharma
2022-04-27 11:06:17 +02:00
parent d9c8452fe7
commit 989c17c911
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java
View File

@@ -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);
}

4
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java
View File

@@ -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");
}

6
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java
View File

@@ -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());