From dc43d2766ca5be1a0fb6f73c4d91070efb001fd3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 18 Oct 2022 10:29:46 +0200 Subject: [PATCH] Upgraded WireMock to 2.34.0 --- spring-cloud-contract-dependencies/pom.xml | 2 +- .../WireMockRestTemplateConfiguration.java | 25 +++++++++----- .../restdocs/WireMockSnippetTests.java | 33 ------------------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index e4cc022d1e..1aa0d93008 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-contract-dependencies Spring Cloud Contract Dependencies - 2.33.2 + 2.34.0 0.6.2 diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java index d2f01253d4..4f245d1d00 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java @@ -16,11 +16,12 @@ package org.springframework.cloud.contract.wiremock; -import org.apache.http.client.HttpClient; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -31,6 +32,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; +import static org.apache.hc.client5.http.ssl.NoopHostnameVerifier.INSTANCE; + /** * @author Dave Syer * @@ -54,10 +57,16 @@ public class WireMockRestTemplateConfiguration { private HttpClient createSslHttpClient() { try { - SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( - new SSLContextBuilder().loadTrustMaterial(null, TrustSelfSignedStrategy.INSTANCE).build(), - NoopHostnameVerifier.INSTANCE); - return HttpClients.custom().setSSLSocketFactory(socketFactory).build(); + + SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder + .create(); + sslConnectionSocketFactoryBuilder + .setSslContext(new SSLContextBuilder() + .loadTrustMaterial(null, TrustSelfSignedStrategy.INSTANCE).build()) + .setHostnameVerifier(INSTANCE); + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder + .create().setSSLSocketFactory(sslConnectionSocketFactoryBuilder.build()).build(); + return HttpClients.custom().setConnectionManager(connectionManager).build(); } catch (Exception ex) { throw new IllegalStateException("Unable to create SSL HttpClient", ex); diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java index 3b27676e2a..67e7619d63 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java @@ -47,7 +47,6 @@ import org.springframework.restdocs.operation.Operation; import org.springframework.restdocs.operation.OperationRequest; import org.springframework.restdocs.operation.OperationRequestPart; import org.springframework.restdocs.operation.OperationResponse; -import org.springframework.restdocs.operation.Parameters; import org.springframework.restdocs.operation.RequestCookie; import org.springframework.restdocs.operation.ResponseCookie; @@ -261,11 +260,6 @@ public class WireMockSnippetTests { return HttpMethod.GET; } - @Override - public Parameters getParameters() { - return null; - } - @Override public Collection getParts() { return null; @@ -309,11 +303,6 @@ public class WireMockSnippetTests { return HttpMethod.POST; } - @Override - public Parameters getParameters() { - return null; - } - @Override public Collection getParts() { return null; @@ -357,11 +346,6 @@ public class WireMockSnippetTests { return HttpMethod.POST; } - @Override - public Parameters getParameters() { - return null; - } - @Override public Collection getParts() { return null; @@ -403,11 +387,6 @@ public class WireMockSnippetTests { return HttpMethod.POST; } - @Override - public Parameters getParameters() { - return null; - } - @Override public Collection getParts() { return null; @@ -449,13 +428,6 @@ public class WireMockSnippetTests { return HttpMethod.POST; } - @Override - public Parameters getParameters() { - Parameters parameters = new Parameters(); - parameters.put("myParam", Collections.singletonList("")); - return parameters; - } - @Override public Collection getParts() { return null; @@ -497,11 +469,6 @@ public class WireMockSnippetTests { return HttpMethod.GET; } - @Override - public Parameters getParameters() { - return null; - } - @Override public Collection getParts() { return null;