From b8a357b685d1ccb3f8b48f0fe9dbb1e6d9bac9b9 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 28 Nov 2017 14:45:11 -0500 Subject: [PATCH] Upgrade wiremock to 1.2.0.RELEASE --- pom.xml | 2 +- .../netflix/eureka/server/doc/RequestVerifierFilter.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4fb9438e..8e409500 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.0.0.BUILD-SNAPSHOT Elmhurst.BUILD-SNAPSHOT - 1.1.2.RELEASE + 1.2.0.RELEASE 3.6.1 diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java index 8fd9eb27..1f210ded 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/RequestVerifierFilter.java @@ -45,6 +45,7 @@ import io.restassured.specification.FilterableResponseSpecification; import org.springframework.util.Base64Utils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; +import wiremock.com.google.common.base.Optional; import static org.assertj.core.api.Assertions.assertThat; @@ -201,6 +202,11 @@ class WireMockRestAssuredRequestAdapter implements Request { this.request = request; } + @Override + public Optional getOriginalRequest() { + return Optional.of(this); + } + @Override public String getUrl() { return request.getDerivedPath();