Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade wiremock dependency to 2.27.2 #150 #155

Merged
merged 1 commit into from
Nov 6, 2020
Merged

Upgrade wiremock dependency to 2.27.2 #150 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mokka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/pl/hycom/mokka/emulator/mock/handler/impl/MockHttpServletRequestAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 2 additions & 4 deletions ...rc/main/java/pl/hycom/mokka/service/openapi/OpenAPIToStubMappingListWrapperConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down