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

Should fix the build

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-03-17 18:21:11 +01:00
parent ad95e87d62
commit 9115aa8d4a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestServiceServer.java
View File

@@ -280,16 +280,24 @@ public final class WireMockRestServiceServer {
: request.getUrlPath()); : request.getUrlPath());
} }
private String withoutBaseUrl(String url) {
int indexOfBaseUrl = url.indexOf(this.baseUrl);
if (indexOfBaseUrl == -1) {
return url;
}
return url.substring(indexOfBaseUrl + this.baseUrl.length() + 1);
}
private Matcher<String> requestMatcher(RequestPattern request) { private Matcher<String> requestMatcher(RequestPattern request) {
return new TypeSafeMatcher<String>() { return new TypeSafeMatcher<String>() {
@Override @Override
protected boolean matchesSafely(String item) { protected boolean matchesSafely(String item) {
if (request.getUrlMatcher() != null) { if (request.getUrlPathPattern() != null) {
return request.getUrlMatcher().match(item).isExactMatch(); return Pattern.compile(request.getUrlPathPattern())
.matcher(withoutBaseUrl(item)).matches();
} }
else if (request.getUrlPathPattern() != null) { else if (request.getUrlMatcher() != null) {
return Pattern.compile(request.getUrlPathPattern()).matcher(item) return request.getUrlMatcher().match(item).isExactMatch();
.matches();
} }
else if (request.getUrlPattern() != null) { else if (request.getUrlPattern() != null) {
return Pattern.compile(request.getUrlPattern()).matcher(item) return Pattern.compile(request.getUrlPattern()).matcher(item)