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

Upgraded WireMock to 2.34.0

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-10-18 10:29:46 +02:00
parent f9c3305239
commit dc43d2766c
3 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-dependencies/pom.xml
View File

@@ -15,7 +15,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.33.2</wiremock.version>
<wiremock.version>2.34.0</wiremock.version>
<jsonassert.version>0.6.2</jsonassert.version>
</properties>
<dependencyManagement>

25
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java
View File

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

33
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java
View File

@@ -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<OperationRequestPart> getParts() {
return null;
@@ -309,11 +303,6 @@ public class WireMockSnippetTests {
return HttpMethod.POST;
}
@Override
public Parameters getParameters() {
return null;
}
@Override
public Collection<OperationRequestPart> getParts() {
return null;
@@ -357,11 +346,6 @@ public class WireMockSnippetTests {
return HttpMethod.POST;
}
@Override
public Parameters getParameters() {
return null;
}
@Override
public Collection<OperationRequestPart> getParts() {
return null;
@@ -403,11 +387,6 @@ public class WireMockSnippetTests {
return HttpMethod.POST;
}
@Override
public Parameters getParameters() {
return null;
}
@Override
public Collection<OperationRequestPart> 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<OperationRequestPart> getParts() {
return null;
@@ -497,11 +469,6 @@ public class WireMockSnippetTests {
return HttpMethod.GET;
}
@Override
public Parameters getParameters() {
return null;
}
@Override
public Collection<OperationRequestPart> getParts() {
return null;