From 5f0a77360e7e65e559e2d91bedaa210411b77208 Mon Sep 17 00:00:00 2001
From: Piotr Kulasek-Szwed <piotr.kulasek-szwed@hycom.pl>
Date: Fri, 6 Nov 2020 16:47:45 +0100
Subject: [PATCH] Upgrade wiremock dependency to 2.27.2 #150

---
 src/mokka/pom.xml                                           | 4 ++--
 .../mock/handler/impl/MockHttpServletRequestAdapter.java    | 2 +-
 .../openapi/OpenAPIToStubMappingListWrapperConverter.java   | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mokka/pom.xml b/src/mokka/pom.xml
index 5ea506b..a859d32 100644
--- a/src/mokka/pom.xml
+++ b/src/mokka/pom.xml
@@ -62,8 +62,8 @@
         <!-- ADR-0004 Should Wiremock be used as stubs engine -->
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>2.26.0</version>
+            <artifactId>wiremock-jre8-standalone</artifactId>
+            <version>2.27.2</version>
         </dependency>
 
         <dependency>
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/emulator/mock/handler/impl/MockHttpServletRequestAdapter.java b/src/mokka/src/main/java/pl/hycom/mokka/emulator/mock/handler/impl/MockHttpServletRequestAdapter.java
index 59e7968..600e90c 100644
--- a/src/mokka/src/main/java/pl/hycom/mokka/emulator/mock/handler/impl/MockHttpServletRequestAdapter.java
+++ b/src/mokka/src/main/java/pl/hycom/mokka/emulator/mock/handler/impl/MockHttpServletRequestAdapter.java
@@ -195,7 +195,7 @@ public boolean isBrowserProxyRequest() {
             return false;
         } else if (this.request instanceof wiremock.org.eclipse.jetty.server.Request) {
             wiremock.org.eclipse.jetty.server.Request jettyRequest = (wiremock.org.eclipse.jetty.server.Request) this.request;
-            return JettyUtils.getUri(jettyRequest).isAbsolute();
+            return JettyUtils.uriIsAbsolute(jettyRequest);
         } else {
             return false;
         }
diff --git a/src/mokka/src/main/java/pl/hycom/mokka/service/openapi/OpenAPIToStubMappingListWrapperConverter.java b/src/mokka/src/main/java/pl/hycom/mokka/service/openapi/OpenAPIToStubMappingListWrapperConverter.java
index 8674e86..eac49d3 100644
--- a/src/mokka/src/main/java/pl/hycom/mokka/service/openapi/OpenAPIToStubMappingListWrapperConverter.java
+++ b/src/mokka/src/main/java/pl/hycom/mokka/service/openapi/OpenAPIToStubMappingListWrapperConverter.java
@@ -6,6 +6,7 @@
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 import com.github.tomakehurst.wiremock.matching.RequestPattern;
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.media.MediaType;
@@ -162,10 +163,7 @@ private ResponseDefinition processMediaType(MediaType mediaType, String contentT
     }
 
     private RequestPattern createWireMockRequestPattern(RequestMethod requestMethod, String path) {
-
-        return new RequestPattern(WireMock.urlEqualTo(path), requestMethod,
-            null, null, null, null,
-            null, null, null, null);
+        return RequestPatternBuilder.newRequestPattern(requestMethod, WireMock.urlEqualTo(path)).build();
     }
 
     private ResponseDefinition createWireMockJSONResponseDefinition(int status, JsonNode rootNode) {