author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
686,936 | 04.01.2019 20:12:15 | 0 | fea7cde3c3a6f05b323579ee950ff435069c242f | Added to the response headers doc example to show how to send multi-valued response headers | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/stubbing.md",
"new_path": "docs-v2/_docs/stubbing.md",
"diff": "@@ -180,17 +180,22 @@ Priority is set via the `priority` attribute in JSON:\n## Sending response headers\n-In addition to matching on request headers, it's also possible to send response headers:\n+In addition to matching on request headers, it's also possible to send response headers.\n+\n+\n+Java:\n```java\nstubFor(get(urlEqualTo(\"/whatever\"))\n.willReturn(aResponse()\n.withStatus(200)\n.withHeader(\"Content-Type\", \"application/json\")\n+ .withHeader(\"Set-Cookie\", \"session_id=91837492837\")\n+ .withHeader(\"Set-Cookie\", \"split_test_group=B\") // You can call withHeader more than once for the same header if multiple values are required\n.withHeader(\"Cache-Control\", \"no-cache\")));\n```\n-Or\n+JSON:\n```json\n{\n@@ -202,6 +207,7 @@ Or\n\"status\": 200,\n\"headers\": {\n\"Content-Type\": \"text/plain\",\n+ \"Set-Cookie\": [\"session_id=91837492837\", \"split_test_group=B\"],\n\"Cache-Control\": \"no-cache\"\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added to the response headers doc example to show how to send multi-valued response headers |
686,936 | 04.01.2019 22:02:44 | 0 | 68be697fce8caeafc958a529b6de93f71885bf3b | Fixed a build deprecation warning by removing << from task defs | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -331,7 +331,8 @@ publishing {\n}\n}\n-task checkReleasePreconditions << {\n+task checkReleasePreconditions {\n+ doLast {\ndef REQUIRED_GIT_BRANCH = 'master'\nprintln \"Using Java version: ${System.getProperty('java.runtime.version')}\"\n@@ -340,14 +341,17 @@ task checkReleasePreconditions << {\ndef currentGitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()\nassert currentGitBranch == REQUIRED_GIT_BRANCH || shouldPublishLocally, \"Must be on the $REQUIRED_GIT_BRANCH branch in order to release to Sonatype\"\n}\n+}\npublish.dependsOn checkReleasePreconditions\n-task addGitTag << {\n+task addGitTag {\n+ doLast {\nif (!shouldPublishLocally) {\nprintln \"git tag ${version}\".execute().text\nprintln \"git push origin --tags\".execute().text\n}\n}\n+}\ntask signAll {\ndependsOn signJars, signThinJar, signShadowJar, signThinJarPom, signStandaloneJarPom\n@@ -386,7 +390,8 @@ task release {\ndependsOn clean, jar, shadowJar, signAll, publish, addGitTag\n}\n-task 'set-release-dir' << {\n+task 'set-release-dir' {\n+ doLast {\nif (releaseDir) {\nreleaseDirUrl = 'file://' + releaseDir\nif (!releaseDirUrl.endsWith('/')) {\n@@ -401,8 +406,10 @@ task 'set-release-dir' << {\nSystem.exit(1)\n}\n}\n+}\n-task 'bump-patch-version' << {\n+task 'bump-patch-version' {\n+ doLast {\ndef filesWithVersion = [\n'build.gradle' : { \"version = '${it}\" },\n'docs-v2/_config.yml' : { \"wiremock_version: ${it}\" },\n@@ -426,8 +433,10 @@ task 'bump-patch-version' << {\n}\n}\n}\n+}\n-task 'bump-minor-version' << {\n+task 'bump-minor-version' {\n+ doLast {\ndef filesWithVersion = [\n'build.gradle' : { \"version = '${it}\" },\n'docs-v2/_config.yml' : { \"wiremock_version: ${it}\" },\n@@ -451,6 +460,7 @@ task 'bump-minor-version' << {\n}\n}\n}\n+}\nint getMajorVersion() {\nInteger.valueOf(project.version.substring(0, project.version.indexOf('.')))\n@@ -468,7 +478,8 @@ task wrapper(type: Wrapper) {\ngradleVersion = '3.1'\n}\n-task 'add-copyright-headers' << {\n+task 'add-copyright-headers' {\n+ doLast {\ndef copyrightNotice = \"\"\"/*\n* Copyright (C) 2011 Thomas Akehurst\n*\n@@ -495,3 +506,4 @@ task 'add-copyright-headers' << {\n}\n}\n}\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed a build deprecation warning by removing << from task defs |
686,962 | 13.01.2019 22:30:24 | -3,600 | 076244bb07717e7863db0cd3d886c91c2a72bf3b | Don't try to parse non XML value in XPath matcher
For better performance, don't try to parse non-XML values in the XPath matcher | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPattern.java",
"diff": "@@ -42,7 +42,7 @@ public class MatchesJsonPathPattern extends PathPattern {\nreturn expectedValue;\n}\n- protected MatchResult isSimpleJsonPathMatch(String value) {\n+ protected MatchResult isSimpleMatch(String value) {\ntry {\nObject obj = JsonPath.read(value, expectedValue);\n@@ -76,7 +76,7 @@ public class MatchesJsonPathPattern extends PathPattern {\n}\n- protected MatchResult isAdvancedJsonPathMatch(String value) {\n+ protected MatchResult isAdvancedMatch(String value) {\nObject obj = null;\ntry {\nobj = JsonPath.read(value, expectedValue);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPattern.java",
"diff": "@@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;\nimport com.github.tomakehurst.wiremock.common.SilentErrorHandler;\nimport com.github.tomakehurst.wiremock.common.Xml;\nimport com.google.common.collect.ImmutableMap;\n-import com.google.common.collect.Sets;\nimport org.custommonkey.xmlunit.NamespaceContext;\nimport org.custommonkey.xmlunit.SimpleNamespaceContext;\nimport org.custommonkey.xmlunit.XMLUnit;\n@@ -86,22 +85,14 @@ public class MatchesXPathPattern extends PathPattern {\n}\n@Override\n- protected MatchResult isSimpleJsonPathMatch(String value) {\n- if (value == null) {\n- return MatchResult.noMatch();\n- }\n-\n+ protected MatchResult isSimpleMatch(String value) {\nNodeList nodeList = findXmlNodesMatching(value);\nreturn MatchResult.of(nodeList != null && nodeList.getLength() > 0);\n}\n@Override\n- protected MatchResult isAdvancedJsonPathMatch(String value) {\n- if (value == null) {\n- return MatchResult.noMatch();\n- }\n-\n+ protected MatchResult isAdvancedMatch(String value) {\nNodeList nodeList = findXmlNodesMatching(value);\nif (nodeList == null || nodeList.getLength() == 0) {\nreturn MatchResult.noMatch();\n@@ -118,6 +109,12 @@ public class MatchesXPathPattern extends PathPattern {\n}\nprivate NodeList findXmlNodesMatching(String value) {\n+ // For performance reason, don't try to parse non XML value\n+ if (value == null || !value.trim().startsWith(\"<\")) {\n+ notifier().info(String.format(\n+ \"Warning: failed to parse the XML document\\nXML: %s\", value));\n+ return null;\n+ }\ntry {\nDocumentBuilder documentBuilder = Xml.newDocumentBuilderFactory().newDocumentBuilder();\ndocumentBuilder.setErrorHandler(new SilentErrorHandler());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPattern.java",
"diff": "@@ -38,12 +38,12 @@ public abstract class PathPattern extends StringValuePattern {\n@Override\npublic MatchResult match(String value) {\nif (isSimple()) {\n- return isSimpleJsonPathMatch(value);\n+ return isSimpleMatch(value);\n}\n- return isAdvancedJsonPathMatch(value);\n+ return isAdvancedMatch(value);\n}\n- protected abstract MatchResult isSimpleJsonPathMatch(String value);\n- protected abstract MatchResult isAdvancedJsonPathMatch(String value);\n+ protected abstract MatchResult isSimpleMatch(String value);\n+ protected abstract MatchResult isAdvancedMatch(String value);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Don't try to parse non XML value in XPath matcher (#1049)
For better performance, don't try to parse non-XML values in the XPath matcher |
686,962 | 15.01.2019 03:18:32 | -3,600 | 564c45c0509e0a81519382db2edab7a13f93b4b8 | Fix high CPU load
Replace *.toLowerCase().equals(*.toLowerCase()) by *.equalsIgnoreCase(*)
detect if we are in Jetty only once
optimize JettyUtils.getUri() method | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/CaseInsensitiveKey.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/CaseInsensitiveKey.java",
"diff": "@@ -35,7 +35,7 @@ public class CaseInsensitiveKey {\nCaseInsensitiveKey that = (CaseInsensitiveKey) o;\n- if (key != null ? !key.toLowerCase().equals(that.key.toLowerCase()) : that.key != null) return false;\n+ if (key != null ? !key.equalsIgnoreCase(that.key) : that.key != null) return false;\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/HttpHeader.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/HttpHeader.java",
"diff": "@@ -71,7 +71,7 @@ public class HttpHeader extends MultiValue {\nHttpHeader that = (HttpHeader) o;\n- if (key != null ? !key.toLowerCase().equals(that.key.toLowerCase()) : that.key != null) return false;\n+ if (key != null ? !key.equalsIgnoreCase(that.key) : that.key != null) return false;\nif (values != null ? !values.equals(that.values) : that.values != null) return false;\nreturn true;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.jetty9;\n-import org.eclipse.jetty.io.ssl.SslConnection;\n-import org.eclipse.jetty.server.HttpChannel;\n-import org.eclipse.jetty.server.Request;\n-import org.eclipse.jetty.server.Response;\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+\n+import java.lang.reflect.Method;\n+import java.net.Socket;\n+import java.net.URI;\n+import java.util.HashMap;\n+import java.util.Map;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServletResponse;\nimport javax.servlet.http.HttpServletResponseWrapper;\n-import java.net.Socket;\n-import java.net.URI;\n-import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import org.eclipse.jetty.io.ssl.SslConnection;\n+import org.eclipse.jetty.server.HttpChannel;\n+import org.eclipse.jetty.server.Request;\n+import org.eclipse.jetty.server.Response;\npublic class JettyUtils {\n+ private static final Map<Class<?>, Method> URI_METHOD_BY_CLASS_CACHE = new HashMap<>();\n+ private static final boolean IS_JETTY;\n+ static {\n+ // do the check only once per classloader / execution\n+ IS_JETTY = isClassExist(\"org.eclipse.jetty.server.Request\");\n+ }\n+\n+ private JettyUtils() {\n+ // Hide public constructor\n+ }\n+\n+ public static boolean isJetty() {\n+ return IS_JETTY;\n+ }\n+\n+ private static boolean isClassExist(String type) {\n+ try {\n+ ClassLoader contextCL = Thread.currentThread().getContextClassLoader();\n+ ClassLoader loader = contextCL == null ? JettyUtils.class.getClassLoader() : contextCL;\n+ Class.forName(type, false, loader);\n+ return true;\n+ } catch (Exception e) {\n+ return false;\n+ }\n+ }\n+\npublic static Response unwrapResponse(HttpServletResponse httpServletResponse) {\nif (httpServletResponse instanceof HttpServletResponseWrapper) {\nServletResponse unwrapped = ((HttpServletResponseWrapper) httpServletResponse).getResponse();\n@@ -40,7 +70,7 @@ public class JettyUtils {\n}\npublic static Socket getTlsSocket(Response response) {\n- HttpChannel httpChannel = response.getHttpOutput().getHttpChannel();\n+ HttpChannel<?> httpChannel = response.getHttpOutput().getHttpChannel();\nSslConnection.DecryptedEndPoint sslEndpoint = (SslConnection.DecryptedEndPoint) httpChannel.getEndPoint();\nObject endpoint = sslEndpoint.getSslConnection().getEndPoint();\ntry {\n@@ -52,14 +82,24 @@ public class JettyUtils {\npublic static URI getUri(Request request) {\ntry {\n- return toUri(request.getClass().getDeclaredMethod(\"getUri\").invoke(request));\n- } catch (Exception ignored) {\n- try {\n- return toUri(request.getClass().getDeclaredMethod(\"getHttpURI\").invoke(request));\n- } catch (Exception ignored2) {\n+ return toUri(getURIMethodFromClass(request.getClass()).invoke(request));\n+ } catch (Exception e) {\nthrow new IllegalArgumentException(request + \" does not have a getUri or getHttpURI method\");\n}\n}\n+\n+ private static Method getURIMethodFromClass(Class<?> requestClass) throws NoSuchMethodException {\n+ if(URI_METHOD_BY_CLASS_CACHE.containsKey(requestClass)){\n+ return URI_METHOD_BY_CLASS_CACHE.get(requestClass);\n+ }\n+ Method method;\n+ try {\n+ method = requestClass.getDeclaredMethod(\"getUri\");\n+ } catch (NoSuchMethodException ignored) {\n+ method = requestClass.getDeclaredMethod(\"getHttpURI\");\n+ }\n+ URI_METHOD_BY_CLASS_CACHE.put(requestClass, method);\n+ return method;\n}\nprivate static URI toUri(Object httpURI) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"diff": "@@ -170,7 +170,7 @@ public class WireMockHttpServletRequestAdapter implements Request {\npublic String getHeader(String key) {\nList<String> headerNames = list(request.getHeaderNames());\nfor (String currentKey : headerNames) {\n- if (currentKey.toLowerCase().equals(key.toLowerCase())) {\n+ if (currentKey.equalsIgnoreCase(key)) {\nreturn request.getHeader(currentKey);\n}\n}\n@@ -183,7 +183,7 @@ public class WireMockHttpServletRequestAdapter implements Request {\npublic HttpHeader header(String key) {\nList<String> headerNames = list(request.getHeaderNames());\nfor (String currentKey : headerNames) {\n- if (currentKey.toLowerCase().equals(key.toLowerCase())) {\n+ if (currentKey.equalsIgnoreCase(key)) {\nList<String> valueList = list(request.getHeaders(currentKey));\nif (valueList.isEmpty()) {\nreturn HttpHeader.empty(key);\n@@ -219,7 +219,7 @@ public class WireMockHttpServletRequestAdapter implements Request {\n@SuppressWarnings(\"unchecked\")\n@Override\npublic Set<String> getAllHeaderKeys() {\n- LinkedHashSet<String> headerKeys = new LinkedHashSet<String>();\n+ LinkedHashSet<String> headerKeys = new LinkedHashSet<>();\nfor (Enumeration<String> headerNames = request.getHeaderNames(); headerNames.hasMoreElements(); ) {\nheaderKeys.add(headerNames.nextElement());\n}\n@@ -253,7 +253,7 @@ public class WireMockHttpServletRequestAdapter implements Request {\n@Override\npublic boolean isBrowserProxyRequest() {\n- if (!isJetty()) {\n+ if (!JettyUtils.isJetty()) {\nreturn false;\n}\nif (request instanceof org.eclipse.jetty.server.Request) {\n@@ -335,21 +335,6 @@ public class WireMockHttpServletRequestAdapter implements Request {\nreturn Optional.fromNullable(originalRequest);\n}\n- private boolean isJetty() {\n- try {\n- getClass(\"org.eclipse.jetty.server.Request\");\n- return true;\n- } catch (Exception e) {\n- }\n- return false;\n- }\n-\n- private void getClass(String type) throws ClassNotFoundException {\n- ClassLoader contextCL = Thread.currentThread().getContextClassLoader();\n- ClassLoader loader = contextCL == null ? WireMockHttpServletRequestAdapter.class.getClassLoader() : contextCL;\n- Class.forName(type, false, loader);\n- }\n-\n@Override\npublic String toString() {\nreturn request.toString() + getBodyAsString();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fix high CPU load
- Replace *.toLowerCase().equals(*.toLowerCase()) by *.equalsIgnoreCase(*)
- detect if we are in Jetty only once
- optimize JettyUtils.getUri() method |
686,962 | 17.01.2019 02:02:09 | -3,600 | e07b0ceeac24c55ba716740757cafb6324b3b206 | Fix CaseInsensitiveKey.hashCode() performance
Cache the hash code
don't use String.hashCode() which create new String | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/CaseInsensitiveKey.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/CaseInsensitiveKey.java",
"diff": "@@ -20,6 +20,10 @@ import com.google.common.base.Function;\npublic class CaseInsensitiveKey {\nprivate final String key;\n+\n+ /** Cache the hash code for the key */\n+ private int hash; // Default to 0\n+\npublic CaseInsensitiveKey(String key) {\nthis.key = key;\n}\n@@ -42,7 +46,15 @@ public class CaseInsensitiveKey {\n@Override\npublic int hashCode() {\n- return key != null ? key.toLowerCase().hashCode() : 0;\n+ int h = hash;\n+ if (h == 0 && key.length() > 0) {\n+ for (int i = 0; i < key.length(); i++) {\n+ char c = Character.toLowerCase(key.charAt(i));\n+ h = 31 * h + c;\n+ }\n+ hash = h;\n+ }\n+ return h;\n}\n@Override\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fix CaseInsensitiveKey.hashCode() performance
- Cache the hash code
- don't use String.hashCode() which create new String |
686,936 | 30.01.2019 20:45:34 | 0 | c21e66752996e5652b0b248aa7c73a49a4bff89c | Fixed shadow JAR problems caused by asm upgrade | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "-plugins {\n- id 'com.github.johnrengelman.shadow' version '1.2.3'\n+buildscript {\n+ repositories {\n+ jcenter()\n+ }\n+ dependencies {\n+ classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'\n+ }\n}\nallprojects {\nbuildscript {\nrepositories {\n+ jcenter()\nmaven {\nurl \"https://oss.sonatype.org\"\n}\nmavenCentral()\n}\n+\n}\napply plugin: 'idea'\n@@ -115,15 +122,13 @@ allprojects {\nexceptionFormat \"full\"\n}\n}\n-\n}\n-\nsubprojects {\n+ apply plugin: 'com.github.johnrengelman.shadow'\napply plugin: 'maven'\napply plugin: 'maven-publish'\napply plugin: 'signing'\n- apply plugin: 'com.github.johnrengelman.shadow'\nsourceSets {\nmain.java.srcDir project(':').sourceSets.main.java\n@@ -327,9 +332,10 @@ subprojects {\n}\n}\n- standaloneJar(MavenPublication) {\n+ standaloneJar(MavenPublication) { publication ->\nartifactId \"${jar.baseName}-standalone\"\n- from components.shadow\n+ project.shadow.component(publication)\n+// from components.shadow\nartifact sourcesJar\nartifact javadocJar\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed shadow JAR problems caused by asm upgrade |
686,974 | 09.01.2019 21:52:26 | -28,800 | 7f92d26039398ef22697443a2a059244ac61b41a | Support XMLUnit placeholders in EqualToXmlPattern | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -40,7 +40,7 @@ allprojects {\njackson : '2.9.8',\njacksonDatabind: '2.9.8',\njetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\n- xmlUnit : '2.5.1',\n+ xmlUnit : '2.6.2',\nguava : '20.0'\n]\n// def versions = [\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -653,6 +653,60 @@ JSON:\n}\n```\n+#### Use placeholders\n+\n+The XMLUnit [placeholders](https://github.com/xmlunit/user-guide/wiki/Placeholders) feature is supported in WireMock. For example, when comparing the XML documents, you can ignore some text nodes.\n+\n+Java:\n+\n+```java\n+.withRequestBody(equalToXml(\"<message><id>${xmlunit.ignore}</id><content>Hello</content></message>\", true))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"equalToXml\" : \"<message><id>${xmlunit.ignore}</id><content>Hello</content></message>\",\n+ \"enablePlaceholders\" : true\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n+When the actual request body is `<message><id>123456</id><content>Hello</content></message>`, it will be deemed a match.\n+\n+If the default placeholder delimiters `${` and `}` can not be used, you can specify custom delimiters (using regular expressions). For example\n+\n+Java:\n+\n+```java\n+.withRequestBody(equalToXml(\"<message><id>[[xmlunit.ignore]]</id><content>Hello</content></message>\", true, \"\\\\[\\\\[\", \"]]\"))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"equalToXml\" : \"<message><id>[[xmlunit.ignore]]</id><content>Hello</content></message>\",\n+ \"enablePlaceholders\" : true,\n+ \"placeholderOpeningDelimiterRegex\" : \"\\\\[\\\\[\",\n+ \"placeholderClosingDelimiterRegex\" : \"]]\"\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n### XPath\nDeems a match if the attribute value is valid XML and matches the XPath expression supplied. An XML document will be considered to match if any elements are returned by the XPath evaluation. WireMock delegates to Java's in-built XPath engine (via XMLUnit), therefore up to (at least) Java 8 it supports XPath version 1.0.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -17,9 +17,6 @@ package com.github.tomakehurst.wiremock.client;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\nimport com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;\n-import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\nimport com.github.tomakehurst.wiremock.core.Admin;\n@@ -30,6 +27,9 @@ import com.github.tomakehurst.wiremock.http.DelayDistribution;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\n+import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.security.ClientAuthenticator;\nimport com.github.tomakehurst.wiremock.standalone.RemoteMappingsLoader;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\n@@ -198,6 +198,14 @@ public class WireMock {\nreturn new EqualToXmlPattern(value);\n}\n+ public static EqualToXmlPattern equalToXml(String value, boolean enablePlaceholders) {\n+ return new EqualToXmlPattern(value, enablePlaceholders, null, null);\n+ }\n+\n+ public static EqualToXmlPattern equalToXml(String value, boolean enablePlaceholders, String placeholderOpeningDelimiterRegex, String placeholderClosingDelimiterRegex) {\n+ return new EqualToXmlPattern(value, enablePlaceholders, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex);\n+ }\n+\npublic static MatchesXPathPattern matchingXPath(String value) {\nreturn new MatchesXPathPattern(value, Collections.<String, String>emptyMap());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPattern.java",
"diff": "@@ -26,6 +26,7 @@ import org.xmlunit.XMLUnitException;\nimport org.xmlunit.builder.DiffBuilder;\nimport org.xmlunit.builder.Input;\nimport org.xmlunit.diff.*;\n+import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator;\nimport java.util.Comparator;\nimport java.util.List;\n@@ -55,10 +56,30 @@ public class EqualToXmlPattern extends StringValuePattern {\n);\nprivate final Document xmlDocument;\n+ private final Boolean enablePlaceholders;\n+ private final String placeholderOpeningDelimiterRegex;\n+ private final String placeholderClosingDelimiterRegex;\n+ private final DifferenceEvaluator diffEvaluator;\npublic EqualToXmlPattern(@JsonProperty(\"equalToXml\") String expectedValue) {\n+ this(expectedValue, null, null, null);\n+ }\n+\n+ public EqualToXmlPattern(@JsonProperty(\"equalToXml\") String expectedValue,\n+ @JsonProperty(\"enablePlaceholders\") Boolean enablePlaceholders,\n+ @JsonProperty(\"placeholderOpeningDelimiterRegex\") String placeholderOpeningDelimiterRegex,\n+ @JsonProperty(\"placeholderClosingDelimiterRegex\") String placeholderClosingDelimiterRegex) {\nsuper(expectedValue);\nxmlDocument = Xml.read(expectedValue);\n+ this.enablePlaceholders = enablePlaceholders;\n+ this.placeholderOpeningDelimiterRegex = placeholderOpeningDelimiterRegex;\n+ this.placeholderClosingDelimiterRegex = placeholderClosingDelimiterRegex;\n+ if (enablePlaceholders != null && enablePlaceholders) {\n+ diffEvaluator = DifferenceEvaluators.chain(IGNORE_UNCOUNTED_COMPARISONS,\n+ new PlaceholderDifferenceEvaluator(placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex));\n+ } else {\n+ diffEvaluator = IGNORE_UNCOUNTED_COMPARISONS;\n+ }\n}\npublic String getEqualToXml() {\n@@ -70,6 +91,18 @@ public class EqualToXmlPattern extends StringValuePattern {\nreturn Xml.prettyPrint(getValue());\n}\n+ public Boolean isEnablePlaceholders() {\n+ return enablePlaceholders;\n+ }\n+\n+ public String getPlaceholderOpeningDelimiterRegex() {\n+ return placeholderOpeningDelimiterRegex;\n+ }\n+\n+ public String getPlaceholderClosingDelimiterRegex() {\n+ return placeholderClosingDelimiterRegex;\n+ }\n+\n@Override\npublic MatchResult match(final String value) {\nreturn new MatchResult() {\n@@ -78,14 +111,13 @@ public class EqualToXmlPattern extends StringValuePattern {\nif (isNullOrEmpty(value)) {\nreturn false;\n}\n-\ntry {\nDiff diff = DiffBuilder.compare(Input.from(expectedValue))\n.withTest(value)\n.withComparisonController(ComparisonControllers.StopWhenDifferent)\n.ignoreWhitespace()\n.ignoreComments()\n- .withDifferenceEvaluator(IGNORE_UNCOUNTED_COMPARISONS)\n+ .withDifferenceEvaluator(diffEvaluator)\n.withNodeMatcher(new OrderInvariantNodeMatcher())\n.withDocumentBuilderFactory(Xml.newDocumentBuilderFactory())\n.build();\n@@ -114,7 +146,7 @@ public class EqualToXmlPattern extends StringValuePattern {\n.withTest(value)\n.ignoreWhitespace()\n.ignoreComments()\n- .withDifferenceEvaluator(IGNORE_UNCOUNTED_COMPARISONS)\n+ .withDifferenceEvaluator(diffEvaluator)\n.withComparisonListeners(new ComparisonListener() {\n@Override\npublic void comparisonPerformed(Comparison comparison, ComparisonResult outcome) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializer.java",
"diff": "@@ -25,8 +25,6 @@ import com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableMap;\n-import com.google.common.collect.Iterables;\n-import com.google.common.collect.Iterators;\nimport java.io.IOException;\nimport java.lang.reflect.Constructor;\n@@ -69,6 +67,8 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nClass<? extends StringValuePattern> patternClass = findPatternClass(rootNode);\nif (patternClass.equals(EqualToJsonPattern.class)) {\nreturn deserializeEqualToJson(rootNode);\n+ } else if (patternClass.equals(EqualToXmlPattern.class)) {\n+ return deserializeEqualToXml(rootNode);\n} else if (patternClass.equals(MatchesJsonPathPattern.class)) {\nreturn deserialiseMatchesJsonPathPattern(rootNode);\n} else if (patternClass.equals(MatchesXPathPattern.class)) {\n@@ -123,6 +123,20 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n}\n}\n+ private EqualToXmlPattern deserializeEqualToXml(JsonNode rootNode) throws JsonMappingException {\n+ if (!rootNode.has(\"equalToXml\")) {\n+ throw new JsonMappingException(rootNode.toString() + \" is not a valid match operation\");\n+ }\n+\n+ JsonNode operand = rootNode.findValue(\"equalToXml\");\n+\n+ Boolean enablePlaceholders = fromNullable(rootNode.findValue(\"enablePlaceholders\"));\n+ String placeholderOpeningDelimiterRegex = fromNullableTextNode(rootNode.findValue(\"placeholderOpeningDelimiterRegex\"));\n+ String placeholderClosingDelimiterRegex = fromNullableTextNode(rootNode.findValue(\"placeholderClosingDelimiterRegex\"));\n+\n+ return new EqualToXmlPattern(operand.textValue(), enablePlaceholders, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex);\n+ }\n+\nprivate MatchesJsonPathPattern deserialiseMatchesJsonPathPattern(JsonNode rootNode) throws JsonMappingException {\nif (!rootNode.has(\"matchesJsonPath\")) {\nthrow new JsonMappingException(rootNode.toString() + \" is not a valid match operation\");\n@@ -183,6 +197,10 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nreturn node == null ? null : node.asBoolean();\n}\n+ private static String fromNullableTextNode(JsonNode node) {\n+ return node == null ? null : node.asText();\n+ }\n+\n@SuppressWarnings(\"unchecked\")\nprivate static Constructor<? extends StringValuePattern> findConstructor(Class<? extends StringValuePattern> clazz) {\nOptional<Constructor<?>> optionalConstructor =\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n+import com.fasterxml.jackson.databind.ObjectMapper;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\n-import com.github.tomakehurst.wiremock.common.Metadata;\nimport com.github.tomakehurst.wiremock.http.Fault;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\n-import com.github.tomakehurst.wiremock.testsupport.MultipartBody;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\n-\n-import java.util.*;\n-\n-import com.google.common.collect.ImmutableList;\n-import com.google.common.collect.ImmutableMap;\nimport org.apache.http.MalformedChunkCodingException;\nimport org.apache.http.NoHttpResponseException;\nimport org.apache.http.client.ClientProtocolException;\nimport org.apache.http.entity.ByteArrayEntity;\n+import org.apache.http.entity.StringEntity;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matcher;\nimport org.hamcrest.TypeSafeMatcher;\n@@ -40,12 +37,18 @@ import org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.rules.ExpectedException;\n+import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\nimport java.net.SocketException;\n+import java.util.HashMap;\n+import java.util.Map;\n+import java.util.Objects;\n+import java.util.UUID;\n-import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.client.WireMock.any;\nimport static com.github.tomakehurst.wiremock.client.WireMock.equalTo;\n-import static com.github.tomakehurst.wiremock.common.Metadata.metadata;\n+import static com.github.tomakehurst.wiremock.client.WireMock.get;\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\nimport static com.github.tomakehurst.wiremock.testsupport.MultipartBody.part;\n@@ -53,13 +56,9 @@ import static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHea\nimport static java.net.HttpURLConnection.HTTP_NOT_FOUND;\nimport static java.net.HttpURLConnection.HTTP_OK;\nimport static java.util.Collections.singletonList;\n-import static org.apache.http.entity.ContentType.APPLICATION_JSON;\n-import static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM;\n-import static org.apache.http.entity.ContentType.APPLICATION_XML;\n-import static org.apache.http.entity.ContentType.TEXT_PLAIN;\n+import static org.apache.http.entity.ContentType.*;\nimport static org.hamcrest.Matchers.*;\n-import static org.junit.Assert.assertThat;\n-import static org.junit.Assert.assertTrue;\n+import static org.junit.Assert.*;\npublic class StubbingAcceptanceTest extends AcceptanceTestBase {\n@@ -492,6 +491,69 @@ public class StubbingAcceptanceTest extends AcceptanceTestBase {\nassertThat(response.statusCode(), is(200));\n}\n+ @Test\n+ public void matchXmlBodyWhenTextNodeIsIgnored() throws UnsupportedEncodingException {\n+ String expectedXml = \"<a>#{xmlunit.ignore}</a>\";\n+ boolean enablePlaceholers = true;\n+ String placeholderOpeningDelimiterRegex = \"#\\\\{\";\n+ String placeholderOpeningDelimiterRegexInJSON = \"#\\\\\\\\{\";\n+ String placeholderClosingDelimiterRegex = \"}\";\n+ String actualXml = \"<a>123</a>\";\n+ String url = \"/some/thing\";\n+ final String stubSpec =\n+ \"{\" +\n+ \"\\\"request\\\": {\" +\n+ \"\\\"url\\\": \\\"\" + url + \"\\\",\" +\n+ \"\\\"method\\\": \\\"POST\\\",\" +\n+ \"\\\"bodyPatterns\\\": [{\" +\n+ \"\\\"equalToXml\\\": \\\"\" + expectedXml + \"\\\",\" +\n+ \"\\\"enablePlaceholders\\\": \" + enablePlaceholers + \",\" +\n+ \"\\\"placeholderOpeningDelimiterRegex\\\": \\\"\" + placeholderOpeningDelimiterRegexInJSON + \"\\\",\" +\n+ \"\\\"placeholderClosingDelimiterRegex\\\": \\\"\" + placeholderClosingDelimiterRegex + \"\\\"\" +\n+ \"}]\" +\n+ \"},\" +\n+ \"\\\"response\\\": {\" +\n+ \"\\\"status\\\": 200\" +\n+ \"}\" +\n+ \"}\";\n+ testClient.post(\"/__admin/mappings\", new StringEntity(stubSpec));\n+\n+ WireMockResponse response = testClient.post(url, new StringEntity(actualXml));\n+ assertEquals(200, response.statusCode());\n+\n+ wireMockServer.verify(postRequestedFor(urlEqualTo(url))\n+ .withRequestBody(equalToXml(expectedXml, enablePlaceholers, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex)));\n+ }\n+\n+ @Test\n+ public void equalToXmlPatternWithPlaceholdersJSONSerialization() throws IOException {\n+ String requestBody = \"<a>#{xmlunit.ignore}</a>\";\n+ boolean enablePlaceholers = true;\n+ String placeholderOpeningDelimiterRegex = \"#\\\\{\";\n+ String placeholderOpeningDelimiterRegexInJSON = \"#\\\\\\\\{\";\n+ String placeholderClosingDelimiterRegex = \"}\";\n+ String expectedBodyPatternsJSONInResponse =\n+ \"[{\" +\n+ \"\\\"equalToXml\\\": \\\"\" + requestBody + \"\\\",\" +\n+ \"\\\"enablePlaceholders\\\": \" + enablePlaceholers + \",\" +\n+ \"\\\"placeholderOpeningDelimiterRegex\\\": \\\"\" + placeholderOpeningDelimiterRegexInJSON + \"\\\",\" +\n+ \"\\\"placeholderClosingDelimiterRegex\\\": \\\"\" + placeholderClosingDelimiterRegex + \"\\\"\" +\n+ \"}]\";\n+\n+ StubMapping stubMapping = wireMockServer.stubFor(post(\"/some/thing\")\n+ .withRequestBody(equalToXml(requestBody, enablePlaceholers, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex)));\n+\n+ WireMockResponse response = testClient.get(\"/__admin/mappings/\" + stubMapping.getId());\n+ assertEquals(200, response.statusCode());\n+\n+ ObjectMapper objectMapper = new ObjectMapper();\n+ ArrayNode expectedBodyPatterns = (ArrayNode) objectMapper.readTree(expectedBodyPatternsJSONInResponse);\n+ ObjectNode responseBody = (ObjectNode) objectMapper.readTree(response.content());\n+ ObjectNode request = (ObjectNode) responseBody.findValue(\"request\");\n+ ArrayNode actualBodyPatterns = (ArrayNode) request.findPath(\"bodyPatterns\");\n+ assertTrue(Objects.equals(expectedBodyPatterns, actualBodyPatterns));\n+ }\n+\n@Test\npublic void matchesQueryParamsUnencoded() {\nstubFor(get(urlPathEqualTo(\"/query\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPatternTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.matching;\n-import com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.common.Notifier;\n+import com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport org.jmock.Expectations;\nimport org.jmock.Mockery;\nimport org.junit.After;\nimport org.junit.Before;\n+import org.junit.Rule;\nimport org.junit.Test;\nimport java.util.Locale;\n+import static com.github.tomakehurst.wiremock.client.WireMock.equalToXml;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static org.hamcrest.CoreMatchers.equalTo;\nimport static org.hamcrest.CoreMatchers.not;\n-import static org.hamcrest.Matchers.closeTo;\n-import static org.hamcrest.Matchers.containsString;\n-import static org.hamcrest.Matchers.is;\n-import static org.junit.Assert.assertFalse;\n-import static org.junit.Assert.assertThat;\n-import static org.junit.Assert.assertTrue;\n+import static org.hamcrest.Matchers.*;\n+import static org.junit.Assert.*;\npublic class EqualToXmlPatternTest {\nprivate Mockery context;\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(options().dynamicPort());\n+\n@Before\npublic void init() {\ncontext = new Mockery();\n@@ -283,7 +285,7 @@ public class EqualToXmlPatternTest {\n@Test\npublic void logsASensibleErrorMessageWhenActualXmlIsBadlyFormed() {\nexpectInfoNotification(\"Failed to process XML. Content is not allowed in prolog.\");\n- WireMock.equalToXml(\"<well-formed />\").match(\"badly-formed >\").isExactMatch();\n+ equalToXml(\"<well-formed />\").match(\"badly-formed >\").isExactMatch();\n}\n@Test\n@@ -300,4 +302,46 @@ public class EqualToXmlPatternTest {\n}});\nLocalNotifier.set(notifier);\n}\n+\n+ @Test\n+ public void createEqualToXmlPatternWithPlaceholderFromWireMockClass() {\n+ Boolean enablePlaceholders = Boolean.TRUE;\n+ String placeholderOpeningDelimiterRegex = \"theOpeningDelimiterRegex\";\n+ String placeholderClosingDelimiterRegex = \"theClosingDelimiterRegex\";\n+ EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", enablePlaceholders, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex);\n+ assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n+ assertEquals(placeholderOpeningDelimiterRegex, equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n+ assertEquals(placeholderClosingDelimiterRegex, equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n+ }\n+\n+ @Test\n+ public void createEqualToXmlPatternWithPlaceholderFromWireMockClass_DefaultDelimiters() {\n+ Boolean enablePlaceholders = Boolean.TRUE;\n+ EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", enablePlaceholders);\n+ assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n+ assertNull(equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n+ assertNull(equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n+ }\n+\n+ @Test\n+ public void returnsMatchWhenTextNodeIsIgnored() {\n+ String expectedXml = \"<a>#{xmlunit.ignore}</a>\";\n+ String actualXml = \"<a>123</a>\";\n+ EqualToXmlPattern pattern = new EqualToXmlPattern(expectedXml, true, \"#\\\\{\", \"}\");\n+ MatchResult matchResult = pattern.match(actualXml);\n+\n+ assertTrue(matchResult.isExactMatch());\n+ assertEquals(matchResult.getDistance(), 0.0, 0);\n+ }\n+\n+ @Test\n+ public void returnsMatchWhenTextNodeIsIgnored_DefaultDelimiters() {\n+ String expectedXml = \"<a>${xmlunit.ignore}</a>\";\n+ String actualXml = \"<a>123</a>\";\n+ EqualToXmlPattern pattern = new EqualToXmlPattern(expectedXml, true, null, null);\n+ MatchResult matchResult = pattern.match(actualXml);\n+\n+ assertTrue(matchResult.isExactMatch());\n+ assertEquals(matchResult.getDistance(), 0.0, 0);\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializerTest.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.databind.ObjectMapper;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+\n+import static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertTrue;\n+\n+public class StringValuePatternJsonDeserializerTest {\n+ @Test\n+ public void deserializeEqualToXmlWithPlaceholder() throws IOException {\n+ Boolean enablePlaceholders = Boolean.TRUE;\n+ String placeholderOpeningDelimiterRegex = \"theOpeningDelimiterRegex\";\n+ String placeholderClosingDelimiterRegex = \"theClosingDelimiterRegex\";\n+ String patternJson = \"{\" +\n+ \"\\\"equalToXml\\\" : \\\"<a/>\\\", \" +\n+ \"\\\"enablePlaceholders\\\" : \" + enablePlaceholders + \", \" +\n+ \"\\\"placeholderOpeningDelimiterRegex\\\" : \\\"\" + placeholderOpeningDelimiterRegex + \"\\\", \" +\n+ \"\\\"placeholderClosingDelimiterRegex\\\" : \\\"\" + placeholderClosingDelimiterRegex + \"\\\"}\";\n+ ObjectMapper objectMapper = new ObjectMapper();\n+ StringValuePattern stringValuePattern = objectMapper.readValue(patternJson, StringValuePattern.class);\n+\n+ assertTrue(stringValuePattern instanceof EqualToXmlPattern);\n+ EqualToXmlPattern equalToXmlPattern = (EqualToXmlPattern) stringValuePattern;\n+ assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n+ assertEquals(placeholderOpeningDelimiterRegex, equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n+ assertEquals(placeholderClosingDelimiterRegex, equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Support XMLUnit placeholders in EqualToXmlPattern |
686,936 | 11.02.2019 18:42:54 | 0 | d345731a7b7af2b55b4969ec1c63c7e6b24e7af3 | Tweaked some XML placeholder tests, mainly for style. Tweaked some doc wording. | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -65,6 +65,7 @@ allprojects {\ncompile \"org.apache.httpcomponents:httpclient:4.5.6\"\ncompile \"org.xmlunit:xmlunit-core:$versions.xmlUnit\"\ncompile \"org.xmlunit:xmlunit-legacy:$versions.xmlUnit\"\n+ compile \"org.xmlunit:xmlunit-placeholders:$versions.xmlUnit\"\ncompile \"com.jayway.jsonpath:json-path:2.4.0\"\ncompile \"org.ow2.asm:asm:7.0\"\ncompile \"org.slf4j:slf4j-api:1.7.12\"\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -653,7 +653,7 @@ JSON:\n}\n```\n-#### Use placeholders\n+#### Use of placeholders\nThe XMLUnit [placeholders](https://github.com/xmlunit/user-guide/wiki/Placeholders) feature is supported in WireMock. For example, when comparing the XML documents, you can ignore some text nodes.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"diff": "@@ -492,66 +492,25 @@ public class StubbingAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void matchXmlBodyWhenTextNodeIsIgnored() throws UnsupportedEncodingException {\n- String expectedXml = \"<a>#{xmlunit.ignore}</a>\";\n- boolean enablePlaceholers = true;\n- String placeholderOpeningDelimiterRegex = \"#\\\\{\";\n- String placeholderOpeningDelimiterRegexInJSON = \"#\\\\\\\\{\";\n- String placeholderClosingDelimiterRegex = \"}\";\n- String actualXml = \"<a>123</a>\";\n- String url = \"/some/thing\";\n- final String stubSpec =\n- \"{\" +\n- \"\\\"request\\\": {\" +\n- \"\\\"url\\\": \\\"\" + url + \"\\\",\" +\n- \"\\\"method\\\": \\\"POST\\\",\" +\n- \"\\\"bodyPatterns\\\": [{\" +\n- \"\\\"equalToXml\\\": \\\"\" + expectedXml + \"\\\",\" +\n- \"\\\"enablePlaceholders\\\": \" + enablePlaceholers + \",\" +\n- \"\\\"placeholderOpeningDelimiterRegex\\\": \\\"\" + placeholderOpeningDelimiterRegexInJSON + \"\\\",\" +\n- \"\\\"placeholderClosingDelimiterRegex\\\": \\\"\" + placeholderClosingDelimiterRegex + \"\\\"\" +\n- \"}]\" +\n- \"},\" +\n- \"\\\"response\\\": {\" +\n- \"\\\"status\\\": 200\" +\n- \"}\" +\n- \"}\";\n- testClient.post(\"/__admin/mappings\", new StringEntity(stubSpec));\n-\n- WireMockResponse response = testClient.post(url, new StringEntity(actualXml));\n- assertEquals(200, response.statusCode());\n-\n- wireMockServer.verify(postRequestedFor(urlEqualTo(url))\n- .withRequestBody(equalToXml(expectedXml, enablePlaceholers, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex)));\n- }\n-\n- @Test\n- public void equalToXmlPatternWithPlaceholdersJSONSerialization() throws IOException {\n- String requestBody = \"<a>#{xmlunit.ignore}</a>\";\n- boolean enablePlaceholers = true;\n- String placeholderOpeningDelimiterRegex = \"#\\\\{\";\n- String placeholderOpeningDelimiterRegexInJSON = \"#\\\\\\\\{\";\n- String placeholderClosingDelimiterRegex = \"}\";\n- String expectedBodyPatternsJSONInResponse =\n- \"[{\" +\n- \"\\\"equalToXml\\\": \\\"\" + requestBody + \"\\\",\" +\n- \"\\\"enablePlaceholders\\\": \" + enablePlaceholers + \",\" +\n- \"\\\"placeholderOpeningDelimiterRegex\\\": \\\"\" + placeholderOpeningDelimiterRegexInJSON + \"\\\",\" +\n- \"\\\"placeholderClosingDelimiterRegex\\\": \\\"\" + placeholderClosingDelimiterRegex + \"\\\"\" +\n- \"}]\";\n-\n- StubMapping stubMapping = wireMockServer.stubFor(post(\"/some/thing\")\n- .withRequestBody(equalToXml(requestBody, enablePlaceholers, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex)));\n-\n- WireMockResponse response = testClient.get(\"/__admin/mappings/\" + stubMapping.getId());\n- assertEquals(200, response.statusCode());\n-\n- ObjectMapper objectMapper = new ObjectMapper();\n- ArrayNode expectedBodyPatterns = (ArrayNode) objectMapper.readTree(expectedBodyPatternsJSONInResponse);\n- ObjectNode responseBody = (ObjectNode) objectMapper.readTree(response.content());\n- ObjectNode request = (ObjectNode) responseBody.findValue(\"request\");\n- ArrayNode actualBodyPatterns = (ArrayNode) request.findPath(\"bodyPatterns\");\n- assertTrue(Objects.equals(expectedBodyPatterns, actualBodyPatterns));\n+ public void matchXmlBodyWhenTextNodeIsIgnored() {\n+ String url = \"/ignore/my/xml\";\n+\n+ stubFor(post(url)\n+ .withRequestBody(equalToXml(\"<a>#{xmlunit.ignore}</a>\", true, \"#\\\\{\", \"}\"))\n+ .willReturn(ok()));\n+\n+ assertThat(testClient.postXml(url, \"<a>123</a>\").statusCode(), is(200));\n+ }\n+\n+ @Test\n+ public void doesNotIgnoreXmlWhenPlaceholderMatchingIsFalse() {\n+ String url = \"/do-not-ignore/my/xml\";\n+\n+ stubFor(post(url)\n+ .withRequestBody(equalToXml(\"<a>#{xmlunit.ignore}</a>\", false, \"#\\\\{\", \"}\"))\n+ .willReturn(ok()));\n+\n+ assertThat(testClient.postXml(url, \"<a>123</a>\").statusCode(), is(404));\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToXmlPatternTest.java",
"diff": "package com.github.tomakehurst.wiremock.matching;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\n+import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport org.jmock.Expectations;\nimport org.jmock.Mockery;\nimport org.junit.After;\n@@ -305,20 +307,18 @@ public class EqualToXmlPatternTest {\n@Test\npublic void createEqualToXmlPatternWithPlaceholderFromWireMockClass() {\n- Boolean enablePlaceholders = Boolean.TRUE;\nString placeholderOpeningDelimiterRegex = \"theOpeningDelimiterRegex\";\nString placeholderClosingDelimiterRegex = \"theClosingDelimiterRegex\";\n- EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", enablePlaceholders, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex);\n- assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n- assertEquals(placeholderOpeningDelimiterRegex, equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n- assertEquals(placeholderClosingDelimiterRegex, equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n+ EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", true, placeholderOpeningDelimiterRegex, placeholderClosingDelimiterRegex);\n+ assertThat(equalToXmlPattern.isEnablePlaceholders(), is(true));\n+ assertThat(equalToXmlPattern.getPlaceholderOpeningDelimiterRegex(), is(placeholderOpeningDelimiterRegex));\n+ assertThat(equalToXmlPattern.getPlaceholderClosingDelimiterRegex(), is(placeholderClosingDelimiterRegex));\n}\n@Test\npublic void createEqualToXmlPatternWithPlaceholderFromWireMockClass_DefaultDelimiters() {\n- Boolean enablePlaceholders = Boolean.TRUE;\n- EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", enablePlaceholders);\n- assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n+ EqualToXmlPattern equalToXmlPattern = equalToXml(\"<a/>\", true);\n+ assertThat(equalToXmlPattern.isEnablePlaceholders(), is(true));\nassertNull(equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\nassertNull(equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n}\n@@ -331,7 +331,7 @@ public class EqualToXmlPatternTest {\nMatchResult matchResult = pattern.match(actualXml);\nassertTrue(matchResult.isExactMatch());\n- assertEquals(matchResult.getDistance(), 0.0, 0);\n+ assertThat(matchResult.getDistance(), is(0.0));\n}\n@Test\n@@ -342,6 +342,49 @@ public class EqualToXmlPatternTest {\nMatchResult matchResult = pattern.match(actualXml);\nassertTrue(matchResult.isExactMatch());\n- assertEquals(matchResult.getDistance(), 0.0, 0);\n+ assertThat(matchResult.getDistance(), is(0.0));\n+ }\n+\n+ @Test\n+ public void deserializesEqualToXmlWithPlaceholder() {\n+ Boolean enablePlaceholders = Boolean.TRUE;\n+ String placeholderOpeningDelimiterRegex = \"theOpeningDelimiterRegex\";\n+ String placeholderClosingDelimiterRegex = \"theClosingDelimiterRegex\";\n+ String patternJson = \"{\" +\n+ \"\\\"equalToXml\\\" : \\\"<a/>\\\", \" +\n+ \"\\\"enablePlaceholders\\\" : \" + enablePlaceholders + \", \" +\n+ \"\\\"placeholderOpeningDelimiterRegex\\\" : \\\"\" + placeholderOpeningDelimiterRegex + \"\\\", \" +\n+ \"\\\"placeholderClosingDelimiterRegex\\\" : \\\"\" + placeholderClosingDelimiterRegex + \"\\\"}\";\n+ StringValuePattern stringValuePattern = Json.read(patternJson, StringValuePattern.class);\n+\n+ assertTrue(stringValuePattern instanceof EqualToXmlPattern);\n+ EqualToXmlPattern equalToXmlPattern = (EqualToXmlPattern) stringValuePattern;\n+ assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n+ assertEquals(placeholderOpeningDelimiterRegex, equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n+ assertEquals(placeholderClosingDelimiterRegex, equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n+ }\n+\n+ @Test\n+ public void serializesEqualToXmlWithPlaceholder() {\n+ String xml = \"<stuff />\";\n+ Boolean enablePlaceholders = Boolean.TRUE;\n+ String placeholderOpeningDelimiterRegex = \"[\";\n+ String placeholderClosingDelimiterRegex = \"]\";\n+\n+ StringValuePattern pattern = new EqualToXmlPattern(\n+ xml,\n+ enablePlaceholders,\n+ placeholderOpeningDelimiterRegex,\n+ placeholderClosingDelimiterRegex\n+ );\n+\n+ String json = Json.write(pattern);\n+\n+ assertThat(json, WireMatchers.equalToJson(\"{\\n\" +\n+ \" \\\"equalToXml\\\": \\\"<stuff />\\\",\\n\" +\n+ \" \\\"enablePlaceholders\\\": true,\\n\" +\n+ \" \\\"placeholderOpeningDelimiterRegex\\\": \\\"[\\\",\\n\" +\n+ \" \\\"placeholderClosingDelimiterRegex\\\": \\\"]\\\"\\n\" +\n+ \"}\"));\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializerTest.java",
"new_path": null,
"diff": "-/*\n- * Copyright (C) 2011 Thomas Akehurst\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package com.github.tomakehurst.wiremock.matching;\n-\n-import com.fasterxml.jackson.databind.ObjectMapper;\n-import org.junit.Test;\n-\n-import java.io.IOException;\n-\n-import static org.junit.Assert.assertEquals;\n-import static org.junit.Assert.assertTrue;\n-\n-public class StringValuePatternJsonDeserializerTest {\n- @Test\n- public void deserializeEqualToXmlWithPlaceholder() throws IOException {\n- Boolean enablePlaceholders = Boolean.TRUE;\n- String placeholderOpeningDelimiterRegex = \"theOpeningDelimiterRegex\";\n- String placeholderClosingDelimiterRegex = \"theClosingDelimiterRegex\";\n- String patternJson = \"{\" +\n- \"\\\"equalToXml\\\" : \\\"<a/>\\\", \" +\n- \"\\\"enablePlaceholders\\\" : \" + enablePlaceholders + \", \" +\n- \"\\\"placeholderOpeningDelimiterRegex\\\" : \\\"\" + placeholderOpeningDelimiterRegex + \"\\\", \" +\n- \"\\\"placeholderClosingDelimiterRegex\\\" : \\\"\" + placeholderClosingDelimiterRegex + \"\\\"}\";\n- ObjectMapper objectMapper = new ObjectMapper();\n- StringValuePattern stringValuePattern = objectMapper.readValue(patternJson, StringValuePattern.class);\n-\n- assertTrue(stringValuePattern instanceof EqualToXmlPattern);\n- EqualToXmlPattern equalToXmlPattern = (EqualToXmlPattern) stringValuePattern;\n- assertEquals(enablePlaceholders, equalToXmlPattern.isEnablePlaceholders());\n- assertEquals(placeholderOpeningDelimiterRegex, equalToXmlPattern.getPlaceholderOpeningDelimiterRegex());\n- assertEquals(placeholderClosingDelimiterRegex, equalToXmlPattern.getPlaceholderClosingDelimiterRegex());\n- }\n-}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked some XML placeholder tests, mainly for style. Tweaked some doc wording. |
686,936 | 11.02.2019 19:01:07 | 0 | 615a621d350174fb5c1c6f146c0834cf415e4b89 | Made JettyUtils work with both Java 7 and Java 8 | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"diff": "@@ -70,7 +70,7 @@ public class JettyUtils {\n}\npublic static Socket getTlsSocket(Response response) {\n- HttpChannel<?> httpChannel = response.getHttpOutput().getHttpChannel();\n+ HttpChannel httpChannel = response.getHttpOutput().getHttpChannel();\nSslConnection.DecryptedEndPoint sslEndpoint = (SslConnection.DecryptedEndPoint) httpChannel.getEndPoint();\nObject endpoint = sslEndpoint.getSslConnection().getEndPoint();\ntry {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Made JettyUtils work with both Java 7 and Java 8 |
686,962 | 11.02.2019 20:02:31 | -3,600 | 3cf0074d11f985d72114f590f1e73d5c8c9a7b11 | For performance reason, don't try to parse XML value in MatchesJsonPathPattern | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPattern.java",
"diff": "@@ -43,6 +43,13 @@ public class MatchesJsonPathPattern extends PathPattern {\n}\nprotected MatchResult isSimpleMatch(String value) {\n+ // For performance reason, don't try to parse XML value\n+ if (value != null && value.trim().startsWith(\"<\")) {\n+ notifier().info(String.format(\n+ \"Warning: JSON path expression '%s' failed to match document '%s' because it's not JSON document\",\n+ expectedValue, value));\n+ return MatchResult.noMatch();\n+ }\ntry {\nObject obj = JsonPath.read(value, expectedValue);\n@@ -77,6 +84,13 @@ public class MatchesJsonPathPattern extends PathPattern {\n}\nprotected MatchResult isAdvancedMatch(String value) {\n+ // For performance reason, don't try to parse XML value\n+ if (value != null && value.trim().startsWith(\"<\")) {\n+ notifier().info(String.format(\n+ \"Warning: JSON path expression '%s' failed to match document '%s' because it's not JSON document\",\n+ expectedValue, value));\n+ return MatchResult.noMatch();\n+ }\nObject obj = null;\ntry {\nobj = JsonPath.read(value, expectedValue);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | For performance reason, don't try to parse XML value in MatchesJsonPathPattern (#1065) |
686,936 | 11.02.2019 19:17:25 | 0 | 1a43624e867896fd08ab410c5e37aa14c4002aa6 | Enabling info logging in Travis config | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -9,5 +9,5 @@ install:\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 6.3.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses\n-script: ./gradlew test --stacktrace --no-daemon\n+script: ./gradlew test --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Enabling info logging in Travis config |
686,936 | 13.02.2019 10:52:21 | 0 | 6ecb765ed9a67b3db3ee20c5fe80a60180869a91 | Fixed build issue - moved API doc generation to allprojects block so that build doesn't fail due to missing Swagger spec | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -123,6 +123,29 @@ allprojects {\nexceptionFormat \"full\"\n}\n}\n+\n+ final DOCS_DIR = project(':').rootDir.getAbsolutePath() + '/docs-v2'\n+\n+ task npmInstall(type: Exec) {\n+ workingDir DOCS_DIR\n+ if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {\n+ commandLine 'cmd', '/c', 'npm', 'i'\n+ } else {\n+ commandLine 'npm', 'i'\n+ }\n+ }\n+\n+ task generateApiDocs(type: Exec) {\n+ dependsOn npmInstall\n+ workingDir DOCS_DIR\n+ if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {\n+ commandLine 'cmd', '/c', 'npm', 'run', 'apidocs'\n+ } else {\n+ commandLine 'npm', 'run', 'apidocs'\n+ }\n+ }\n+\n+ processResources.dependsOn generateApiDocs\n}\nsubprojects {\n@@ -385,29 +408,7 @@ subprojects {\ndependsOn signJars, signThinJar, signShadowJar, signThinJarPom, signStandaloneJarPom\n}\n- final DOCS_DIR = project(':').rootDir.getAbsolutePath() + '/docs-v2'\n-\n- task npmInstall(type: Exec) {\n- workingDir DOCS_DIR\n- if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {\n- commandLine 'cmd', '/c', 'npm', 'i'\n- } else {\n- commandLine 'npm', 'i'\n- }\n- }\n-\n- task generateApiDocs(type: Exec) {\n- dependsOn npmInstall\n- workingDir DOCS_DIR\n- if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {\n- commandLine 'cmd', '/c', 'npm', 'run', 'apidocs'\n- } else {\n- commandLine 'npm', 'run', 'apidocs'\n- }\n- }\n-\njar.dependsOn generateApiDocs\n- processResources.dependsOn generateApiDocs\ntask deleteGeneratedApiDocs(type: Delete) {\ndelete \"src/main/resources/swagger\"\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed build issue - moved API doc generation to allprojects block so that build doesn't fail due to missing Swagger spec |
686,936 | 13.02.2019 19:58:16 | 0 | 1851b61cef869286b6902638ee51551360f5aa62 | Added support for importing multiple stubs in one request | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -463,4 +463,9 @@ public class WireMockServer implements Container, Stubbing, Admin {\npublic void removeStubsByMetadata(StringValuePattern pattern) {\nwireMockApp.removeStubsByMetadata(pattern);\n}\n+\n+ @Override\n+ public void importStubs(StubImport stubImport) {\n+ wireMockApp.importStubs(stubImport);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -72,6 +72,7 @@ public class AdminRoutes {\nrouter.add(DELETE, \"/mappings/{id}\", RemoveStubMappingTask.class);\nrouter.add(POST, \"/mappings/find-by-metadata\", FindStubMappingsByMetadataTask.class);\nrouter.add(POST, \"/mappings/remove-by-metadata\", RemoveStubMappingsByMetadataTask.class);\n+ router.add(POST, \"/mappings/import\", ImportStubMappingsTask.class);\nrouter.add(GET, \"/files\", GetAllStubFilesTask.class);\nrouter.add(PUT, \"/files/{filename}\", EditStubFileTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/ImportStubMappingsTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.admin.model.StubImport;\n+import com.github.tomakehurst.wiremock.common.Json;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+public class ImportStubMappingsTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ StubImport stubImport = Json.read(request.getBodyAsString(), StubImport.class);\n+ admin.importStubs(stubImport);\n+ return ResponseDefinition.ok();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/StubImport.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+import java.util.List;\n+\n+public class StubImport {\n+\n+ public static class Options {\n+\n+ public enum DuplicatePolicy { OVERWRITE, IGNORE }\n+\n+ private final DuplicatePolicy duplicatePolicy;\n+ private final Boolean deleteAllNotInImport;\n+\n+ public Options(@JsonProperty(\"duplicatePolicy\") DuplicatePolicy duplicatePolicy,\n+ @JsonProperty(\"deleteAllNotInImport\") Boolean deleteAllNotInImport) {\n+ this.duplicatePolicy = duplicatePolicy;\n+ this.deleteAllNotInImport = deleteAllNotInImport;\n+ }\n+\n+ public DuplicatePolicy getDuplicatePolicy() {\n+ return duplicatePolicy;\n+ }\n+\n+ public Boolean getDeleteAllNotInImport() {\n+ return deleteAllNotInImport;\n+ }\n+\n+ public static final Options DEFAULTS = new Options(DuplicatePolicy.OVERWRITE, false);\n+ }\n+\n+ private final List<StubMapping> mappings;\n+ private final Options importOptions;\n+\n+ public StubImport(@JsonProperty(\"mappings\") List<StubMapping> mappings,\n+ @JsonProperty(\"importOptions\") Options importOptions) {\n+ this.mappings = mappings;\n+ this.importOptions = importOptions;\n+ }\n+\n+ public List<StubMapping> getMappings() {\n+ return mappings;\n+ }\n+\n+ public Options getImportOptions() {\n+ return importOptions;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -35,6 +35,7 @@ import com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.security.ClientAuthenticator;\nimport com.github.tomakehurst.wiremock.security.NotAuthorisedException;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.stubbing.StubMappingCollection;\nimport com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\nimport com.github.tomakehurst.wiremock.verification.FindRequestsResult;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n@@ -363,6 +364,15 @@ public class HttpAdminClient implements Admin {\n);\n}\n+ @Override\n+ public void importStubs(StubImport stubImport) {\n+ executeRequest(\n+ adminRoutes.requestSpecForTask(ImportStubMappingsTask.class),\n+ stubImport,\n+ Void.class\n+ );\n+ }\n+\npublic int port() {\nreturn port;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -17,6 +17,7 @@ package com.github.tomakehurst.wiremock.client;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\nimport com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;\n+import com.github.tomakehurst.wiremock.admin.model.StubImport;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\nimport com.github.tomakehurst.wiremock.core.Admin;\n@@ -780,4 +781,12 @@ public class WireMock {\npublic static void removeStubsByMetadata(StringValuePattern pattern) {\ndefaultInstance.get().removeStubsByMetadataPattern(pattern);\n}\n+\n+ public void importStubMappings(StubImport stubImport) {\n+ admin.importStubs(stubImport);\n+ }\n+\n+ public static void importStubs(StubImport stubImport) {\n+ defaultInstance.get().importStubMappings(stubImport);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -30,6 +30,7 @@ import com.github.tomakehurst.wiremock.verification.FindRequestsResult;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.VerificationResult;\n+import java.util.List;\nimport java.util.UUID;\npublic interface Admin {\n@@ -77,4 +78,6 @@ public interface Admin {\nListStubMappingsResult findAllStubsByMetadata(StringValuePattern pattern);\nvoid removeStubsByMetadata(StringValuePattern pattern);\n+\n+ void importStubs(StubImport stubImport);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -35,9 +35,11 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.stubbing.StubMappings;\nimport com.github.tomakehurst.wiremock.verification.*;\nimport com.github.tomakehurst.wiremock.verification.diff.PlainTextDiffRenderer;\n+import com.google.common.base.Function;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n+import com.google.common.collect.Iterables;\nimport java.util.List;\nimport java.util.Map;\n@@ -48,6 +50,8 @@ import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.NOT_MATCHED;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.TO_LOGGED_REQUEST;\nimport static com.google.common.collect.FluentIterable.from;\n+import static com.google.common.collect.Iterables.contains;\n+import static com.google.common.collect.Iterables.transform;\npublic class WireMockApp implements StubServer, Admin {\n@@ -418,5 +422,35 @@ public class WireMockApp implements StubServer, Admin {\n}\n}\n+ @Override\n+ public void importStubs(StubImport stubImport) {\n+ List<StubMapping> mappings = stubImport.getMappings();\n+ for (int i = mappings.size() - 1; i >= 0; i--) {\n+ StubMapping mapping = mappings.get(i);\n+ if (mapping.getId() != null && getStubMapping(mapping.getId()).isPresent()) {\n+ if (stubImport.getImportOptions().getDuplicatePolicy() == StubImport.Options.DuplicatePolicy.OVERWRITE) {\n+ editStubMapping(mapping);\n+ }\n+ } else {\n+ addStubMapping(mapping);\n+ }\n+ }\n+\n+ if (stubImport.getImportOptions().getDeleteAllNotInImport()) {\n+ Iterable<UUID> ids = transform(mappings, new Function<StubMapping, UUID>() {\n+ @Override\n+ public UUID apply(StubMapping input) {\n+ return input.getId();\n+ }\n+ });\n+ for (StubMapping mapping: listAllStubMappings().getMappings()) {\n+ if (!contains(ids, mapping.getId())) {\n+ removeStubMapping(mapping);\n+ }\n+ }\n+ }\n+\n+ }\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"diff": "+package com.github.tomakehurst.wiremock;\n+\n+import com.github.tomakehurst.wiremock.admin.model.StubImport;\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+\n+import java.util.List;\n+import java.util.UUID;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.stubMappingWithUrl;\n+import static java.util.Arrays.asList;\n+import static org.hamcrest.Matchers.hasItem;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class StubImportAcceptanceTest extends AcceptanceTestBase {\n+\n+ private static Admin admin;\n+\n+ @BeforeClass\n+ public static void setup() {\n+ admin = wireMockServer;\n+ }\n+\n+ @Test\n+ public void importsAllStubsWhenNoneAreAlreadyPresent() {\n+ StubImport stubImport = new StubImport(asList(\n+ get(\"/one\").willReturn(ok()).build(),\n+ post(\"/two\").willReturn(ok()).build(),\n+ put(\"/three\").willReturn(ok()).build()\n+ ), StubImport.Options.DEFAULTS);\n+\n+ admin.importStubs(stubImport);\n+\n+ List<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n+\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/one\")));\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/two\")));\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/three\")));\n+ }\n+\n+ @Test\n+ public void overwritesExistingStubsByDefault() {\n+ UUID id1 = UUID.randomUUID();\n+ wm.stubFor(get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Original\")));\n+\n+ StubImport stubImport = new StubImport(asList(\n+ get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Updated\")).build(),\n+ post(\"/two\").willReturn(ok()).build(),\n+ put(\"/three\").willReturn(ok()).build()\n+ ), StubImport.Options.DEFAULTS);\n+\n+ admin.importStubs(stubImport);\n+\n+ List<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n+ assertThat(stubs.size(), is(3));\n+ assertThat(stubs.get(2).getResponse().getBody(), is(\"Updated\"));\n+ }\n+\n+ @Test\n+ public void ignoresExistingStubsIfConfigured() {\n+ UUID id1 = UUID.randomUUID();\n+ wm.stubFor(get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Original\")));\n+\n+ StubImport stubImport = new StubImport(asList(\n+ get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Updated\")).build(),\n+ post(\"/two\").willReturn(ok()).build(),\n+ put(\"/three\").willReturn(ok()).build()\n+ ), new StubImport.Options(StubImport.Options.DuplicatePolicy.IGNORE, false));\n+\n+ WireMock wireMock = new WireMock(wireMockServer.port());\n+ wireMock.importStubMappings(stubImport);\n+\n+ List<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n+ assertThat(stubs.size(), is(3));\n+ assertThat(stubs.get(2).getResponse().getBody(), is(\"Original\"));\n+ }\n+\n+ @Test\n+ public void deletesStubsNotInImportIfConfigured() {\n+ UUID id1 = UUID.randomUUID();\n+ wm.stubFor(get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Original\")));\n+ wm.stubFor(get(\"/four\").willReturn(ok()));\n+ wm.stubFor(get(\"/five\").willReturn(ok()));\n+\n+ StubImport stubImport = new StubImport(asList(\n+ get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Updated\")).build(),\n+ post(\"/two\").willReturn(ok()).build(),\n+ put(\"/three\").willReturn(ok()).build()\n+ ), new StubImport.Options(StubImport.Options.DuplicatePolicy.OVERWRITE, true));\n+\n+ WireMock.importStubs(stubImport);\n+\n+ List<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n+ assertThat(stubs.size(), is(3));\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/one\")));\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/two\")));\n+ assertThat(stubs, hasItem(stubMappingWithUrl(\"/three\")));\n+ assertThat(stubs.get(2).getResponse().getBody(), is(\"Updated\"));\n+ }\n+\n+ @Test\n+ public void doesNotDeleteStubsNotInImportIfNotConfigured() {\n+ UUID id1 = UUID.randomUUID();\n+ wm.stubFor(get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Original\")));\n+ wm.stubFor(get(\"/four\").willReturn(ok()));\n+ wm.stubFor(get(\"/five\").willReturn(ok()));\n+\n+ StubImport stubImport = new StubImport(asList(\n+ get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Updated\")).build(),\n+ post(\"/two\").willReturn(ok()).build(),\n+ put(\"/three\").willReturn(ok()).build()\n+ ), new StubImport.Options(StubImport.Options.DuplicatePolicy.OVERWRITE, false));\n+\n+ WireMock.importStubs(stubImport);\n+\n+ List<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n+ assertThat(stubs.size(), is(5));\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for importing multiple stubs in one request |
686,936 | 14.02.2019 19:15:45 | 0 | 162c7efe61ee1f8ff8c1790fd8636692373e37e9 | Switched to a more DSL style for stub imports | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -42,6 +42,7 @@ import com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.standalone.MappingsLoader;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.stubbing.StubMappingJsonRecorder;\nimport com.github.tomakehurst.wiremock.verification.*;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/ImportStubMappingsTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/ImportStubMappingsTask.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\npackage com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\n-import com.github.tomakehurst.wiremock.admin.model.StubImport;\n+import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.http.Request;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -34,8 +34,8 @@ import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.security.ClientAuthenticator;\nimport com.github.tomakehurst.wiremock.security.NotAuthorisedException;\n+import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.github.tomakehurst.wiremock.stubbing.StubMappingCollection;\nimport com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\nimport com.github.tomakehurst.wiremock.verification.FindRequestsResult;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -17,7 +17,7 @@ package com.github.tomakehurst.wiremock.client;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\nimport com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;\n-import com.github.tomakehurst.wiremock.admin.model.StubImport;\n+import com.github.tomakehurst.wiremock.stubbing.*;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\nimport com.github.tomakehurst.wiremock.core.Admin;\n@@ -33,9 +33,6 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.security.ClientAuthenticator;\nimport com.github.tomakehurst.wiremock.standalone.RemoteMappingsLoader;\n-import com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.verification.*;\nimport com.github.tomakehurst.wiremock.verification.diff.Diff;\n@@ -786,6 +783,14 @@ public class WireMock {\nadmin.importStubs(stubImport);\n}\n+ public void importStubMappings(StubImportBuilder stubImport) {\n+ importStubMappings(stubImport.build());\n+ }\n+\n+ public static void importStubs(StubImportBuilder stubImport) {\n+ importStubs(stubImport.build());\n+ }\n+\npublic static void importStubs(StubImport stubImport) {\ndefaultInstance.get().importStubMappings(stubImport);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -17,20 +17,19 @@ package com.github.tomakehurst.wiremock.core;\nimport com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\n-import com.github.tomakehurst.wiremock.matching.MatchesJsonPathPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n+import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\nimport com.github.tomakehurst.wiremock.verification.FindRequestsResult;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.VerificationResult;\n-import java.util.List;\nimport java.util.UUID;\npublic interface Admin {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -29,17 +29,13 @@ import com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.recording.*;\nimport com.github.tomakehurst.wiremock.standalone.MappingsLoader;\n-import com.github.tomakehurst.wiremock.stubbing.InMemoryStubMappings;\n-import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.github.tomakehurst.wiremock.stubbing.StubMappings;\n+import com.github.tomakehurst.wiremock.stubbing.*;\nimport com.github.tomakehurst.wiremock.verification.*;\nimport com.github.tomakehurst.wiremock.verification.diff.PlainTextDiffRenderer;\nimport com.google.common.base.Function;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n-import com.google.common.collect.Iterables;\nimport java.util.List;\nimport java.util.Map;\n"
},
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/StubImport.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubImport.java",
"diff": "-package com.github.tomakehurst.wiremock.admin.model;\n+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.stubbing;\nimport com.fasterxml.jackson.annotation.JsonProperty;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport java.util.List;\npublic class StubImport {\n+ private final List<StubMapping> mappings;\n+ private final Options importOptions;\n+\n+ public StubImport(@JsonProperty(\"mappings\") List<StubMapping> mappings,\n+ @JsonProperty(\"importOptions\") Options importOptions) {\n+ this.mappings = mappings;\n+ this.importOptions = importOptions;\n+ }\n+\n+ public List<StubMapping> getMappings() {\n+ return mappings;\n+ }\n+\n+ public Options getImportOptions() {\n+ return importOptions;\n+ }\n+\n+ public static StubImportBuilder stubImport() {\n+ return new StubImportBuilder();\n+ }\n+\npublic static class Options {\npublic enum DuplicatePolicy { OVERWRITE, IGNORE }\n@@ -31,20 +66,4 @@ public class StubImport {\npublic static final Options DEFAULTS = new Options(DuplicatePolicy.OVERWRITE, false);\n}\n- private final List<StubMapping> mappings;\n- private final Options importOptions;\n-\n- public StubImport(@JsonProperty(\"mappings\") List<StubMapping> mappings,\n- @JsonProperty(\"importOptions\") Options importOptions) {\n- this.mappings = mappings;\n- this.importOptions = importOptions;\n- }\n-\n- public List<StubMapping> getMappings() {\n- return mappings;\n- }\n-\n- public Options getImportOptions() {\n- return importOptions;\n- }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubImportBuilder.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.stubbing;\n+\n+import com.github.tomakehurst.wiremock.client.MappingBuilder;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+\n+public class StubImportBuilder {\n+\n+ private List<StubMapping> mappings = new ArrayList<>();\n+ private StubImport.Options.DuplicatePolicy duplicatePolicy = StubImport.Options.DuplicatePolicy.OVERWRITE;\n+ private Boolean deleteAllNotInImport = false;\n+\n+ StubImportBuilder() {\n+ }\n+\n+ public StubImportBuilder stub(MappingBuilder stubMappingBuilder) {\n+ mappings.add(stubMappingBuilder.build());\n+ return this;\n+ }\n+\n+ public StubImportBuilder stub(StubMapping stubMapping) {\n+ mappings.add(stubMapping);\n+ return this;\n+ }\n+\n+ public StubImportBuilder ignoreExisting() {\n+ duplicatePolicy = StubImport.Options.DuplicatePolicy.IGNORE;\n+ return this;\n+ }\n+\n+ public StubImportBuilder overwriteExisting() {\n+ duplicatePolicy = StubImport.Options.DuplicatePolicy.OVERWRITE;\n+ return this;\n+ }\n+\n+ public StubImportBuilder deleteAllExistingStubsNotInImport() {\n+ deleteAllNotInImport = true;\n+ return this;\n+ }\n+\n+ public StubImportBuilder doNotDeleteExistingStubs() {\n+ deleteAllNotInImport = false;\n+ return this;\n+ }\n+\n+ public StubImport build() {\n+ return new StubImport(mappings, new StubImport.Options(duplicatePolicy, deleteAllNotInImport));\n+ }\n+\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\npackage com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.admin.model.StubImport;\n+import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -11,8 +26,8 @@ import java.util.List;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.stubbing.StubImport.stubImport;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.stubMappingWithUrl;\n-import static java.util.Arrays.asList;\nimport static org.hamcrest.Matchers.hasItem;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -28,13 +43,11 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n@Test\npublic void importsAllStubsWhenNoneAreAlreadyPresent() {\n- StubImport stubImport = new StubImport(asList(\n- get(\"/one\").willReturn(ok()).build(),\n- post(\"/two\").willReturn(ok()).build(),\n- put(\"/three\").willReturn(ok()).build()\n- ), StubImport.Options.DEFAULTS);\n-\n- admin.importStubs(stubImport);\n+ admin.importStubs(stubImport()\n+ .stub(get(\"/one\").willReturn(ok()))\n+ .stub(post(\"/two\").willReturn(ok()))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .build());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\n@@ -50,15 +63,13 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n.withId(id1)\n.willReturn(ok(\"Original\")));\n- StubImport stubImport = new StubImport(asList(\n- get(\"/one\")\n+ admin.importStubs(stubImport()\n+ .stub(get(\"/one\")\n.withId(id1)\n- .willReturn(ok(\"Updated\")).build(),\n- post(\"/two\").willReturn(ok()).build(),\n- put(\"/three\").willReturn(ok()).build()\n- ), StubImport.Options.DEFAULTS);\n-\n- admin.importStubs(stubImport);\n+ .willReturn(ok(\"Updated\")))\n+ .stub(post(\"/two\").willReturn(ok()))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .build());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(3));\n@@ -72,16 +83,15 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n.withId(id1)\n.willReturn(ok(\"Original\")));\n- StubImport stubImport = new StubImport(asList(\n- get(\"/one\")\n- .withId(id1)\n- .willReturn(ok(\"Updated\")).build(),\n- post(\"/two\").willReturn(ok()).build(),\n- put(\"/three\").willReturn(ok()).build()\n- ), new StubImport.Options(StubImport.Options.DuplicatePolicy.IGNORE, false));\n-\nWireMock wireMock = new WireMock(wireMockServer.port());\n- wireMock.importStubMappings(stubImport);\n+ wireMock.importStubMappings(stubImport()\n+ .stub(get(\"/one\")\n+ .withId(id1)\n+ .willReturn(ok(\"Updated\")))\n+ .stub(post(\"/two\").willReturn(ok()))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .ignoreExisting()\n+ .build());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(3));\n@@ -97,15 +107,14 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\nwm.stubFor(get(\"/four\").willReturn(ok()));\nwm.stubFor(get(\"/five\").willReturn(ok()));\n- StubImport stubImport = new StubImport(asList(\n- get(\"/one\")\n+ WireMock.importStubs(stubImport()\n+ .stub(get(\"/one\")\n.withId(id1)\n- .willReturn(ok(\"Updated\")).build(),\n- post(\"/two\").willReturn(ok()).build(),\n- put(\"/three\").willReturn(ok()).build()\n- ), new StubImport.Options(StubImport.Options.DuplicatePolicy.OVERWRITE, true));\n-\n- WireMock.importStubs(stubImport);\n+ .willReturn(ok(\"Updated\")))\n+ .stub(post(\"/two\").willReturn(ok()))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .deleteAllExistingStubsNotInImport()\n+ .build());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(3));\n@@ -124,15 +133,15 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\nwm.stubFor(get(\"/four\").willReturn(ok()));\nwm.stubFor(get(\"/five\").willReturn(ok()));\n- StubImport stubImport = new StubImport(asList(\n- get(\"/one\")\n+ WireMock.importStubs(stubImport()\n+ .stub(get(\"/one\")\n.withId(id1)\n- .willReturn(ok(\"Updated\")).build(),\n- post(\"/two\").willReturn(ok()).build(),\n- put(\"/three\").willReturn(ok()).build()\n- ), new StubImport.Options(StubImport.Options.DuplicatePolicy.OVERWRITE, false));\n-\n- WireMock.importStubs(stubImport);\n+ .willReturn(ok(\"Updated\")))\n+ .stub(post(\"/two\").willReturn(ok()))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .overwriteExisting()\n+ .doNotDeleteExistingStubs()\n+ .build());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(5));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Switched to a more DSL style for stub imports |
686,936 | 14.02.2019 19:29:50 | 0 | 51905fa3273fd912fe00ccd54812ff08d9737b14 | Added an admin API test case for importing | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -664,4 +664,45 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(data, not(hasKey(\"metadata\")));\n}\n+ static final String IMPORT_JSON = \"{\\n\" +\n+ \" \\\"mappings\\\": [\\n\" +\n+ \" {\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"method\\\": \\\"GET\\\",\\n\" +\n+ \" \\\"url\\\": \\\"/one\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 200\\n\" +\n+ \" }\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"id\\\": \\\"8c5db8b0-2db4-4ad7-a99f-38c9b00da3f7\\\",\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/two\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"body\\\": \\\"Updated\\\"\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \" ],\\n\" +\n+ \" \\n\" +\n+ \" \\\"importOptions\\\": {\\n\" +\n+ \" \\\"duplicatePolicy\\\": \\\"IGNORE\\\",\\n\" +\n+ \" \\\"deleteAllNotInImport\\\": true\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void importStubs() {\n+ UUID id2 = UUID.fromString(\"8c5db8b0-2db4-4ad7-a99f-38c9b00da3f7\");\n+ wm.stubFor(get(\"/two\").withId(id2).willReturn(ok(\"Original\")));\n+ wm.stubFor(get(\"/three\").willReturn(ok()));\n+\n+ testClient.postJson(\"/__admin/mappings/import\", IMPORT_JSON);\n+\n+ List<StubMapping> stubs = wireMockServer.listAllStubMappings().getMappings();\n+ assertThat(stubs.get(1).getResponse().getBody(), is(\"Original\"));\n+ assertThat(stubs.size(), is(2));\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added an admin API test case for importing |
686,936 | 14.02.2019 19:35:12 | 0 | 4622c474fad8557cdf19c1f0427ef8fcf662e817 | Updated stub import test cases to use builder overload of import methods | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubImportAcceptanceTest.java",
"diff": "@@ -89,8 +89,7 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n.willReturn(ok(\"Updated\")))\n.stub(post(\"/two\").willReturn(ok()))\n.stub(put(\"/three\").willReturn(ok()))\n- .ignoreExisting()\n- .build());\n+ .ignoreExisting());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(3));\n@@ -112,8 +111,7 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n.willReturn(ok(\"Updated\")))\n.stub(post(\"/two\").willReturn(ok()))\n.stub(put(\"/three\").willReturn(ok()))\n- .deleteAllExistingStubsNotInImport()\n- .build());\n+ .deleteAllExistingStubsNotInImport());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(3));\n@@ -139,8 +137,7 @@ public class StubImportAcceptanceTest extends AcceptanceTestBase {\n.stub(post(\"/two\").willReturn(ok()))\n.stub(put(\"/three\").willReturn(ok()))\n.overwriteExisting()\n- .doNotDeleteExistingStubs()\n- .build());\n+ .doNotDeleteExistingStubs());\nList<StubMapping> stubs = admin.listAllStubMappings().getMappings();\nassertThat(stubs.size(), is(5));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Updated stub import test cases to use builder overload of import methods |
686,936 | 15.02.2019 10:43:58 | 0 | 5608342f1ef244ec409554ba1c7ec3e4b3f06921 | Documented multi stub file and import features | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -190,6 +190,40 @@ More content\nSee [stubbing](/docs/stubbing/) and [verifying](/docs/verifying/) for more on the JSON API.\n+### Multi-stub JSON files\n+\n+JSON files containing multiple stub mappings can also be used. These are of the form:\n+\n+```json\n+{\n+ \"mappings\": [\n+ {\n+ \"request\": {\n+ \"method\": \"GET\",\n+ \"url\": \"/one\"\n+ },\n+ \"response\": {\n+ \"status\": 200\n+ }\n+ },\n+ {\n+ \"id\": \"8c5db8b0-2db4-4ad7-a99f-38c9b00da3f7\",\n+ \"request\": {\n+ \"url\": \"/two\"\n+ },\n+ \"response\": {\n+ \"body\": \"Updated\"\n+ }\n+ }\n+ ]\n+}\n+```\n+\n+> **note**\n+>\n+> Stubs loaded from multi-mapping files are read-only, so any attempt to update or remove (including remove all) will cause an error to be thrown.\n+\n+\n## Pushing JSON files to a remote WireMock instance\nYou can push a collection of mappings to a remote\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/stubbing.md",
"new_path": "docs-v2/_docs/stubbing.md",
"diff": "@@ -459,3 +459,62 @@ A single stub mapping can be retrieved by ID in Java by calling `WireMock.getSin\nUUID of the stub mapping.\nVia the HTTP client a mapping can be retrieved by sending a `GET` to `http://<host>:<port>/__admin/mappings/{id}`.\n+\n+\n+## Bulk importing stubs\n+\n+Multiple stubs can be imported in one call.\n+\n+Java:\n+\n+```java\n+WireMock.importStubs(stubImport()\n+ .stub(get(\"/one\").willReturn(ok()))\n+ .stub(post(\"/two\").willReturn(ok(\"Body content\")))\n+ .stub(put(\"/three\").willReturn(ok()))\n+ .ignoreExisting()\n+ .deleteAllExistingStubsNotInImport());\n+```\n+\n+Via the JSON API, `POST` the to `/__admin/mappings/import`:\n+\n+```json\n+{\n+ \"mappings\": [\n+ {\n+ \"request\": {\n+ \"method\": \"GET\",\n+ \"url\": \"/one\"\n+ },\n+ \"response\": {\n+ \"status\": 200\n+ }\n+ },\n+ {\n+ \"id\": \"8c5db8b0-2db4-4ad7-a99f-38c9b00da3f7\",\n+ \"request\": {\n+ \"url\": \"/two\"\n+ },\n+ \"response\": {\n+ \"status\": 200,\n+ \"body\": \"Body content\"\n+ }\n+ }\n+ ],\n+\n+ \"importOptions\": {\n+ \"duplicatePolicy\": \"IGNORE\",\n+ \"deleteAllNotInImport\": true\n+ }\n+}\n+```\n+\n+### Existing stubs policy\n+\n+By default, if a stub in an import already exists (has an ID of a stub already loaded), then the existing stub will be overwritten.\n+This can be changed by setting `duplicatePolicy` in the JSON to `IGNORE` or calling `ignoreExisting()` on the Java builder.\n+\n+### Replacing all stubs with the import\n+\n+If you want to ensure that the only stubs loaded after the import has completed are the ones it contains, you can set\n+`\"deleteAllNotInImport\": true` in the JSON or call `deleteAllExistingStubsNotInImport()` on the Java builder.\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Documented multi stub file and import features |
686,936 | 19.02.2019 19:46:31 | 0 | dc9e534337195c3b491ffea958b6f2efa5227ade | Enhanced multithreaded test case to include a verify call | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/MultithreadConfigurationInheritanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/MultithreadConfigurationInheritanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport org.junit.AfterClass;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\n@@ -30,25 +31,29 @@ import static org.junit.Assert.assertEquals;\npublic class MultithreadConfigurationInheritanceTest {\nprivate static WireMockServer wireMockServer;\n+ private static WireMockTestClient client;\n@BeforeClass\npublic static void setup(){\nwireMockServer = new WireMockServer(0);\nwireMockServer.start();\nWireMock.configureFor(wireMockServer.port());\n+ client = new WireMockTestClient(wireMockServer.port());\n}\n-\n@AfterClass\npublic static void shutdown(){\nwireMockServer.shutdown();\n}\n-\n@Test(timeout = 5000) //Add a timeout so the test will execute in a new thread\npublic void verifyConfigurationInherited() {\n//Make a call to the wiremock server. If this doesn't call to 8082 this will fail\n//with an exception\nstubFor(any(urlEqualTo(\"/foo/bar\")).willReturn(aResponse().withStatus(200)));\n+\n+ client.get(\"/foo/bar\");\n+\n+ verify(getRequestedFor(urlPathEqualTo(\"/foo/bar\")));\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Enhanced multithreaded test case to include a verify call |
686,936 | 21.02.2019 19:16:32 | 0 | 981881404784286b26a3e06439a1b3f7c8219640 | Upgraded to latest redoc | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/package-lock.json",
"new_path": "docs-v2/package-lock.json",
"diff": "\"requires\": true,\n\"dependencies\": {\n\"@babel/runtime\": {\n- \"version\": \"7.1.5\",\n- \"resolved\": \"https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz\",\n- \"integrity\": \"sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==\",\n+ \"version\": \"7.3.1\",\n+ \"resolved\": \"https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.1.tgz\",\n+ \"integrity\": \"sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==\",\n\"dev\": true,\n\"requires\": {\n\"regenerator-runtime\": \"0.12.1\"\n\"tweetnacl\": \"0.14.4\"\n}\n},\n+ \"big.js\": {\n+ \"version\": \"5.2.2\",\n+ \"resolved\": \"https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz\",\n+ \"integrity\": \"sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==\",\n+ \"dev\": true\n+ },\n\"binary-extensions\": {\n\"version\": \"1.8.0\",\n\"resolved\": \"https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz\",\n\"requires\": {\n\"good-listener\": \"1.2.2\",\n\"select\": \"1.1.2\",\n- \"tiny-emitter\": \"2.0.2\"\n+ \"tiny-emitter\": \"2.1.0\"\n}\n},\n\"cliui\": {\n\"dev\": true\n},\n\"dompurify\": {\n- \"version\": \"1.0.8\",\n- \"resolved\": \"https://registry.npmjs.org/dompurify/-/dompurify-1.0.8.tgz\",\n- \"integrity\": \"sha512-vetRFbN1SXSPfP3ClIiYnxTrXquSqakBEOoB5JESn0SVcSYzpu6ougjakpKnskGctYdlNpwf+riUHSkG7d4XUw==\",\n+ \"version\": \"1.0.10\",\n+ \"resolved\": \"https://registry.npmjs.org/dompurify/-/dompurify-1.0.10.tgz\",\n+ \"integrity\": \"sha512-huhl3DSWX5LaA7jDtnj3XQdJgWW1wYouNW7N0drGzQa4vEUSVWyeFN+Atx6HP4r5cang6oQytMom6I4yhGJj5g==\",\n\"dev\": true\n},\n\"duplexer\": {\n\"jsbn\": \"0.1.0\"\n}\n},\n+ \"emojis-list\": {\n+ \"version\": \"2.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz\",\n+ \"integrity\": \"sha1-TapNnbAPmBmIDHn6RXrlsJof04k=\",\n+ \"dev\": true\n+ },\n\"error-ex\": {\n\"version\": \"1.3.0\",\n\"resolved\": \"https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz\",\n\"integrity\": \"sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=\",\n\"dev\": true\n},\n+ \"esprima\": {\n+ \"version\": \"4.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz\",\n+ \"integrity\": \"sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==\",\n+ \"dev\": true\n+ },\n\"event-stream\": {\n\"version\": \"3.3.4\",\n\"resolved\": \"https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz\",\n\"dev\": true\n},\n\"hoist-non-react-statics\": {\n- \"version\": \"3.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.0.tgz\",\n- \"integrity\": \"sha512-3IascCRfaEkbmHjJnUxWSspIUE1okLPjGTMVXW8zraUo1t3yg1BadKAxAGILHwgoBzmMnzrgeeaDGBvpuPz6dA==\",\n+ \"version\": \"3.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz\",\n+ \"integrity\": \"sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==\",\n\"dev\": true,\n\"requires\": {\n- \"react-is\": \"16.6.3\"\n+ \"react-is\": \"16.8.2\"\n}\n},\n\"hosted-git-info\": {\n\"integrity\": \"sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==\",\n\"dev\": true\n},\n+ \"js-yaml\": {\n+ \"version\": \"3.12.1\",\n+ \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz\",\n+ \"integrity\": \"sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"argparse\": \"1.0.9\",\n+ \"esprima\": \"4.0.1\"\n+ }\n+ },\n\"jsbn\": {\n\"version\": \"0.1.0\",\n\"resolved\": \"https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz\",\n\"dev\": true\n},\n\"json-schema-ref-parser\": {\n- \"version\": \"6.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.0.1.tgz\",\n- \"integrity\": \"sha512-Qjyev3LL2ka2uiTphvKBV4xH6iilNnCjkU1x4i4NfllT3IFfo1MkPDfG0HEY3nR76v+8kxaBcICe7eGbIWAXiA==\",\n+ \"version\": \"6.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz\",\n+ \"integrity\": \"sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==\",\n\"dev\": true,\n\"requires\": {\n\"call-me-maybe\": \"1.0.1\",\n- \"js-yaml\": \"3.12.0\",\n- \"ono\": \"4.0.10\"\n+ \"js-yaml\": \"3.12.1\",\n+ \"ono\": \"4.0.11\"\n},\n\"dependencies\": {\n- \"esprima\": {\n- \"version\": \"4.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz\",\n- \"integrity\": \"sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==\",\n- \"dev\": true\n- },\n- \"js-yaml\": {\n- \"version\": \"3.12.0\",\n- \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz\",\n- \"integrity\": \"sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==\",\n+ \"ono\": {\n+ \"version\": \"4.0.11\",\n+ \"resolved\": \"https://registry.npmjs.org/ono/-/ono-4.0.11.tgz\",\n+ \"integrity\": \"sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==\",\n\"dev\": true,\n\"requires\": {\n- \"argparse\": \"1.0.9\",\n- \"esprima\": \"4.0.1\"\n+ \"format-util\": \"1.0.3\"\n}\n}\n}\n\"integrity\": \"sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=\",\n\"dev\": true\n},\n+ \"json5\": {\n+ \"version\": \"1.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/json5/-/json5-1.0.1.tgz\",\n+ \"integrity\": \"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"minimist\": \"1.2.0\"\n+ }\n+ },\n\"jsonify\": {\n\"version\": \"0.0.0\",\n\"resolved\": \"https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz\",\n\"strip-bom\": \"2.0.0\"\n}\n},\n+ \"loader-utils\": {\n+ \"version\": \"1.2.3\",\n+ \"resolved\": \"https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz\",\n+ \"integrity\": \"sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"big.js\": \"5.2.2\",\n+ \"emojis-list\": \"2.1.0\",\n+ \"json5\": \"1.0.1\"\n+ }\n+ },\n\"locate-path\": {\n\"version\": \"3.0.0\",\n\"resolved\": \"https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz\",\n\"integrity\": \"sha1-YpV2jpjhTcFc6NNi72NA24KFIDE=\",\n\"dev\": true\n},\n+ \"lodash.merge\": {\n+ \"version\": \"4.6.1\",\n+ \"resolved\": \"https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz\",\n+ \"integrity\": \"sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==\",\n+ \"dev\": true\n+ },\n\"lodash.mergewith\": {\n\"version\": \"4.6.1\",\n\"resolved\": \"https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz\",\n\"integrity\": \"sha1-GA8fnr74sOY45BZq1S24eb6y/8U=\",\n\"dev\": true\n},\n+ \"marked\": {\n+ \"version\": \"0.6.1\",\n+ \"resolved\": \"https://registry.npmjs.org/marked/-/marked-0.6.1.tgz\",\n+ \"integrity\": \"sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==\",\n+ \"dev\": true\n+ },\n\"mem\": {\n\"version\": \"4.0.0\",\n\"resolved\": \"https://registry.npmjs.org/mem/-/mem-4.0.0.tgz\",\n}\n},\n\"memoize-one\": {\n- \"version\": \"4.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/memoize-one/-/memoize-one-4.0.3.tgz\",\n- \"integrity\": \"sha512-QmpUu4KqDmX0plH4u+tf0riMc1KHE1+lw95cMrLlXQAFOx/xnBtwhZ52XJxd9X2O6kwKBqX32kmhbhlobD0cuw==\",\n+ \"version\": \"4.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/memoize-one/-/memoize-one-4.1.0.tgz\",\n+ \"integrity\": \"sha512-2GApq0yI/b22J2j9rhbrAlsHb0Qcz+7yWxeLG8h+95sl1XPUgeLimQSOdur4Vw7cUhrBHwaUZxWFZueojqNRzA==\",\n\"dev\": true\n},\n\"meow\": {\n}\n},\n\"mobx-react\": {\n- \"version\": \"5.4.2\",\n- \"resolved\": \"https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.2.tgz\",\n- \"integrity\": \"sha512-alSN0KDAAOb1OkYujfoJjjk0JWxWRKO4sLGB4hN2CuvaJMrlj7bhGQe7CBMJvEFNjtJRbhJcquYVjQ3rrH2zQQ==\",\n+ \"version\": \"5.4.3\",\n+ \"resolved\": \"https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.3.tgz\",\n+ \"integrity\": \"sha512-WC8yFlwvJ91hy8j6CrydAuFteUafcuvdITFQeHl3LRIf5ayfT/4W3M/byhEYD2BcJWejeXr8y4Rh2H26RunCRQ==\",\n\"dev\": true,\n\"requires\": {\n- \"hoist-non-react-statics\": \"3.2.0\",\n+ \"hoist-non-react-statics\": \"3.3.0\",\n\"react-lifecycles-compat\": \"3.0.4\"\n}\n},\n}\n},\n\"polished\": {\n- \"version\": \"2.3.0\",\n- \"resolved\": \"https://registry.npmjs.org/polished/-/polished-2.3.0.tgz\",\n- \"integrity\": \"sha512-G2yD9LhJy5HBuU+Im5qe70ubaJI/ZTTOIJO6GRMwJ2WSoAiPzlm8+LjAXMnm9/K0E0NumRVHvQu2HHPKQSYQjw==\",\n+ \"version\": \"2.3.3\",\n+ \"resolved\": \"https://registry.npmjs.org/polished/-/polished-2.3.3.tgz\",\n+ \"integrity\": \"sha512-59V4fDbdxtH4I1m9TWxFsoGJbC8nnOpUYo5uFmvMfKp9Qh+6suo4VMUle1TGIIUZIGxfkW+Rs485zPk0wcwR2Q==\",\n\"dev\": true,\n\"requires\": {\n- \"@babel/runtime\": \"7.1.5\"\n+ \"@babel/runtime\": \"7.3.1\"\n}\n},\n\"postcss\": {\n\"dev\": true\n},\n\"prop-types\": {\n- \"version\": \"15.6.2\",\n- \"resolved\": \"https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz\",\n- \"integrity\": \"sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==\",\n+ \"version\": \"15.7.2\",\n+ \"resolved\": \"https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz\",\n+ \"integrity\": \"sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==\",\n\"dev\": true,\n\"requires\": {\n\"loose-envify\": \"1.4.0\",\n- \"object-assign\": \"4.1.1\"\n+ \"object-assign\": \"4.1.1\",\n+ \"react-is\": \"16.8.2\"\n},\n\"dependencies\": {\n\"object-assign\": {\n}\n},\n\"react-dropdown\": {\n- \"version\": \"1.6.2\",\n- \"resolved\": \"https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.6.2.tgz\",\n- \"integrity\": \"sha512-6RpKAFEVZLr53y91qnxC9rAWcoDvq8A9YstmeSV2AQgJxNFRcsreN1mJNRUctSvIwm0Hph07ouMvDc2GvfQBsA==\",\n+ \"version\": \"1.6.4\",\n+ \"resolved\": \"https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.6.4.tgz\",\n+ \"integrity\": \"sha512-zTlNRZ6vzjEPsodBNgh6Xjp9IempEx9sReH3crT2Jw4S6KW2wS/BRIH3d/grYf/iXARadDRD91//uUCs9yjoLg==\",\n\"dev\": true,\n\"requires\": {\n\"classnames\": \"2.2.6\"\n}\n},\n\"react-hot-loader\": {\n- \"version\": \"4.3.12\",\n- \"resolved\": \"https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.12.tgz\",\n- \"integrity\": \"sha512-GMM4TsqUVss2QPe+Y33NlgydA5/+7tAVQxR0rZqWvBpapM8JhD7p6ymMwSZzr5yxjoXXlK/6P6qNQBOqm1dqdg==\",\n+ \"version\": \"4.7.1\",\n+ \"resolved\": \"https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.7.1.tgz\",\n+ \"integrity\": \"sha512-OVq9tBndJ+KJWyWbj6kAkJbRVFx3Ykx+XOlndT3zyxAQMBFFygV+AS9RQi6Z2axkPIcEkuE5K6nkpcjlzR8I9w==\",\n\"dev\": true,\n\"requires\": {\n\"fast-levenshtein\": \"2.0.6\",\n\"global\": \"4.3.2\",\n\"hoist-non-react-statics\": \"2.5.5\",\n- \"prop-types\": \"15.6.2\",\n+ \"loader-utils\": \"1.2.3\",\n+ \"lodash.merge\": \"4.6.1\",\n+ \"prop-types\": \"15.7.2\",\n\"react-lifecycles-compat\": \"3.0.4\",\n- \"shallowequal\": \"1.1.0\"\n+ \"shallowequal\": \"1.1.0\",\n+ \"source-map\": \"0.7.3\"\n},\n\"dependencies\": {\n\"hoist-non-react-statics\": {\n\"resolved\": \"https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz\",\n\"integrity\": \"sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==\",\n\"dev\": true\n+ },\n+ \"source-map\": {\n+ \"version\": \"0.7.3\",\n+ \"resolved\": \"https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz\",\n+ \"integrity\": \"sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==\",\n+ \"dev\": true\n}\n}\n},\n\"react-is\": {\n- \"version\": \"16.6.3\",\n- \"resolved\": \"https://registry.npmjs.org/react-is/-/react-is-16.6.3.tgz\",\n- \"integrity\": \"sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==\",\n+ \"version\": \"16.8.2\",\n+ \"resolved\": \"https://registry.npmjs.org/react-is/-/react-is-16.8.2.tgz\",\n+ \"integrity\": \"sha512-D+NxhSR2HUCjYky1q1DwpNUD44cDpUXzSmmFyC3ug1bClcU/iDNy0YNn1iwme28fn+NFhpA13IndOd42CrFb+Q==\",\n\"dev\": true\n},\n\"react-lifecycles-compat\": {\n\"dev\": true,\n\"requires\": {\n\"classnames\": \"2.2.6\",\n- \"prop-types\": \"15.6.2\"\n+ \"prop-types\": \"15.7.2\"\n}\n},\n\"read-file-stdin\": {\n}\n},\n\"redoc\": {\n- \"version\": \"2.0.0-rc.0\",\n- \"resolved\": \"https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.0.tgz\",\n- \"integrity\": \"sha512-xH0xZ0mYFgWp4aUk9TAsGUKlyiT5Ph0MvhO3rK/cKUaCUZ+vwuOANA00Sf5hOMtXnjsXgJxC7i7fJ7tyX2yxWg==\",\n+ \"version\": \"2.0.0-rc.2\",\n+ \"resolved\": \"https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.2.tgz\",\n+ \"integrity\": \"sha512-KsacFfNeBSBwGbWD8zzckYZ9V5TQB33xCl0I2pNQrWEEyhOZyfpp4Sf7qmOVYxj8DzdqHTP/HJiCtH84o68+mg==\",\n\"dev\": true,\n\"requires\": {\n\"classnames\": \"2.2.6\",\n\"decko\": \"1.2.0\",\n- \"dompurify\": \"1.0.8\",\n+ \"dompurify\": \"1.0.10\",\n\"eventemitter3\": \"3.1.0\",\n\"json-pointer\": \"0.6.0\",\n- \"json-schema-ref-parser\": \"6.0.1\",\n+ \"json-schema-ref-parser\": \"6.1.0\",\n\"lunr\": \"2.3.5\",\n\"mark.js\": \"8.11.1\",\n- \"marked\": \"git+https://github.com/markedjs/marked.git#fb48827236ed3a43e611d2adb3c070ca3f55ed8e\",\n- \"memoize-one\": \"4.0.3\",\n- \"mobx-react\": \"5.4.2\",\n+ \"marked\": \"0.6.1\",\n+ \"memoize-one\": \"4.1.0\",\n+ \"mobx-react\": \"5.4.3\",\n\"openapi-sampler\": \"1.0.0-beta.14\",\n\"perfect-scrollbar\": \"1.4.0\",\n- \"polished\": \"2.3.0\",\n+ \"polished\": \"2.3.3\",\n\"prismjs\": \"1.15.0\",\n- \"prop-types\": \"15.6.2\",\n- \"react-dropdown\": \"1.6.2\",\n- \"react-hot-loader\": \"4.3.12\",\n+ \"prop-types\": \"15.7.2\",\n+ \"react-dropdown\": \"1.6.4\",\n+ \"react-hot-loader\": \"4.7.1\",\n\"react-tabs\": \"2.3.0\",\n- \"slugify\": \"1.3.3\",\n+ \"slugify\": \"1.3.4\",\n\"stickyfill\": \"1.1.1\",\n\"tslib\": \"1.9.3\"\n- },\n- \"dependencies\": {\n- \"marked\": {\n- \"version\": \"git+https://github.com/markedjs/marked.git#fb48827236ed3a43e611d2adb3c070ca3f55ed8e\",\n- \"dev\": true\n- }\n}\n},\n\"regenerator-runtime\": {\n\"dev\": true\n},\n\"slugify\": {\n- \"version\": \"1.3.3\",\n- \"resolved\": \"https://registry.npmjs.org/slugify/-/slugify-1.3.3.tgz\",\n- \"integrity\": \"sha512-aFvcXobuowA7RqU4IBVJvqmhkREDIqsj4oIJKk6JuZ5EO1PCwtAAwDCl8TdsMs4J9zCoDAVkB9FLUElDjNcRSg==\",\n+ \"version\": \"1.3.4\",\n+ \"resolved\": \"https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz\",\n+ \"integrity\": \"sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw==\",\n\"dev\": true\n},\n\"source-map\": {\n\"dev\": true\n},\n\"tiny-emitter\": {\n- \"version\": \"2.0.2\",\n- \"resolved\": \"https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz\",\n- \"integrity\": \"sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==\",\n+ \"version\": \"2.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz\",\n+ \"integrity\": \"sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==\",\n\"dev\": true,\n\"optional\": true\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/package.json",
"new_path": "docs-v2/package.json",
"diff": "\"swagger-ui-dist\": \"3.20.1\",\n\"swagger-cli\": \"2.2.0\",\n\"uglify-js\": \"^2.6.1\",\n- \"redoc\": \"2.0.0-rc.0\",\n+ \"redoc\": \"2.0.0-rc.2\",\n\"shx\": \"0.2.2\"\n},\n\"scripts\": {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to latest redoc |
686,936 | 21.02.2019 19:18:12 | 0 | a24e3cd7f38b73398caff927b9cb72f33da689b7 | Tweaked Swagger doc tag names | [
{
"change_type": "MODIFY",
"old_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"new_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"diff": "@@ -12,12 +12,12 @@ servers:\n- url: /\ntags:\n- - name: Mappings\n+ - name: Stub Mappings\ndescription: Operations on stub mappings\nexternalDocs:\ndescription: User documentation\nurl: http://wiremock.org/docs/stubbing/\n- - name: Request Journal\n+ - name: Requests\ndescription: Logged requests and responses received by the mock service\nexternalDocs:\ndescription: User documentation\n@@ -45,7 +45,7 @@ paths:\nget:\nsummary: Get all stub mappings\ntags:\n- - Mappings\n+ - Stub Mappings\nparameters:\n- description: The maximum number of results to return\nin: query\n@@ -73,7 +73,7 @@ paths:\npost:\nsummary: Create a new stub mapping\ntags:\n- - Mappings\n+ - Stub Mappings\nrequestBody:\n$ref: \"#/components/requestBodies/stubMapping\"\nresponses:\n@@ -82,7 +82,7 @@ paths:\ndelete:\nsummary: Delete all stub mappings\ntags:\n- - Mappings\n+ - Stub Mappings\nresponses:\n'200':\ndescription: Successfully deleted\n@@ -92,7 +92,7 @@ paths:\nsummary: Reset stub mappings\ndescription: Restores stub mappings to the defaults defined back in the backing store\ntags:\n- - Mappings\n+ - Stub Mappings\nresponses:\n'200':\ndescription: Successfully reset\n@@ -102,7 +102,7 @@ paths:\nsummary: Persist stub mappings\ndescription: Save all persistent stub mappings to the backing store\ntags:\n- - Mappings\n+ - Stub Mappings\nresponses:\n'200':\ndescription: Successfully saved\n@@ -119,7 +119,7 @@ paths:\nget:\nsummary: Get stub mapping by ID\ntags:\n- - Mappings\n+ - Stub Mappings\nresponses:\n'404':\ndescription: Stub mapping not found\n@@ -128,7 +128,7 @@ paths:\nput:\nsummary: Update a stub mapping\ntags:\n- - Mappings\n+ - Stub Mappings\nrequestBody:\n$ref: \"#/components/requestBodies/stubMapping\"\nresponses:\n@@ -139,7 +139,7 @@ paths:\ndelete:\nsummary: Delete a stub mapping\ntags:\n- - Mappings\n+ - Stub Mappings\nresponses:\n'404':\ndescription: Stub mapping not found\n@@ -150,7 +150,7 @@ paths:\npost:\ndescription: Find stubs by matching on their metadata\ntags:\n- - Mappings\n+ - Stub Mappings\nrequestBody:\ncontent:\napplication/json:\n@@ -173,7 +173,7 @@ paths:\npost:\nsummary: Delete stub mappings matching metadata\ntags:\n- - Mappings\n+ - Stub Mappings\nrequestBody:\ncontent:\napplication/json:\n@@ -189,7 +189,7 @@ paths:\nget:\nsummary: Get all requests in journal\ntags:\n- - Request Journal\n+ - Requests\nparameters:\n- description: The maximum number of results to return\nin: query\n@@ -213,7 +213,7 @@ paths:\ndelete:\nsummary: Delete all requests in journal\ntags:\n- - Request Journal\n+ - Requests\nresponses:\n'200':\ndescription: Successfully deleted\n@@ -222,7 +222,7 @@ paths:\nget:\nsummary: Get request by ID\ntags:\n- - Request Journal\n+ - Requests\nparameters:\n- description: The UUID of the logged request\nin: path\n@@ -245,7 +245,7 @@ paths:\npost:\nsummary: Empty the request journal\ntags:\n- - Request Journal\n+ - Requests\nresponses:\n'200':\ndescription: Successfully reset\n@@ -255,7 +255,7 @@ paths:\nsummary: Count requests by criteria\ndescription: Count requests logged in the journal matching the specified criteria\ntags:\n- - Request Journal\n+ - Requests\nrequestBody:\n$ref: \"#/components/requestBodies/requestPattern\"\nresponses:\n@@ -275,7 +275,7 @@ paths:\nsummary: Find requests by criteria\ndescription: Retrieve details of requests logged in the journal matching the specified criteria\ntags:\n- - Request Journal\n+ - Requests\nrequestBody:\n$ref: \"#/components/requestBodies/requestPattern\"\nresponses:\n@@ -291,7 +291,7 @@ paths:\nsummary: Find unmatched requests\ndescription: Get details of logged requests that weren't matched by any stub mapping\ntags:\n- - Request Journal\n+ - Requests\nresponses:\n'200':\ndescription: Unmatched request details\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked Swagger doc tag names |
686,936 | 21.02.2019 19:23:27 | 0 | 4f83a6dc4e147c19282de0ad666b0eeb755a97b6 | Fixed ./serve.sh so that API docs are built first | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/package.json",
"new_path": "docs-v2/package.json",
"diff": "\"watch:css\": \"onchange \\\"assets/_scss/**/*.scss\\\" -- npm run build:css\",\n\"watch:js\": \"onchange \\\"assets/js/**/*.js\\\" -e \\\"assets/js/main.min.js\\\" -- npm run build:js\",\n\"watch:all\": \"npm-run-all --parallel watch:css watch:js\",\n+ \"serve\": \"npm run apidocs && npm run watch:all\",\n\"build:css\": \"npm run scss && npm run autoprefixer\",\n\"build:js\": \"npm run uglify\",\n\"build:all\": \"npm run build:css && npm run build:js\",\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/serve.sh",
"new_path": "docs-v2/serve.sh",
"diff": "set -euo pipefail\n-npm run watch:all &\n+npm run serve &\nbundle exec jekyll serve\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"new_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"diff": "@@ -2,7 +2,7 @@ openapi: 3.0.0\ninfo:\ntitle: WireMock\n- version: 2.19.0\n+ version: 2.21.0\nexternalDocs:\ndescription: WireMock user documentation\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed ./serve.sh so that API docs are built first |
686,962 | 22.02.2019 00:39:31 | -3,600 | b46b4454a9dfbf5d4f756346442479754b4a798e | Only template datas between first '{{' and last '}}' | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating;\n+\n+import java.io.IOException;\n+import java.io.Writer;\n+import java.util.List;\n+\n+import org.apache.commons.lang3.NotImplementedException;\n+\n+import com.github.jknack.handlebars.Context;\n+import com.github.jknack.handlebars.Handlebars;\n+import com.github.jknack.handlebars.TagType;\n+import com.github.jknack.handlebars.Template;\n+import com.github.jknack.handlebars.TypeSafeTemplate;\n+\n+public class HandlebarsOptimizedTemplate implements Template {\n+\n+ private static final String NOT_IMPLEMENTED = \"not implemented\";\n+\n+ private final Template template;\n+\n+ private String startContent;\n+ private String templateContent;\n+ private String endContent;\n+\n+ public HandlebarsOptimizedTemplate(final Handlebars handlebars, final String content) throws IOException {\n+ startContent = content;\n+ templateContent = \"\";\n+ endContent = \"\";\n+\n+ int firstDelimStartPosition = content.indexOf(Handlebars.DELIM_START);\n+ if (firstDelimStartPosition != -1) {\n+ int lastDelimEndPosition = content.lastIndexOf(Handlebars.DELIM_END);\n+ if (lastDelimEndPosition != -1) {\n+ startContent = content.substring(0, firstDelimStartPosition);\n+ templateContent = content.substring(firstDelimStartPosition,\n+ lastDelimEndPosition + Handlebars.DELIM_END.length());\n+ endContent = content.substring(lastDelimEndPosition + Handlebars.DELIM_END.length(), content.length());\n+ }\n+ }\n+ this.template = handlebars.compileInline(templateContent);\n+ }\n+\n+ @Override\n+ public void apply(Object context, Writer writer) throws IOException {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public String apply(Object context) throws IOException {\n+ StringBuilder sb = new StringBuilder();\n+ return sb.append(startContent).append(template.apply(context)).append(endContent).toString();\n+ }\n+\n+ @Override\n+ public void apply(Context context, Writer writer) throws IOException {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public String apply(Context context) throws IOException {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public String text() {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public String toJavaScript() {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public <T, S extends TypeSafeTemplate<T>> S as(Class<S> type) {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public <T> TypeSafeTemplate<T> as() {\n+ return template.as();\n+ }\n+\n+ @Override\n+ public List<String> collect(TagType... tagType) {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public List<String> collectReferenceParameters() {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public String filename() {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+\n+ @Override\n+ public int[] position() {\n+ throw new NotImplementedException(NOT_IMPLEMENTED);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -165,7 +165,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nprivate Template uncheckedCompileTemplate(String content) {\ntry {\n- return handlebars.compileInline(content);\n+ return new HandlebarsOptimizedTemplate(handlebars, content);\n} catch (IOException e) {\nreturn throwUnchecked(e, Template.class);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Only template datas between first '{{' and last '}}' |
686,962 | 22.02.2019 23:25:22 | -3,600 | d3c296133301986be3cfcf56d1c82531793db849 | Remove implementing Template | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating;\nimport java.io.IOException;\n-import java.io.Writer;\n-import java.util.List;\n-import org.apache.commons.lang3.NotImplementedException;\n-\n-import com.github.jknack.handlebars.Context;\nimport com.github.jknack.handlebars.Handlebars;\n-import com.github.jknack.handlebars.TagType;\nimport com.github.jknack.handlebars.Template;\n-import com.github.jknack.handlebars.TypeSafeTemplate;\n-\n-public class HandlebarsOptimizedTemplate implements Template {\n- private static final String NOT_IMPLEMENTED = \"not implemented\";\n+public class HandlebarsOptimizedTemplate {\nprivate final Template template;\n@@ -40,64 +31,8 @@ public class HandlebarsOptimizedTemplate implements Template {\nthis.template = handlebars.compileInline(templateContent);\n}\n- @Override\n- public void apply(Object context, Writer writer) throws IOException {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\npublic String apply(Object context) throws IOException {\nStringBuilder sb = new StringBuilder();\nreturn sb.append(startContent).append(template.apply(context)).append(endContent).toString();\n}\n-\n- @Override\n- public void apply(Context context, Writer writer) throws IOException {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public String apply(Context context) throws IOException {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public String text() {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public String toJavaScript() {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public <T, S extends TypeSafeTemplate<T>> S as(Class<S> type) {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public <T> TypeSafeTemplate<T> as() {\n- return template.as();\n- }\n-\n- @Override\n- public List<String> collect(TagType... tagType) {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public List<String> collectReferenceParameters() {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public String filename() {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n-\n- @Override\n- public int[] position() {\n- throw new NotImplementedException(NOT_IMPLEMENTED);\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -17,7 +17,6 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating;\nimport com.github.jknack.handlebars.Handlebars;\nimport com.github.jknack.handlebars.Helper;\n-import com.github.jknack.handlebars.Template;\nimport com.github.jknack.handlebars.helper.AssignHelper;\nimport com.github.jknack.handlebars.helper.ConditionalHelpers;\nimport com.github.jknack.handlebars.helper.NumberHelper;\n@@ -113,13 +112,13 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n.put(\"request\", RequestTemplateModel.from(request)).build();\nif (responseDefinition.specifiesTextBodyContent()) {\n- Template bodyTemplate = uncheckedCompileTemplate(responseDefinition.getBody());\n+ HandlebarsOptimizedTemplate bodyTemplate = uncheckedCompileTemplate(responseDefinition.getBody());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n} else if (responseDefinition.specifiesBodyFile()) {\n- Template filePathTemplate = uncheckedCompileTemplate(responseDefinition.getBodyFileName());\n+ HandlebarsOptimizedTemplate filePathTemplate = uncheckedCompileTemplate(responseDefinition.getBodyFileName());\nString compiledFilePath = uncheckedApplyTemplate(filePathTemplate, model);\nTextFile file = files.getTextFileNamed(compiledFilePath);\n- Template bodyTemplate = uncheckedCompileTemplate(file.readContentsAsString());\n+ HandlebarsOptimizedTemplate bodyTemplate = uncheckedCompileTemplate(file.readContentsAsString());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n}\n@@ -130,7 +129,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nList<String> newValues = Lists.transform(input.values(), new Function<String, String>() {\n@Override\npublic String apply(String input) {\n- Template template = uncheckedCompileTemplate(input);\n+ HandlebarsOptimizedTemplate template = uncheckedCompileTemplate(input);\nreturn uncheckedApplyTemplate(template, model);\n}\n});\n@@ -142,7 +141,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n}\nif (responseDefinition.getProxyBaseUrl() != null) {\n- Template proxyBaseUrlTemplate = uncheckedCompileTemplate(responseDefinition.getProxyBaseUrl());\n+ HandlebarsOptimizedTemplate proxyBaseUrlTemplate = uncheckedCompileTemplate(responseDefinition.getProxyBaseUrl());\nString newProxyBaseUrl = uncheckedApplyTemplate(proxyBaseUrlTemplate, model);\nnewResponseDefBuilder.proxiedFrom(newProxyBaseUrl);\n}\n@@ -150,12 +149,12 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nreturn newResponseDefBuilder.build();\n}\n- private void applyTemplatedResponseBody(ResponseDefinitionBuilder newResponseDefBuilder, ImmutableMap<String, Object> model, Template bodyTemplate) {\n+ private void applyTemplatedResponseBody(ResponseDefinitionBuilder newResponseDefBuilder, ImmutableMap<String, Object> model, HandlebarsOptimizedTemplate bodyTemplate) {\nString newBody = uncheckedApplyTemplate(bodyTemplate, model);\nnewResponseDefBuilder.withBody(newBody);\n}\n- private String uncheckedApplyTemplate(Template template, Object context) {\n+ private String uncheckedApplyTemplate(HandlebarsOptimizedTemplate template, Object context) {\ntry {\nreturn template.apply(context);\n} catch (IOException e) {\n@@ -163,11 +162,11 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n}\n}\n- private Template uncheckedCompileTemplate(String content) {\n+ private HandlebarsOptimizedTemplate uncheckedCompileTemplate(String content) {\ntry {\nreturn new HandlebarsOptimizedTemplate(handlebars, content);\n} catch (IOException e) {\n- return throwUnchecked(e, Template.class);\n+ return throwUnchecked(e, HandlebarsOptimizedTemplate.class);\n}\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Remove implementing Template |
686,936 | 10.03.2019 15:18:17 | 0 | e8f929b34fe659fb96c89a35cfaad493681475ed | Fixed - jre8 pom contained both Java 7 and 8 depedencies | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -35,23 +35,29 @@ allprojects {\nmavenCentral()\n}\n- def versions = [\n+ def versionSets = [\n+ java7: [\nhandlebars : '4.0.7',\n+ jetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\n+ guava : '20.0',\njackson : '2.9.8',\njacksonDatabind: '2.9.8',\n- jetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\n- xmlUnit : '2.6.2',\n- guava : '20.0'\n+ xmlUnit : '2.6.2'\n+\n+ ],\n+ java8: [\n+ handlebars : '4.1.2',\n+ jetty : '9.4.14.v20181114',\n+ guava : '27.0.1-jre',\n+ jackson : '2.9.8',\n+ jacksonDatabind: '2.9.8',\n+ xmlUnit : '2.6.2'\n]\n-// def versions = [\n-// handlebars : '4.1.2',\n-// jackson : '2.9.8',\n-// jacksonDatabind: '2.9.8',\n-// jetty : '9.4.14.v20181114',\n-// xmlUnit : '2.5.1',\n-// guava : '27.0.1-jre',\n-//// guava : '20.0'\n-// ]\n+ ]\n+\n+ def versions = project.name == 'wiremock' ?\n+ versionSets.java7 :\n+ versionSets[project.name]\ndependencies {\ncompile \"org.eclipse.jetty:jetty-server:$versions.jetty\"\n@@ -350,8 +356,12 @@ subprojects {\ndep.name == it.artifactId.text()\n}\n}.each() {\n+ if (it.name in VARIABLE_VERSION_ARTIFACTS.keySet() && it.version != VARIABLE_VERSION_ARTIFACTS[it.name]) {\n+ it.remove()\n+ } else {\nit.scope*.value = 'compile'\n}\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "java8/build.gradle",
"new_path": "java8/build.gradle",
"diff": "@@ -3,32 +3,3 @@ shadowJar.baseName = 'wiremock-jre8-standalone'\nsourceCompatibility = 1.8\ntargetCompatibility = 1.8\n\\ No newline at end of file\n-\n-def versions = [\n- handlebars : '4.1.2',\n- jetty : '9.4.14.v20181114',\n- guava : '27.0.1-jre'\n-]\n-\n-dependencies {\n- compile \"org.eclipse.jetty:jetty-server:$versions.jetty\"\n- compile \"org.eclipse.jetty:jetty-servlet:$versions.jetty\"\n- compile \"org.eclipse.jetty:jetty-servlets:$versions.jetty\"\n- compile \"org.eclipse.jetty:jetty-webapp:$versions.jetty\"\n-\n- compile \"com.google.guava:guava:$versions.guava\"\n-\n- compile \"com.github.jknack:handlebars:$versions.handlebars\", {\n- exclude group: 'org.mozilla', module: 'rhino'\n- }\n- compile(\"com.github.jknack:handlebars-helpers:$versions.handlebars\") {\n- exclude group: 'org.mozilla', module: 'rhino'\n- }\n-}\n-\n-task dumpThing {\n- doLast {\n- println shadowJar.baseName\n- }\n-\n-}\n\\ No newline at end of file\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1089 - jre8 pom contained both Java 7 and 8 depedencies |
686,936 | 12.03.2019 11:32:58 | 0 | e68f0c6463b14f68e0bf8ee60aa9e5ddba23138e | Upgraded the jre8 build to Jetty 9.4.15.v20190215 | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -55,3 +55,5 @@ tmp*\nsrc/main/resources/swagger/wiremock-admin-api.json\nsrc/main/resources/assets/swagger-ui/swagger-ui-dist\n+\n+scripts/client-cert.*\n"
},
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -47,7 +47,7 @@ allprojects {\n],\njava8: [\nhandlebars : '4.1.2',\n- jetty : '9.4.14.v20181114',\n+ jetty : '9.4.15.v20190215',\nguava : '27.0.1-jre',\njackson : '2.9.8',\njacksonDatabind: '2.9.8',\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/create-client-cert.sh",
"diff": "+#!/usr/bin/env bash\n+\n+openssl req -x509 -newkey rsa:2048 -utf8 -days 3650 -nodes -config client-cert.conf -keyout client-cert.key -out client-cert.crt\n+openssl pkcs12 -export -inkey client-cert.key -in client-cert.crt -out client-cert.p12\n+keytool -importkeystore -deststorepass mytruststorepassword -destkeypass mytruststorepassword -srckeystore client-cert.p12 -srcstorepass mytruststorepassword -deststoretype pkcs12 -destkeystore ../src/test/resources/test-truststore.pkcs12\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"diff": "@@ -41,7 +41,6 @@ import org.eclipse.jetty.servlets.CrossOriginFilter;\nimport org.eclipse.jetty.util.ssl.SslContextFactory;\nimport javax.servlet.DispatcherType;\n-import java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.net.Socket;\nimport java.nio.ByteBuffer;\n@@ -253,7 +252,6 @@ public class JettyHttpServer implements HttpServer {\nif (httpsSettings.hasTrustStore()) {\nsslContextFactory.setTrustStorePath(httpsSettings.trustStorePath());\nsslContextFactory.setTrustStorePassword(httpsSettings.trustStorePassword());\n- sslContextFactory.setTrustStoreType(httpsSettings.trustStoreType());\n}\nsslContextFactory.setNeedClientAuth(httpsSettings.needClientAuth());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/HttpsAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/HttpsAcceptanceTest.java",
"diff": "@@ -20,6 +20,7 @@ import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.http.Fault;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\n+import com.github.tomakehurst.wiremock.testsupport.TestFiles;\nimport com.google.common.io.Resources;\nimport org.apache.commons.lang3.SystemUtils;\nimport org.apache.http.HttpResponse;\n@@ -36,11 +37,9 @@ import org.apache.http.impl.client.HttpClients;\nimport org.apache.http.ssl.SSLContexts;\nimport org.apache.http.util.EntityUtils;\nimport org.hamcrest.Matchers;\n-import org.hamcrest.core.IsInstanceOf;\nimport org.junit.After;\nimport org.junit.Rule;\nimport org.junit.Test;\n-import org.junit.internal.matchers.ThrowableCauseMatcher;\nimport org.junit.rules.ExpectedException;\nimport javax.net.ssl.SSLContext;\n@@ -57,6 +56,7 @@ import java.security.cert.CertificateException;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.github.tomakehurst.wiremock.testsupport.TestFiles.*;\nimport static org.hamcrest.Matchers.instanceOf;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -67,10 +67,6 @@ import static org.junit.Assume.assumeTrue;\npublic class HttpsAcceptanceTest {\n- private static final String TRUST_STORE_PATH = toPath(\"test-clientstore\");\n- private static final String KEY_STORE_PATH = toPath(\"test-keystore\");\n- private static final String TRUST_STORE_PASSWORD = \"mytruststorepassword\";\n-\nprivate WireMockServer wireMockServer;\nprivate WireMockServer proxy;\nprivate HttpClient httpClient;\n@@ -307,6 +303,7 @@ public class HttpsAcceptanceTest {\nSSLContext sslcontext = SSLContexts.custom()\n.loadTrustMaterial(null, new TrustSelfSignedStrategy())\n.loadKeyMaterial(trustStore, trustStorePassword.toCharArray())\n+ .setKeyStoreType(\"pkcs12\")\n.setProtocol(\"TLS\")\n.build();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java",
"diff": "@@ -19,16 +19,15 @@ import org.junit.Test;\nimport java.security.KeyStore;\n+import static com.github.tomakehurst.wiremock.testsupport.TestFiles.TRUST_STORE_PASSWORD;\nimport static com.github.tomakehurst.wiremock.testsupport.TestFiles.filePath;\nimport static org.junit.Assert.assertNotNull;\npublic class KeyStoreSettingsTest {\n- private final static String TRUSTSTORE_PASSWORD = \"mytruststorepassword\";\n-\n@Test\npublic void loadsTrustStoreFromClasspath() {\n- KeyStoreSettings trustStoreSettings = new KeyStoreSettings(\"test-clientstore\", TRUSTSTORE_PASSWORD);\n+ KeyStoreSettings trustStoreSettings = new KeyStoreSettings(\"test-truststore.pkcs12\", TRUST_STORE_PASSWORD);\nKeyStore keyStore = trustStoreSettings.loadStore();\nassertNotNull(keyStore);\n@@ -36,7 +35,7 @@ public class KeyStoreSettingsTest {\n@Test\npublic void loadsTrustStoreFromFilesystem() {\n- KeyStoreSettings trustStoreSettings = new KeyStoreSettings(filePath(\"test-clientstore\"), TRUSTSTORE_PASSWORD);\n+ KeyStoreSettings trustStoreSettings = new KeyStoreSettings(filePath(\"test-truststore.pkcs12\"), TRUST_STORE_PASSWORD);\nKeyStore keyStore = trustStoreSettings.loadStore();\nassertNotNull(keyStore);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java",
"diff": "@@ -26,6 +26,10 @@ import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\npublic class TestFiles {\n+ public static final String TRUST_STORE_PASSWORD = \"mytruststorepassword\";\n+ public static final String TRUST_STORE_PATH = filePath(\"test-truststore.pkcs12\");\n+ public static final String KEY_STORE_PATH = filePath(\"test-keystore\");\n+\npublic static String defaultTestFilesRoot() {\nreturn filePath(\"test-file-root\");\n}\n@@ -51,4 +55,5 @@ public class TestFiles {\n\"sample-war\" :\n\"../sample-war\";\n}\n+\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/resources/test-clientstore",
"new_path": "src/test/resources/test-clientstore",
"diff": "Binary files a/src/test/resources/test-clientstore and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/resources/test-clientstore.bak",
"new_path": "src/test/resources/test-clientstore.bak",
"diff": "Binary files a/src/test/resources/test-clientstore.bak and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "src/test/resources/test-truststore.pkcs12",
"new_path": "src/test/resources/test-truststore.pkcs12",
"diff": "Binary files /dev/null and b/src/test/resources/test-truststore.pkcs12 differ\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded the jre8 build to Jetty 9.4.15.v20190215 |
686,936 | 12.03.2019 11:38:42 | 0 | b27187e0434d8174e728aecc458f7350d60fa5e8 | Fixed some minor issues with the example client cert/truststore creation script | [
{
"change_type": "MODIFY",
"old_path": "scripts/create-client-cert.sh",
"new_path": "scripts/create-client-cert.sh",
"diff": "#!/usr/bin/env bash\nopenssl req -x509 -newkey rsa:2048 -utf8 -days 3650 -nodes -config client-cert.conf -keyout client-cert.key -out client-cert.crt\n-openssl pkcs12 -export -inkey client-cert.key -in client-cert.crt -out client-cert.p12\n-keytool -importkeystore -deststorepass mytruststorepassword -destkeypass mytruststorepassword -srckeystore client-cert.p12 -srcstorepass mytruststorepassword -deststoretype pkcs12 -destkeystore ../src/test/resources/test-truststore.pkcs12\n\\ No newline at end of file\n+openssl pkcs12 -export -inkey client-cert.key -in client-cert.crt -out client-cert.p12 -password pass:mytruststorepassword\n+keytool -importkeystore -deststorepass mytruststorepassword -destkeypass mytruststorepassword -srckeystore client-cert.p12 -srcstorepass mytruststorepassword -deststoretype pkcs12 -destkeystore client-cert.pkcs12\n\\ No newline at end of file\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed some minor issues with the example client cert/truststore creation script |
686,936 | 12.03.2019 18:13:37 | 0 | b9eb5cc56c9d7ff130b89b3d8343a999d8250c94 | Added a doc note about building client certificates with SANs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/https.md",
"new_path": "docs-v2/_docs/https.md",
"diff": "@@ -61,6 +61,13 @@ public WireMockRule wireMockRule = new WireMockRule(wireMockConfig()\nIf you using WireMock as a proxy onto another system which requires client certificate authentication, you will also need to\nspecify a trust store containing the certificate(s).\n+> **note**\n+>\n+> Version 9.4.15.v20190215 of Jetty (used in the jre8 WireMock build) requires client certificates to contain Subject Alternative Names.\n+> See [this script](https://github.com/tomakehurst/wiremock/blob/master/scripts/create-client-cert.sh) for an example of how to build\n+> a truststore containing a valid certificate (you'll probably want to edit the client-cert.conf file before running this).\n+\n+\n## Common HTTPS issues\n`javax.net.ssl.SSLException: Unrecognized SSL message, plaintext connection?`: Usually means you've tried to connect to the\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a doc note about building client certificates with SANs |
686,936 | 14.03.2019 11:21:19 | 0 | 2de7889415b6a450ea7e868a46d19e393d039eda | Added support for specifying a policy determining whether responses should be chunk encoded or returned with a Content-Length header | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"diff": "@@ -36,6 +36,8 @@ import java.util.Map;\npublic interface Options {\n+ enum ChunkedEncodingPolicy { ALWAYS, NEVER, BODY_FILE }\n+\nint DEFAULT_PORT = 8080;\nint DYNAMIC_PORT = 0;\nint DEFAULT_CONTAINER_THREADS = 10;\n@@ -65,4 +67,5 @@ public interface Options {\nboolean getHttpsRequiredForAdminApi();\nNotMatchedRenderer getNotMatchedRenderer();\nAsynchronousResponseSettings getAsynchronousResponseSettings();\n+ ChunkedEncodingPolicy getChunkedEncodingPolicy();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"diff": "@@ -91,6 +91,7 @@ public class WireMockConfiguration implements Options {\nprivate NotMatchedRenderer notMatchedRenderer = new PlainTextStubNotMatchedRenderer();\nprivate boolean asynchronousResponseEnabled;\nprivate int asynchronousResponseThreads;\n+ private ChunkedEncodingPolicy chunkedEncodingPolicy;\nprivate MappingsSource getMappingsSource() {\nif (mappingsSource == null) {\n@@ -330,6 +331,11 @@ public class WireMockConfiguration implements Options {\nreturn this;\n}\n+ public WireMockConfiguration useChunkedTransferEncoding(ChunkedEncodingPolicy policy) {\n+ this.chunkedEncodingPolicy = policy;\n+ return this;\n+ }\n+\n@Override\npublic int portNumber() {\nreturn portNumber;\n@@ -465,4 +471,8 @@ public class WireMockConfiguration implements Options {\nreturn new AsynchronousResponseSettings(asynchronousResponseEnabled, asynchronousResponseThreads);\n}\n+ @Override\n+ public ChunkedEncodingPolicy getChunkedEncodingPolicy() {\n+ return chunkedEncodingPolicy;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/Response.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/Response.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.http;\n+import com.github.tomakehurst.wiremock.common.BinaryFile;\nimport com.github.tomakehurst.wiremock.common.InputStreamSource;\nimport com.github.tomakehurst.wiremock.common.StreamSources;\nimport com.github.tomakehurst.wiremock.common.Strings;\n@@ -120,6 +121,10 @@ public class Response {\nreturn bodyStreamSource == null ? null : bodyStreamSource.getStream();\n}\n+ public boolean hasInlineBody() {\n+ return !BinaryFile.class.isAssignableFrom(bodyStreamSource.getClass());\n+ }\n+\npublic HttpHeaders getHeaders() {\nreturn headers;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"diff": "@@ -105,6 +105,7 @@ public class JettyHttpServer implements HttpServer {\nstubRequestHandler,\noptions.filesRoot(),\noptions.getAsynchronousResponseSettings(),\n+ options.getChunkedEncodingPolicy(),\nnotifier\n);\n@@ -326,6 +327,7 @@ public class JettyHttpServer implements HttpServer {\nStubRequestHandler stubRequestHandler,\nFileSource fileSource,\nAsynchronousResponseSettings asynchronousResponseSettings,\n+ Options.ChunkedEncodingPolicy chunkedEncodingPolicy,\nNotifier notifier\n) {\nServletContextHandler mockServiceContext = new ServletContextHandler(jettyServer, \"/\");\n@@ -339,6 +341,7 @@ public class JettyHttpServer implements HttpServer {\nmockServiceContext.setAttribute(JettyFaultInjectorFactory.class.getName(), new JettyFaultInjectorFactory());\nmockServiceContext.setAttribute(StubRequestHandler.class.getName(), stubRequestHandler);\nmockServiceContext.setAttribute(Notifier.KEY, notifier);\n+ mockServiceContext.setAttribute(Options.ChunkedEncodingPolicy.class.getName(), chunkedEncodingPolicy);\nServletHolder servletHolder = mockServiceContext.addServlet(WireMockHandlerDispatchingServlet.class, \"/\");\nservletHolder.setInitParameter(RequestHandler.HANDLER_CLASS_KEY, StubRequestHandler.class.getName());\nservletHolder.setInitParameter(FaultInjectorFactory.INJECTOR_CLASS_KEY, JettyFaultInjectorFactory.class.getName());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WarConfiguration.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WarConfiguration.java",
"diff": "@@ -171,4 +171,9 @@ public class WarConfiguration implements Options {\npublic AsynchronousResponseSettings getAsynchronousResponseSettings() {\nreturn new AsynchronousResponseSettings(false, 0);\n}\n+\n+ @Override\n+ public ChunkedEncodingPolicy getChunkedEncodingPolicy() {\n+ return ChunkedEncodingPolicy.ALWAYS;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHandlerDispatchingServlet.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHandlerDispatchingServlet.java",
"diff": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.servlet;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.core.FaultInjector;\n+import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.core.WireMockApp;\nimport com.github.tomakehurst.wiremock.http.*;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n@@ -32,6 +33,8 @@ import java.io.InputStream;\nimport java.util.concurrent.ScheduledExecutorService;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static com.github.tomakehurst.wiremock.core.Options.ChunkedEncodingPolicy.BODY_FILE;\n+import static com.github.tomakehurst.wiremock.core.Options.ChunkedEncodingPolicy.NEVER;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\nimport static com.github.tomakehurst.wiremock.servlet.WireMockHttpServletRequestAdapter.ORIGINAL_REQUEST_KEY;\nimport static com.google.common.base.Charsets.UTF_8;\n@@ -57,6 +60,7 @@ public class WireMockHandlerDispatchingServlet extends HttpServlet {\nprivate String wiremockFileSourceRoot = \"/\";\nprivate boolean shouldForwardToFilesContext;\nprivate MultipartRequestConfigurer multipartRequestConfigurer;\n+ private Options.ChunkedEncodingPolicy chunkedEncodingPolicy;\n@Override\npublic void init(ServletConfig config) {\n@@ -83,6 +87,11 @@ public class WireMockHandlerDispatchingServlet extends HttpServlet {\nnotifier = (Notifier) context.getAttribute(Notifier.KEY);\nmultipartRequestConfigurer = (MultipartRequestConfigurer) context.getAttribute(MultipartRequestConfigurer.KEY);\n+\n+ Object chunkedEncodingPolicyAttr = context.getAttribute(Options.ChunkedEncodingPolicy.class.getName());\n+ chunkedEncodingPolicy = chunkedEncodingPolicyAttr != null ?\n+ (Options.ChunkedEncodingPolicy) chunkedEncodingPolicyAttr :\n+ Options.ChunkedEncodingPolicy.ALWAYS;\n}\nprivate String getNormalizedMappedUnder(ServletConfig config) {\n@@ -204,6 +213,10 @@ public class WireMockHandlerDispatchingServlet extends HttpServlet {\n}\n}\n+ if (chunkedEncodingPolicy == NEVER || (chunkedEncodingPolicy == BODY_FILE && response.hasInlineBody())) {\n+ httpServletResponse.setContentLength(response.getBody().length);\n+ }\n+\nif (response.shouldAddChunkedDribbleDelay()) {\nwriteAndTranslateExceptionsWithChunkedDribbleDelay(httpServletResponse, response.getBodyStream(), response.getChunkedDribbleDelay());\n} else {\n@@ -217,10 +230,7 @@ public class WireMockHandlerDispatchingServlet extends HttpServlet {\nprivate static void writeAndTranslateExceptions(HttpServletResponse httpServletResponse, InputStream content) {\ntry (ServletOutputStream out = httpServletResponse.getOutputStream()) {\n- byte[] body = ByteStreams.toByteArray(content);\n- httpServletResponse.setContentLength(body.length);\n- out.write(body);\n-// ByteStreams.copy(content, out);\n+ ByteStreams.copy(content, out);\nout.flush();\n} catch (IOException e) {\nthrowUnchecked(e);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"diff": "@@ -90,6 +90,7 @@ public class CommandLineOptions implements Options {\nprivate static final String ADMIN_API_REQUIRE_HTTPS = \"admin-api-require-https\";\nprivate static final String ASYNCHRONOUS_RESPONSE_ENABLED = \"async-response-enabled\";\nprivate static final String ASYNCHRONOUS_RESPONSE_THREADS = \"async-response-threads\";\n+ private static final String USE_CHUNKED_ENCODING = \"use-chunked-encoding\";\nprivate final OptionSet optionSet;\nprivate final FileSource fileSource;\n@@ -132,6 +133,7 @@ public class CommandLineOptions implements Options {\noptionParser.accepts(ADMIN_API_REQUIRE_HTTPS, \"Require HTTPS to be used to access the admin API\");\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_ENABLED, \"Enable asynchronous response\").withRequiredArg().defaultsTo(\"false\");\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_THREADS, \"Number of asynchronous response threads\").withRequiredArg().defaultsTo(\"10\");\n+ optionParser.accepts(USE_CHUNKED_ENCODING, \"Whether to use Transfer-Encoding: chunked in responses. Can be set to always, never or body_file.\").withRequiredArg().defaultsTo(\"always\");\noptionParser.accepts(HELP, \"Print this message\");\n@@ -495,6 +497,13 @@ public class CommandLineOptions implements Options {\nreturn new AsynchronousResponseSettings(isAsynchronousResponseEnabled(), getAsynchronousResponseThreads());\n}\n+ @Override\n+ public ChunkedEncodingPolicy getChunkedEncodingPolicy() {\n+ return optionSet.has(USE_CHUNKED_ENCODING) ?\n+ ChunkedEncodingPolicy.valueOf(optionSet.valueOf(USE_CHUNKED_ENCODING).toString().toUpperCase()) :\n+ ChunkedEncodingPolicy.ALWAYS;\n+ }\n+\nprivate boolean isAsynchronousResponseEnabled() {\nreturn optionSet.has(ASYNCHRONOUS_RESPONSE_ENABLED) ?\nBoolean.valueOf((String) optionSet.valueOf(ASYNCHRONOUS_RESPONSE_ENABLED)) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/TransferEncodingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/TransferEncodingAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\n+import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\n-import org.hamcrest.Matchers;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.apache.commons.lang3.StringUtils;\n+import org.junit.After;\nimport org.junit.Test;\n-import static com.github.tomakehurst.wiremock.client.WireMock.*;\n-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;\n-import static java.net.HttpURLConnection.HTTP_OK;\n-import static org.hamcrest.Matchers.is;\n-import static org.hamcrest.Matchers.nullValue;\n+import static com.github.tomakehurst.wiremock.client.WireMock.get;\n+import static com.github.tomakehurst.wiremock.client.WireMock.ok;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.github.tomakehurst.wiremock.testsupport.TestFiles.filePath;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\n-public class TransferEncodingAcceptanceTest extends AcceptanceTestBase {\n+public class TransferEncodingAcceptanceTest {\n+\n+ WireMockServer wm;\n+ WireMockTestClient testClient;\n@Test\n- public void matchingOnRequestBodyWithTwoRegexes() {\n+ public void sendsContentLengthWhenTransferEncodingChunkedPolicyIsNever() {\n+ startWithChunkedEncodingPolicy(Options.ChunkedEncodingPolicy.NEVER);\n+\nfinal String url = \"/content-length-encoding\";\nfinal String body = \"Body content\";\n- stubFor(get(url).willReturn(ok(body)));\n+ wm.stubFor(get(url).willReturn(ok(body)));\n+\n+ WireMockResponse response = testClient.get(url);\n+ assertThat(response.statusCode(), is(200));\n+\n+ String expectedContentLength = String.valueOf(body.getBytes().length);\n+ assertThat(response.firstHeader(\"Transfer-Encoding\"), nullValue());\n+ assertThat(response.firstHeader(\"Content-Length\"), is(expectedContentLength));\n+ }\n+\n+ @Test\n+ public void sendsTransferEncodingChunkedWhenPolicyIsAlways() {\n+ startWithChunkedEncodingPolicy(Options.ChunkedEncodingPolicy.ALWAYS);\n+\n+ final String url = \"/chunked-encoding-always\";\n+ final String body = \"Body content\";\n+\n+ wm.stubFor(get(url).willReturn(ok(body)));\n+\n+ WireMockResponse response = testClient.get(url);\n+ assertThat(response.statusCode(), is(200));\n+\n+ assertThat(response.firstHeader(\"Transfer-Encoding\"), is(\"chunked\"));\n+ assertThat(response.firstHeader(\"Content-Length\"), nullValue());\n+ }\n+\n+ @Test\n+ public void sendsTransferEncodingChunkedWhenPolicyIsBodyFileAndBodyFileIsUsed() {\n+ startWithChunkedEncodingPolicy(Options.ChunkedEncodingPolicy.BODY_FILE);\n+\n+ final String fileUrl = \"/chunked-encoding-body\";\n+ final String inlineBodyUrl = \"/chunked-encoding-body-file\";\n+\n+ wm.stubFor(get(fileUrl).willReturn(ok().withBodyFile(\"plain-example.txt\")));\n+ wm.stubFor(get(inlineBodyUrl).willReturn(ok(\"Body content\")));\n+\n+ WireMockResponse response = testClient.get(fileUrl);\n+ assertThat(response.statusCode(), is(200));\n+ assertThat(response.firstHeader(\"Transfer-Encoding\"), is(\"chunked\"));\n+ assertThat(response.firstHeader(\"Content-Length\"), nullValue());\n+\n+ response = testClient.get(inlineBodyUrl);\n+ assertThat(response.statusCode(), is(200));\n+ assertThat(response.firstHeader(\"Transfer-Encoding\"), nullValue());\n+ assertThat(response.firstHeader(\"Content-Length\"), notNullValue());\n+ }\n+\n+ @Test\n+ public void sendsContentLengthWhenTransferEncodingChunkedPolicyIsNeverAndDribbleDelayIsApplied() {\n+ startWithChunkedEncodingPolicy(Options.ChunkedEncodingPolicy.NEVER);\n+\n+ final String url = \"/content-length-encoding\";\n+ final String body = \"Slightly longer body content in this string\";\n+\n+ wm.stubFor(get(url)\n+ .willReturn(ok(body)\n+ .withChunkedDribbleDelay(5, 200)));\nWireMockResponse response = testClient.get(url);\nassertThat(response.statusCode(), is(200));\n@@ -27,4 +91,20 @@ public class TransferEncodingAcceptanceTest extends AcceptanceTestBase {\nassertThat(response.firstHeader(\"Transfer-Encoding\"), nullValue());\nassertThat(response.firstHeader(\"Content-Length\"), is(expectedContentLength));\n}\n+\n+ private void startWithChunkedEncodingPolicy(Options.ChunkedEncodingPolicy chunkedEncodingPolicy) {\n+ wm = new WireMockServer(wireMockConfig()\n+ .dynamicPort()\n+ .withRootDirectory(filePath(\"test-file-root\"))\n+ .useChunkedTransferEncoding(chunkedEncodingPolicy)\n+ );\n+ wm.start();\n+\n+ testClient = new WireMockTestClient(wm.port());\n+ }\n+\n+ @After\n+ public void cleanup() {\n+ wm.stop();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"diff": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.standalone;\nimport com.github.tomakehurst.wiremock.client.BasicCredentials;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.ProxySettings;\n+import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n@@ -387,6 +388,12 @@ public class CommandLineOptionsTest {\nassertThat(options.getAsynchronousResponseSettings().getThreads(), is(20));\n}\n+ @Test\n+ public void setsChunkedEncodingPolicy() {\n+ CommandLineOptions options = new CommandLineOptions(\"--use-chunked-encoding\", \"always\");\n+ assertThat(options.getChunkedEncodingPolicy(), is(Options.ChunkedEncodingPolicy.ALWAYS));\n+ }\n+\n@Test\npublic void setsDefaultNumberOfAsynchronousResponseThreads() {\nCommandLineOptions options = new CommandLineOptions();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for specifying a policy determining whether responses should be chunk encoded or returned with a Content-Length header |
686,936 | 16.03.2019 09:37:59 | 0 | 7a63912921777a1bf93ec4bae02a3d1296058697 | Documented transfer encoding configuration settings | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/configuration.md",
"new_path": "docs-v2/_docs/configuration.md",
"diff": "@@ -147,3 +147,20 @@ For details see [Extending WireMock](/docs/extending-wiremock/).\n// Add extensions\n.extensions(\"com.mycorp.ExtensionOne\", \"com.mycorp.ExtensionTwo\")\n```\n+\n+## Transfer encoding\n+\n+By default WireMock will send all responses chunk encoded, meaning with a `Transfer-Encoding: chunked` header present and no `Content-Length` header.\n+\n+This behaviour can be modified by setting a chunked encoding policy e.g.\n+\n+```java\n+.useChunkedTransferEncoding(Options.ChunkedEncodingPolicy.BODY_FILE)\n+```\n+\n+Valid values are:\n+\n+* `NEVER` - Never use chunked encoding. Warning: this will buffer all response bodies in order to calculate the size.\n+This might put a lot of strain on the garbage collector if you're using large response bodies.\n+* `BODY_FILE` - Use chunked encoding for body files but calculate a `Content-Length` for directly configured bodies.\n+* `ALWAYS` - Always use chunk encoding - the default.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -119,6 +119,9 @@ com.mycorp.HeaderTransformer,com.mycorp.BodyTransformer. See extending-wiremock.\n`--local-response-templating`: Enable rendering of response definitions using Handlebars templates for specific stub mappings.\n+`--use-chunked-encoding`: Set the policy for sending responses with `Transfer-Encoding: chunked`. Valid values are `always`, `never` and `body_file`.\n+The last of these will cause chunked encoding to be used only when a stub defines its response body from a file.\n+\n`--help`: Show command line help\n## Configuring WireMock using the Java client\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Documented transfer encoding configuration settings |
686,936 | 16.03.2019 18:17:31 | 0 | 88bbe7fb2160bbcae02a7d42af423b68c116fbf1 | Try multiple times to start on a random port during WAR test as this sometimes fails on Travis due to BindExceptions | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/WarDeploymentAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/WarDeploymentAcceptanceTest.java",
"diff": "@@ -49,17 +49,38 @@ public class WarDeploymentAcceptanceTest {\n@Before\npublic void init() throws Exception {\n- int port = Network.findFreePort();\n- jetty = new Server(port);\nString webAppRootPath = sampleWarRootDir() + \"/src/main/webapp\";\nWebAppContext context = new WebAppContext(webAppRootPath, \"/wiremock\");\n- jetty.setHandler(context);\n- jetty.start();\n+\n+ int port = attemptToStartOnRandomPort(context);\nWireMock.configureFor(\"localhost\", port, \"/wiremock\");\ntestClient = new WireMockTestClient(port);\n}\n+ private int attemptToStartOnRandomPort(WebAppContext context) throws Exception {\n+ int port;\n+\n+ int attemptsRemaining = 3;\n+ while (true) {\n+ port = Network.findFreePort();\n+ jetty = new Server(port);\n+ jetty.setHandler(context);\n+ try {\n+ jetty.start();\n+ break;\n+ } catch (Exception e) {\n+ attemptsRemaining--;\n+ if (attemptsRemaining > 0) {\n+ continue;\n+ }\n+\n+ throw e;\n+ }\n+ }\n+ return port;\n+ }\n+\n@After\npublic void cleanup() throws Exception {\njetty.stop();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Try multiple times to start on a random port during WAR test as this sometimes fails on Travis due to BindExceptions |
686,936 | 16.03.2019 18:30:34 | 0 | fec9ecd4cefde98e0342abbcf814366677d7532e | Slightly raised a timeout in a test to reduce build flakeyness | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseDelaySynchronousFailureAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseDelaySynchronousFailureAcceptanceTest.java",
"diff": "@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;\npublic class ResponseDelaySynchronousFailureAcceptanceTest {\n- private static final int SOCKET_TIMEOUT_MILLISECONDS = 1000;\n+ private static final int SOCKET_TIMEOUT_MILLISECONDS = 1500;\nprivate static final int SHORTER_THAN_SOCKET_TIMEOUT = SOCKET_TIMEOUT_MILLISECONDS / 2;\nprivate ExecutorService httpClientExecutor = Executors.newCachedThreadPool();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Slightly raised a timeout in a test to reduce build flakeyness |
686,936 | 16.03.2019 18:45:24 | 0 | 79d878845ba818188c751d5422c49799edf35e17 | Deleted flakey and not terribly useful test | [
{
"change_type": "DELETE",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseDelaySynchronousFailureAcceptanceTest.java",
"new_path": null,
"diff": "-/*\n- * Copyright (C) 2011 Thomas Akehurst\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package com.github.tomakehurst.wiremock;\n-\n-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;\n-import com.github.tomakehurst.wiremock.http.HttpClientFactory;\n-import com.github.tomakehurst.wiremock.junit.WireMockRule;\n-import org.apache.http.HttpResponse;\n-import org.apache.http.client.methods.HttpGet;\n-import org.junit.Rule;\n-import org.junit.Test;\n-\n-import java.io.IOException;\n-import java.net.SocketTimeoutException;\n-import java.util.ArrayList;\n-import java.util.List;\n-import java.util.concurrent.Callable;\n-import java.util.concurrent.ExecutionException;\n-import java.util.concurrent.ExecutorService;\n-import java.util.concurrent.Executors;\n-import java.util.concurrent.Future;\n-\n-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n-import static com.github.tomakehurst.wiremock.client.WireMock.get;\n-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n-import static org.hamcrest.CoreMatchers.instanceOf;\n-import static org.hamcrest.CoreMatchers.is;\n-import static org.junit.Assert.assertThat;\n-import static org.junit.Assert.fail;\n-\n-public class ResponseDelaySynchronousFailureAcceptanceTest {\n-\n- private static final int SOCKET_TIMEOUT_MILLISECONDS = 1500;\n- private static final int SHORTER_THAN_SOCKET_TIMEOUT = SOCKET_TIMEOUT_MILLISECONDS / 2;\n-\n- private ExecutorService httpClientExecutor = Executors.newCachedThreadPool();\n-\n- @Rule\n- public WireMockRule wireMockRule = new WireMockRule(getOptions());\n-\n- private WireMockConfiguration getOptions() {\n- WireMockConfiguration wireMockConfiguration = new WireMockConfiguration();\n- wireMockConfiguration.jettyAcceptors(1).containerThreads(8);\n- wireMockConfiguration.asynchronousResponseEnabled(false);\n- wireMockConfiguration.dynamicPort();\n- return wireMockConfiguration;\n- }\n-\n- @Test\n- public void requestIsFailedWhenMultipleRequestsHitSynchronousServer() throws Exception {\n- stubFor(get(urlEqualTo(\"/delayed\")).willReturn(\n- aResponse()\n- .withStatus(200)\n- .withFixedDelay(SHORTER_THAN_SOCKET_TIMEOUT)));\n- List<Future<HttpResponse>> responses = httpClientExecutor.invokeAll(getHttpRequestCallables(10));\n- try {\n- for (Future<HttpResponse> response : responses) {\n- assertThat(response.get().getStatusLine().getStatusCode(), is(200));\n- }\n- fail(\"A timeout exception expected reading multiple responses from synchronous WireMock server\");\n- } catch (ExecutionException e) {\n- assertThat(e.getCause(), instanceOf(SocketTimeoutException.class));\n- assertThat(e.getCause().getMessage(), is(\"Read timed out\"));\n- }\n- }\n-\n- private List<Callable<HttpResponse>> getHttpRequestCallables(int requestCount) throws IOException {\n- List<Callable<HttpResponse>> requests = new ArrayList<>();\n- for (int i = 0; i < requestCount; i++) {\n- requests.add(new Callable<HttpResponse>() {\n- @Override\n- public HttpResponse call() throws Exception {\n- return HttpClientFactory\n- .createClient(SOCKET_TIMEOUT_MILLISECONDS)\n- .execute(new HttpGet(String.format(\"http://localhost:%d/delayed\", wireMockRule.port())));\n- }\n- });\n- }\n- return requests;\n- }\n-\n-}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Deleted flakey and not terribly useful test |
686,936 | 16.03.2019 19:11:47 | 0 | 681833e5a0723cbef67bd7f50fac670dc109768e | Added some diagnostic info to the Travis config | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -9,5 +9,8 @@ install:\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 6.3.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses\n-script: ./gradlew test --info --stacktrace --no-daemon\n+script:\n+ - $JAVA_HOME/bin/java -version\n+ - java -version\n+ - ./gradlew test --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added some diagnostic info to the Travis config |
686,936 | 16.03.2019 19:44:13 | 0 | 85760b7ee65d57aee752fb3ce8ad5c093e0305ae | Attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -6,11 +6,10 @@ jdk:\n- openjdk8\ninstall:\n- - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 6.3.0\n- - JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses\n+ - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n+ - JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n+ - apt-get upgrade -y openjdk7\nscript:\n- - $JAVA_HOME/bin/java -version\n- - java -version\n- - ./gradlew test --info --stacktrace --no-daemon\n+ - ./gradlew check --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type |
686,936 | 16.03.2019 19:47:23 | 0 | 36c9e1c4b99464fb884b6d6ed5db151c71f715e6 | Added missing sudo to package upgrade command in the Travis config | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -8,7 +8,7 @@ jdk:\ninstall:\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n- - apt-get upgrade -y openjdk7\n+ - sudo apt-get upgrade -y openjdk7\nscript:\n- ./gradlew check --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added missing sudo to package upgrade command in the Travis config |
686,936 | 16.03.2019 19:53:37 | 0 | 1cbfcab5c80ec120ae56c5433d6d36e8fe5684ca | 2nd attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -8,7 +8,7 @@ jdk:\ninstall:\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n- - sudo apt-get upgrade -y openjdk7\n+ - sudo apt-get upgrade -y java-1.7.0-openjdk-amd64\nscript:\n- ./gradlew check --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | 2nd attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type |
686,936 | 16.03.2019 19:59:55 | 0 | 8f413ba6179c57b144f4c2d1102c612a5e825a34 | Added some debug output to the travis config | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -8,7 +8,7 @@ jdk:\ninstall:\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n- - sudo apt-get upgrade -y java-1.7.0-openjdk-amd64\n+ - sudo apt list | grep openjdk\nscript:\n- ./gradlew check --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added some debug output to the travis config |
686,936 | 16.03.2019 20:08:26 | 0 | bad5c7f8da2c9ea8ee1afc78330b17b2433b8f4a | 3rd attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -6,9 +6,9 @@ jdk:\n- openjdk8\ninstall:\n+ - sudo apt-get upgrade -y openjdk-7-jdk\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n- - sudo apt list | grep openjdk\nscript:\n- ./gradlew check --info --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | 3rd attempt at upgrading openjdk7 in Travis to avoid build failures due to keystore type |
686,936 | 16.03.2019 20:24:59 | 0 | 739999f470c29e16d6cdefb1a179ba56f7e7f0c5 | Attempt to fix Travis build failures by switching test truststore based on JVM version | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -6,7 +6,6 @@ jdk:\n- openjdk8\ninstall:\n- - sudo apt-get upgrade -y openjdk-7-jdk\n- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 8.12.0\n- JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew classes testClasses -x generateApiDocs\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/common/KeyStoreSettingsTest.java",
"diff": "@@ -19,15 +19,14 @@ import org.junit.Test;\nimport java.security.KeyStore;\n-import static com.github.tomakehurst.wiremock.testsupport.TestFiles.TRUST_STORE_PASSWORD;\n-import static com.github.tomakehurst.wiremock.testsupport.TestFiles.filePath;\n+import static com.github.tomakehurst.wiremock.testsupport.TestFiles.*;\nimport static org.junit.Assert.assertNotNull;\npublic class KeyStoreSettingsTest {\n@Test\npublic void loadsTrustStoreFromClasspath() {\n- KeyStoreSettings trustStoreSettings = new KeyStoreSettings(\"test-truststore.pkcs12\", TRUST_STORE_PASSWORD);\n+ KeyStoreSettings trustStoreSettings = new KeyStoreSettings(TRUST_STORE_NAME, TRUST_STORE_PASSWORD);\nKeyStore keyStore = trustStoreSettings.loadStore();\nassertNotNull(keyStore);\n@@ -35,7 +34,7 @@ public class KeyStoreSettingsTest {\n@Test\npublic void loadsTrustStoreFromFilesystem() {\n- KeyStoreSettings trustStoreSettings = new KeyStoreSettings(filePath(\"test-truststore.pkcs12\"), TRUST_STORE_PASSWORD);\n+ KeyStoreSettings trustStoreSettings = new KeyStoreSettings(TRUST_STORE_PATH, TRUST_STORE_PASSWORD);\nKeyStore keyStore = trustStoreSettings.loadStore();\nassertNotNull(keyStore);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java",
"diff": "@@ -27,9 +27,16 @@ import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\npublic class TestFiles {\npublic static final String TRUST_STORE_PASSWORD = \"mytruststorepassword\";\n- public static final String TRUST_STORE_PATH = filePath(\"test-truststore.pkcs12\");\n+ public static final String TRUST_STORE_NAME = getTrustStoreRelativeName();\n+ public static final String TRUST_STORE_PATH = filePath(TRUST_STORE_NAME);\npublic static final String KEY_STORE_PATH = filePath(\"test-keystore\");\n+ private static String getTrustStoreRelativeName() {\n+ return System.getProperty(\"java.specification.version\").equals(\"1.7\") ?\n+ \"test-truststore.jks\" :\n+ \"test-truststore.pkcs12\";\n+ }\n+\npublic static String defaultTestFilesRoot() {\nreturn filePath(\"test-file-root\");\n}\n"
},
{
"change_type": "ADD",
"old_path": "src/test/resources/test-truststore.jks",
"new_path": "src/test/resources/test-truststore.jks",
"diff": "Binary files /dev/null and b/src/test/resources/test-truststore.jks differ\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Attempt to fix Travis build failures by switching test truststore based on JVM version |
687,031 | 17.03.2019 21:51:41 | -3,600 | 54f500acbfa6d2ed25895b35e02d4b3880a6201d | Replace usage of internal java.xml class with public abstraction
This commit fixes problem of using DocumentBuilderFactoryImpl from com.sun.org.apache.xerces.internal.jaxp package. Problem arises as this package is not public (not exported) since JDK 9. Solution is to replace use of this class with DocumentBuilderFactory from exported package java.xml.parsers. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Xml.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Xml.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n-import com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl;\nimport org.custommonkey.xmlunit.XMLUnit;\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\n@@ -150,14 +149,40 @@ public class Xml {\n}\n}\n- public static class SkipResolvingEntitiesDocumentBuilderFactory extends DocumentBuilderFactoryImpl {\n+ public static class SkipResolvingEntitiesDocumentBuilderFactory extends DocumentBuilderFactory {\n+ private final DocumentBuilderFactory documentBuilderFactory;\n+\n+ public SkipResolvingEntitiesDocumentBuilderFactory() {\n+ documentBuilderFactory = DocumentBuilderFactory.newInstance();\n+ }\n+\n@Override\npublic DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {\n- DocumentBuilder documentBuilder = super.newDocumentBuilder();\n+ DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();\ndocumentBuilder.setEntityResolver(new SkipResolvingEntitiesDocumentBuilderFactory.ResolveToEmptyString());\nreturn documentBuilder;\n}\n+ @Override\n+ public void setAttribute(String name, Object value) throws IllegalArgumentException {\n+ documentBuilderFactory.setAttribute(name, value);\n+ }\n+\n+ @Override\n+ public Object getAttribute(String name) throws IllegalArgumentException {\n+ return documentBuilderFactory.getAttribute(name);\n+ }\n+\n+ @Override\n+ public void setFeature(String name, boolean value) throws ParserConfigurationException {\n+ documentBuilderFactory.setFeature(name, value);\n+ }\n+\n+ @Override\n+ public boolean getFeature(String name) throws ParserConfigurationException {\n+ return documentBuilderFactory.getFeature(name);\n+ }\n+\nprivate static class ResolveToEmptyString implements EntityResolver {\n@Override\npublic InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Replace usage of internal java.xml class with public abstraction (#1098)
This commit fixes problem of using DocumentBuilderFactoryImpl from com.sun.org.apache.xerces.internal.jaxp package. Problem arises as this package is not public (not exported) since JDK 9. Solution is to replace use of this class with DocumentBuilderFactory from exported package java.xml.parsers. |
686,936 | 17.03.2019 21:21:36 | 0 | a2586ae762cc3868b85c685d670993961a9716ba | Added a template method to ResponseTemplateTransformer allowing a subclass to supply extra model elements | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -108,9 +108,12 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n@Override\npublic ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) {\nResponseDefinitionBuilder newResponseDefBuilder = ResponseDefinitionBuilder.like(responseDefinition);\n+\nfinal ImmutableMap<String, Object> model = ImmutableMap.<String, Object>builder()\n.put(\"parameters\", firstNonNull(parameters, Collections.<String, Object>emptyMap()))\n- .put(\"request\", RequestTemplateModel.from(request)).build();\n+ .put(\"request\", RequestTemplateModel.from(request))\n+ .putAll(addExtraModelElements(request, responseDefinition, files, parameters))\n+ .build();\nif (responseDefinition.specifiesTextBodyContent()) {\nTemplate bodyTemplate = uncheckedCompileTemplate(responseDefinition.getBody());\n@@ -150,6 +153,13 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nreturn newResponseDefBuilder.build();\n}\n+ /**\n+ * Override this to add extra elements to the template model\n+ */\n+ protected Map<String, Object> addExtraModelElements(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) {\n+ return Collections.emptyMap();\n+ }\n+\nprivate void applyTemplatedResponseBody(ResponseDefinitionBuilder newResponseDefBuilder, ImmutableMap<String, Object> model, Template bodyTemplate) {\nString newBody = uncheckedApplyTemplate(bodyTemplate, model);\nnewResponseDefBuilder.withBody(newBody);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a template method to ResponseTemplateTransformer allowing a subclass to supply extra model elements |
686,936 | 09.04.2019 09:19:32 | -3,600 | b7ef9b7f7697c13c21ed84beda1c5dea85851884 | Added regex extract, form, base64, URL encoding, string trim and size handlebars helpers | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/Base64Helper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Helper;\n+import com.github.jknack.handlebars.Options;\n+import com.github.jknack.handlebars.TagType;\n+\n+import java.io.IOException;\n+\n+import static com.github.tomakehurst.wiremock.common.Encoding.decodeBase64;\n+import static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\n+\n+public class Base64Helper implements Helper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ String value = options.tagType == TagType.SECTION ?\n+ options.fn(context).toString() :\n+ context.toString();\n+\n+ if (Boolean.TRUE.equals(options.hash.get(\"decode\"))) {\n+ return new String(decodeBase64(value));\n+ }\n+\n+ return encodeBase64(value.getBytes());\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormFieldHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+\n+import java.util.Map;\n+\n+import static com.google.common.base.MoreObjects.firstNonNull;\n+\n+public class FormFieldHelper extends HandlebarsHelper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) {\n+ Map<String, String> formData = FormParser.parse(\n+ context.toString(),\n+ Boolean.TRUE.equals(options.hash.get(\"urlDecode\")),\n+ firstNonNull(options.hash.get(\"encoding\"), \"utf-8\").toString()\n+ );\n+\n+ String key = options.param(0);\n+ return formData.get(key);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormParser.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.google.common.collect.ImmutableMap;\n+\n+import java.net.URLDecoder;\n+import java.util.Map;\n+\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+\n+public class FormParser {\n+\n+ public static Map<String, String> parse(String formText, boolean urlDecode) {\n+ return parse(formText, urlDecode, \"utf-8\");\n+ }\n+\n+ public static Map<String, String> parse(String formText, boolean urlDecode, String encoding) {\n+ ImmutableMap.Builder<String, String> mapBuilder = ImmutableMap.builder();\n+ for (String formField: formText.split(\"&\")) {\n+ String[] parts = formField.split(\"=\");\n+ if (parts.length > 1) {\n+ String key = parts[0];\n+ String value = urlDecode ?\n+ urlDecode(parts[1].trim(), encoding) :\n+ parts[1].trim();\n+\n+ mapBuilder.put(key, value);\n+ }\n+ }\n+\n+ return mapBuilder.build();\n+ }\n+\n+ private static String urlDecode(String text, String encoding) {\n+ try {\n+ return URLDecoder.decode(text, encoding);\n+ } catch (Exception e) {\n+ return throwUnchecked(e, String.class);\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RegexExtractHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.ListOrSingle;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+import java.util.regex.Matcher;\n+import java.util.regex.Pattern;\n+\n+public class RegexExtractHelper extends HandlebarsHelper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) {\n+ String regexString = options.param(0);\n+ Pattern regex = Pattern.compile(regexString);\n+ Matcher matcher = regex.matcher(context.toString());\n+ if (!matcher.find()) {\n+ return handleError(\"Nothing matched \" + regexString);\n+ }\n+\n+ if (options.params.length == 1) {\n+ return matcher.group();\n+ }\n+\n+ List<String> groups = new ArrayList<>(matcher.groupCount());\n+ for (int i = 1; i <= matcher.groupCount(); i++) {\n+ groups.add(matcher.group(i));\n+ }\n+\n+ String variableName = options.param(1);\n+ options.context.data(variableName, new ListOrSingle<>(groups));\n+\n+ return null;\n+\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SizeHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+\n+import java.io.IOException;\n+import java.util.List;\n+import java.util.Map;\n+\n+public class SizeHelper extends HandlebarsHelper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ Class<?> contextClass = context.getClass();\n+\n+ if (CharSequence.class.isAssignableFrom(contextClass)) {\n+ return ((CharSequence) context).length();\n+ }\n+\n+ if (List.class.isAssignableFrom(contextClass)) {\n+ return ((List) context).size();\n+ }\n+\n+ if (Map.class.isAssignableFrom(contextClass)) {\n+ return ((Map) context).size();\n+ }\n+\n+ return null;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/StringTrimHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Helper;\n+import com.github.jknack.handlebars.Options;\n+import com.github.jknack.handlebars.TagType;\n+\n+import java.io.IOException;\n+\n+public class StringTrimHelper implements Helper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ String value = options.tagType == TagType.SECTION ?\n+ options.fn(context).toString() :\n+ context.toString();\n+\n+ return value.trim();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/UrlEncodingHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Helper;\n+import com.github.jknack.handlebars.Options;\n+\n+import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n+import java.net.URLDecoder;\n+import java.net.URLEncoder;\n+\n+public class UrlEncodingHelper implements Helper<Object> {\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ Object encodingObj = options.hash.get(\"encoding\");\n+ String encoding = encodingObj != null ? encodingObj.toString() : \"utf-8\";\n+ if (Boolean.TRUE.equals(options.hash.get(\"decode\"))) {\n+ return decode(context.toString(), encoding);\n+ }\n+\n+ return encode(context.toString(), encoding);\n+ }\n+\n+ private String encode(String value, String encoding) throws IOException {\n+ try {\n+ return URLEncoder.encode(value, encoding);\n+ } catch (UnsupportedEncodingException e) {\n+ throw new IOException(e);\n+ }\n+ }\n+\n+ private String decode(String value, String encoding) throws IOException {\n+ try {\n+ return URLDecoder.decode(value, encoding);\n+ } catch (UnsupportedEncodingException e) {\n+ throw new IOException(e);\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"diff": "@@ -82,5 +82,63 @@ public enum WireMockHelpers implements Helper<Object> {\npublic Object apply(Object context, Options options) throws IOException {\nreturn helper.apply(context.toString(), options);\n}\n+ },\n+\n+ trim {\n+ private StringTrimHelper helper = new StringTrimHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n+ }\n+ },\n+\n+ base64 {\n+ private Base64Helper helper = new Base64Helper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n+ }\n+ },\n+\n+ urlEncode {\n+ private UrlEncodingHelper helper = new UrlEncodingHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n+ }\n+ },\n+\n+ formField {\n+ private FormFieldHelper helper = new FormFieldHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n+ }\n+ },\n+\n+ regexExtract {\n+ private RegexExtractHelper helper = new RegexExtractHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n+ }\n+ },\n+\n+ size {\n+ private SizeHelper helper = new SizeHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return helper.apply(context, options);\n}\n}\n+\n+\n+\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -32,6 +32,7 @@ import java.util.Collections;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n+import static com.github.tomakehurst.wiremock.client.WireMock.ok;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\nimport static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\nimport static org.hamcrest.Matchers.is;\n@@ -543,6 +544,113 @@ public class ResponseTemplateTransformerTest {\n));\n}\n+ @Test\n+ public void trimContent() {\n+ String body = transform(\"{{#trim}}\\n\" +\n+ \"{\\n\" +\n+ \" \\\"data\\\": \\\"spaced out JSON\\\"\\n\" +\n+ \"}\\n\" +\n+ \" {{/trim}}\");\n+\n+ assertThat(body, is(\"{\\n\" +\n+ \" \\\"data\\\": \\\"spaced out JSON\\\"\\n\" +\n+ \"}\"));\n+ }\n+\n+ @Test\n+ public void trimValue() {\n+ String body = transform(\"{{trim ' stuff '}}\");\n+ assertThat(body, is(\"stuff\"));\n+ }\n+\n+ @Test\n+ public void base64EncodeContent() {\n+ String body = transform(\"{{#base64}}hello{{/base64}}\");\n+ assertThat(body, is(\"aGVsbG8=\"));\n+ }\n+\n+ @Test\n+ public void base64EncodeValue() {\n+ String body = transform(\"{{{base64 'hello'}}}\");\n+ assertThat(body, is(\"aGVsbG8=\"));\n+ }\n+\n+ @Test\n+ public void base64DecodeValue() {\n+ String body = transform(\"{{{base64 'aGVsbG8=' decode=true}}}\");\n+ assertThat(body, is(\"hello\"));\n+ }\n+\n+ @Test\n+ public void urlEncodeValue() {\n+ String body = transform(\"{{{urlEncode 'one two'}}}\");\n+ assertThat(body, is(\"one+two\"));\n+ }\n+\n+ @Test\n+ public void urlDecodeValue() {\n+ String body = transform(\"{{{urlEncode 'one+two' decode=true}}}\");\n+ assertThat(body, is(\"one two\"));\n+ }\n+\n+ @Test\n+ public void extractFormValue() {\n+ String body = transform(\"{{{formField request.body 'item2'}}}\", \"item1=one&item2=two%202&item3=three%203\");\n+ assertThat(body, is(\"two%202\"));\n+ }\n+\n+ @Test\n+ public void extractFormValueWithUrlDecoding() {\n+ String body = transform(\"{{{formField request.body 'item2' urlDecode=true}}}\", \"item1=one&item2=two%202&item3=three%203\");\n+ assertThat(body, is(\"two 2\"));\n+ }\n+\n+ @Test\n+ public void extractSingleRegexValue() {\n+ String body = transform(\"{{regexExtract request.body '[A-Z]+'}}\", \"abc-DEF-123\");\n+ assertThat(body, is(\"DEF\"));\n+ }\n+\n+ @Test\n+ public void extractMultipleRegexValues() {\n+ String body = transform(\"{{regexExtract request.body '([a-z]+)-([A-Z]+)-([0-9]+)' 'parts'}}{{parts.0}},{{parts.1}},{{parts.2}}\", \"abc-DEF-123\");\n+ assertThat(body, is(\"abc,DEF,123\"));\n+ }\n+\n+ @Test\n+ public void calculateStringSize() {\n+ String body = transform(\"{{size 'abcde'}}\");\n+ assertThat(body, is(\"5\"));\n+ }\n+\n+ @Test\n+ public void calculateListSize() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?things=1&things=2&things=3&things=4\"),\n+ ok(\"{{size request.query.things}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"4\"));\n+ }\n+\n+ @Test\n+ public void calculateMapSize() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?one=1&two=2&three=3\"),\n+ ok(\"{{size request.query}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"3\"));\n+ }\n+\n+ private String transform(String responseBodyTemplate) {\n+ return transform(mockRequest(), aResponse().withBody(responseBodyTemplate)).getBody();\n+ }\n+\n+ private String transform(String responseBodyTemplate, String requestBody) {\n+ return transform(mockRequest().body(requestBody), aResponse().withBody(responseBodyTemplate)).getBody();\n+ }\n+\nprivate ResponseDefinition transform(Request request, ResponseDefinitionBuilder responseDefinitionBuilder) {\nreturn transformer.transform(\nrequest,\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added regex extract, form, base64, URL encoding, string trim and size handlebars helpers |
686,936 | 09.04.2019 19:53:37 | -3,600 | 70b962fdfac8a153ae690a0ea53cb035145bb4ef | Reworked formField helper into formdata - now extracts form data as a map rather than just returning one field, and supports multiple values for the same key | [
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormFieldHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormDataHelper.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.ListOrSingle;\nimport java.util.Map;\nimport static com.google.common.base.MoreObjects.firstNonNull;\n-public class FormFieldHelper extends HandlebarsHelper<Object> {\n+public class FormDataHelper extends HandlebarsHelper<Object> {\n@Override\npublic Object apply(Object context, Options options) {\n- Map<String, String> formData = FormParser.parse(\n+ Map<String, ListOrSingle<String>> formData = FormParser.parse(\ncontext.toString(),\nBoolean.TRUE.equals(options.hash.get(\"urlDecode\")),\nfirstNonNull(options.hash.get(\"encoding\"), \"utf-8\").toString()\n);\n- String key = options.param(0);\n- return formData.get(key);\n+ if (options.params.length > 0) {\n+ String variableName = options.param(0);\n+ options.context.data(variableName, formData);\n+ return null;\n+ }\n+\n+ return formData;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormParser.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/FormParser.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n-import com.google.common.collect.ImmutableMap;\n+import com.github.tomakehurst.wiremock.common.ListOrSingle;\nimport java.net.URLDecoder;\n+import java.util.LinkedHashMap;\nimport java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\npublic class FormParser {\n- public static Map<String, String> parse(String formText, boolean urlDecode) {\n+ public static Map<String, ListOrSingle<String>> parse(String formText, boolean urlDecode) {\nreturn parse(formText, urlDecode, \"utf-8\");\n}\n- public static Map<String, String> parse(String formText, boolean urlDecode, String encoding) {\n- ImmutableMap.Builder<String, String> mapBuilder = ImmutableMap.builder();\n+ public static Map<String, ListOrSingle<String>> parse(String formText, boolean urlDecode, String encoding) {\n+ Map<String, ListOrSingle<String>> map = new LinkedHashMap<>();\n+\nfor (String formField: formText.split(\"&\")) {\nString[] parts = formField.split(\"=\");\nif (parts.length > 1) {\n@@ -23,11 +25,17 @@ public class FormParser {\nurlDecode(parts[1].trim(), encoding) :\nparts[1].trim();\n- mapBuilder.put(key, value);\n+ ListOrSingle<String> existing = map.get(key);\n+ if (existing != null) {\n+ existing.add(value);\n+ } else {\n+ map.put(key, ListOrSingle.of(value));\n+ }\n+\n}\n}\n- return mapBuilder.build();\n+ return map;\n}\nprivate static String urlDecode(String text, String encoding) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"diff": "@@ -111,8 +111,8 @@ public enum WireMockHelpers implements Helper<Object> {\n}\n},\n- formField {\n- private FormFieldHelper helper = new FormFieldHelper();\n+ formData {\n+ private FormDataHelper helper = new FormDataHelper();\n@Override\npublic Object apply(Object context, Options options) throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -595,13 +595,21 @@ public class ResponseTemplateTransformerTest {\n@Test\npublic void extractFormValue() {\n- String body = transform(\"{{{formField request.body 'item2'}}}\", \"item1=one&item2=two%202&item3=three%203\");\n+ String body = transform(\"{{{formData request.body 'form'}}}{{{form.item2}}}\", \"item1=one&item2=two%202&item3=three%203\");\n+ assertThat(body, is(\"two%202\"));\n+ }\n+\n+ @Test\n+ public void extractFormMultiValue() {\n+ String body = transform(\n+ \"{{{formData request.body 'form'}}}{{form.item.1}}\", \"item=1&item=two%202&item=3\"\n+ );\nassertThat(body, is(\"two%202\"));\n}\n@Test\npublic void extractFormValueWithUrlDecoding() {\n- String body = transform(\"{{{formField request.body 'item2' urlDecode=true}}}\", \"item1=one&item2=two%202&item3=three%203\");\n+ String body = transform(\"{{{formData request.body 'form' urlDecode=true}}}{{{form.item2}}}\", \"item1=one&item2=two%202&item3=three%203\");\nassertThat(body, is(\"two 2\"));\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Reworked formField helper into formdata - now extracts form data as a map rather than just returning one field, and supports multiple values for the same key |
686,936 | 09.04.2019 20:02:38 | -3,600 | 3ecb4c16fa74217d7649e1a400ecb54b4724c70e | Added first, last and end offset accessors to ListOrSingle to be used in templates | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/ListOrSingle.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/ListOrSingle.java",
"diff": "@@ -49,10 +49,23 @@ public class ListOrSingle<T> extends ArrayList<T> {\nreturn new ListOrSingle<>(items);\n}\n- public T first() {\n+ public T getFirst() {\nreturn get(0);\n}\n+ public T getLast() {\n+ return get(size() - 1);\n+ }\n+\n+ @Override\n+ public T get(int index) {\n+ if (index < 0) {\n+ index = size() - 1 + index;\n+ }\n+\n+ return super.get(index);\n+ }\n+\npublic boolean isSingle() {\nreturn size() == 1;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/ListOrSingleSerialiser.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/ListOrSingleSerialiser.java",
"diff": "@@ -35,7 +35,7 @@ public class ListOrSingleSerialiser extends JsonSerializer<ListOrSingle<Object>>\nreturn;\n}\n- Object firstValue = value.first();\n+ Object firstValue = value.getFirst();\nif (value.isSingle()) {\nJsonSerializer<Object> serializer = serializers.findValueSerializer(firstValue.getClass());\nserializer.serialize(firstValue, gen, serializers);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -651,6 +651,46 @@ public class ResponseTemplateTransformerTest {\nassertThat(body, is(\"3\"));\n}\n+ @Test\n+ public void firstListElement() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?things=1&things=2&things=3&things=4\"),\n+ ok(\"{{request.query.things.first}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"1\"));\n+ }\n+\n+ @Test\n+ public void lastListElement() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?things=1&things=2&things=3&things=4\"),\n+ ok(\"{{request.query.things.last}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"4\"));\n+ }\n+\n+ @Test\n+ public void listElementOffsetFromEnd() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?things=1&things=2&things=3&things=4\"),\n+ ok(\"{{request.query.things.[-2]}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"2\"));\n+ }\n+\n+ @Test\n+ public void listElementOffsetFromEnd2() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?things=1&things=2&things=3&things=4\"),\n+ ok(\"{{request.query.things.[-1]}}\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"3\"));\n+ }\n+\nprivate String transform(String responseBodyTemplate) {\nreturn transform(mockRequest(), aResponse().withBody(responseBodyTemplate)).getBody();\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added first, last and end offset accessors to ListOrSingle to be used in templates |
686,936 | 10.04.2019 18:56:45 | -3,600 | fe235613a85c47f1690214e5953a12f4d09817b4 | Added a stub lifecycle event listener extension point | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -37,11 +37,11 @@ import com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n+import java.util.Collections;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.UUID;\n-import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.NOT_MATCHED;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.TO_LOGGED_REQUEST;\n@@ -65,8 +65,8 @@ public class WireMockApp implements StubServer, Admin {\nprivate final MappingsSaver mappingsSaver;\nprivate final NearMissCalculator nearMissCalculator;\nprivate final PlainTextDiffRenderer diffRenderer;\n-\nprivate final Recorder recorder;\n+ private final List<StubLifecycleListener> stubLifecycleListeners;\nprivate Options options;\n@@ -92,6 +92,8 @@ public class WireMockApp implements StubServer, Admin {\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\ndiffRenderer = new PlainTextDiffRenderer(customMatchers);\nrecorder = new Recorder(this);\n+ stubLifecycleListeners = ImmutableList.copyOf(options.extensionsOfType(StubLifecycleListener.class).values());\n+\nthis.container = container;\nloadDefaultMappings();\n}\n@@ -117,6 +119,7 @@ public class WireMockApp implements StubServer, Admin {\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\ndiffRenderer = new PlainTextDiffRenderer(requestMatchers);\nrecorder = new Recorder(this);\n+ stubLifecycleListeners = Collections.emptyList();\nloadDefaultMappings();\n}\n@@ -200,6 +203,10 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.save(stubMapping);\n}\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubCreated(stubMapping);\n+ }\n}\n@Override\n@@ -208,6 +215,10 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.remove(stubMapping);\n}\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubRemoved(stubMapping);\n+ }\n}\n@Override\n@@ -216,6 +227,10 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.save(stubMapping);\n}\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubEdited(stubMapping);\n+ }\n}\n@Override\n@@ -248,6 +263,10 @@ public class WireMockApp implements StubServer, Admin {\nstubMappings.reset();\nresetRequests();\nloadDefaultMappings();\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubsResetToDefaults();\n+ }\n}\n@Override\n@@ -259,6 +278,10 @@ public class WireMockApp implements StubServer, Admin {\npublic void resetMappings() {\nmappingsSaver.removeAll();\nstubMappings.reset();\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubsReset();\n+ }\n}\n@Override\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubLifecycleListener.java",
"diff": "+package com.github.tomakehurst.wiremock.extension;\n+\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+public interface StubLifecycleListener extends Extension {\n+\n+ void stubCreated(StubMapping stub);\n+ void stubEdited(StubMapping stub);\n+ void stubRemoved(StubMapping stub);\n+ void stubsReset();\n+ void stubsResetToDefaults();\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"diff": "+package com.github.tomakehurst.wiremock;\n+\n+import com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\n+import com.github.tomakehurst.wiremock.junit.WireMockRule;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+import java.util.UUID;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.get;\n+import static com.github.tomakehurst.wiremock.client.WireMock.ok;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class StubLifecycleListenerAcceptanceTest {\n+\n+ TestStubLifecycleListener listener = new TestStubLifecycleListener();\n+\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(options()\n+ .dynamicPort()\n+ .extensions(listener));\n+\n+ @Before\n+ public void init() {\n+ listener.events.clear();\n+ }\n+\n+ @Test\n+ public void callbackMethodIsCalledForStubCreation() {\n+ wm.stubFor(get(\"/test\").withName(\"Created\").willReturn(ok()));\n+ assertThat(listener.events.get(0), is(\"stubCreated, name: Created\"));\n+ }\n+\n+ @Test\n+ public void callbackMethodIsCalledForStubEdit() {\n+ UUID id = UUID.randomUUID();\n+ wm.stubFor(get(\"/test\").withId(id).withName(\"Created\").willReturn(ok()));\n+ wm.editStub(get(\"/test\").withId(id).withName(\"Edited\").willReturn(ok()));\n+ assertThat(listener.events.get(1), is(\"stubEdited, name: Edited\"));\n+ }\n+\n+ @Test\n+ public void callbackMethodIsCalledForStubRemove() {\n+ StubMapping stub = wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\n+ wm.removeStub(stub);\n+ assertThat(listener.events.get(1), is(\"stubRemoved, name: To remove\"));\n+ }\n+\n+ @Test\n+ public void callbackMethodIsCalledForStubsReset() {\n+ wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\n+ wm.resetMappings();\n+ assertThat(listener.events.get(1), is(\"stubsReset\"));\n+ }\n+\n+ @Test\n+ public void callbackMethodIsCalledForStubsResetToDefault() {\n+ wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\n+ wm.resetToDefaultMappings();\n+ assertThat(listener.events.get(1), is(\"stubsResetToDefaults\"));\n+ }\n+\n+ public static class TestStubLifecycleListener implements StubLifecycleListener {\n+\n+ public List<String> events = new ArrayList<>();\n+\n+ @Override\n+ public void stubCreated(StubMapping stub) {\n+ events.add(\"stubCreated, name: \" + stub.getName());\n+ }\n+\n+ @Override\n+ public void stubEdited(StubMapping stub) {\n+ events.add(\"stubEdited, name: \" + stub.getName());\n+ }\n+\n+ @Override\n+ public void stubRemoved(StubMapping stub) {\n+ events.add(\"stubRemoved, name: \" + stub.getName());\n+ }\n+\n+ @Override\n+ public void stubsReset() {\n+ events.add(\"stubsReset\");\n+ }\n+\n+ @Override\n+ public void stubsResetToDefaults() {\n+ events.add(\"stubsResetToDefaults\");\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"test-stub-lifecycle-listener\";\n+ }\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a stub lifecycle event listener extension point |
686,936 | 10.04.2019 19:26:39 | -3,600 | 79a7cb6ac79cac2d4bdc003d159cd3f0b9d3434b | Added ability to get global settings, update them all at the same time via Java and update them via a PUT to the admin API. Added extended configuration to global settings. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -469,4 +469,9 @@ public class WireMockServer implements Container, Stubbing, Admin {\npublic void importStubs(StubImport stubImport) {\nwireMockApp.importStubs(stubImport);\n}\n+\n+ @Override\n+ public GetGlobalSettingsResult getGlobalSettings() {\n+ return wireMockApp.getGlobalSettings();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -99,6 +99,8 @@ public class AdminRoutes {\nrouter.add(POST, \"/near-misses/request\", FindNearMissesForRequestTask.class);\nrouter.add(POST, \"/near-misses/request-pattern\", FindNearMissesForRequestPatternTask.class);\n+ router.add(GET, \"/settings\", GetGlobalSettingsTask.class);\n+ router.add(PUT, \"/settings\", GlobalSettingsUpdateTask.class);\nrouter.add(POST, \"/settings\", GlobalSettingsUpdateTask.class);\nrouter.add(POST, \"/shutdown\", ShutdownServerTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/GetGlobalSettingsTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+public class GetGlobalSettingsTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ return ResponseDefinition.okForJson(admin.getGlobalSettings());\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/GetGlobalSettingsResult.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+import com.github.tomakehurst.wiremock.global.GlobalSettings;\n+\n+public class GetGlobalSettingsResult {\n+\n+ private final GlobalSettings settings;\n+\n+ public GetGlobalSettingsResult(@JsonProperty(\"settings\") GlobalSettings settings) {\n+ this.settings = settings;\n+ }\n+\n+ public GlobalSettings getSettings() {\n+ return settings;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -373,6 +373,11 @@ public class HttpAdminClient implements Admin {\n);\n}\n+ @Override\n+ public GetGlobalSettingsResult getGlobalSettings() {\n+ return executeRequest(adminRoutes.requestSpecForTask(GetGlobalSettingsTask.class), GetGlobalSettingsResult.class);\n+ }\n+\npublic int port() {\nreturn port;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -645,7 +645,11 @@ public class WireMock {\nupdateGlobalSettings(settings);\n}\n- private void updateGlobalSettings(GlobalSettings settings) {\n+ public static void updateSettings(GlobalSettings settings) {\n+ defaultInstance.get().updateGlobalSettings(settings);\n+ }\n+\n+ public void updateGlobalSettings(GlobalSettings settings) {\nglobalSettingsHolder.replaceWith(settings);\nadmin.updateGlobalSettings(settings);\n}\n@@ -794,4 +798,12 @@ public class WireMock {\npublic static void importStubs(StubImport stubImport) {\ndefaultInstance.get().importStubMappings(stubImport);\n}\n+\n+ public GlobalSettings getGlobalSettings() {\n+ return admin.getGlobalSettings().getSettings();\n+ }\n+\n+ public static GlobalSettings getSettings() {\n+ return defaultInstance.get().getGlobalSettings();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -79,4 +79,6 @@ public interface Admin {\nvoid removeStubsByMetadata(StringValuePattern pattern);\nvoid importStubs(StubImport stubImport);\n+\n+ GetGlobalSettingsResult getGlobalSettings();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -471,5 +471,9 @@ public class WireMockApp implements StubServer, Admin {\n}\n+ @Override\n+ public GetGlobalSettingsResult getGlobalSettings() {\n+ return new GetGlobalSettingsResult(globalSettingsHolder.get());\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/global/GlobalSettings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/global/GlobalSettings.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.global;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.http.DelayDistribution;\nimport java.util.Objects;\n@@ -23,6 +24,7 @@ public class GlobalSettings {\nprivate Integer fixedDelay;\nprivate DelayDistribution delayDistribution;\n+ private Parameters extended;\npublic Integer getFixedDelay() {\nreturn fixedDelay;\n@@ -40,6 +42,14 @@ public class GlobalSettings {\ndelayDistribution = distribution;\n}\n+ public Parameters getExtended() {\n+ return extended;\n+ }\n+\n+ public void setExtended(Parameters extended) {\n+ this.extended = extended;\n+ }\n+\npublic GlobalSettings copy() {\nGlobalSettings newSettings = new GlobalSettings();\nnewSettings.setFixedDelay(fixedDelay);\n@@ -51,15 +61,14 @@ public class GlobalSettings {\npublic boolean equals(Object o) {\nif (this == o) return true;\nif (o == null || getClass() != o.getClass()) return false;\n-\nGlobalSettings that = (GlobalSettings) o;\n-\n- return Objects.equals(fixedDelay, that.fixedDelay)\n- && Objects.equals(delayDistribution, that.delayDistribution);\n+ return Objects.equals(getFixedDelay(), that.getFixedDelay()) &&\n+ Objects.equals(getDelayDistribution(), that.getDelayDistribution()) &&\n+ Objects.equals(getExtended(), that.getExtended());\n}\n@Override\npublic int hashCode() {\n- return Objects.hash(fixedDelay, delayDistribution);\n+ return Objects.hash(getFixedDelay(), getDelayDistribution(), getExtended());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -698,4 +698,18 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(stubs.size(), is(2));\n}\n+ final String SETTINGS_JSON = \"{\\n\" +\n+ \" \\\"extended\\\": {\\n\" +\n+ \" \\\"mySetting\\\": 123\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void updateGlobalSettingsViaPut() {\n+ WireMockResponse response = testClient.putWithBody(\"/__admin/settings\", SETTINGS_JSON, \"application/json\");\n+\n+ assertThat(response.statusCode(), is(200));\n+ assertThat(wireMockServer.getGlobalSettings().getSettings().getExtended().getInt(\"mySetting\"), is(123));\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/GlobalSettingsAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/GlobalSettingsAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.LogNormal;\nimport org.junit.Test;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static org.hamcrest.Matchers.greaterThanOrEqualTo;\n+import static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\npublic class GlobalSettingsAcceptanceTest extends AcceptanceTestBase {\n@@ -62,4 +65,24 @@ public class GlobalSettingsAcceptanceTest extends AcceptanceTestBase {\nassertThat(duration, greaterThanOrEqualTo(90));\n}\n+ @Test\n+ public void fetchSettings() {\n+ WireMock.setGlobalFixedDelay(30);\n+\n+ GlobalSettings settings = WireMock.getSettings();\n+\n+ assertThat(settings.getFixedDelay(), is(30));\n+ }\n+\n+ @Test\n+ public void setAndRetrieveExtendedSettings() {\n+ GlobalSettings settings = new GlobalSettings();\n+ settings.setExtended(Parameters.one(\"mySetting\", \"setting-value\"));\n+ WireMock.updateSettings(settings);\n+\n+ GlobalSettings fetchedSettings = WireMock.getSettings();\n+\n+ assertThat(fetchedSettings.getExtended().getString(\"mySetting\"), is(\"setting-value\"));\n+ }\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to get global settings, update them all at the same time via Java and update them via a PUT to the admin API. Added extended configuration to global settings. |
686,936 | 12.04.2019 09:53:24 | -3,600 | ae3507166bb05ffa43215d772368fe6a8d0853d8 | Made the handlebars JSONPath helper support objects in addition to strings | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelper.java",
"diff": "@@ -24,11 +24,11 @@ import com.jayway.jsonpath.JsonPathException;\nimport java.io.IOException;\nimport java.util.Map;\n-public class HandlebarsJsonPathHelper extends HandlebarsHelper<String> {\n+public class HandlebarsJsonPathHelper extends HandlebarsHelper<Object> {\n@Override\n- public Object apply(final String inputJson, final Options options) throws IOException {\n- if (inputJson == null) {\n+ public Object apply(final Object input, final Options options) throws IOException {\n+ if (input == null) {\nreturn \"\";\n}\n@@ -38,11 +38,13 @@ public class HandlebarsJsonPathHelper extends HandlebarsHelper<String> {\nfinal String jsonPath = options.param(0);\ntry {\n- Object result = JsonPath.read(inputJson, jsonPath);\n+ Object result = input instanceof String ?\n+ JsonPath.read((String) input, jsonPath) :\n+ JsonPath.read(input, jsonPath);\nreturn JsonData.create(result);\n} catch (InvalidJsonException e) {\nreturn this.handleError(\n- inputJson + \" is not valid JSON\",\n+ input + \" is not valid JSON\",\ne.getJson(), e);\n} catch (JsonPathException e) {\nreturn this.handleError(jsonPath + \" is not a valid JSONPath expression\", e);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"diff": "@@ -47,7 +47,7 @@ public enum WireMockHelpers implements Helper<Object> {\n@Override\npublic Object apply(final Object context, final Options options) throws IOException {\n- return this.helper.apply(String.valueOf(context), options);\n+ return this.helper.apply(context, options);\n}\n},\nrandomValue {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\n+import com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n+import com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.google.common.collect.ImmutableMap;\nimport org.junit.Before;\nimport org.junit.Test;\nimport java.io.IOException;\n+import java.util.Map;\nimport static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n@@ -205,4 +209,23 @@ public class HandlebarsJsonPathHelperTest extends HandlebarsHelperTestBase {\npublic void rendersAMeaningfulErrorWhenJsonPathIsNull() {\ntestHelperError(helper, \"{\\\"test\\\":\\\"success}\", null, is(\"[ERROR: The JSONPath cannot be empty]\"));\n}\n+\n+ @Test\n+ public void extractsValueFromAMap() {\n+ ResponseTemplateTransformer transformer = new ResponseTemplateTransformer(true) {\n+ @Override\n+ protected Map<String, Object> addExtraModelElements(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) {\n+ return ImmutableMap.<String, Object>of(\"mapData\", ImmutableMap.of(\"things\", \"abc\"));\n+ }\n+ };\n+\n+ final ResponseDefinition responseDefinition = transformer.transform(\n+ mockRequest(),\n+ aResponse()\n+ .withBody(\"{{jsonPath mapData '$.things'}}\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), is(\"abc\"));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Made the handlebars JSONPath helper support objects in addition to strings |
686,936 | 12.04.2019 17:30:35 | -3,600 | 9b3a1ecc8cab937e626f386c78f5a1731c4a885b | Added a test case in support of template performance optimisation (only templating between first and last delimters) | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -691,6 +691,16 @@ public class ResponseTemplateTransformerTest {\nassertThat(body, is(\"3\"));\n}\n+ @Test\n+ public void correctlyRendersWhenContentExistsEitherSideOfTemplate() {\n+ String body = transform(\n+ mockRequest().url(\"/stuff?one=1&two=2\"),\n+ ok(\"Start \\n\\n {{request.query.one}} middle {{{request.query.two}}} end\\n\"))\n+ .getBody();\n+\n+ assertThat(body, is(\"Start \\n\\n 1 middle 2 end\\n\"));\n+ }\n+\nprivate String transform(String responseBodyTemplate) {\nreturn transform(mockRequest(), aResponse().withBody(responseBodyTemplate)).getBody();\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a test case in support of template performance optimisation (only templating between first and last delimters) |
686,936 | 13.04.2019 15:02:05 | -3,600 | c9cd2482a500899122b9664c6313b613d714ba17 | Removed stub lifecycle listener callback for resetToDefaults and added old stub mapping to the parameters passed to the edit callback | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -66,7 +66,6 @@ public class WireMockApp implements StubServer, Admin {\nprivate final NearMissCalculator nearMissCalculator;\nprivate final PlainTextDiffRenderer diffRenderer;\nprivate final Recorder recorder;\n- private final List<StubLifecycleListener> stubLifecycleListeners;\nprivate final List<GlobalSettingsListener> globalSettingsListeners;\nprivate Options options;\n@@ -89,11 +88,12 @@ public class WireMockApp implements StubServer, Admin {\nstubMappings = new InMemoryStubMappings(\ncustomMatchers,\noptions.extensionsOfType(ResponseDefinitionTransformer.class),\n- fileSource);\n+ fileSource,\n+ ImmutableList.copyOf(options.extensionsOfType(StubLifecycleListener.class).values())\n+ );\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\ndiffRenderer = new PlainTextDiffRenderer(customMatchers);\nrecorder = new Recorder(this);\n- stubLifecycleListeners = ImmutableList.copyOf(options.extensionsOfType(StubLifecycleListener.class).values());\nglobalSettingsListeners = ImmutableList.copyOf(options.extensionsOfType(GlobalSettingsListener.class).values());\nthis.container = container;\n@@ -116,12 +116,11 @@ public class WireMockApp implements StubServer, Admin {\nthis.mappingsSaver = mappingsSaver;\nglobalSettingsHolder = new GlobalSettingsHolder();\nrequestJournal = requestJournalDisabled ? new DisabledRequestJournal() : new InMemoryRequestJournal(maxRequestJournalEntries);\n- stubMappings = new InMemoryStubMappings(requestMatchers, transformers, rootFileSource);\n+ stubMappings = new InMemoryStubMappings(requestMatchers, transformers, rootFileSource, Collections.<StubLifecycleListener>emptyList());\nthis.container = container;\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\ndiffRenderer = new PlainTextDiffRenderer(requestMatchers);\nrecorder = new Recorder(this);\n- stubLifecycleListeners = Collections.emptyList();\nglobalSettingsListeners = Collections.emptyList();\nloadDefaultMappings();\n}\n@@ -206,10 +205,6 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.save(stubMapping);\n}\n-\n- for (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubCreated(stubMapping);\n- }\n}\n@Override\n@@ -218,10 +213,6 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.remove(stubMapping);\n}\n-\n- for (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubRemoved(stubMapping);\n- }\n}\n@Override\n@@ -230,10 +221,6 @@ public class WireMockApp implements StubServer, Admin {\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.save(stubMapping);\n}\n-\n- for (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubEdited(stubMapping);\n- }\n}\n@Override\n@@ -266,10 +253,6 @@ public class WireMockApp implements StubServer, Admin {\nstubMappings.reset();\nresetRequests();\nloadDefaultMappings();\n-\n- for (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubsResetToDefaults();\n- }\n}\n@Override\n@@ -281,10 +264,6 @@ public class WireMockApp implements StubServer, Admin {\npublic void resetMappings() {\nmappingsSaver.removeAll();\nstubMappings.reset();\n-\n- for (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubsReset();\n- }\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubLifecycleListener.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubLifecycleListener.java",
"diff": "@@ -20,8 +20,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\npublic interface StubLifecycleListener extends Extension {\nvoid stubCreated(StubMapping stub);\n- void stubEdited(StubMapping stub);\n+ void stubEdited(StubMapping oldStub, StubMapping newStub);\nvoid stubRemoved(StubMapping stub);\nvoid stubsReset();\n- void stubsResetToDefaults();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"diff": "@@ -19,6 +19,7 @@ import com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\n+import com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\n@@ -26,7 +27,6 @@ import com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\n-import com.google.common.collect.FluentIterable;\nimport com.google.common.collect.ImmutableList;\nimport java.util.*;\n@@ -47,17 +47,21 @@ public class InMemoryStubMappings implements StubMappings {\nprivate final Map<String, RequestMatcherExtension> customMatchers;\nprivate final Map<String, ResponseDefinitionTransformer> transformers;\nprivate final FileSource rootFileSource;\n+ private final List<StubLifecycleListener> stubLifecycleListeners;\n- public InMemoryStubMappings(Map<String, RequestMatcherExtension> customMatchers, Map<String, ResponseDefinitionTransformer> transformers, FileSource rootFileSource) {\n+ public InMemoryStubMappings(Map<String, RequestMatcherExtension> customMatchers, Map<String, ResponseDefinitionTransformer> transformers, FileSource rootFileSource, List<StubLifecycleListener> stubLifecycleListeners) {\nthis.customMatchers = customMatchers;\nthis.transformers = transformers;\nthis.rootFileSource = rootFileSource;\n+ this.stubLifecycleListeners = stubLifecycleListeners;\n}\npublic InMemoryStubMappings() {\nthis(Collections.<String, RequestMatcherExtension>emptyMap(),\nCollections.<String, ResponseDefinitionTransformer>emptyMap(),\n- new SingleRootFileSource(\".\"));\n+ new SingleRootFileSource(\".\"),\n+ Collections.<StubLifecycleListener>emptyList()\n+ );\n}\n@Override\n@@ -100,12 +104,20 @@ public class InMemoryStubMappings implements StubMappings {\npublic void addMapping(StubMapping mapping) {\nmappings.add(mapping);\nscenarios.onStubMappingAdded(mapping);\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubCreated(mapping);\n+ }\n}\n@Override\npublic void removeMapping(StubMapping mapping) {\nmappings.remove(mapping);\nscenarios.onStubMappingRemoved(mapping);\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubRemoved(mapping);\n+ }\n}\n@Override\n@@ -128,6 +140,10 @@ public class InMemoryStubMappings implements StubMappings {\nmappings.replace(existingMapping, stubMapping);\nscenarios.onStubMappingUpdated(existingMapping, stubMapping);\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubEdited(existingMapping, stubMapping);\n+ }\n}\n@@ -135,6 +151,10 @@ public class InMemoryStubMappings implements StubMappings {\npublic void reset() {\nmappings.clear();\nscenarios.clear();\n+\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.stubsReset();\n+ }\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"diff": "@@ -57,7 +57,7 @@ public class StubLifecycleListenerAcceptanceTest {\nUUID id = UUID.randomUUID();\nwm.stubFor(get(\"/test\").withId(id).withName(\"Created\").willReturn(ok()));\nwm.editStub(get(\"/test\").withId(id).withName(\"Edited\").willReturn(ok()));\n- assertThat(listener.events.get(1), is(\"stubEdited, name: Edited\"));\n+ assertThat(listener.events.get(1), is(\"stubEdited, old name: Created, new name: Edited\"));\n}\n@Test\n@@ -74,13 +74,6 @@ public class StubLifecycleListenerAcceptanceTest {\nassertThat(listener.events.get(1), is(\"stubsReset\"));\n}\n- @Test\n- public void callbackMethodIsCalledForStubsResetToDefault() {\n- wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\n- wm.resetToDefaultMappings();\n- assertThat(listener.events.get(1), is(\"stubsResetToDefaults\"));\n- }\n-\npublic static class TestStubLifecycleListener implements StubLifecycleListener {\npublic List<String> events = new ArrayList<>();\n@@ -91,8 +84,8 @@ public class StubLifecycleListenerAcceptanceTest {\n}\n@Override\n- public void stubEdited(StubMapping stub) {\n- events.add(\"stubEdited, name: \" + stub.getName());\n+ public void stubEdited(StubMapping oldStub, StubMapping newStub) {\n+ events.add(\"stubEdited, old name: \" + oldStub.getName() + \", new name: \" + newStub.getName());\n}\n@Override\n@@ -105,11 +98,6 @@ public class StubLifecycleListenerAcceptanceTest {\nevents.add(\"stubsReset\");\n}\n- @Override\n- public void stubsResetToDefaults() {\n- events.add(\"stubsResetToDefaults\");\n- }\n-\n@Override\npublic String getName() {\nreturn \"test-stub-lifecycle-listener\";\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Removed stub lifecycle listener callback for resetToDefaults and added old stub mapping to the parameters passed to the edit callback |
686,936 | 13.04.2019 17:55:08 | -3,600 | 2e92e590920a39ab1ba030dffbb8eb197752f1cd | Added response template caching for improved performance under load | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java",
"diff": "@@ -19,6 +19,7 @@ import java.io.IOException;\nimport com.github.jknack.handlebars.Handlebars;\nimport com.github.jknack.handlebars.Template;\n+import com.github.tomakehurst.wiremock.common.Exceptions;\npublic class HandlebarsOptimizedTemplate {\n@@ -28,7 +29,7 @@ public class HandlebarsOptimizedTemplate {\nprivate String templateContent;\nprivate String endContent;\n- public HandlebarsOptimizedTemplate(final Handlebars handlebars, final String content) throws IOException {\n+ public HandlebarsOptimizedTemplate(final Handlebars handlebars, final String content) {\nstartContent = content;\ntemplateContent = \"\";\nendContent = \"\";\n@@ -43,7 +44,16 @@ public class HandlebarsOptimizedTemplate {\nendContent = content.substring(lastDelimEndPosition + Handlebars.DELIM_END.length(), content.length());\n}\n}\n- this.template = handlebars.compileInline(templateContent);\n+\n+ this.template = uncheckedCompileTemplate(handlebars, templateContent);\n+ }\n+\n+ private static Template uncheckedCompileTemplate(Handlebars handlebars, String templateContent) {\n+ try {\n+ return handlebars.compileInline(templateContent);\n+ } catch (IOException e) {\n+ return Exceptions.throwUnchecked(e, Template.class);\n+ }\n}\npublic String apply(Object context) throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -22,16 +22,22 @@ import com.github.jknack.handlebars.helper.ConditionalHelpers;\nimport com.github.jknack.handlebars.helper.NumberHelper;\nimport com.github.jknack.handlebars.helper.StringHelpers;\nimport com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\n+import com.github.tomakehurst.wiremock.common.Exceptions;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.TextFile;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\n+import com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WireMockHelpers;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Function;\n+import com.google.common.cache.Cache;\n+import com.google.common.cache.CacheBuilder;\n+import com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableMap;\nimport com.google.common.collect.Iterables;\nimport com.google.common.collect.Lists;\n@@ -40,17 +46,20 @@ import java.io.IOException;\nimport java.util.Collections;\nimport java.util.List;\nimport java.util.Map;\n+import java.util.concurrent.Callable;\n+import java.util.concurrent.ExecutionException;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.google.common.base.MoreObjects.firstNonNull;\n-public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n+public class ResponseTemplateTransformer extends ResponseDefinitionTransformer implements StubLifecycleListener {\npublic static final String NAME = \"response-template\";\nprivate final boolean global;\nprivate final Handlebars handlebars;\n+ private final Cache<TemplateCacheKey, HandlebarsOptimizedTemplate> cache;\npublic ResponseTemplateTransformer(boolean global) {\nthis(global, Collections.<String, Helper>emptyMap());\n@@ -92,6 +101,8 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nfor (Map.Entry<String, Helper> entry: helpers.entrySet()) {\nthis.handlebars.registerHelper(entry.getKey(), entry.getValue());\n}\n+\n+ cache = CacheBuilder.newBuilder().build();\n}\n@Override\n@@ -105,7 +116,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n}\n@Override\n- public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) {\n+ public ResponseDefinition transform(Request request, final ResponseDefinition responseDefinition, FileSource files, Parameters parameters) {\nResponseDefinitionBuilder newResponseDefBuilder = ResponseDefinitionBuilder.like(responseDefinition);\nfinal ImmutableMap<String, Object> model = ImmutableMap.<String, Object>builder()\n@@ -115,36 +126,37 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n.build();\nif (responseDefinition.specifiesTextBodyContent()) {\n- HandlebarsOptimizedTemplate bodyTemplate = uncheckedCompileTemplate(responseDefinition.getBody());\n+ HandlebarsOptimizedTemplate bodyTemplate = getTemplate(TemplateCacheKey.forInlineBody(responseDefinition), responseDefinition.getBody());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n} else if (responseDefinition.specifiesBodyFile()) {\n- HandlebarsOptimizedTemplate filePathTemplate = uncheckedCompileTemplate(responseDefinition.getBodyFileName());\n+ HandlebarsOptimizedTemplate filePathTemplate = new HandlebarsOptimizedTemplate(handlebars, responseDefinition.getBodyFileName());\nString compiledFilePath = uncheckedApplyTemplate(filePathTemplate, model);\nTextFile file = files.getTextFileNamed(compiledFilePath);\n- HandlebarsOptimizedTemplate bodyTemplate = uncheckedCompileTemplate(file.readContentsAsString());\n+\n+ HandlebarsOptimizedTemplate bodyTemplate = getTemplate(\n+ TemplateCacheKey.forFileBody(responseDefinition, compiledFilePath), file.readContentsAsString());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n}\nif (responseDefinition.getHeaders() != null) {\nIterable<HttpHeader> newResponseHeaders = Iterables.transform(responseDefinition.getHeaders().all(), new Function<HttpHeader, HttpHeader>() {\n@Override\n- public HttpHeader apply(HttpHeader input) {\n- List<String> newValues = Lists.transform(input.values(), new Function<String, String>() {\n- @Override\n- public String apply(String input) {\n- HandlebarsOptimizedTemplate template = uncheckedCompileTemplate(input);\n- return uncheckedApplyTemplate(template, model);\n+ public HttpHeader apply(final HttpHeader header) {\n+ ImmutableList.Builder<String> valueListBuilder = ImmutableList.builder();\n+ int index = 0;\n+ for (String headerValue: header.values()) {\n+ HandlebarsOptimizedTemplate template = getTemplate(TemplateCacheKey.forHeader(responseDefinition, header.key(), index++), headerValue);\n+ valueListBuilder.add(uncheckedApplyTemplate(template, model));\n}\n- });\n- return new HttpHeader(input.key(), newValues);\n+ return new HttpHeader(header.key(), valueListBuilder.build());\n}\n});\nnewResponseDefBuilder.withHeaders(new HttpHeaders(newResponseHeaders));\n}\nif (responseDefinition.getProxyBaseUrl() != null) {\n- HandlebarsOptimizedTemplate proxyBaseUrlTemplate = uncheckedCompileTemplate(responseDefinition.getProxyBaseUrl());\n+ HandlebarsOptimizedTemplate proxyBaseUrlTemplate = getTemplate(TemplateCacheKey.forProxyUrl(responseDefinition), responseDefinition.getProxyBaseUrl());\nString newProxyBaseUrl = uncheckedApplyTemplate(proxyBaseUrlTemplate, model);\nnewResponseDefBuilder.proxiedFrom(newProxyBaseUrl);\n}\n@@ -172,11 +184,36 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\n}\n}\n- private HandlebarsOptimizedTemplate uncheckedCompileTemplate(String content) {\n+ private HandlebarsOptimizedTemplate getTemplate(final TemplateCacheKey key, final String content) {\ntry {\n+ return cache.get(key, new Callable<HandlebarsOptimizedTemplate>() {\n+ @Override\n+ public HandlebarsOptimizedTemplate call() {\nreturn new HandlebarsOptimizedTemplate(handlebars, content);\n- } catch (IOException e) {\n- return throwUnchecked(e, HandlebarsOptimizedTemplate.class);\n}\n+ });\n+ } catch (ExecutionException e) {\n+ return Exceptions.throwUnchecked(e, HandlebarsOptimizedTemplate.class);\n+ }\n+ }\n+\n+ @Override\n+ public void stubCreated(StubMapping stub) {}\n+\n+ @Override\n+ public void stubEdited(StubMapping oldStub, StubMapping newStub) {}\n+\n+ @Override\n+ public void stubRemoved(StubMapping stub) {\n+ cache.invalidateAll();\n+ }\n+\n+ @Override\n+ public void stubsReset() {\n+ cache.invalidateAll();\n+ }\n+\n+ public long getCacheSize() {\n+ return cache.size();\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/TemplateCacheKey.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating;\n+\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+import java.util.Objects;\n+\n+public class TemplateCacheKey {\n+\n+ public enum ResponseElement { BODY, PROXY_URL, HEADER }\n+\n+ private final ResponseDefinition responseDefinition;\n+ private final ResponseElement element;\n+ private final String name;\n+ private final Integer index;\n+\n+ public static TemplateCacheKey forInlineBody(ResponseDefinition responseDefinition) {\n+ return new TemplateCacheKey(responseDefinition, ResponseElement.BODY, \"[inlineBody]\", null);\n+ }\n+\n+ public static TemplateCacheKey forFileBody(ResponseDefinition responseDefinition, String filename) {\n+ return new TemplateCacheKey(responseDefinition, ResponseElement.BODY, filename, null);\n+ }\n+\n+ public static TemplateCacheKey forHeader(ResponseDefinition responseDefinition, String headerName, int valueIndex) {\n+ return new TemplateCacheKey(responseDefinition, ResponseElement.HEADER, headerName, valueIndex);\n+ }\n+\n+ public static TemplateCacheKey forProxyUrl(ResponseDefinition responseDefinition) {\n+ return new TemplateCacheKey(responseDefinition, ResponseElement.PROXY_URL, \"[proxyUrl]\", null);\n+ }\n+\n+ private TemplateCacheKey(ResponseDefinition responseDefinition, ResponseElement element, String name, Integer index) {\n+ this.responseDefinition = responseDefinition;\n+ this.element = element;\n+ this.name = name;\n+ this.index = index;\n+ }\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ TemplateCacheKey that = (TemplateCacheKey) o;\n+ return responseDefinition.equals(that.responseDefinition) &&\n+ element == that.element &&\n+ name.equals(that.name) &&\n+ Objects.equals(index, that.index);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(responseDefinition, element, name, index);\n+ }\n+\n+ @Override\n+ public String toString() {\n+ final StringBuilder sb = new StringBuilder(\"TemplateCacheKey{\");\n+ sb.append(\"responseDefinition=\").append(responseDefinition);\n+ sb.append(\", element=\").append(element);\n+ sb.append(\", name='\").append(name).append('\\'');\n+ sb.append(\", index=\").append(index);\n+ sb.append('}');\n+ return sb.toString();\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -25,6 +25,8 @@ import org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\nimport org.junit.runner.RunWith;\n+import java.util.UUID;\n+\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static com.github.tomakehurst.wiremock.testsupport.TestFiles.defaultTestFilesRoot;\n@@ -98,7 +100,7 @@ public class ResponseTemplatingAcceptanceTest {\npublic void appliesToResponseBodyFromFile() {\nwm.stubFor(get(urlPathEqualTo(\"/templated\"))\n.willReturn(aResponse()\n- .withBodyFile(\"templated-example.txt\")));\n+ .withBodyFile(\"templated-example-1.txt\")));\nassertThat(client.get(\"/templated\").content(), is(\"templated\"));\n}\n@@ -114,5 +116,42 @@ public class ResponseTemplatingAcceptanceTest {\nassertThat(response.statusCode(), is(200));\n}\n+\n+ @Test\n+ public void supportsSelectionResponseBodyTemplateViaTemplate() {\n+ wm.stubFor(get(urlPathMatching(\"/templated/.*\"))\n+ .willReturn(aResponse()\n+ .withBodyFile(\"templated-example-{{request.path.1}}.txt\")));\n+\n+ assertThat(client.get(\"/templated/2\").content(), is(\"templated\"));\n+ assertThat(client.get(\"/templated/3\").content(), is(\"3\"));\n+ }\n+\n+ @Test\n+ public void cacheIsClearedWhenStubEdited() {\n+ String url = \"/templated/one/two\";\n+ UUID id = UUID.randomUUID();\n+\n+ wm.stubFor(get(urlPathEqualTo(url))\n+ .withId(id)\n+ .willReturn(aResponse()\n+ .withHeader(\"X-Value\", \"{{request.path.1}}\")\n+ .withBody(\"{{request.path.1}}\")));\n+\n+ WireMockResponse response = client.get(url);\n+ assertThat(response.content(), is(\"one\"));\n+ assertThat(response.firstHeader(\"X-Value\"), is(\"one\"));\n+\n+ wm.stubFor(get(urlPathEqualTo(url))\n+ .withId(id)\n+ .willReturn(aResponse()\n+ .withHeader(\"X-Value\", \"{{request.path.2}}\")\n+ .withBody(\"{{request.path.2}}\")));\n+\n+ response = client.get(url);\n+ assertThat(response.content(), is(\"two\"));\n+ assertThat(response.firstHeader(\"X-Value\"), is(\"two\"));\n+ }\n+\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -31,10 +31,10 @@ import java.io.IOException;\nimport java.util.Collections;\nimport java.util.List;\n-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n-import static com.github.tomakehurst.wiremock.client.WireMock.ok;\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\nimport static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static org.hamcrest.Matchers.greaterThan;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -701,6 +701,26 @@ public class ResponseTemplateTransformerTest {\nassertThat(body, is(\"Start \\n\\n 1 middle 2 end\\n\"));\n}\n+ @Test\n+ public void clearsTemplateCacheOnReset() {\n+ transform(\"{{now}}\");\n+ assertThat(transformer.getCacheSize(), greaterThan(0L));\n+\n+ transformer.stubsReset();\n+\n+ assertThat(transformer.getCacheSize(), is(0L));\n+ }\n+\n+ @Test\n+ public void clearsTemplateCacheWhenAnyStubRemovedReset() {\n+ transform(\"{{now}}\");\n+ assertThat(transformer.getCacheSize(), greaterThan(0L));\n+\n+ transformer.stubRemoved(get(anyUrl()).build());\n+\n+ assertThat(transformer.getCacheSize(), is(0L));\n+ }\n+\nprivate String transform(String responseBodyTemplate) {\nreturn transform(mockRequest(), aResponse().withBody(responseBodyTemplate)).getBody();\n}\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/resources/test-file-root/__files/templated-example.txt",
"new_path": "src/test/resources/test-file-root/__files/templated-example-1.txt",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/resources/test-file-root/__files/templated-example-2.txt",
"diff": "+{{request.path.0}}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/resources/test-file-root/__files/templated-example-3.txt",
"diff": "+{{request.path.1}}\n\\ No newline at end of file\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added response template caching for improved performance under load |
686,936 | 13.04.2019 18:48:40 | -3,600 | 98e1cd5027e4e612c16ff05a7dd5bedd51556e74 | Added ability to limit the template cache size | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;\nimport java.io.IOException;\nimport java.util.Collections;\n+import java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\n@@ -60,6 +61,11 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nprivate final Handlebars handlebars;\nprivate final Cache<TemplateCacheKey, HandlebarsOptimizedTemplate> cache;\n+ private final Long maxCacheEntries;\n+\n+ public static Builder builder() {\n+ return new Builder();\n+ }\npublic ResponseTemplateTransformer(boolean global) {\nthis(global, Collections.<String, Helper>emptyMap());\n@@ -70,10 +76,10 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n}\npublic ResponseTemplateTransformer(boolean global, Map<String, Helper> helpers) {\n- this(global, new Handlebars(), helpers);\n+ this(global, new Handlebars(), helpers, null);\n}\n- public ResponseTemplateTransformer(boolean global, Handlebars handlebars, Map<String, Helper> helpers) {\n+ public ResponseTemplateTransformer(boolean global, Handlebars handlebars, Map<String, Helper> helpers, Long maxCacheEntries) {\nthis.global = global;\nthis.handlebars = handlebars;\n@@ -102,7 +108,12 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nthis.handlebars.registerHelper(entry.getKey(), entry.getValue());\n}\n- cache = CacheBuilder.newBuilder().build();\n+ this.maxCacheEntries = maxCacheEntries;\n+ CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder();\n+ if (maxCacheEntries != null) {\n+ cacheBuilder.maximumSize(maxCacheEntries);\n+ }\n+ cache = cacheBuilder.build();\n}\n@Override\n@@ -185,6 +196,10 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n}\nprivate HandlebarsOptimizedTemplate getTemplate(final TemplateCacheKey key, final String content) {\n+ if (maxCacheEntries != null && maxCacheEntries < 1) {\n+ return new HandlebarsOptimizedTemplate(handlebars, content);\n+ }\n+\ntry {\nreturn cache.get(key, new Callable<HandlebarsOptimizedTemplate>() {\n@Override\n@@ -216,4 +231,40 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\npublic long getCacheSize() {\nreturn cache.size();\n}\n+\n+ public static class Builder {\n+ private boolean global = true;\n+ private Handlebars handlebars = new Handlebars();\n+ private Map<String, Helper> helpers = new HashMap<>();\n+ private Long maxCacheEntries = null;\n+\n+ public Builder global(boolean global) {\n+ this.global = global;\n+ return this;\n+ }\n+\n+ public Builder handlebars(Handlebars handlebars) {\n+ this.handlebars = handlebars;\n+ return this;\n+ }\n+\n+ public Builder helpers(Map<String, Helper> helpers) {\n+ this.helpers = helpers;\n+ return this;\n+ }\n+\n+ public Builder helper(String name, Helper helper) {\n+ this.helpers.put(name, helper);\n+ return this;\n+ }\n+\n+ public Builder maxCacheEntries(Long maxCacheEntries) {\n+ this.maxCacheEntries = maxCacheEntries;\n+ return this;\n+ }\n+\n+ public ResponseTemplateTransformer build() {\n+ return new ResponseTemplateTransformer(global, handlebars, helpers, maxCacheEntries);\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -26,6 +26,7 @@ import com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Before;\nimport org.junit.Test;\n+import org.junit.experimental.theories.suppliers.TestedOn;\nimport java.io.IOException;\nimport java.util.Collections;\n@@ -274,7 +275,10 @@ public class ResponseTemplateTransformerTest {\n}\n};\n- transformer = new ResponseTemplateTransformer(false, \"string-length\", helper);\n+ transformer = ResponseTemplateTransformer.builder()\n+ .global(false)\n+ .helper(\"string-length\", helper)\n+ .build();\nResponseDefinition transformedResponseDef = transform(mockRequest()\n.url(\"/things\")\n@@ -334,7 +338,10 @@ public class ResponseTemplateTransformerTest {\n@Test\npublic void escapingCanBeDisabled() {\nHandlebars handlebars = new Handlebars().with(EscapingStrategy.NOOP);\n- ResponseTemplateTransformer transformerWithEscapingDisabled = new ResponseTemplateTransformer(true, handlebars, Collections.<String, Helper>emptyMap());\n+ ResponseTemplateTransformer transformerWithEscapingDisabled = ResponseTemplateTransformer.builder()\n+ .global(true)\n+ .handlebars(handlebars)\n+ .build();\nfinal ResponseDefinition responseDefinition = transformerWithEscapingDisabled.transform(\nmockRequest()\n.url(\"/json\").\n@@ -721,6 +728,36 @@ public class ResponseTemplateTransformerTest {\nassertThat(transformer.getCacheSize(), is(0L));\n}\n+ @Test\n+ public void honoursCacheSizeLimit() {\n+ transformer = ResponseTemplateTransformer.builder()\n+ .maxCacheEntries(3L)\n+ .build();\n+\n+ transform(\"{{now}} 1\");\n+ transform(\"{{now}} 2\");\n+ transform(\"{{now}} 3\");\n+ transform(\"{{now}} 4\");\n+ transform(\"{{now}} 5\");\n+\n+ assertThat(transformer.getCacheSize(), is(3L));\n+ }\n+\n+ @Test\n+ public void honours0CacheSizeLimit() {\n+ transformer = ResponseTemplateTransformer.builder()\n+ .maxCacheEntries(0L)\n+ .build();\n+\n+ transform(\"{{now}} 1\");\n+ transform(\"{{now}} 2\");\n+ transform(\"{{now}} 3\");\n+ transform(\"{{now}} 4\");\n+ transform(\"{{now}} 5\");\n+\n+ assertThat(transformer.getCacheSize(), is(0L));\n+ }\n+\nprivate String transform(String responseBodyTemplate) {\nreturn transform(mockRequest(), aResponse().withBody(responseBodyTemplate)).getBody();\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to limit the template cache size |
686,936 | 13.04.2019 19:00:58 | -3,600 | 6f791e4c83dfe6022f4e48661ad1b4ae9577750b | Made max template cache entries configurable via the command line | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -232,6 +232,10 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nreturn cache.size();\n}\n+ public Long getMaxCacheEntries() {\n+ return maxCacheEntries;\n+ }\n+\npublic static class Builder {\nprivate boolean global = true;\nprivate Handlebars handlebars = new Handlebars();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"diff": "@@ -91,6 +91,7 @@ public class CommandLineOptions implements Options {\nprivate static final String ASYNCHRONOUS_RESPONSE_ENABLED = \"async-response-enabled\";\nprivate static final String ASYNCHRONOUS_RESPONSE_THREADS = \"async-response-threads\";\nprivate static final String USE_CHUNKED_ENCODING = \"use-chunked-encoding\";\n+ private static final String MAX_TEMPLATE_CACHE_ENTRIES = \"max-template-cache-entries\";\nprivate final OptionSet optionSet;\nprivate final FileSource fileSource;\n@@ -134,6 +135,7 @@ public class CommandLineOptions implements Options {\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_ENABLED, \"Enable asynchronous response\").withRequiredArg().defaultsTo(\"false\");\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_THREADS, \"Number of asynchronous response threads\").withRequiredArg().defaultsTo(\"10\");\noptionParser.accepts(USE_CHUNKED_ENCODING, \"Whether to use Transfer-Encoding: chunked in responses. Can be set to always, never or body_file.\").withRequiredArg().defaultsTo(\"always\");\n+ optionParser.accepts(MAX_TEMPLATE_CACHE_ENTRIES, \"The maximum number of response template fragments that can be cached. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg();\noptionParser.accepts(HELP, \"Print this message\");\n@@ -313,10 +315,16 @@ public class CommandLineOptions implements Options {\n}\nif (optionSet.has(GLOBAL_RESPONSE_TEMPLATING) && ResponseDefinitionTransformer.class.isAssignableFrom(extensionType)) {\n- ResponseTemplateTransformer transformer = new ResponseTemplateTransformer(true);\n+ ResponseTemplateTransformer transformer = ResponseTemplateTransformer.builder()\n+ .global(true)\n+ .maxCacheEntries(getMaxTemplateCacheEntries())\n+ .build();\nbuilder.put(transformer.getName(), (T) transformer);\n} else if (optionSet.has(LOCAL_RESPONSE_TEMPLATING) && ResponseDefinitionTransformer.class.isAssignableFrom(extensionType)) {\n- ResponseTemplateTransformer transformer = new ResponseTemplateTransformer(false);\n+ ResponseTemplateTransformer transformer = ResponseTemplateTransformer.builder()\n+ .global(false)\n+ .maxCacheEntries(getMaxTemplateCacheEntries())\n+ .build();\nbuilder.put(transformer.getName(), (T) transformer);\n}\n@@ -504,6 +512,12 @@ public class CommandLineOptions implements Options {\nChunkedEncodingPolicy.ALWAYS;\n}\n+ private Long getMaxTemplateCacheEntries() {\n+ return optionSet.has(MAX_TEMPLATE_CACHE_ENTRIES) ?\n+ Long.valueOf(optionSet.valueOf(MAX_TEMPLATE_CACHE_ENTRIES).toString()) :\n+ null;\n+ }\n+\nprivate boolean isAsynchronousResponseEnabled() {\nreturn optionSet.has(ASYNCHRONOUS_RESPONSE_ENABLED) ?\nBoolean.valueOf((String) optionSet.valueOf(ASYNCHRONOUS_RESPONSE_ENABLED)) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"diff": "@@ -36,14 +36,7 @@ import java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.ProxySettings.NO_PROXY;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n-import static org.hamcrest.Matchers.allOf;\n-import static org.hamcrest.Matchers.containsString;\n-import static org.hamcrest.Matchers.endsWith;\n-import static org.hamcrest.Matchers.hasItems;\n-import static org.hamcrest.Matchers.hasSize;\n-import static org.hamcrest.Matchers.instanceOf;\n-import static org.hamcrest.Matchers.is;\n-import static org.hamcrest.Matchers.isEmptyOrNullString;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\npublic class CommandLineOptionsTest {\n@@ -409,6 +402,24 @@ public class CommandLineOptionsTest {\nassertThat(options.toString(), allOf(containsString(\"1338\")));\n}\n+ @Test\n+ public void configuresMaxTemplateCacheEntriesIfSpecified() {\n+ CommandLineOptions options = new CommandLineOptions(\"--global-response-templating\", \"--max-template-cache-entries\", \"5\");\n+ Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n+ ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n+\n+ assertThat(transformer.getMaxCacheEntries(), is(5L));\n+ }\n+\n+ @Test\n+ public void configuresMaxTemplateCacheEntriesToNullIfNotSpecified() {\n+ CommandLineOptions options = new CommandLineOptions(\"--global-response-templating\");\n+ Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n+ ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n+\n+ assertThat(transformer.getMaxCacheEntries(), nullValue());\n+ }\n+\npublic static class ResponseDefinitionTransformerExt1 extends ResponseDefinitionTransformer {\n@Override\npublic ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) { return null; }\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Made max template cache entries configurable via the command line |
686,936 | 13.04.2019 19:49:16 | -3,600 | 3bea8e51df377f38c46b0aa0a8af96b1bcbb5e29 | Added the ability to disable templating of body files when templating is enabled for other fields | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Metadata.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Metadata.java",
"diff": "@@ -34,19 +34,31 @@ public class Metadata extends LinkedHashMap<String, Object> {\n}\npublic Integer getInt(String key) {\n- return checkValidityAndCast(key, Integer.class);\n+ return checkPresenceValidityAndCast(key, Integer.class);\n+ }\n+\n+ public Integer getInt(String key, Integer defaultValue) {\n+ return returnIfValidOrDefaultIfNot(key, Integer.class, defaultValue);\n}\npublic Boolean getBoolean(String key) {\n- return checkValidityAndCast(key, Boolean.class);\n+ return checkPresenceValidityAndCast(key, Boolean.class);\n+ }\n+\n+ public Boolean getBoolean(String key, Boolean defaultValue) {\n+ return returnIfValidOrDefaultIfNot(key, Boolean.class, defaultValue);\n}\npublic String getString(String key) {\n- return checkValidityAndCast(key, String.class);\n+ return checkPresenceValidityAndCast(key, String.class);\n+ }\n+\n+ public String getString(String key, String defaultValue) {\n+ return returnIfValidOrDefaultIfNot(key, String.class, defaultValue);\n}\npublic List<?> getList(String key) {\n- return checkValidityAndCast(key, List.class);\n+ return checkPresenceValidityAndCast(key, List.class);\n}\n@SuppressWarnings(\"unchecked\")\n@@ -57,12 +69,21 @@ public class Metadata extends LinkedHashMap<String, Object> {\n}\n@SuppressWarnings(\"unchecked\")\n- private <T> T checkValidityAndCast(String key, Class<T> type) {\n+ private <T> T checkPresenceValidityAndCast(String key, Class<T> type) {\ncheckKeyPresent(key);\ncheckArgument(type.isAssignableFrom(get(key).getClass()), key + \" is not of type \" + type.getSimpleName());\nreturn (T) get(key);\n}\n+ @SuppressWarnings(\"unchecked\")\n+ private <T> T returnIfValidOrDefaultIfNot(String key, Class<T> type, T defaultValue) {\n+ if (!containsKey(key) || !type.isAssignableFrom(get(key).getClass())) {\n+ return defaultValue;\n+ }\n+\n+ return (T) get(key);\n+ }\n+\nprivate void checkKeyPresent(String key) {\ncheckArgument(containsKey(key), key + \"' not present\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -144,10 +144,13 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nString compiledFilePath = uncheckedApplyTemplate(filePathTemplate, model);\nTextFile file = files.getTextFileNamed(compiledFilePath);\n+ boolean disableBodyFileTemplating = parameters.getBoolean(\"disableBodyFileTemplating\", false);\n+ if (!disableBodyFileTemplating) {\nHandlebarsOptimizedTemplate bodyTemplate = getTemplate(\nTemplateCacheKey.forFileBody(responseDefinition, compiledFilePath), file.readContentsAsString());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n}\n+ }\nif (responseDefinition.getHeaders() != null) {\nIterable<HttpHeader> newResponseHeaders = Iterables.transform(responseDefinition.getHeaders().all(), new Function<HttpHeader, HttpHeader>() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"diff": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.stubbing;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\nimport com.github.tomakehurst.wiremock.http.Request;\n@@ -25,6 +26,7 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n+import com.google.common.base.MoreObjects;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n@@ -34,6 +36,7 @@ import java.util.*;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.github.tomakehurst.wiremock.core.WireMockApp.FILES_ROOT;\nimport static com.github.tomakehurst.wiremock.http.ResponseDefinition.copyOf;\n+import static com.google.common.base.MoreObjects.firstNonNull;\nimport static com.google.common.collect.FluentIterable.from;\nimport static com.google.common.collect.Iterables.filter;\nimport static com.google.common.collect.Iterables.find;\n@@ -94,7 +97,12 @@ public class InMemoryStubMappings implements StubMappings {\nResponseDefinitionTransformer transformer = transformers.get(0);\nResponseDefinition newResponseDef =\ntransformer.applyGlobally() || responseDefinition.hasTransformer(transformer) ?\n- transformer.transform(request, responseDefinition, rootFileSource.child(FILES_ROOT), responseDefinition.getTransformerParameters()) :\n+ transformer.transform(\n+ request,\n+ responseDefinition,\n+ rootFileSource.child(FILES_ROOT),\n+ firstNonNull(responseDefinition.getTransformerParameters(), Parameters.empty())\n+ ) :\nresponseDefinition;\nreturn applyTransformations(request, newResponseDef, transformers.subList(1, transformers.size()));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -153,5 +153,24 @@ public class ResponseTemplatingAcceptanceTest {\nassertThat(response.firstHeader(\"X-Value\"), is(\"two\"));\n}\n+ @Test\n+ public void supportsDisablingTemplatingOfBodyFilesPerStub() {\n+ UUID id = UUID.randomUUID();\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .withId(id)\n+ .willReturn(aResponse()\n+ .withBodyFile(\"templated-example-1.txt\")));\n+\n+ assertThat(client.get(\"/templated\").content(), is(\"templated\"));\n+\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .withId(id)\n+ .willReturn(aResponse()\n+ .withBodyFile(\"templated-example-1.txt\")\n+ .withTransformerParameter(\"disableBodyFileTemplating\", true)));\n+\n+ assertThat(client.get(\"/templated\").content(), is(\"{{request.path.[0]}}\"));\n+ }\n+\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added the ability to disable templating of body files when templating is enabled for other fields |
686,962 | 13.04.2019 20:54:03 | -7,200 | 46d3faa917b600f2d3ffe0e0513592d79c6b8263 | Put DocumentBuilderFactory and DocumentBuilder in ThreadLocal cache | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Xml.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Xml.java",
"diff": "@@ -43,6 +43,9 @@ import static javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION;\npublic class Xml {\n+ private Xml() {\n+ // Hide constructor\n+ }\npublic static void optimizeFactoriesLoading() {\nString transformerFactoryImpl = TransformerFactory.newInstance().getClass().getName();\nString xPathFactoryImpl = XPathFactory.newInstance().getClass().getName();\n@@ -138,8 +141,16 @@ public class Xml {\n}\npublic static DocumentBuilderFactory newDocumentBuilderFactory() {\n+ return new SkipResolvingEntitiesDocumentBuilderFactory();\n+ }\n+\n+ private static class SkipResolvingEntitiesDocumentBuilderFactory extends DocumentBuilderFactory {\n+\n+ private static final ThreadLocal<DocumentBuilderFactory> DBF_CACHE = new ThreadLocal<DocumentBuilderFactory>() {\n+ @Override\n+ protected DocumentBuilderFactory initialValue() {\ntry {\n- DocumentBuilderFactory dbf = new SkipResolvingEntitiesDocumentBuilderFactory();\n+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();\ndbf.setFeature(\"http://xml.org/sax/features/validation\", false);\ndbf.setFeature(\"http://apache.org/xml/features/nonvalidating/load-dtd-grammar\", false);\ndbf.setFeature(\"http://apache.org/xml/features/nonvalidating/load-external-dtd\", false);\n@@ -148,46 +159,56 @@ public class Xml {\nreturn throwUnchecked(e, DocumentBuilderFactory.class);\n}\n}\n-\n- public static class SkipResolvingEntitiesDocumentBuilderFactory extends DocumentBuilderFactory {\n- private final DocumentBuilderFactory documentBuilderFactory;\n-\n- public SkipResolvingEntitiesDocumentBuilderFactory() {\n- documentBuilderFactory = DocumentBuilderFactory.newInstance();\n+ };\n+ private static final ThreadLocal<DocumentBuilder> DB_CACHE = new ThreadLocal<DocumentBuilder>() {\n+ @Override\n+ protected DocumentBuilder initialValue() {\n+ try {\n+ return DBF_CACHE.get().newDocumentBuilder();\n+ } catch (ParserConfigurationException e) {\n+ return throwUnchecked(e, DocumentBuilder.class);\n+ }\n}\n@Override\n- public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {\n- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();\n- documentBuilder.setEntityResolver(new SkipResolvingEntitiesDocumentBuilderFactory.ResolveToEmptyString());\n+ public DocumentBuilder get() {\n+ DocumentBuilder documentBuilder = super.get();\n+ documentBuilder.setEntityResolver(new ResolveToEmptyString());\n+ documentBuilder.setErrorHandler(null);\nreturn documentBuilder;\n}\n+ };\n@Override\n- public void setAttribute(String name, Object value) throws IllegalArgumentException {\n- documentBuilderFactory.setAttribute(name, value);\n+ public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {\n+ return DB_CACHE.get();\n}\n+ private static class ResolveToEmptyString implements EntityResolver {\n@Override\n- public Object getAttribute(String name) throws IllegalArgumentException {\n- return documentBuilderFactory.getAttribute(name);\n+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {\n+ return new InputSource(new StringReader(\"\"));\n+ }\n}\n@Override\n- public void setFeature(String name, boolean value) throws ParserConfigurationException {\n- documentBuilderFactory.setFeature(name, value);\n+ public void setAttribute(String name, Object value) {\n+ DBF_CACHE.get().setAttribute(name, value);\n}\n@Override\n- public boolean getFeature(String name) throws ParserConfigurationException {\n- return documentBuilderFactory.getFeature(name);\n+ public Object getAttribute(String name) {\n+ return DBF_CACHE.get().getAttribute(name);\n}\n- private static class ResolveToEmptyString implements EntityResolver {\n@Override\n- public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {\n- return new InputSource(new StringReader(\"\"));\n+ public void setFeature(String name, boolean value) throws ParserConfigurationException {\n+ DBF_CACHE.get().setFeature(name, value);\n}\n+\n+ @Override\n+ public boolean getFeature(String name) throws ParserConfigurationException {\n+ return DBF_CACHE.get().getFeature(name);\n}\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Put DocumentBuilderFactory and DocumentBuilder in ThreadLocal cache (#1096) |
686,962 | 13.04.2019 21:02:24 | -7,200 | 70b72b28c36004fe4e57c2a88527ed2f318f1bfd | Fail-safe behavior if json mapping file is not valid
Fix | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Json.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Json.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n-import com.fasterxml.jackson.annotation.JsonInclude;\n-import com.fasterxml.jackson.core.JsonParser;\n-import com.fasterxml.jackson.core.type.TypeReference;\n-import com.fasterxml.jackson.databind.*;\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport java.io.IOException;\nimport java.util.Map;\n-import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import com.fasterxml.jackson.annotation.JsonInclude;\n+import com.fasterxml.jackson.core.JsonParser;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.core.type.TypeReference;\n+import com.fasterxml.jackson.databind.JsonNode;\n+import com.fasterxml.jackson.databind.ObjectMapper;\n+import com.fasterxml.jackson.databind.ObjectWriter;\npublic final class Json {\n@@ -48,8 +51,8 @@ public final class Json {\ntry {\nObjectMapper mapper = getObjectMapper();\nreturn mapper.readValue(json, clazz);\n- } catch (JsonMappingException mappingException) {\n- throw JsonException.fromJackson(mappingException);\n+ } catch (JsonProcessingException processingException) {\n+ throw JsonException.fromJackson(processingException);\n} catch (IOException ioe) {\nreturn throwUnchecked(ioe, clazz);\n}\n@@ -59,8 +62,8 @@ public final class Json {\ntry {\nObjectMapper mapper = getObjectMapper();\nreturn mapper.readValue(json, typeRef);\n- } catch (JsonMappingException mappingException) {\n- throw JsonException.fromJackson(mappingException);\n+ } catch (JsonProcessingException processingException) {\n+ throw JsonException.fromJackson(processingException);\n} catch (IOException ioe) {\nreturn throwUnchecked(ioe, (Class<T>) typeRef.getType());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/JsonException.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/JsonException.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n+import com.fasterxml.jackson.core.JsonProcessingException;\nimport com.fasterxml.jackson.databind.JsonMappingException;\nimport com.google.common.base.Function;\nimport com.google.common.base.Joiner;\n@@ -30,8 +31,8 @@ public class JsonException extends InvalidInputException {\nsuper(errors);\n}\n- public static JsonException fromJackson(JsonMappingException e) {\n- Throwable rootCause = getRootCause(e);\n+ public static JsonException fromJackson(JsonProcessingException processingException) {\n+ Throwable rootCause = getRootCause(processingException);\nString message = rootCause.getMessage();\nif (rootCause instanceof PatternSyntaxException) {\n@@ -43,8 +44,11 @@ public class JsonException extends InvalidInputException {\nmessage = ((InvalidInputException) rootCause).getErrors().first().getDetail();\n}\n- List<String> nodes = transform(e.getPath(), TO_NODE_NAMES);\n- String pointer = '/' + Joiner.on('/').join(nodes);\n+ String pointer = null;\n+ if(processingException instanceof JsonMappingException) {\n+ List<String> nodes = transform(((JsonMappingException)processingException).getPath(), TO_NODE_NAMES);\n+ pointer = '/' + Joiner.on('/').join(nodes);\n+ }\nreturn new JsonException(Errors.single(10, pointer, \"Error parsing JSON\", message));\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fail-safe behavior if json mapping file is not valid (#1093)
Fix #1025 |
686,936 | 14.04.2019 17:29:19 | -3,600 | 55dd5f2a34b78500d6e948df0399ff08a22f5b31 | Added documentation for new handlebars helpers | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -319,6 +319,115 @@ Random strings of various kinds can be generated:\n{% endraw %}\n+## String trim helper\n+Use the `trim` helper to remove whitespace from the start and end of the input:\n+\n+{% raw %}\n+```\n+{{trim request.headers.X-Padded-Header}}\n+\n+{{#trim}}\n+\n+ Some stuff with whitespace\n+\n+{{/trim}}\n+```\n+{% endraw %}\n+\n+\n+## Base64 helper\n+The `base64` helper can be used to base64 encode and decode values:\n+\n+{% raw %}\n+```\n+{{base64 request.headers.X-Plain-Header}}\n+{{base64 request.headers.X-Encoded-Header decode=true}}\n+\n+{{#base64}}\n+Content to encode\n+{{/base64}}\n+\n+{{#base64 decode=true}}\n+Q29udGVudCB0byBkZWNvZGUK\n+{{/base64}}\n+```\n+{% endraw %}\n+\n+\n+## URL encoding helper\n+The `urlEncode` helper can be used to URL encode and decode values:\n+\n+{% raw %}\n+```\n+{{urlEncode request.headers.X-Plain-Header}}\n+{{urlEncode request.headers.X-Encoded-Header decode=true}}\n+\n+{{#urlEncode}}\n+Content to encode\n+{{/urlEncode}}\n+\n+{{#urlEncode decode=true}}\n+Content%20to%20decode\n+{{/urlEncode}}\n+```\n+{% endraw %}\n+\n+\n+## Form helper\n+The `formData` helper parses its input as an HTTP form, returning an object containing the individual fields as attributes.\n+The helper takes the input string and variable name as its required parameters, with an optional `urlDecode` parameter\n+indicating that values should be URL decoded. The folowing example will parse the request body as a form, then output a single field `formField3`:\n+\n+{% raw %}\n+```\n+{{formData request.body 'form' urlDecode=true}}}{{{form.formField3}}\n+```\n+{% endraw %}\n+\n+If the form submitted has multiple values for a given field, these can be accessed by index:\n+\n+{% raw %}\n+```\n+{{formData request.body 'form' urlDecode=true}}}{{{form.multiValueField.1}}, {{{form.multiValueField.2}}\n+{{formData request.body 'form' urlDecode=true}}}{{{form.multiValueField.first}}, {{{form.multiValueField.last}}\n+```\n+{% endraw %}\n+\n+\n+## Regular expression extract helper\n+The `regexExtract` helper supports extraction of values matching a regular expresson from a string.\n+\n+A single value can be extracted like this:\n+\n+{% raw %}\n+```\n+{{regexExtract request.body '[A-Z]+'}}\"\n+```\n+{% endraw %}\n+\n+Regex groups can be used to extract multiple parts into an object for later use (the last parameter is a variable name to which the object will be assigned):\n+\n+{% raw %}\n+```\n+{{regexExtract request.body '([a-z]+)-([A-Z]+)-([0-9]+)' 'parts'}}\n+{{parts.0}},{{parts.1}},{{parts.2}}\n+```\n+{% endraw %}\n+\n+\n+## Size helper\n+\n+The `size` helper returns the size of a string, list or map:\n+\n+{% raw %}\n+```\n+{{size 'abcde'}}\n+{{size request.query.things}}\n+```\n+{% endraw %}\n+\n+\n+\n## Custom helpers\nCustom Handlebars helpers can be registered with the transformer on construction:\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added documentation for new handlebars helpers |
686,936 | 14.04.2019 17:43:32 | -3,600 | ae591bd772de564c25075e1e88147f3291154c08 | Documented template cache settings | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -54,6 +54,26 @@ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\nCommand line parameters can be used to enable templating when running WireMock [standalone](/docs/running-standalone/#command-line-options).\n+## Template caching\n+\n+By default, all templated fragments (headers, bodies and proxy URLs) are cached in their compiled form for performance,\n+since compilation can be expensive for larger templates.\n+\n+The size of the cache is not limited by default, but can be a construction time:\n+\n+```java\n+@Rule\n+public WireMockRule wm = new WireMockRule(options()\n+ .extensions(ResponseTemplateTransformer.builder()\n+ .global(false)\n+ .maxCacheEntries(3L)\n+ .build();)\n+);\n+```\n+\n+Setting the limit to 0 will disable caching completely.\n+\n+\n## Proxying\nTemplating also works when defining proxy URLs, e.g.\n@@ -154,6 +174,25 @@ The model of the request is supplied to the header and body templates. The follo\n`request.body` - Request body text (avoid for non-text bodies)\n+### Values that can be one or many\n+\n+A number of HTTP elements (query parameters, form fields, headers) can be single or multiple valued. The template request model and built-in helpers attempt to make\n+this easy to work with by wrapping these in a \"list or single\" type that returns the first (and often only) value when no index is specified, but also support index access.\n+\n+For instance, given a request URL like `/multi-query?things=1&things=2&things=3` I can extract the query data in the following ways:\n+\n+{% raw %}\n+```\n+{{request.query.things}} // Will return 1\n+{{request.query.things.0}} // Will return 1\n+{{request.query.things.first}} // Will return 1\n+{{request.query.things.1}} // Will return 2\n+{{request.query.things.[-1]}} // Will return 2\n+{{request.query.things.last}} // Will return 3\n+```\n+{% endraw %}\n+\n+\n## Handlebars helpers\nAll of the standard helpers (template functions) provided by the [Java Handlebars implementation by jknack](https://github.com/jknack/handlebars.java)\nplus all of the [string helpers](https://github.com/jknack/handlebars.java/blob/master/handlebars/src/main/java/com/github/jknack/handlebars/helper/StringHelpers.java)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -119,6 +119,8 @@ com.mycorp.HeaderTransformer,com.mycorp.BodyTransformer. See extending-wiremock.\n`--local-response-templating`: Enable rendering of response definitions using Handlebars templates for specific stub mappings.\n+`--max-template-cache-entries`: Set the maximum number of compiled template fragments to cache. Only has any effect when response templating is enabled. Defaults to no limit.\n+\n`--use-chunked-encoding`: Set the policy for sending responses with `Transfer-Encoding: chunked`. Valid values are `always`, `never` and `body_file`.\nThe last of these will cause chunked encoding to be used only when a stub defines its response body from a file.\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Documented template cache settings |
686,936 | 14.04.2019 17:48:13 | -3,600 | eabd3d2ee53b8446f97dea3bb5d5be2b992e2fca | Added doc note to response templating article about eq helper with one-or-many values | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -67,7 +67,7 @@ public WireMockRule wm = new WireMockRule(options()\n.extensions(ResponseTemplateTransformer.builder()\n.global(false)\n.maxCacheEntries(3L)\n- .build();)\n+ .build())\n);\n```\n@@ -192,6 +192,12 @@ For instance, given a request URL like `/multi-query?things=1&things=2&things=3`\n```\n{% endraw %}\n+> **Note**\n+>\n+> When using the `eq` helper with one-or-many values, it is necessary to use the indexed form, even if only one value is present.\n+> The reason for this is that the non-indexed form returns the wrapper type and not a String, and will therefore fail any comparison\n+> with another String value.\n+\n## Handlebars helpers\nAll of the standard helpers (template functions) provided by the [Java Handlebars implementation by jknack](https://github.com/jknack/handlebars.java)\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added doc note to response templating article about eq helper with one-or-many values |
686,936 | 14.04.2019 17:56:22 | -3,600 | 47eea2832b871427b6f99691cd594e7e2f333412 | Fixed - NPE thrown when attempting to import multiple stubs via the API with no import options | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -33,6 +33,7 @@ import com.github.tomakehurst.wiremock.stubbing.*;\nimport com.github.tomakehurst.wiremock.verification.*;\nimport com.github.tomakehurst.wiremock.verification.diff.PlainTextDiffRenderer;\nimport com.google.common.base.Function;\n+import com.google.common.base.MoreObjects;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n@@ -45,6 +46,7 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.NOT_MATCHED;\nimport static com.github.tomakehurst.wiremock.stubbing.ServeEvent.TO_LOGGED_REQUEST;\n+import static com.google.common.base.MoreObjects.firstNonNull;\nimport static com.google.common.collect.FluentIterable.from;\nimport static com.google.common.collect.Iterables.contains;\nimport static com.google.common.collect.Iterables.transform;\n@@ -436,10 +438,12 @@ public class WireMockApp implements StubServer, Admin {\n@Override\npublic void importStubs(StubImport stubImport) {\nList<StubMapping> mappings = stubImport.getMappings();\n+ StubImport.Options importOptions = firstNonNull(stubImport.getImportOptions(), StubImport.Options.DEFAULTS);\n+\nfor (int i = mappings.size() - 1; i >= 0; i--) {\nStubMapping mapping = mappings.get(i);\nif (mapping.getId() != null && getStubMapping(mapping.getId()).isPresent()) {\n- if (stubImport.getImportOptions().getDuplicatePolicy() == StubImport.Options.DuplicatePolicy.OVERWRITE) {\n+ if (importOptions.getDuplicatePolicy() == StubImport.Options.DuplicatePolicy.OVERWRITE) {\neditStubMapping(mapping);\n}\n} else {\n@@ -447,7 +451,7 @@ public class WireMockApp implements StubServer, Admin {\n}\n}\n- if (stubImport.getImportOptions().getDeleteAllNotInImport()) {\n+ if (importOptions.getDeleteAllNotInImport()) {\nIterable<UUID> ids = transform(mappings, new Function<StubMapping, UUID>() {\n@Override\npublic UUID apply(StubMapping input) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -712,4 +712,40 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(wireMockServer.getGlobalSettings().getSettings().getExtended().getInt(\"mySetting\"), is(123));\n}\n+ static final String STUB_IMPORT_JSON = \"{\\n\" +\n+ \" \\\"mappings\\\": [\\n\" +\n+ \" {\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/one\\\",\\n\" +\n+ \" \\\"method\\\": \\\"GET\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 200\\n\" +\n+ \" }\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/two\\\",\\n\" +\n+ \" \\\"method\\\": \\\"GET\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 200\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \" ]\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void importMultipleStubsWithDefaultParameters() {\n+ WireMockResponse response = testClient.postJson(\"/__admin/mappings/import\", STUB_IMPORT_JSON);\n+\n+ assertThat(response.statusCode(), is(200));\n+\n+ List<StubMapping> allStubs = wm.getStubMappings();\n+ assertThat(allStubs.size(), is(2));\n+ assertThat(allStubs.get(0).getRequest().getUrl(), is(\"/one\"));\n+ assertThat(allStubs.get(1).getRequest().getUrl(), is(\"/two\"));\n+\n+ }\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1113 - NPE thrown when attempting to import multiple stubs via the API with no import options |
686,936 | 14.04.2019 18:17:57 | -3,600 | 43debd2d906db6c112c4461cc594390275833380 | Fixed - multi stub import fails when unknown JSON elements are present | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubImport.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubImport.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.stubbing;\n+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport java.util.List;\n+@JsonIgnoreProperties(ignoreUnknown = true)\npublic class StubImport {\nprivate final List<StubMapping> mappings;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -732,7 +732,10 @@ public class AdminApiTest extends AcceptanceTestBase {\n\" \\\"status\\\": 200\\n\" +\n\" }\\n\" +\n\" }\\n\" +\n- \" ]\\n\" +\n+ \" ],\\n\" +\n+ \" \\\"meta\\\" : {\\n\" +\n+ \" \\\"total\\\" : 2\\n\" +\n+ \" }\\n\" +\n\"}\";\n@Test\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1114 - multi stub import fails when unknown JSON elements are present |
687,007 | 19.04.2019 17:07:54 | -3,600 | 7c5923afc657056ec334cd0187db3bb2e688db94 | Apply disableBodyFileTemplating only to body content | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -142,10 +142,12 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n} else if (responseDefinition.specifiesBodyFile()) {\nHandlebarsOptimizedTemplate filePathTemplate = new HandlebarsOptimizedTemplate(handlebars, responseDefinition.getBodyFileName());\nString compiledFilePath = uncheckedApplyTemplate(filePathTemplate, model);\n- TextFile file = files.getTextFileNamed(compiledFilePath);\nboolean disableBodyFileTemplating = parameters.getBoolean(\"disableBodyFileTemplating\", false);\n- if (!disableBodyFileTemplating) {\n+ if (disableBodyFileTemplating) {\n+ newResponseDefBuilder.withBodyFile(compiledFilePath);\n+ } else {\n+ TextFile file = files.getTextFileNamed(compiledFilePath);\nHandlebarsOptimizedTemplate bodyTemplate = getTemplate(\nTemplateCacheKey.forFileBody(responseDefinition, compiledFilePath), file.readContentsAsString());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -170,6 +170,14 @@ public class ResponseTemplatingAcceptanceTest {\n.withTransformerParameter(\"disableBodyFileTemplating\", true)));\nassertThat(client.get(\"/templated\").content(), is(\"{{request.path.[0]}}\"));\n+\n+ wm.stubFor(get(urlPathMatching(\"/templated/.*\"))\n+ .withId(id)\n+ .willReturn(aResponse()\n+ .withBodyFile(\"templated-example-{{request.path.1}}.txt\")\n+ .withTransformerParameter(\"disableBodyFileTemplating\", true)));\n+\n+ assertThat(client.get(\"/templated/1\").content(), is(\"{{request.path.[0]}}\"));\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Apply disableBodyFileTemplating only to body content (#1116) |
686,936 | 13.05.2019 18:35:28 | -3,600 | 202f85e068fcb56677fda7da6558f322bbb8a22d | Extended StubLifecycleListener to support callbacks before, in addition to after lifecycle events | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubLifecycleListener.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubLifecycleListener.java",
"diff": "@@ -19,8 +19,15 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\npublic interface StubLifecycleListener extends Extension {\n- void stubCreated(StubMapping stub);\n- void stubEdited(StubMapping oldStub, StubMapping newStub);\n- void stubRemoved(StubMapping stub);\n- void stubsReset();\n+ void beforeStubCreated(StubMapping stub);\n+ void afterStubCreated(StubMapping stub);\n+\n+ void beforeStubEdited(StubMapping oldStub, StubMapping newStub);\n+ void afterStubEdited(StubMapping oldStub, StubMapping newStub);\n+\n+ void beforeStubRemoved(StubMapping stub);\n+ void afterStubRemoved(StubMapping stub);\n+\n+ void beforeStubsReset();\n+ void afterStubsReset();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -218,18 +218,30 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n}\n@Override\n- public void stubCreated(StubMapping stub) {}\n+ public void beforeStubCreated(StubMapping stub) {}\n@Override\n- public void stubEdited(StubMapping oldStub, StubMapping newStub) {}\n+ public void afterStubCreated(StubMapping stub) {}\n@Override\n- public void stubRemoved(StubMapping stub) {\n+ public void beforeStubEdited(StubMapping oldStub, StubMapping newStub) {}\n+\n+ @Override\n+ public void afterStubEdited(StubMapping oldStub, StubMapping newStub) {}\n+\n+ @Override\n+ public void beforeStubRemoved(StubMapping stub) {}\n+\n+ @Override\n+ public void afterStubRemoved(StubMapping stub) {\ncache.invalidateAll();\n}\n@Override\n- public void stubsReset() {\n+ public void beforeStubsReset() {}\n+\n+ @Override\n+ public void afterStubsReset() {\ncache.invalidateAll();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java",
"diff": "@@ -26,7 +26,6 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n-import com.google.common.base.MoreObjects;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n@@ -110,21 +109,29 @@ public class InMemoryStubMappings implements StubMappings {\n@Override\npublic void addMapping(StubMapping mapping) {\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.beforeStubCreated(mapping);\n+ }\n+\nmappings.add(mapping);\nscenarios.onStubMappingAdded(mapping);\nfor (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubCreated(mapping);\n+ listener.afterStubCreated(mapping);\n}\n}\n@Override\npublic void removeMapping(StubMapping mapping) {\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.beforeStubRemoved(mapping);\n+ }\n+\nmappings.remove(mapping);\nscenarios.onStubMappingRemoved(mapping);\nfor (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubRemoved(mapping);\n+ listener.afterStubRemoved(mapping);\n}\n}\n@@ -142,6 +149,9 @@ public class InMemoryStubMappings implements StubMappings {\n}\nfinal StubMapping existingMapping = optionalExistingMapping.get();\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.beforeStubEdited(existingMapping, stubMapping);\n+ }\nstubMapping.setInsertionIndex(existingMapping.getInsertionIndex());\nstubMapping.setDirty(true);\n@@ -150,18 +160,22 @@ public class InMemoryStubMappings implements StubMappings {\nscenarios.onStubMappingUpdated(existingMapping, stubMapping);\nfor (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubEdited(existingMapping, stubMapping);\n+ listener.afterStubEdited(existingMapping, stubMapping);\n}\n}\n@Override\npublic void reset() {\n+ for (StubLifecycleListener listener: stubLifecycleListeners) {\n+ listener.beforeStubsReset();\n+ }\n+\nmappings.clear();\nscenarios.clear();\nfor (StubLifecycleListener listener: stubLifecycleListeners) {\n- listener.stubsReset();\n+ listener.afterStubsReset();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"diff": "@@ -47,9 +47,10 @@ public class StubLifecycleListenerAcceptanceTest {\n}\n@Test\n- public void callbackMethodIsCalledForStubCreation() {\n+ public void beforeAndAfterMethodsAreCalledForStubCreation() {\nwm.stubFor(get(\"/test\").withName(\"Created\").willReturn(ok()));\n- assertThat(listener.events.get(0), is(\"stubCreated, name: Created\"));\n+ assertThat(listener.events.get(0), is(\"beforeStubCreated, name: Created\"));\n+ assertThat(listener.events.get(1), is(\"afterStubCreated, name: Created\"));\n}\n@Test\n@@ -57,21 +58,24 @@ public class StubLifecycleListenerAcceptanceTest {\nUUID id = UUID.randomUUID();\nwm.stubFor(get(\"/test\").withId(id).withName(\"Created\").willReturn(ok()));\nwm.editStub(get(\"/test\").withId(id).withName(\"Edited\").willReturn(ok()));\n- assertThat(listener.events.get(1), is(\"stubEdited, old name: Created, new name: Edited\"));\n+ assertThat(listener.events.get(2), is(\"beforeStubEdited, old name: Created, new name: Edited\"));\n+ assertThat(listener.events.get(3), is(\"afterStubEdited, old name: Created, new name: Edited\"));\n}\n@Test\npublic void callbackMethodIsCalledForStubRemove() {\nStubMapping stub = wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\nwm.removeStub(stub);\n- assertThat(listener.events.get(1), is(\"stubRemoved, name: To remove\"));\n+ assertThat(listener.events.get(2), is(\"beforeStubRemoved, name: To remove\"));\n+ assertThat(listener.events.get(3), is(\"afterStubRemoved, name: To remove\"));\n}\n@Test\npublic void callbackMethodIsCalledForStubsReset() {\nwm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\nwm.resetMappings();\n- assertThat(listener.events.get(1), is(\"stubsReset\"));\n+ assertThat(listener.events.get(2), is(\"beforeStubsReset\"));\n+ assertThat(listener.events.get(3), is(\"afterStubsReset\"));\n}\npublic static class TestStubLifecycleListener implements StubLifecycleListener {\n@@ -79,23 +83,43 @@ public class StubLifecycleListenerAcceptanceTest {\npublic List<String> events = new ArrayList<>();\n@Override\n- public void stubCreated(StubMapping stub) {\n- events.add(\"stubCreated, name: \" + stub.getName());\n+ public void beforeStubCreated(StubMapping stub) {\n+ events.add(\"beforeStubCreated, name: \" + stub.getName());\n}\n@Override\n- public void stubEdited(StubMapping oldStub, StubMapping newStub) {\n- events.add(\"stubEdited, old name: \" + oldStub.getName() + \", new name: \" + newStub.getName());\n+ public void afterStubCreated(StubMapping stub) {\n+ events.add(\"afterStubCreated, name: \" + stub.getName());\n}\n@Override\n- public void stubRemoved(StubMapping stub) {\n- events.add(\"stubRemoved, name: \" + stub.getName());\n+ public void beforeStubEdited(StubMapping oldStub, StubMapping newStub) {\n+ events.add(\"beforeStubEdited, old name: \" + oldStub.getName() + \", new name: \" + newStub.getName());\n}\n@Override\n- public void stubsReset() {\n- events.add(\"stubsReset\");\n+ public void afterStubEdited(StubMapping oldStub, StubMapping newStub) {\n+ events.add(\"afterStubEdited, old name: \" + oldStub.getName() + \", new name: \" + newStub.getName());\n+ }\n+\n+ @Override\n+ public void beforeStubRemoved(StubMapping stub) {\n+ events.add(\"beforeStubRemoved, name: \" + stub.getName());\n+ }\n+\n+ @Override\n+ public void afterStubRemoved(StubMapping stub) {\n+ events.add(\"afterStubRemoved, name: \" + stub.getName());\n+ }\n+\n+ @Override\n+ public void beforeStubsReset() {\n+ events.add(\"beforeStubsReset\");\n+ }\n+\n+ @Override\n+ public void afterStubsReset() {\n+ events.add(\"afterStubsReset\");\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java",
"diff": "@@ -26,10 +26,8 @@ import com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Before;\nimport org.junit.Test;\n-import org.junit.experimental.theories.suppliers.TestedOn;\nimport java.io.IOException;\n-import java.util.Collections;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n@@ -713,7 +711,7 @@ public class ResponseTemplateTransformerTest {\ntransform(\"{{now}}\");\nassertThat(transformer.getCacheSize(), greaterThan(0L));\n- transformer.stubsReset();\n+ transformer.afterStubsReset();\nassertThat(transformer.getCacheSize(), is(0L));\n}\n@@ -723,7 +721,7 @@ public class ResponseTemplateTransformerTest {\ntransform(\"{{now}}\");\nassertThat(transformer.getCacheSize(), greaterThan(0L));\n- transformer.stubRemoved(get(anyUrl()).build());\n+ transformer.afterStubRemoved(get(anyUrl()).build());\nassertThat(transformer.getCacheSize(), is(0L));\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Extended StubLifecycleListener to support callbacks before, in addition to after lifecycle events |
686,936 | 15.05.2019 19:21:12 | -3,600 | bb098e09a806874bf575a91fe7243ec8caf32214 | Added ability to throw an exception from a stub lifecycle listener causing the action to be vetoed and a sensible error returned to the caller | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/ClientError.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/ClientError.java",
"diff": "@@ -33,6 +33,8 @@ public class ClientError extends RuntimeException {\nreturn new InvalidInputException(errors);\ncase 30:\nreturn new NotRecordingException();\n+ case 50:\n+ return new NotPermittedException(errors);\ndefault:\nreturn new ClientError(errors);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Errors.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Errors.java",
"diff": "@@ -53,6 +53,10 @@ public class Errors {\nreturn single(10, pointer, message);\n}\n+ public static Errors notPermitted(String reason) {\n+ return single(50, reason);\n+ }\n+\npublic Error first() {\nif (errors.isEmpty()) {\nthrow new IllegalStateException(\"No errors are present\");\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/NotPermittedException.java",
"diff": "+package com.github.tomakehurst.wiremock.common;\n+\n+public class NotPermittedException extends ClientError {\n+\n+ public NotPermittedException(Errors errors) {\n+ super(errors);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"diff": "@@ -21,6 +21,7 @@ import com.github.tomakehurst.wiremock.admin.AdminUriTemplate;\nimport com.github.tomakehurst.wiremock.admin.NotFoundException;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\nimport com.github.tomakehurst.wiremock.common.InvalidInputException;\n+import com.github.tomakehurst.wiremock.common.NotPermittedException;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.security.Authenticator;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n@@ -81,6 +82,8 @@ public class AdminRequestHandler extends AbstractRequestHandler {\nreturn ServeEvent.forUnmatchedRequest(LoggedRequest.createFrom(request));\n} catch (InvalidInputException iie) {\nreturn ServeEvent.forBadRequest(LoggedRequest.createFrom(request), iie.getErrors());\n+ } catch (NotPermittedException npe) {\n+ return ServeEvent.forNotAllowedRequest(LoggedRequest.createFrom(request), npe.getErrors());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java",
"diff": "@@ -188,9 +188,12 @@ public class ResponseDefinition {\n}\npublic static ResponseDefinition notPermitted(String message) {\n- Errors errors = Errors.single(40, message);\n+ return notPermitted(Errors.single(40, message));\n+ }\n+\n+ public static ResponseDefinition notPermitted(Errors errors) {\nreturn ResponseDefinitionBuilder\n- .jsonResponse(Json.write(errors), HTTP_FORBIDDEN);\n+ .jsonResponse(errors, HTTP_FORBIDDEN);\n}\npublic static ResponseDefinition browserProxy(Request originalRequest) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/ServeEvent.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/ServeEvent.java",
"diff": "@@ -70,6 +70,10 @@ public class ServeEvent {\nreturn new ServeEvent(request, null, ResponseDefinition.badRequest(errors));\n}\n+ public static ServeEvent forNotAllowedRequest(LoggedRequest request, Errors errors) {\n+ return new ServeEvent(request, null, ResponseDefinition.notPermitted(errors));\n+ }\n+\npublic static ServeEvent of(LoggedRequest request, ResponseDefinition responseDefinition) {\nreturn new ServeEvent(request, null, responseDefinition);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubLifecycleListenerAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.Errors;\n+import com.github.tomakehurst.wiremock.common.NotPermittedException;\nimport com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.hamcrest.Matchers;\nimport org.junit.Before;\nimport org.junit.Rule;\nimport org.junit.Test;\n@@ -30,52 +34,82 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get;\nimport static com.github.tomakehurst.wiremock.client.WireMock.ok;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static org.hamcrest.Matchers.is;\n-import static org.junit.Assert.assertThat;\n+import static org.junit.Assert.*;\npublic class StubLifecycleListenerAcceptanceTest {\n- TestStubLifecycleListener listener = new TestStubLifecycleListener();\n+ TestStubLifecycleListener loggingListener = new TestStubLifecycleListener();\n+ ExceptionThrowingStubLifecycleListener exceptionThrowingListener = new ExceptionThrowingStubLifecycleListener();\n@Rule\npublic WireMockRule wm = new WireMockRule(options()\n.dynamicPort()\n- .extensions(listener));\n+ .extensions(loggingListener, exceptionThrowingListener));\n@Before\npublic void init() {\n- listener.events.clear();\n+ loggingListener.events.clear();\n+ exceptionThrowingListener.throwException = false;\n}\n@Test\npublic void beforeAndAfterMethodsAreCalledForStubCreation() {\nwm.stubFor(get(\"/test\").withName(\"Created\").willReturn(ok()));\n- assertThat(listener.events.get(0), is(\"beforeStubCreated, name: Created\"));\n- assertThat(listener.events.get(1), is(\"afterStubCreated, name: Created\"));\n+ assertThat(loggingListener.events.get(0), is(\"beforeStubCreated, name: Created\"));\n+ assertThat(loggingListener.events.get(1), is(\"afterStubCreated, name: Created\"));\n}\n@Test\n- public void callbackMethodIsCalledForStubEdit() {\n+ public void beforeAndAfterMethodsAreCalledForStubEdit() {\nUUID id = UUID.randomUUID();\nwm.stubFor(get(\"/test\").withId(id).withName(\"Created\").willReturn(ok()));\nwm.editStub(get(\"/test\").withId(id).withName(\"Edited\").willReturn(ok()));\n- assertThat(listener.events.get(2), is(\"beforeStubEdited, old name: Created, new name: Edited\"));\n- assertThat(listener.events.get(3), is(\"afterStubEdited, old name: Created, new name: Edited\"));\n+ assertThat(loggingListener.events.get(2), is(\"beforeStubEdited, old name: Created, new name: Edited\"));\n+ assertThat(loggingListener.events.get(3), is(\"afterStubEdited, old name: Created, new name: Edited\"));\n}\n@Test\n- public void callbackMethodIsCalledForStubRemove() {\n+ public void beforeAndAfterMethodsAreCalledForStubRemove() {\nStubMapping stub = wm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\nwm.removeStub(stub);\n- assertThat(listener.events.get(2), is(\"beforeStubRemoved, name: To remove\"));\n- assertThat(listener.events.get(3), is(\"afterStubRemoved, name: To remove\"));\n+ assertThat(loggingListener.events.get(2), is(\"beforeStubRemoved, name: To remove\"));\n+ assertThat(loggingListener.events.get(3), is(\"afterStubRemoved, name: To remove\"));\n}\n@Test\n- public void callbackMethodIsCalledForStubsReset() {\n+ public void beforeAndAfterMethodsAreCalledForStubsReset() {\nwm.stubFor(get(\"/test\").withName(\"To remove\").willReturn(ok()));\nwm.resetMappings();\n- assertThat(listener.events.get(2), is(\"beforeStubsReset\"));\n- assertThat(listener.events.get(3), is(\"afterStubsReset\"));\n+ assertThat(loggingListener.events.get(2), is(\"beforeStubsReset\"));\n+ assertThat(loggingListener.events.get(3), is(\"afterStubsReset\"));\n+ }\n+\n+ @Test\n+ public void stubCreationCanBeVetoedWhenExceptionIsThrown() {\n+ exceptionThrowingListener.throwException = true;\n+\n+ try {\n+ wm.stubFor(get(\"/test\").withName(\"Created\").willReturn(ok()));\n+ fail(\"Expected an exception to be thrown\");\n+ } catch (Exception e) {\n+ assertThat(e, Matchers.<Exception>instanceOf(NotPermittedException.class));\n+ }\n+\n+ assertTrue(wm.listAllStubMappings().getMappings().isEmpty());\n+ }\n+\n+ @Test\n+ public void sensibleExceptionIsThrownWhenRemoteAndExceptionThrownFromListener() {\n+ WireMock wmRemote = new WireMock(wm.port());\n+ exceptionThrowingListener.throwException = true;\n+\n+ try {\n+ wmRemote.register(get(\"/test\").withName(\"Created\").willReturn(ok()));\n+ fail(\"Expected an exception to be thrown\");\n+ } catch (Exception e) {\n+ assertThat(e, Matchers.<Exception>instanceOf(NotPermittedException.class));\n+ assertThat(((NotPermittedException) e).getErrors().first().getTitle(), is(\"quota exhausted\"));\n+ }\n}\npublic static class TestStubLifecycleListener implements StubLifecycleListener {\n@@ -127,4 +161,59 @@ public class StubLifecycleListenerAcceptanceTest {\nreturn \"test-stub-lifecycle-listener\";\n}\n}\n+\n+ public static class ExceptionThrowingStubLifecycleListener implements StubLifecycleListener {\n+\n+ public boolean throwException = false;\n+\n+ @Override\n+ public void beforeStubCreated(StubMapping stub) {\n+ throwIfRequired();\n+ }\n+\n+ @Override\n+ public void afterStubCreated(StubMapping stub) {\n+ }\n+\n+ @Override\n+ public void beforeStubEdited(StubMapping oldStub, StubMapping newStub) {\n+ throwIfRequired();\n+ }\n+\n+ @Override\n+ public void afterStubEdited(StubMapping oldStub, StubMapping newStub) {\n+\n+ }\n+\n+ @Override\n+ public void beforeStubRemoved(StubMapping stub) {\n+ throwIfRequired();\n+ }\n+\n+ @Override\n+ public void afterStubRemoved(StubMapping stub) {\n+\n+ }\n+\n+ @Override\n+ public void beforeStubsReset() {\n+ throwIfRequired();\n+ }\n+\n+ @Override\n+ public void afterStubsReset() {\n+\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"exception-thrower\";\n+ }\n+\n+ private void throwIfRequired() {\n+ if (throwException) {\n+ throw new NotPermittedException(Errors.notPermitted(\"quota exhausted\"));\n+ }\n+ }\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to throw an exception from a stub lifecycle listener causing the action to be vetoed and a sensible error returned to the caller |
686,936 | 03.06.2019 22:51:04 | -3,600 | 7926c5d7ddf5ac8e5abf6e5e2ed7750923b89114 | Added a request filter extension point, currently only supporting filtering of stub requests (not admin) | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -21,6 +21,7 @@ import com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.Xml;\nimport com.github.tomakehurst.wiremock.extension.*;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.global.GlobalSettingsHolder;\nimport com.github.tomakehurst.wiremock.http.*;\n@@ -137,7 +138,8 @@ public class WireMockApp implements StubServer, Admin {\nthis,\nnew BasicResponseRenderer(),\noptions.getAdminAuthenticator(),\n- options.getHttpsRequiredForAdminApi()\n+ options.getHttpsRequiredForAdminApi(),\n+ Collections.<RequestFilter>emptyList()\n);\n}\n@@ -158,7 +160,8 @@ public class WireMockApp implements StubServer, Admin {\n),\nthis,\npostServeActions,\n- requestJournal\n+ requestJournal,\n+ ImmutableList.copyOf(options.extensionsOfType(RequestFilter.class).values())\n);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/ContinueAction.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.http.Request;\n+\n+public class ContinueAction extends RequestFilterAction {\n+\n+ private final Request request;\n+\n+ ContinueAction(Request request) {\n+ this.request = request;\n+ }\n+\n+ public Request getRequest() {\n+ return request;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestFilter.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.extension.Extension;\n+import com.github.tomakehurst.wiremock.http.Request;\n+\n+public interface RequestFilter extends Extension {\n+\n+ RequestFilterAction filter(Request request);\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestFilterAction.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+public class RequestFilterAction {\n+\n+ public static RequestFilterAction continueWith(Request request) {\n+ return new ContinueAction(request);\n+ }\n+\n+ public static RequestFilterAction stopWith(ResponseDefinition responseDefinition) {\n+ return new StopAction(responseDefinition);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.http.*;\n+import com.google.common.base.Optional;\n+\n+import java.util.Collection;\n+import java.util.Map;\n+import java.util.Set;\n+\n+public class RequestWrapper implements Request {\n+\n+ private final Request delegate;\n+\n+ public RequestWrapper(Request delegate) {\n+ this.delegate = delegate;\n+ }\n+\n+ @Override\n+ public String getUrl() {\n+ return delegate.getUrl();\n+ }\n+\n+ @Override\n+ public String getAbsoluteUrl() {\n+ return delegate.getAbsoluteUrl();\n+ }\n+\n+ @Override\n+ public RequestMethod getMethod() {\n+ return delegate.getMethod();\n+ }\n+\n+ @Override\n+ public String getScheme() {\n+ return delegate.getScheme();\n+ }\n+\n+ @Override\n+ public String getHost() {\n+ return delegate.getHost();\n+ }\n+\n+ @Override\n+ public int getPort() {\n+ return delegate.getPort();\n+ }\n+\n+ @Override\n+ public String getClientIp() {\n+ return delegate.getClientIp();\n+ }\n+\n+ @Override\n+ public String getHeader(String key) {\n+ return delegate.getHeader(key);\n+ }\n+\n+ @Override\n+ public HttpHeader header(String key) {\n+ return delegate.header(key);\n+ }\n+\n+ @Override\n+ public ContentTypeHeader contentTypeHeader() {\n+ return delegate.contentTypeHeader();\n+ }\n+\n+ @Override\n+ public HttpHeaders getHeaders() {\n+ return delegate.getHeaders();\n+ }\n+\n+ @Override\n+ public boolean containsHeader(String key) {\n+ return delegate.containsHeader(key);\n+ }\n+\n+ @Override\n+ public Set<String> getAllHeaderKeys() {\n+ return delegate.getAllHeaderKeys();\n+ }\n+\n+ @Override\n+ public Map<String, Cookie> getCookies() {\n+ return delegate.getCookies();\n+ }\n+\n+ @Override\n+ public QueryParameter queryParameter(String key) {\n+ return delegate.queryParameter(key);\n+ }\n+\n+ @Override\n+ public byte[] getBody() {\n+ return delegate.getBody();\n+ }\n+\n+ @Override\n+ public String getBodyAsString() {\n+ return delegate.getBodyAsString();\n+ }\n+\n+ @Override\n+ public String getBodyAsBase64() {\n+ return delegate.getBodyAsBase64();\n+ }\n+\n+ @Override\n+ public boolean isMultipart() {\n+ return delegate.isMultipart();\n+ }\n+\n+ @Override\n+ public Collection<Part> getParts() {\n+ return delegate.getParts();\n+ }\n+\n+ @Override\n+ public Part getPart(String name) {\n+ return delegate.getPart(name);\n+ }\n+\n+ @Override\n+ public boolean isBrowserProxyRequest() {\n+ return delegate.isBrowserProxyRequest();\n+ }\n+\n+ @Override\n+ public Optional<Request> getOriginalRequest() {\n+ return delegate.getOriginalRequest();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/StopAction.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+public class StopAction extends RequestFilterAction {\n+\n+ private final ResponseDefinition responseDefinition;\n+\n+ StopAction(ResponseDefinition responseDefinition) {\n+ this.responseDefinition = responseDefinition;\n+ }\n+\n+ public ResponseDefinition getResponseDefinition() {\n+ return responseDefinition;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/AbstractRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/AbstractRequestHandler.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.http;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.ContinueAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilterAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.StopAction;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.google.common.base.Stopwatch;\nimport java.util.List;\n@@ -28,9 +33,11 @@ public abstract class AbstractRequestHandler implements RequestHandler, RequestE\nprotected List<RequestListener> listeners = newArrayList();\nprotected final ResponseRenderer responseRenderer;\n+ protected final List<RequestFilter> requestFilters;\n- public AbstractRequestHandler(ResponseRenderer responseRenderer) {\n+ public AbstractRequestHandler(ResponseRenderer responseRenderer, List<RequestFilter> requestFilters) {\nthis.responseRenderer = responseRenderer;\n+ this.requestFilters = requestFilters;\n}\n@Override\n@@ -44,7 +51,20 @@ public abstract class AbstractRequestHandler implements RequestHandler, RequestE\n@Override\npublic void handle(Request request, HttpResponder httpResponder) {\nStopwatch stopwatch = Stopwatch.createStarted();\n- ServeEvent serveEvent = handleRequest(request);\n+\n+ ServeEvent serveEvent;\n+\n+ if (!requestFilters.isEmpty()) {\n+ RequestFilterAction requestFilterAction = processFilters(request, requestFilters, RequestFilterAction.continueWith(request));\n+ if (requestFilterAction instanceof ContinueAction) {\n+ serveEvent = handleRequest(((ContinueAction) requestFilterAction).getRequest());\n+ } else {\n+ serveEvent = ServeEvent.of(LoggedRequest.createFrom(request), ((StopAction) requestFilterAction).getResponseDefinition());\n+ }\n+ } else {\n+ serveEvent = handleRequest(request);\n+ }\n+\nResponseDefinition responseDefinition = serveEvent.getResponseDefinition();\nresponseDefinition.setOriginalRequest(request);\nResponse response = responseRenderer.render(serveEvent);\n@@ -72,6 +92,21 @@ public abstract class AbstractRequestHandler implements RequestHandler, RequestE\nstopwatch.stop();\n}\n+ private static RequestFilterAction processFilters(Request request, List<RequestFilter> requestFilters, RequestFilterAction lastAction) {\n+ if (requestFilters.isEmpty()) {\n+ return lastAction;\n+ }\n+\n+ RequestFilterAction action = requestFilters.get(0).filter(request);\n+\n+ if (action instanceof ContinueAction) {\n+ Request newRequest = ((ContinueAction) action).getRequest();\n+ return processFilters(newRequest, requestFilters.subList(1, requestFilters.size()), action);\n+ }\n+\n+ return action;\n+ }\n+\nprotected String formatRequest(Request request) {\nStringBuilder sb = new StringBuilder();\nsb.append(request.getClientIp())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"diff": "@@ -23,11 +23,13 @@ import com.github.tomakehurst.wiremock.admin.model.PathParams;\nimport com.github.tomakehurst.wiremock.common.InvalidInputException;\nimport com.github.tomakehurst.wiremock.common.NotPermittedException;\nimport com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.security.Authenticator;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport java.net.URI;\n+import java.util.List;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.github.tomakehurst.wiremock.core.WireMockApp.ADMIN_CONTEXT_ROOT;\n@@ -39,8 +41,14 @@ public class AdminRequestHandler extends AbstractRequestHandler {\nprivate final Authenticator authenticator;\nprivate final boolean requireHttps;\n- public AdminRequestHandler(AdminRoutes adminRoutes, Admin admin, ResponseRenderer responseRenderer, Authenticator authenticator, boolean requireHttps) {\n- super(responseRenderer);\n+ public AdminRequestHandler(AdminRoutes adminRoutes,\n+ Admin admin,\n+ ResponseRenderer responseRenderer,\n+ Authenticator authenticator,\n+ boolean requireHttps,\n+ List<RequestFilter> requestFilters\n+ ) {\n+ super(responseRenderer, requestFilters);\nthis.adminRoutes = adminRoutes;\nthis.admin = admin;\nthis.authenticator = authenticator;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/StubRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/StubRequestHandler.java",
"diff": "@@ -19,9 +19,11 @@ import com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.StubServer;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.PostServeAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.verification.RequestJournal;\n+import java.util.List;\nimport java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n@@ -37,8 +39,9 @@ public class StubRequestHandler extends AbstractRequestHandler {\nResponseRenderer responseRenderer,\nAdmin admin,\nMap<String, PostServeAction> postServeActions,\n- RequestJournal requestJournal) {\n- super(responseRenderer);\n+ RequestJournal requestJournal,\n+ List<RequestFilter> requestFilters) {\n+ super(responseRenderer, requestFilters);\nthis.stubServer = stubServer;\nthis.admin = admin;\nthis.postServeActions = postServeActions;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RequestFilterAcceptanceTest.java",
"diff": "+package com.github.tomakehurst.wiremock;\n+\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilterAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestWrapper;\n+import com.github.tomakehurst.wiremock.http.HttpHeader;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.apache.commons.lang3.RandomStringUtils;\n+import org.junit.After;\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class RequestFilterAcceptanceTest {\n+\n+ private WireMockServer wm;\n+ private WireMockTestClient client;\n+ private String url;\n+\n+ @Test\n+ public void filterCanContinueWithModifiedRequest() {\n+ initialise(new RequestHeaderModifyingFilter());\n+\n+ wm.stubFor(get(url)\n+ .withHeader(\"X-Modify-Me\", equalTo(\"modified\"))\n+ .willReturn(ok()));\n+\n+ WireMockResponse response = client.get(url, withHeader(\"X-Modify-Me\", \"original\"));\n+ assertThat(response.statusCode(), is(200));\n+ }\n+\n+ @Test\n+ public void filterCanStopWithResponse() {\n+ initialise(new AuthenticatingFilter());\n+\n+ wm.stubFor(get(url).willReturn(ok()));\n+\n+ WireMockResponse good = client.get(url, withHeader(\"Authorization\", \"Token 123\"));\n+ assertThat(good.statusCode(), is(200));\n+\n+ WireMockResponse bad = client.get(url);\n+ assertThat(bad.statusCode(), is(401));\n+ }\n+\n+ @Test\n+ public void filtersAreChained() {\n+ initialise(\n+ new RequestHeaderAppendingFilter(\"A\"),\n+ new RequestHeaderAppendingFilter(\"B\"),\n+ new RequestHeaderAppendingFilter(\"C\")\n+ );\n+\n+ wm.stubFor(get(url)\n+ .withHeader(\"X-Modify-Me\", equalTo(\"_ABC\"))\n+ .willReturn(ok()));\n+\n+ WireMockResponse response = client.get(url, withHeader(\"X-Modify-Me\", \"_\"));\n+ assertThat(response.statusCode(), is(200));\n+ }\n+\n+ @Before\n+ public void init() {\n+ url = \"/\" + RandomStringUtils.randomAlphabetic(5);\n+ }\n+\n+ @After\n+ public void stopServer() {\n+ wm.stop();\n+ }\n+\n+ private void initialise(RequestFilter... filters) {\n+ wm = new WireMockServer(wireMockConfig().dynamicPort().extensions(filters));\n+ wm.start();\n+ client = new WireMockTestClient(wm.port());\n+ }\n+\n+ public static class RequestHeaderModifyingFilter implements RequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ Request newRequest = new RequestWrapper(request) {\n+ @Override\n+ public HttpHeader header(String key) {\n+ if (key.equals(\"X-Modify-Me\")) {\n+ return new HttpHeader(\"X-Modify-Me\", \"modified\");\n+ }\n+\n+ return super.header(key);\n+ }\n+ };\n+\n+ return RequestFilterAction.continueWith(newRequest);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"request-header-modifier\";\n+ }\n+ }\n+\n+ public static class AuthenticatingFilter implements RequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ HttpHeader authHeader = request.header(\"Authorization\");\n+ if (!authHeader.isPresent() || !authHeader.firstValue().equals(\"Token 123\")) {\n+ return RequestFilterAction.stopWith(ResponseDefinition.notAuthorised());\n+ }\n+\n+ return RequestFilterAction.continueWith(request);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"authenticator\";\n+ }\n+ }\n+\n+ public static class RequestHeaderAppendingFilter implements RequestFilter {\n+\n+ private final String value;\n+\n+ public RequestHeaderAppendingFilter(String value) {\n+ this.value = value;\n+ }\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ Request newRequest = new RequestWrapper(request) {\n+ @Override\n+ public HttpHeader header(String key) {\n+ HttpHeader existingHeader = super.header(key);\n+ if (key.equals(\"X-Modify-Me\")) {\n+ return new HttpHeader(\"X-Modify-Me\", existingHeader.firstValue() + value);\n+ }\n+\n+ return existingHeader;\n+ }\n+ };\n+\n+ return RequestFilterAction.continueWith(newRequest);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"request-header-appender-\" + value;\n+ }\n+ }\n+\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerTest.java",
"diff": "@@ -20,6 +20,7 @@ import com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.StubServer;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.extension.PostServeAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.http.AdminRequestHandler;\nimport com.github.tomakehurst.wiremock.http.BasicResponseRenderer;\nimport com.github.tomakehurst.wiremock.http.ResponseRenderer;\n@@ -50,12 +51,14 @@ public class JettyHttpServerTest {\ncontext = new Mockery();\nAdmin admin = context.mock(Admin.class);\n- adminRequestHandler = new AdminRequestHandler(AdminRoutes.defaults(), admin, new BasicResponseRenderer(), new NoAuthenticator(), false);\n+ adminRequestHandler = new AdminRequestHandler(AdminRoutes.defaults(), admin, new BasicResponseRenderer(), new NoAuthenticator(), false, Collections.<RequestFilter>emptyList());\nstubRequestHandler = new StubRequestHandler(context.mock(StubServer.class),\ncontext.mock(ResponseRenderer.class),\nadmin,\nCollections.<String, PostServeAction>emptyMap(),\n- context.mock(RequestJournal.class));\n+ context.mock(RequestJournal.class),\n+ Collections.<RequestFilter>emptyList()\n+ );\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/stubbing/AdminRequestHandlerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/stubbing/AdminRequestHandlerTest.java",
"diff": "@@ -17,6 +17,7 @@ package com.github.tomakehurst.wiremock.stubbing;\nimport com.github.tomakehurst.wiremock.admin.AdminRoutes;\nimport com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.*;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n@@ -30,6 +31,8 @@ import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import java.util.Collections;\n+\nimport static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.DELETE;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\n@@ -55,7 +58,7 @@ public class AdminRequestHandlerTest {\nhttpResponder = new MockHttpResponder();\n- handler = new AdminRequestHandler(AdminRoutes.defaults(), admin, new BasicResponseRenderer(), new NoAuthenticator(), false);\n+ handler = new AdminRequestHandler(AdminRoutes.defaults(), admin, new BasicResponseRenderer(), new NoAuthenticator(), false, Collections.<RequestFilter>emptyList());\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/stubbing/StubRequestHandlerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/stubbing/StubRequestHandlerTest.java",
"diff": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.stubbing;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.StubServer;\nimport com.github.tomakehurst.wiremock.extension.PostServeAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestListener;\nimport com.github.tomakehurst.wiremock.http.Response;\n@@ -66,7 +67,7 @@ public class StubRequestHandlerTest {\nadmin = context.mock(Admin.class);\nrequestJournal = context.mock(RequestJournal.class);\n- requestHandler = new StubRequestHandler(stubServer, responseRenderer, admin, Collections.<String, PostServeAction>emptyMap(), requestJournal);\n+ requestHandler = new StubRequestHandler(stubServer, responseRenderer, admin, Collections.<String, PostServeAction>emptyMap(), requestJournal, Collections.<RequestFilter>emptyList());\ncontext.checking(new Expectations() {{\nallowing(requestJournal);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a request filter extension point, currently only supporting filtering of stub requests (not admin) |
686,936 | 04.06.2019 17:49:12 | -3,600 | 5accd88d6f776278b4700e90993272da4b1a5565 | Added support for applying request filters to admin (in addition to stubs) | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -34,9 +34,9 @@ import com.github.tomakehurst.wiremock.stubbing.*;\nimport com.github.tomakehurst.wiremock.verification.*;\nimport com.github.tomakehurst.wiremock.verification.diff.PlainTextDiffRenderer;\nimport com.google.common.base.Function;\n-import com.google.common.base.MoreObjects;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\n+import com.google.common.collect.FluentIterable;\nimport com.google.common.collect.ImmutableList;\nimport java.util.Collections;\n@@ -139,7 +139,7 @@ public class WireMockApp implements StubServer, Admin {\nnew BasicResponseRenderer(),\noptions.getAdminAuthenticator(),\noptions.getHttpsRequiredForAdminApi(),\n- Collections.<RequestFilter>emptyList()\n+ getAdminRequestFilters()\n);\n}\n@@ -161,10 +161,32 @@ public class WireMockApp implements StubServer, Admin {\nthis,\npostServeActions,\nrequestJournal,\n- ImmutableList.copyOf(options.extensionsOfType(RequestFilter.class).values())\n+ getStubRequestFilters()\n);\n}\n+ private List<RequestFilter> getAdminRequestFilters() {\n+ return FluentIterable.from(options.extensionsOfType(RequestFilter.class).values())\n+ .filter(new Predicate<RequestFilter>() {\n+ @Override\n+ public boolean apply(RequestFilter filter) {\n+ return filter.applyToAdmin();\n+ }\n+ })\n+ .toList();\n+ }\n+\n+ private List<RequestFilter> getStubRequestFilters() {\n+ return FluentIterable.from(options.extensionsOfType(RequestFilter.class).values())\n+ .filter(new Predicate<RequestFilter>() {\n+ @Override\n+ public boolean apply(RequestFilter filter) {\n+ return filter.applyToStubs();\n+ }\n+ })\n+ .toList();\n+ }\n+\npublic GlobalSettingsHolder getGlobalSettingsHolder() {\nreturn globalSettingsHolder;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/AdminRequestFilter.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+public abstract class AdminRequestFilter implements RequestFilter {\n+\n+ @Override\n+ public boolean applyToAdmin() {\n+ return true;\n+ }\n+\n+ @Override\n+ public boolean applyToStubs() {\n+ return false;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestFilter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestFilter.java",
"diff": "@@ -7,4 +7,7 @@ public interface RequestFilter extends Extension {\nRequestFilterAction filter(Request request);\n+ boolean applyToAdmin();\n+ boolean applyToStubs();\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/StubRequestFilter.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+public abstract class StubRequestFilter implements RequestFilter {\n+\n+ @Override\n+ public boolean applyToAdmin() {\n+ return false;\n+ }\n+\n+ @Override\n+ public boolean applyToStubs() {\n+ return true;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RequestFilterAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RequestFilterAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\n-import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilterAction;\n-import com.github.tomakehurst.wiremock.extension.requestfilter.RequestWrapper;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.*;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n@@ -39,7 +37,7 @@ public class RequestFilterAcceptanceTest {\n@Test\npublic void filterCanStopWithResponse() {\n- initialise(new AuthenticatingFilter());\n+ initialise(new StubAuthenticatingFilter());\nwm.stubFor(get(url).willReturn(ok()));\n@@ -66,6 +64,57 @@ public class RequestFilterAcceptanceTest {\nassertThat(response.statusCode(), is(200));\n}\n+ @Test\n+ public void filterCanBeAppliedToAdmin() {\n+ initialise(new AdminAuthenticatingFilter());\n+\n+ wm.stubFor(get(url).willReturn(ok()));\n+\n+ String adminUrl = \"/__admin/mappings\";\n+ WireMockResponse good = client.get(adminUrl, withHeader(\"Authorization\", \"Token 123\"));\n+ assertThat(good.statusCode(), is(200));\n+\n+ WireMockResponse bad = client.get(adminUrl);\n+ assertThat(bad.statusCode(), is(401));\n+\n+ // Stubs are unaffected\n+ WireMockResponse stub = client.get(url);\n+ assertThat(stub.statusCode(), is(200));\n+ }\n+\n+ @Test\n+ public void filterCanBeAppliedToStubs() {\n+ initialise(new StubAuthenticatingFilter());\n+\n+ wm.stubFor(get(url).willReturn(ok()));\n+\n+ String adminUrl = \"/__admin/mappings\";\n+ WireMockResponse good = client.get(url, withHeader(\"Authorization\", \"Token 123\"));\n+ assertThat(good.statusCode(), is(200));\n+\n+ WireMockResponse bad = client.get(url);\n+ assertThat(bad.statusCode(), is(401));\n+\n+ // Admin routes are unaffected\n+ WireMockResponse stub = client.get(adminUrl);\n+ assertThat(stub.statusCode(), is(200));\n+ }\n+\n+ @Test\n+ public void filterCanBeAppliedToStubsAndAdmin() {\n+ initialise(new BothAuthenticatingFilter());\n+\n+ wm.stubFor(get(url).willReturn(ok()));\n+\n+ String adminUrl = \"/__admin/mappings\";\n+\n+ WireMockResponse stub = client.get(url);\n+ assertThat(stub.statusCode(), is(401));\n+\n+ WireMockResponse admin = client.get(adminUrl);\n+ assertThat(admin.statusCode(), is(401));\n+ }\n+\n@Before\npublic void init() {\nurl = \"/\" + RandomStringUtils.randomAlphabetic(5);\n@@ -82,7 +131,7 @@ public class RequestFilterAcceptanceTest {\nclient = new WireMockTestClient(wm.port());\n}\n- public static class RequestHeaderModifyingFilter implements RequestFilter {\n+ public static class RequestHeaderModifyingFilter extends StubRequestFilter {\n@Override\npublic RequestFilterAction filter(Request request) {\n@@ -106,7 +155,7 @@ public class RequestFilterAcceptanceTest {\n}\n}\n- public static class AuthenticatingFilter implements RequestFilter {\n+ public static class StubAuthenticatingFilter extends StubRequestFilter {\n@Override\npublic RequestFilterAction filter(Request request) {\n@@ -120,11 +169,11 @@ public class RequestFilterAcceptanceTest {\n@Override\npublic String getName() {\n- return \"authenticator\";\n+ return \"stub-authenticator\";\n}\n}\n- public static class RequestHeaderAppendingFilter implements RequestFilter {\n+ public static class RequestHeaderAppendingFilter extends StubRequestFilter {\nprivate final String value;\n@@ -155,5 +204,50 @@ public class RequestFilterAcceptanceTest {\n}\n}\n+ public static class AdminAuthenticatingFilter extends AdminRequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ HttpHeader authHeader = request.header(\"Authorization\");\n+ if (!authHeader.isPresent() || !authHeader.firstValue().equals(\"Token 123\")) {\n+ return RequestFilterAction.stopWith(ResponseDefinition.notAuthorised());\n+ }\n+\n+ return RequestFilterAction.continueWith(request);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"admin-authenticator\";\n+ }\n+ }\n+\n+ public static class BothAuthenticatingFilter implements RequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ HttpHeader authHeader = request.header(\"Authorization\");\n+ if (!authHeader.isPresent() || !authHeader.firstValue().equals(\"Token 123\")) {\n+ return RequestFilterAction.stopWith(ResponseDefinition.notAuthorised());\n+ }\n+\n+ return RequestFilterAction.continueWith(request);\n+ }\n+\n+ @Override\n+ public boolean applyToAdmin() {\n+ return true;\n+ }\n+\n+ @Override\n+ public boolean applyToStubs() {\n+ return true;\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"both-authenticator\";\n+ }\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for applying request filters to admin (in addition to stubs) |
686,936 | 06.06.2019 20:13:01 | -3,600 | 96f118ee96f07fb1ceab4da70269e02a5c4402d7 | Added a builder to RequestWrapper to facilite common transformations | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/FieldTransformer.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+public interface FieldTransformer<T> {\n+\n+ T transform(T source);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapper.java",
"diff": "package com.github.tomakehurst.wiremock.extension.requestfilter;\nimport com.github.tomakehurst.wiremock.http.*;\n+import com.google.common.base.Function;\nimport com.google.common.base.Optional;\n+import com.google.common.base.Predicate;\n+import com.google.common.collect.ImmutableMap;\n-import java.util.Collection;\n-import java.util.Map;\n-import java.util.Set;\n+import java.util.*;\n+\n+import static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\n+import static com.google.common.base.MoreObjects.firstNonNull;\n+import static com.google.common.collect.FluentIterable.from;\n+import static com.google.common.collect.Lists.newArrayList;\n+import static com.google.common.collect.Maps.newHashMap;\n+import static org.apache.commons.lang3.StringUtils.countMatches;\n+import static org.apache.commons.lang3.StringUtils.ordinalIndexOf;\npublic class RequestWrapper implements Request {\nprivate final Request delegate;\n+ private final RequestMethod method;\n+ private final FieldTransformer<String> absoluteUrlTransformer;\n+ private final List<HttpHeader> addedHeaders;\n+ private final List<String> removedHeaders;\n+ private final Map<CaseInsensitiveKey, FieldTransformer<List<String>>> headerTransformers;\n+ private final Map<String, Cookie> additionalCookies;\n+ private final Map<String, FieldTransformer<Cookie>> cookieTransformers;\n+ private final FieldTransformer<Body> bodyTransformer;\n+ private final FieldTransformer<Part> multipartTransformer;\n+\npublic RequestWrapper(Request delegate) {\n+ this(\n+ delegate,\n+ null,\n+ null,\n+ Collections.<HttpHeader>emptyList(),\n+ Collections.<String>emptyList(),\n+ Collections.<CaseInsensitiveKey, FieldTransformer<List<String>>>emptyMap(),\n+ Collections.<String, Cookie>emptyMap(),\n+ Collections.<String, FieldTransformer<Cookie>>emptyMap(),\n+ null,\n+ null\n+ );\n+ }\n+\n+ public RequestWrapper(\n+ Request delegate,\n+ RequestMethod method,\n+ FieldTransformer<String> absoluteUrlTransformer,\n+ List<HttpHeader> addedHeaders,\n+ List<String> removedHeaders,\n+ Map<CaseInsensitiveKey, FieldTransformer<List<String>>> headerTransformers,\n+ Map<String, Cookie> additionalCookies,\n+ Map<String, FieldTransformer<Cookie>> cookieTransformers,\n+ FieldTransformer<Body> bodyTransformer,\n+ FieldTransformer<Part> multipartTransformer\n+ ) {\nthis.delegate = delegate;\n+\n+ this.method = method;\n+ this.absoluteUrlTransformer = absoluteUrlTransformer;\n+ this.addedHeaders = addedHeaders;\n+ this.removedHeaders = removedHeaders;\n+ this.headerTransformers = headerTransformers;\n+ this.additionalCookies = additionalCookies;\n+ this.cookieTransformers = cookieTransformers;\n+ this.bodyTransformer = bodyTransformer;\n+ this.multipartTransformer = multipartTransformer;\n+ }\n+\n+ public static Builder create() {\n+ return new Builder();\n}\n@Override\npublic String getUrl() {\n- return delegate.getUrl();\n+ String absoluteUrl = getAbsoluteUrl();\n+ int relativeStartIndex =\n+ countMatches(absoluteUrl, \"/\") >= 3 ?\n+ ordinalIndexOf(absoluteUrl, \"/\", 3) :\n+ absoluteUrl.length();\n+ return absoluteUrl.substring(relativeStartIndex);\n}\n@Override\npublic String getAbsoluteUrl() {\n+ if (absoluteUrlTransformer != null) {\n+ return absoluteUrlTransformer.transform(delegate.getAbsoluteUrl());\n+ }\n+\nreturn delegate.getAbsoluteUrl();\n}\n@Override\npublic RequestMethod getMethod() {\n- return delegate.getMethod();\n+ return firstNonNull(method, delegate.getMethod());\n}\n@Override\n@@ -52,12 +120,12 @@ public class RequestWrapper implements Request {\n@Override\npublic String getHeader(String key) {\n- return delegate.getHeader(key);\n+ return getHeaders().getHeader(key).firstValue();\n}\n@Override\npublic HttpHeader header(String key) {\n- return delegate.header(key);\n+ return getHeaders().getHeader(key);\n}\n@Override\n@@ -67,22 +135,56 @@ public class RequestWrapper implements Request {\n@Override\npublic HttpHeaders getHeaders() {\n- return delegate.getHeaders();\n+ Collection<HttpHeader> existingHeaders = delegate.getHeaders().all();\n+\n+ List<HttpHeader> combinedHeaders = from(existingHeaders)\n+ .append(addedHeaders)\n+ .filter(new Predicate<HttpHeader>() {\n+ @Override\n+ public boolean apply(HttpHeader httpHeader) {\n+ return !removedHeaders.contains(httpHeader.key());\n+ }\n+ })\n+ .transform(new Function<HttpHeader, HttpHeader>() {\n+ @Override\n+ public HttpHeader apply(HttpHeader httpHeader) {\n+ if (headerTransformers.containsKey(httpHeader.caseInsensitiveKey())) {\n+ FieldTransformer<List<String>> transformer = headerTransformers.get(httpHeader.caseInsensitiveKey());\n+ List<String> newValues = transformer.transform(httpHeader.values());\n+ return new HttpHeader(httpHeader.key(), newValues);\n+ }\n+\n+ return httpHeader;\n+ }\n+ })\n+ .toList();\n+ return new HttpHeaders(combinedHeaders);\n}\n@Override\npublic boolean containsHeader(String key) {\n- return delegate.containsHeader(key);\n+ return getHeaders().keys().contains(key);\n}\n@Override\npublic Set<String> getAllHeaderKeys() {\n- return delegate.getAllHeaderKeys();\n+ return getHeaders().keys();\n}\n@Override\npublic Map<String, Cookie> getCookies() {\n- return delegate.getCookies();\n+ ImmutableMap.Builder<String, Cookie> builder = ImmutableMap.builder();\n+ for (Map.Entry<String, Cookie> entry: delegate.getCookies().entrySet()) {\n+ Cookie newCookie = cookieTransformers.containsKey(entry.getKey()) ?\n+ cookieTransformers.get(entry.getKey()).transform(entry.getValue()) :\n+ entry.getValue();\n+\n+ builder.put(entry.getKey(), newCookie);\n+ }\n+\n+ builder.putAll(additionalCookies);\n+\n+ return builder.build();\n}\n@Override\n@@ -92,17 +194,25 @@ public class RequestWrapper implements Request {\n@Override\npublic byte[] getBody() {\n+ if (bodyTransformer != null) {\n+ return bodyTransformer.transform(new Body(delegate.getBody())).asBytes();\n+ }\n+\nreturn delegate.getBody();\n}\n@Override\npublic String getBodyAsString() {\n+ if (bodyTransformer != null) {\n+ return bodyTransformer.transform(new Body(delegate.getBodyAsString())).asString();\n+ }\n+\nreturn delegate.getBodyAsString();\n}\n@Override\npublic String getBodyAsBase64() {\n- return delegate.getBodyAsBase64();\n+ return encodeBase64(getBody());\n}\n@Override\n@@ -112,11 +222,26 @@ public class RequestWrapper implements Request {\n@Override\npublic Collection<Part> getParts() {\n+ if (delegate.getParts() == null || multipartTransformer == null) {\nreturn delegate.getParts();\n}\n+ return from(delegate.getParts())\n+ .transform(new Function<Part, Part>() {\n+ @Override\n+ public Part apply(Part part) {\n+ return multipartTransformer.transform(part);\n+ }\n+ })\n+ .toList();\n+ }\n+\n@Override\npublic Part getPart(String name) {\n+ if (multipartTransformer != null) {\n+ return multipartTransformer.transform(delegate.getPart(name));\n+ }\n+\nreturn delegate.getPart(name);\n}\n@@ -129,4 +254,70 @@ public class RequestWrapper implements Request {\npublic Optional<Request> getOriginalRequest() {\nreturn delegate.getOriginalRequest();\n}\n+\n+ public static class Builder {\n+\n+ private RequestMethod requestMethod;\n+ private FieldTransformer<String> absoluteUrlTransformer;\n+\n+ private final List<HttpHeader> additionalHeaders = newArrayList();\n+ private final List<String> headersToRemove = newArrayList();\n+ private final Map<CaseInsensitiveKey, FieldTransformer<List<String>>> headerTransformers = newHashMap();\n+\n+ private final Map<String, Cookie> additionalCookies = newHashMap();\n+ private final List<String> cookiesToRemove = newArrayList();\n+ private final Map<String, FieldTransformer<Cookie>> cookieTransformers = newHashMap();\n+\n+ private FieldTransformer<Body> bodyTransformer;\n+ private FieldTransformer<Part> mutlipartTransformer;\n+\n+ public Builder addHeader(String key, String... values) {\n+ additionalHeaders.add(new HttpHeader(key, values));\n+ return this;\n+ }\n+\n+ public Builder removeHeader(String key) {\n+ headersToRemove.add(key);\n+ return this;\n+ }\n+\n+ public Builder transformHeader(String key, FieldTransformer<List<String>> transformer) {\n+ headerTransformers.put(CaseInsensitiveKey.from(key), transformer);\n+ return this;\n+ }\n+\n+ public Builder setMethod(RequestMethod method) {\n+ requestMethod = method;\n+ return this;\n+ }\n+\n+ public Builder transformAbsoluteUrl(FieldTransformer<String> transformer) {\n+ absoluteUrlTransformer = transformer;\n+ return this;\n+ }\n+\n+ public Request wrap(Request request) {\n+ return new RequestWrapper(request, requestMethod, absoluteUrlTransformer, additionalHeaders, headersToRemove, headerTransformers, additionalCookies, cookieTransformers, bodyTransformer, mutlipartTransformer);\n+ }\n+\n+ public Builder transformBody(FieldTransformer<Body> transformer) {\n+ bodyTransformer = transformer;\n+ return this;\n+ }\n+\n+ public Builder transformCookie(String name, FieldTransformer<Cookie> transformer) {\n+ cookieTransformers.put(name, transformer);\n+ return this;\n+ }\n+\n+ public Builder transformParts(FieldTransformer<Part> transformer) {\n+ mutlipartTransformer = transformer;\n+ return this;\n+ }\n+\n+ public Builder addCookie(String name, Cookie value) {\n+ additionalCookies.put(name, value);\n+ return this;\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RequestFilterAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RequestFilterAcceptanceTest.java",
"diff": "@@ -11,6 +11,9 @@ import org.junit.After;\nimport org.junit.Before;\nimport org.junit.Test;\n+import java.util.Collections;\n+import java.util.List;\n+\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\n@@ -57,7 +60,7 @@ public class RequestFilterAcceptanceTest {\n);\nwm.stubFor(get(url)\n- .withHeader(\"X-Modify-Me\", equalTo(\"_ABC\"))\n+ .withHeader(\"X-Modify-Me\", matching(\"_[ABC]{3}\"))\n.willReturn(ok()));\nWireMockResponse response = client.get(url, withHeader(\"X-Modify-Me\", \"_\"));\n@@ -183,17 +186,14 @@ public class RequestFilterAcceptanceTest {\n@Override\npublic RequestFilterAction filter(Request request) {\n- Request newRequest = new RequestWrapper(request) {\n+ Request newRequest = RequestWrapper.create()\n+ .transformHeader(\"X-Modify-Me\", new FieldTransformer<List<String>>() {\n@Override\n- public HttpHeader header(String key) {\n- HttpHeader existingHeader = super.header(key);\n- if (key.equals(\"X-Modify-Me\")) {\n- return new HttpHeader(\"X-Modify-Me\", existingHeader.firstValue() + value);\n+ public List<String> transform(List<String> existingValue) {\n+ return Collections.singletonList(existingValue.get(0) + value);\n}\n-\n- return existingHeader;\n- }\n- };\n+ })\n+ .wrap(request);\nreturn RequestFilterAction.continueWith(newRequest);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapperTest.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.requestfilter;\n+\n+import com.github.tomakehurst.wiremock.http.*;\n+import com.github.tomakehurst.wiremock.matching.MockMultipart;\n+import com.github.tomakehurst.wiremock.matching.MockRequest;\n+import com.google.common.base.Function;\n+import com.google.common.collect.FluentIterable;\n+import org.hamcrest.Matcher;\n+import org.junit.Test;\n+\n+import java.util.List;\n+\n+import static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\n+import static com.github.tomakehurst.wiremock.matching.MockMultipart.mockPart;\n+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.google.common.collect.Iterables.getFirst;\n+import static org.hamcrest.Matchers.hasItem;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class RequestWrapperTest {\n+\n+ @Test\n+ public void changesTheRequestMethod() {\n+ MockRequest request = mockRequest().method(RequestMethod.GET);\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .setMethod(RequestMethod.POST)\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getMethod(), is(RequestMethod.POST));\n+ }\n+\n+ @Test\n+ public void transformsTheUrl() {\n+ MockRequest request = mockRequest().url(\"/original-path?one=1&two=2\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformAbsoluteUrl(new FieldTransformer<String>() {\n+ @Override\n+ public String transform(String existingUrl) {\n+ return existingUrl\n+ .replace(\"my.domain\", \"wiremock.org\")\n+ .replace(\"/original-path\", \"/new-path\");\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getUrl(), is(\"/new-path?one=1&two=2\"));\n+ assertThat(wrappedRequest.getAbsoluteUrl(), is(\"http://wiremock.org/new-path?one=1&two=2\"));\n+ }\n+\n+ @Test\n+ public void transformsAUrlWithNoPath() {\n+ MockRequest request = mockRequest().url(\"\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformAbsoluteUrl(new FieldTransformer<String>() {\n+ @Override\n+ public String transform(String existingUrl) {\n+ return existingUrl\n+ .replace(\"my.domain\", \"wiremock.org\");\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getUrl(), is(\"\"));\n+ assertThat(wrappedRequest.getAbsoluteUrl(), is(\"http://wiremock.org\"));\n+ }\n+\n+ @Test\n+ public void addsSpecifiedHeaders() {\n+ MockRequest request = mockRequest().header(\"One\", \"1\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .addHeader(\"Two\", \"2\")\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getHeaders().size(), is(2));\n+ assertThat(wrappedRequest.getHeader(\"Two\"), is(\"2\"));\n+ }\n+\n+ @Test\n+ public void removesSpecifiedHeaders() {\n+ MockRequest request = mockRequest().header(\"One\", \"1\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .removeHeader(\"One\")\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getHeaders().size(), is(0));\n+ }\n+\n+ @Test\n+ public void transformsSpecifiedHeaders() {\n+ MockRequest request = mockRequest()\n+ .header(\"One\", \"1\")\n+ .header(\"Two\", \"2\", \"3\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformHeader(\"One\", new FieldTransformer<List<String>>() {\n+ @Override\n+ public List<String> transform(List<String> headerValues) {\n+ return FluentIterable.from(headerValues).transform(new Function<String, String>() {\n+ @Override\n+ public String apply(String headerValue) {\n+ return headerValue + \"1\";\n+ }\n+ }).toList();\n+ }\n+ })\n+ .transformHeader(\"two\", new FieldTransformer<List<String>>() {\n+ @Override\n+ public List<String> transform(List<String> headerValues) {\n+ return FluentIterable.from(headerValues).transform(new Function<String, String>() {\n+ @Override\n+ public String apply(String headerValue) {\n+ return headerValue + \"2\";\n+ }\n+ }).toList();\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getHeader(\"One\"), is(\"11\"));\n+ HttpHeader headerTwo = wrappedRequest.header(\"Two\");\n+ assertThat(headerTwo.values().get(0), is(\"22\"));\n+ assertThat(headerTwo.values().get(1), is(\"32\"));\n+ }\n+\n+ @Test\n+ public void addsSpecifiedCookies() {\n+ MockRequest request = mockRequest()\n+ .cookie(\"One\", \"1\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .addCookie(\"Two\", new Cookie(\"2\"))\n+ .addCookie(\"Three\", new Cookie(\"3\"))\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getCookies().size(), is(3));\n+ assertThat(wrappedRequest.getCookies().get(\"Two\").firstValue(), is(\"2\"));\n+ assertThat(wrappedRequest.getCookies().get(\"Three\").firstValue(), is(\"3\"));\n+ }\n+\n+ @Test\n+ public void transformsSpecifiedCookies() {\n+ MockRequest request = mockRequest()\n+ .cookie(\"One\", \"1\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformCookie(\"One\", new FieldTransformer<Cookie>() {\n+ @Override\n+ public Cookie transform(Cookie cookie) {\n+ return new Cookie(cookie.firstValue() + \"1\");\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getCookies().get(\"One\").firstValue(), is(\"11\"));\n+ }\n+\n+ @Test\n+ public void transformsAStringBody() {\n+ MockRequest request = mockRequest().body(\"One\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformBody(new FieldTransformer<Body>() {\n+ @Override\n+ public Body transform(Body existingBody) {\n+ String newValue = existingBody.asString().replace(\"One\", \"Two\");\n+ return new Body(newValue);\n+\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getBodyAsString(), is(\"Two\"));\n+ assertThat(wrappedRequest.getBodyAsBase64(), is(encodeBase64(\"Two\".getBytes())));\n+ }\n+\n+ @Test\n+ public void transformsABinaryBody() {\n+ final byte[] initialBytes = new byte[] {1,2,3};\n+ final byte[] finalBytes = new byte[] {4,5,6};\n+\n+ MockRequest request = mockRequest().body(initialBytes);\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformBody(new FieldTransformer<Body>() {\n+ @Override\n+ public Body transform(Body existingBody) {\n+ return new Body(finalBytes);\n+\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getBody(), is(finalBytes));\n+ assertThat(wrappedRequest.getBodyAsBase64(), is(encodeBase64(finalBytes)));\n+ }\n+\n+ @Test\n+ public void transformsMultiparts() {\n+ MockRequest request = mockRequest()\n+ .part(mockPart().name(\"one\").body(\"1\"))\n+ .part(mockPart().name(\"two\").body(\"2\"));\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformParts(new FieldTransformer<Request.Part>() {\n+ @Override\n+ public Request.Part transform(Request.Part existingPart) {\n+ return existingPart.getName().equals(\"one\") ?\n+ mockPart().name(\"one\").body(\"1111\") :\n+ mockPart().name(\"two\").body(\"2222\");\n+\n+ }\n+ })\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getPart(\"one\").getBody().asString(), is(\"1111\"));\n+ assertThat(wrappedRequest.getPart(\"two\").getBody().asString(), is(\"2222\"));\n+ assertThat(wrappedRequest.getParts(), hasItem(mockPart().name(\"one\").body(\"1111\")));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MockMultipart.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MockMultipart.java",
"diff": "@@ -21,6 +21,7 @@ import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport java.util.List;\n+import java.util.Objects;\nimport static com.google.common.collect.Lists.newArrayList;\n@@ -78,4 +79,29 @@ public class MockMultipart implements Request.Part {\npublic Body getBody() {\nreturn body;\n}\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ MockMultipart that = (MockMultipart) o;\n+ return Objects.equals(name, that.name) &&\n+ Objects.equals(headers, that.headers) &&\n+ Objects.equals(body, that.body);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(name, headers, body);\n+ }\n+\n+ @Override\n+ public String toString() {\n+ final StringBuilder sb = new StringBuilder(\"MockMultipart{\");\n+ sb.append(\"name='\").append(name).append('\\'');\n+ sb.append(\", headers=\").append(headers);\n+ sb.append(\", body=\").append(body);\n+ sb.append('}');\n+ return sb.toString();\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a builder to RequestWrapper to facilite common transformations |
686,936 | 06.06.2019 20:19:52 | -3,600 | 28a6ec549a8da767130191d7cf99252121a9bfbe | Added cookie removal builder method to RequestWrapper | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapper.java",
"diff": "@@ -26,6 +26,7 @@ public class RequestWrapper implements Request {\nprivate final List<String> removedHeaders;\nprivate final Map<CaseInsensitiveKey, FieldTransformer<List<String>>> headerTransformers;\nprivate final Map<String, Cookie> additionalCookies;\n+ private final List<String> cookiesToRemove;\nprivate final Map<String, FieldTransformer<Cookie>> cookieTransformers;\nprivate final FieldTransformer<Body> bodyTransformer;\nprivate final FieldTransformer<Part> multipartTransformer;\n@@ -39,6 +40,7 @@ public class RequestWrapper implements Request {\nCollections.<String>emptyList(),\nCollections.<CaseInsensitiveKey, FieldTransformer<List<String>>>emptyMap(),\nCollections.<String, Cookie>emptyMap(),\n+ Collections.<String>emptyList(),\nCollections.<String, FieldTransformer<Cookie>>emptyMap(),\nnull,\nnull\n@@ -53,6 +55,7 @@ public class RequestWrapper implements Request {\nList<String> removedHeaders,\nMap<CaseInsensitiveKey, FieldTransformer<List<String>>> headerTransformers,\nMap<String, Cookie> additionalCookies,\n+ List<String> cookiesToRemove,\nMap<String, FieldTransformer<Cookie>> cookieTransformers,\nFieldTransformer<Body> bodyTransformer,\nFieldTransformer<Part> multipartTransformer\n@@ -65,6 +68,7 @@ public class RequestWrapper implements Request {\nthis.removedHeaders = removedHeaders;\nthis.headerTransformers = headerTransformers;\nthis.additionalCookies = additionalCookies;\n+ this.cookiesToRemove = cookiesToRemove;\nthis.cookieTransformers = cookieTransformers;\nthis.bodyTransformer = bodyTransformer;\nthis.multipartTransformer = multipartTransformer;\n@@ -179,8 +183,10 @@ public class RequestWrapper implements Request {\ncookieTransformers.get(entry.getKey()).transform(entry.getValue()) :\nentry.getValue();\n+ if (!cookiesToRemove.contains(entry.getKey())) {\nbuilder.put(entry.getKey(), newCookie);\n}\n+ }\nbuilder.putAll(additionalCookies);\n@@ -297,7 +303,7 @@ public class RequestWrapper implements Request {\n}\npublic Request wrap(Request request) {\n- return new RequestWrapper(request, requestMethod, absoluteUrlTransformer, additionalHeaders, headersToRemove, headerTransformers, additionalCookies, cookieTransformers, bodyTransformer, mutlipartTransformer);\n+ return new RequestWrapper(request, requestMethod, absoluteUrlTransformer, additionalHeaders, headersToRemove, headerTransformers, additionalCookies, cookiesToRemove, cookieTransformers, bodyTransformer, mutlipartTransformer);\n}\npublic Builder transformBody(FieldTransformer<Body> transformer) {\n@@ -319,5 +325,10 @@ public class RequestWrapper implements Request {\nadditionalCookies.put(name, value);\nreturn this;\n}\n+\n+ public Builder removeCookie(String name) {\n+ cookiesToRemove.add(name);\n+ return this;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/requestfilter/RequestWrapperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.requestfilter;\nimport com.github.tomakehurst.wiremock.http.*;\n-import com.github.tomakehurst.wiremock.matching.MockMultipart;\nimport com.github.tomakehurst.wiremock.matching.MockRequest;\nimport com.google.common.base.Function;\nimport com.google.common.collect.FluentIterable;\n-import org.hamcrest.Matcher;\nimport org.junit.Test;\nimport java.util.List;\n@@ -13,9 +11,7 @@ import java.util.List;\nimport static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\nimport static com.github.tomakehurst.wiremock.matching.MockMultipart.mockPart;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n-import static com.google.common.collect.Iterables.getFirst;\n-import static org.hamcrest.Matchers.hasItem;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\npublic class RequestWrapperTest {\n@@ -143,6 +139,21 @@ public class RequestWrapperTest {\nassertThat(wrappedRequest.getCookies().get(\"Three\").firstValue(), is(\"3\"));\n}\n+ @Test\n+ public void removesSpecifiedCookies() {\n+ MockRequest request = mockRequest()\n+ .cookie(\"One\", \"1\")\n+ .cookie(\"Two\", \"2\")\n+ .cookie(\"Three\", \"3\");\n+\n+ Request wrappedRequest = RequestWrapper.create()\n+ .removeCookie(\"Two\")\n+ .wrap(request);\n+\n+ assertThat(wrappedRequest.getCookies().size(), is(2));\n+ assertThat(wrappedRequest.getCookies().get(\"Two\"), nullValue());\n+ }\n+\n@Test\npublic void transformsSpecifiedCookies() {\nMockRequest request = mockRequest()\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added cookie removal builder method to RequestWrapper |
686,936 | 06.06.2019 20:50:27 | -3,600 | 5fac15f7fb527da2db14b0ab5adc4e45ae73b3fa | Empty or null stub IDs in JSON are now treated as absent, so that an ID is generated | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -228,6 +228,10 @@ public class WireMockApp implements StubServer, Admin {\n@Override\npublic void addStubMapping(StubMapping stubMapping) {\n+ if (stubMapping.getId() == null) {\n+ stubMapping.setId(UUID.randomUUID());\n+ }\n+\nstubMappings.addMapping(stubMapping);\nif (stubMapping.shouldBePersisted()) {\nmappingsSaver.save(stubMapping);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -28,6 +28,9 @@ import com.google.common.collect.ImmutableMap;\nimport com.toomuchcoding.jsonassert.JsonAssertion;\nimport com.toomuchcoding.jsonassert.JsonVerifiable;\nimport org.apache.http.entity.StringEntity;\n+import org.hamcrest.Description;\n+import org.hamcrest.Matcher;\n+import org.hamcrest.TypeSafeMatcher;\nimport org.junit.After;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONAssert;\n@@ -698,6 +701,90 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(stubs.size(), is(2));\n}\n+ static final String EMPTY_ID_IMPORT_JSON = \"{\\n\" +\n+ \" \\\"mappings\\\": [\\n\" +\n+ \" {\\n\" +\n+ \" \\\"id\\\": \\\"\\\",\\n\" +\n+ \" \\\"name\\\": \\\"Empty ID\\\",\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/empty-id\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 204\\n\" +\n+ \" }\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"id\\\": null,\\n\" +\n+ \" \\\"name\\\": \\\"Null ID\\\",\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/null-id\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 204\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \" ]\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void treatsEmptyOrNullIdFieldsAsNotPresent() {\n+ WireMockResponse response = testClient.postJson(\"/__admin/mappings/import\", EMPTY_ID_IMPORT_JSON);\n+ assertThat(response.statusCode(), is(200));\n+\n+ List<StubMapping> stubs = wireMockServer.listAllStubMappings().getMappings();\n+ assertThat(stubs, everyItem(hasIdAndUuid()));\n+ }\n+\n+ static final String EMPTY_UUID_IMPORT_JSON = \"{\\n\" +\n+ \" \\\"mappings\\\": [\\n\" +\n+ \" {\\n\" +\n+ \" \\\"id\\\": \\\"27d7818b-4df6-4630-a6ab-c50e87e384e1\\\",\\n\" +\n+ \" \\\"uuid\\\": \\\"\\\",\\n\" +\n+ \" \\\"name\\\": \\\"Empty UUID\\\",\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/empty-id\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 204\\n\" +\n+ \" }\\n\" +\n+ \" },\\n\" +\n+ \" {\\n\" +\n+ \" \\\"id\\\": \\\"95b5c478-eb39-4bad-ba55-a336dbfeaa53\\\",\\n\" +\n+ \" \\\"uuid\\\": null,\\n\" +\n+ \" \\\"name\\\": \\\"Null ID\\\",\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"url\\\": \\\"/null-id\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 204\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \" ]\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void treatsEmptyOrNullUuidFieldsAsNotPresent() {\n+ WireMockResponse response = testClient.postJson(\"/__admin/mappings/import\", EMPTY_UUID_IMPORT_JSON);\n+ assertThat(response.statusCode(), is(200));\n+\n+ List<StubMapping> stubs = wireMockServer.listAllStubMappings().getMappings();\n+ assertThat(stubs, everyItem(hasIdAndUuid()));\n+ }\n+\n+ private static final Matcher<StubMapping> hasIdAndUuid() {\n+ return new TypeSafeMatcher<StubMapping>() {\n+ @Override\n+ protected boolean matchesSafely(StubMapping stub) {\n+ return stub.getId() != null && stub.getUuid() != null;\n+ }\n+\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"a stub with a non-null ID and UUID\");\n+ }\n+ };\n+ }\n+\nfinal String SETTINGS_JSON = \"{\\n\" +\n\" \\\"extended\\\": {\\n\" +\n\" \\\"mySetting\\\": 123\\n\" +\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Empty or null stub IDs in JSON are now treated as absent, so that an ID is generated |
686,936 | 09.06.2019 17:30:04 | -3,600 | d4db4466697f62999e0a5e175c447cdde8b9e219 | Fixed - diff line rendering throws an exception when path is / | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/diff/DiffLine.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/diff/DiffLine.java",
"diff": "@@ -80,6 +80,10 @@ class DiffLine<V> {\nreturn true;\n}\n+ if (index < 2) {\n+ return false;\n+ }\n+\nString sub = s.substring(index - 2, index);\nreturn sub.equals(\"\\\\\\\\\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/verification/diff/PlainTextDiffRendererTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/verification/diff/PlainTextDiffRendererTest.java",
"diff": "@@ -32,8 +32,11 @@ import static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\nimport static com.github.tomakehurst.wiremock.matching.MockMultipart.mockPart;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\nimport static com.github.tomakehurst.wiremock.testsupport.TestFiles.file;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalsMultiLine;\n+import static com.github.tomakehurst.wiremock.verification.diff.JUnitStyleDiffRenderer.junitStyleDiffMessage;\n+import static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\npublic class PlainTextDiffRendererTest {\n@@ -388,6 +391,23 @@ public class PlainTextDiffRendererTest {\nassertThat(output, equalsMultiLine(file(\"not-found-diff-sample_only-custom_matcher.txt\")));\n}\n+\n+ @Test\n+ public void handlesUrlsWithQueryStringAndNoPath() {\n+ Diff diff = new Diff(\n+ newRequestPattern(GET, urlMatching(\"/?q=correct\"))\n+ .build(),\n+ mockRequest()\n+ .method(GET)\n+ .url(\"/q=wrong\")\n+ );\n+\n+ String output = diffRenderer.render(diff);\n+ System.out.println(output);\n+\n+ assertThat(output, equalsMultiLine(file(\"not-found-diff-sample_no-path.txt\")));\n+ }\n+\npublic static class MyCustomMatcher extends RequestMatcherExtension {\n@Override\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/resources/not-found-diff-sample_no-path.txt",
"diff": "+\n+ Request was not matched\n+ =======================\n+\n+-----------------------------------------------------------------------------------------------------------------------\n+| Closest stub | Request |\n+-----------------------------------------------------------------------------------------------------------------------\n+ |\n+GET | GET\n+/?q=correct | /q=wrong <<<<< URL does not match. When using a regex, \"?\" should be \"\\\\?\"\n+ |\n+ |\n+-----------------------------------------------------------------------------------------------------------------------\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1136 - diff line rendering throws an exception when path is / |
686,936 | 09.06.2019 20:07:26 | -3,600 | 9b248e384167b8e434516ab91cb8728ca77d29f0 | Fixed - 500 response returned when query parameter contains spaces and no stub is matched | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Encoding.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Encoding.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n+import java.io.UnsupportedEncodingException;\n+import java.net.URLEncoder;\n+\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+\npublic class Encoding {\nprivate static Base64Encoder encoder = null;\n@@ -42,4 +47,13 @@ public class Encoding {\ngetInstance().encode(content) :\nnull;\n}\n+\n+ public static String urlEncode(String unencodedUrl) {\n+ try {\n+ return URLEncoder.encode(unencodedUrl, \"utf-8\");\n+ } catch (UnsupportedEncodingException e) {\n+ return throwUnchecked(e, String.class);\n+ }\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Urls.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Urls.java",
"diff": "@@ -37,6 +37,22 @@ import static com.google.common.collect.FluentIterable.from;\npublic class Urls {\n+ public static Map<String, QueryParameter> splitQueryFromUrl(String url) {\n+ String queryPart = url.contains(\"?\") && !url.endsWith(\"?\") ?\n+ url.substring(url.indexOf('?') + 1) :\n+ null;\n+\n+ return splitQuery(queryPart);\n+ }\n+\n+ public static Map<String, QueryParameter> splitQuery(URI uri) {\n+ if (uri == null) {\n+ return Collections.emptyMap();\n+ }\n+\n+ return splitQuery(uri.getRawQuery());\n+ }\n+\npublic static Map<String, QueryParameter> splitQuery(String query) {\nif (query == null) {\nreturn Collections.emptyMap();\n@@ -62,6 +78,12 @@ public class Urls {\n});\n}\n+ public static String getPath(String url) {\n+ return url.contains(\"?\") ?\n+ url.substring(0, url.indexOf(\"?\")) :\n+ url;\n+ }\n+\npublic static String urlToPathParts(URI uri) {\nIterable<String> uriPathNodes = Splitter.on(\"/\").omitEmptyStrings().split(uri.getPath());\nint nodeCount = Iterables.size(uriPathNodes);\n@@ -73,14 +95,6 @@ public class Urls {\n\"\";\n}\n- public static Map<String, QueryParameter> splitQuery(URI uri) {\n- if (uri == null) {\n- return Collections.emptyMap();\n- }\n-\n- return splitQuery(uri.getRawQuery());\n- }\n-\npublic static String decode(String encoded) {\ntry {\nreturn URLDecoder.decode(encoded, \"utf-8\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"diff": "@@ -22,6 +22,7 @@ import com.github.tomakehurst.wiremock.admin.NotFoundException;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\nimport com.github.tomakehurst.wiremock.common.InvalidInputException;\nimport com.github.tomakehurst.wiremock.common.NotPermittedException;\n+import com.github.tomakehurst.wiremock.common.Urls;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilter;\nimport com.github.tomakehurst.wiremock.security.Authenticator;\n@@ -74,7 +75,7 @@ public class AdminRequestHandler extends AbstractRequestHandler {\n}\nnotifier().info(\"Admin request received:\\n\" + formatRequest(request));\n- String path = URI.create(withoutAdminRoot(request.getUrl())).getPath();\n+ String path = Urls.getPath(withoutAdminRoot(request.getUrl()));\ntry {\nAdminTask adminTask = adminRoutes.taskFor(request.getMethod(), path);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"diff": "@@ -23,7 +23,6 @@ import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.QueryParameter;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n-import com.github.tomakehurst.wiremock.jetty9.DefaultMultipartRequestConfigurer;\nimport com.github.tomakehurst.wiremock.jetty9.JettyUtils;\nimport com.google.common.base.Function;\nimport com.google.common.base.Optional;\n@@ -35,7 +34,6 @@ import com.google.common.collect.Maps;\nimport java.io.IOException;\nimport java.nio.charset.Charset;\nimport java.util.*;\n-import javax.servlet.MultipartConfigElement;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletRequest;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/LoggedRequest.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/LoggedRequest.java",
"diff": "@@ -37,13 +37,12 @@ import java.util.Set;\nimport java.nio.charset.Charset;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n-import static com.github.tomakehurst.wiremock.common.Urls.safelyCreateURL;\n+import static com.github.tomakehurst.wiremock.common.Urls.*;\nimport static com.google.common.base.Charsets.UTF_8;\nimport static com.github.tomakehurst.wiremock.common.Encoding.decodeBase64;\nimport static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\nimport static com.github.tomakehurst.wiremock.common.Strings.stringFromBytes;\n-import static com.github.tomakehurst.wiremock.common.Urls.splitQuery;\nimport static com.github.tomakehurst.wiremock.http.HttpHeaders.copyOf;\nimport static com.google.common.base.MoreObjects.firstNonNull;\nimport static com.google.common.collect.FluentIterable.from;\n@@ -67,7 +66,8 @@ public class LoggedRequest implements Request {\nprivate final Collection<Part> multiparts;\npublic static LoggedRequest createFrom(Request request) {\n- return new LoggedRequest(request.getUrl(),\n+ return new LoggedRequest(\n+ request.getUrl(),\nrequest.getAbsoluteUrl(),\nrequest.getMethod(),\nrequest.getClientIp(),\n@@ -126,7 +126,7 @@ public class LoggedRequest implements Request {\nthis.body = body;\nthis.headers = headers;\nthis.cookies = cookies;\n- this.queryParams = splitQuery(URI.create(url));\n+ this.queryParams = splitQueryFromUrl(url);\nthis.isBrowserProxyRequest = isBrowserProxyRequest;\nthis.loggedDate = loggedDate;\nthis.multiparts = multiparts;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/NotMatchedPageAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/NotMatchedPageAcceptanceTest.java",
"diff": "@@ -37,6 +37,7 @@ import static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHea\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalsMultiLine;\nimport static com.github.tomakehurst.wiremock.verification.notmatched.PlainTextStubNotMatchedRenderer.CONSOLE_WIDTH_HEADER_KEY;\nimport static com.google.common.net.HttpHeaders.CONTENT_TYPE;\n+import static org.hamcrest.Matchers.containsString;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -154,8 +155,18 @@ public class NotMatchedPageAcceptanceTest {\nassertThat(response.content(), is(\"No you don't!\"));\n}\n+ @Test\n+ public void returns404AndDiffReportWhenPlusSymbolInQuery() {\n+ configure();\n+\n+ WireMockResponse response = testClient.get(\"/some/api/records?sort=updated+asc&filter_updated_gt=2019-01-02\");\n+\n+ assertThat(response.statusCode(), is(404));\n+ assertThat(response.content(), containsString(\"No response could be served\"));\n+ }\n+\nprivate void configure() {\n- configure(WireMockConfiguration.wireMockConfig());\n+ configure(WireMockConfiguration.wireMockConfig().dynamicPort());\n}\nprivate void configure(WireMockConfiguration options) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/common/UrlsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/common/UrlsTest.java",
"diff": "@@ -19,10 +19,10 @@ import com.github.tomakehurst.wiremock.http.QueryParameter;\nimport org.junit.Test;\nimport java.net.URI;\n+import java.util.List;\nimport java.util.Map;\n-import static org.hamcrest.Matchers.hasItems;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\npublic class UrlsTest {\n@@ -82,4 +82,68 @@ public class UrlsTest {\nString pathParts = Urls.urlToPathParts(URI.create(\"/foo/bar/zoo/wire/mock?param=value\"));\nassertThat(pathParts, is(\"foo-bar-zoo-wire-mock\"));\n}\n+\n+ @Test\n+ public void splitsQueryFromUrl() {\n+ Map<String, QueryParameter> query = Urls.splitQueryFromUrl(\"/a/b?one=1&one=11&two=2\");\n+\n+ List<String> oneValues = query.get(\"one\").values();\n+ assertThat(oneValues, hasItems(\"1\", \"11\"));\n+ assertThat(oneValues, hasItem(\"11\"));\n+ assertThat(query.get(\"two\").firstValue(), is(\"2\"));\n+ }\n+\n+ @Test\n+ public void splitsQueryFromUrlWithTrailingSlash() {\n+ Map<String, QueryParameter> query = Urls.splitQueryFromUrl(\"/a/b/?one=1&one=11&two=2\");\n+\n+ List<String> oneValues = query.get(\"one\").values();\n+ assertThat(oneValues, hasItems(\"1\", \"11\"));\n+ assertThat(oneValues, hasItem(\"11\"));\n+ assertThat(query.get(\"two\").firstValue(), is(\"2\"));\n+ }\n+\n+ @Test\n+ public void splitQueryFromUrlHandlesUrlThatEndsWithQuestionMark() {\n+ Map<String, QueryParameter> query = Urls.splitQueryFromUrl(\"/a/b/?\");\n+ assertThat(query.isEmpty(), is(true));\n+ }\n+\n+ @Test\n+ public void splitQueryFromUrlReturnsEmptyWhenNoQuery() {\n+ Map<String, QueryParameter> query = Urls.splitQueryFromUrl(\"/a/b\");\n+ assertThat(query.isEmpty(), is(true));\n+ }\n+\n+ @Test\n+ public void splitQueryFromUrlReturnsEmptyWhenTrailingSlashAndNoQuery() {\n+ Map<String, QueryParameter> query = Urls.splitQueryFromUrl(\"/a/b/\");\n+ assertThat(query.isEmpty(), is(true));\n+ }\n+\n+ @Test\n+ public void getsThePathFromAUrlWithAQueryString() {\n+ assertThat(Urls.getPath(\"/one/two/3?q=a\"), is(\"/one/two/3\"));\n+ }\n+\n+ @Test\n+ public void getsThePathFromAUrlWithoutAQueryString() {\n+ assertThat(Urls.getPath(\"/one/two/3\"), is(\"/one/two/3\"));\n+ }\n+\n+ @Test\n+ public void getsThePathFromAUrlWithATrailingSlashAndQueryString() {\n+ assertThat(Urls.getPath(\"/one/two/3/?q=a\"), is(\"/one/two/3/\"));\n+ }\n+\n+ @Test\n+ public void getsThePathFromAUrlWithRootPathAndQuery() {\n+ assertThat(Urls.getPath(\"/?q=a\"), is(\"/\"));\n+ }\n+\n+ @Test\n+ public void getsThePathFromAUrlWithJustAQuery() {\n+ assertThat(Urls.getPath(\"?q=a\"), is(\"\"));\n+ }\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1128 - 500 response returned when query parameter contains spaces and no stub is matched |
687,055 | 12.06.2019 04:28:42 | -33,480 | f236dec94fb1425b8704cec26cdbfea3686104bd | Update README with gradlew invocation required to build standalone jar | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -49,7 +49,8 @@ To run all of WireMock's tests:\nTo build both JARs (thin and standalone):\n```bash\n-./gradlew jar shadowJar\n+./gradlew -c release-settings.gradle :java8:shadowJar\n```\n-The built JARs will be placed under ``build/libs``.\n+The built JAR will be placed under ``java8/build/libs``.\n+\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Update README with gradlew invocation required to build standalone jar (#1135) |
686,942 | 11.06.2019 22:41:17 | -7,200 | 5275c37967ed9270db04f641942058669ec52907 | Fixed some documentation issues. | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -33,7 +33,7 @@ stubFor(any(urlPathEqualTo(\"/everything\"))\naMultipart()\n.withName(\"info\")\n.withHeader(\"Content-Type\", containing(\"charset\"))\n- .withMultipartBody(equalToJson(\"{}\"))\n+ .withBody(equalToJson(\"{}\"))\n)\n.willReturn(aResponse()));\n```\n@@ -306,7 +306,7 @@ Deems a match if the entire attribute value matched the expected regular express\nJava:\n```java\n-.withQueryParam(\"search_term\", matches(\"^(.*)wiremock([A-Za-z]+)$\"))\n+.withQueryParam(\"search_term\", matching(\"^(.*)wiremock([A-Za-z]+)$\"))\n```\nJSON:\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed some documentation issues. (#1076) |
686,936 | 13.06.2019 19:32:53 | -3,600 | b23d54a1be5a1a92b34cb51de8f4a5801c80ca9d | Added methods to Metadata for conversion to and from an arbitrary object | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Metadata.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Metadata.java",
"diff": "@@ -88,10 +88,18 @@ public class Metadata extends LinkedHashMap<String, Object> {\ncheckArgument(containsKey(key), key + \"' not present\");\n}\n+ public static <T> Metadata from(T myData) {\n+ return new Metadata(Json.objectToMap(myData));\n+ }\n+\npublic static Builder metadata() {\nreturn new Builder();\n}\n+ public <T> T as(Class<T> myDataClass) {\n+ return Json.mapToObject(this, myDataClass);\n+ }\n+\npublic static class Builder {\nprivate final ImmutableMap.Builder<String, Object> mapBuilder;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/Parameters.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/Parameters.java",
"diff": "@@ -44,7 +44,4 @@ public class Parameters extends Metadata {\nreturn from(Json.objectToMap(myData));\n}\n- public <T> T as(Class<T> myDataClass) {\n- return Json.mapToObject(this, myDataClass);\n- }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added methods to Metadata for conversion to and from an arbitrary object |
686,936 | 13.06.2019 19:53:56 | -3,600 | ba4ec4dd0ad2e42e04341a901972504c2eae25a6 | Added the ability to PUT global settings in a wrapper JSON object | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -102,6 +102,7 @@ public class AdminRoutes {\nrouter.add(GET, \"/settings\", GetGlobalSettingsTask.class);\nrouter.add(PUT, \"/settings\", GlobalSettingsUpdateTask.class);\nrouter.add(POST, \"/settings\", GlobalSettingsUpdateTask.class);\n+\nrouter.add(POST, \"/shutdown\", ShutdownServerTask.class);\nrouter.add(GET, \"/docs/swagger\", GetSwaggerSpecTask.class);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/GlobalSettingsUpdateTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/GlobalSettingsUpdateTask.java",
"diff": "package com.github.tomakehurst.wiremock.admin.tasks;\nimport com.github.tomakehurst.wiremock.admin.AdminTask;\n+import com.github.tomakehurst.wiremock.admin.model.GetGlobalSettingsResult;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\n@@ -27,7 +28,13 @@ public class GlobalSettingsUpdateTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n- GlobalSettings newSettings = Json.read(request.getBodyAsString(), GlobalSettings.class);\n+ GlobalSettings newSettings;\n+ try {\n+ newSettings = Json.read(request.getBodyAsString(), GlobalSettings.class);\n+ } catch (Exception e) {\n+ newSettings = Json.read(request.getBodyAsString(), GetGlobalSettingsResult.class).getSettings();\n+ }\n+\nadmin.updateGlobalSettings(newSettings);\nreturn ResponseDefinition.ok();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -20,6 +20,9 @@ import com.github.tomakehurst.wiremock.common.Errors;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.TextFile;\n+import com.github.tomakehurst.wiremock.global.GlobalSettings;\n+import com.github.tomakehurst.wiremock.http.DelayDistribution;\n+import com.github.tomakehurst.wiremock.http.UniformDistribution;\nimport com.github.tomakehurst.wiremock.junit.Stubbing;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -30,6 +33,7 @@ import com.toomuchcoding.jsonassert.JsonVerifiable;\nimport org.apache.http.entity.StringEntity;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matcher;\n+import org.hamcrest.Matchers;\nimport org.hamcrest.TypeSafeMatcher;\nimport org.junit.After;\nimport org.junit.Test;\n@@ -799,6 +803,37 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(wireMockServer.getGlobalSettings().getSettings().getExtended().getInt(\"mySetting\"), is(123));\n}\n+ final String WRAPPED_SETTINGS_JSON = \"{\\n\" +\n+ \" \\\"settings\\\": {\\n\" +\n+ \" \\\"delayDistribution\\\": {\\n\" +\n+ \" \\\"type\\\": \\\"uniform\\\",\\n\" +\n+ \" \\\"lower\\\": 100,\\n\" +\n+ \" \\\"upper\\\": 300\\n\" +\n+ \" },\\n\" +\n+ \"\\n\" +\n+ \" \\\"extended\\\": {\\n\" +\n+ \" \\\"one\\\": 1,\\n\" +\n+ \" \\\"two\\\": {\\n\" +\n+ \" \\\"name\\\": \\\"abc\\\"\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void updateGlobalSettingsViaPutWithWrapper() {\n+ WireMockResponse response = testClient.putWithBody(\"/__admin/settings\", WRAPPED_SETTINGS_JSON, \"application/json\");\n+\n+ assertThat(response.statusCode(), is(200));\n+\n+ GlobalSettings settings = wireMockServer.getGlobalSettings().getSettings();\n+ assertThat(settings.getDelayDistribution(), Matchers.<DelayDistribution>instanceOf(UniformDistribution.class));\n+ assertThat(settings.getExtended().getInt(\"one\"), is(1));\n+ assertThat(settings.getExtended().getMetadata(\"two\").as(TestExtendedSettingsData.class).name, is(\"abc\"));\n+ }\n+\n+\n+\nstatic final String STUB_IMPORT_JSON = \"{\\n\" +\n\" \\\"mappings\\\": [\\n\" +\n\" {\\n\" +\n@@ -838,4 +873,8 @@ public class AdminApiTest extends AcceptanceTestBase {\n}\n+ public static class TestExtendedSettingsData {\n+ public String name;\n+ }\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added the ability to PUT global settings in a wrapper JSON object |
686,936 | 13.06.2019 20:28:25 | -3,600 | 828af52f6ed2a2b5151aefe35ff3942269511099 | Added ability to patch extended global settings | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -102,6 +102,7 @@ public class AdminRoutes {\nrouter.add(GET, \"/settings\", GetGlobalSettingsTask.class);\nrouter.add(PUT, \"/settings\", GlobalSettingsUpdateTask.class);\nrouter.add(POST, \"/settings\", GlobalSettingsUpdateTask.class);\n+ router.add(PATCH, \"/settings/extended\", PatchExtendedSettingsTask.class);\nrouter.add(POST, \"/shutdown\", ShutdownServerTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/PatchExtendedSettingsTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.ExtendedSettingsWrapper;\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.common.Json;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.global.GlobalSettings;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+public class PatchExtendedSettingsTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ ExtendedSettingsWrapper extendedSettingsWrapper = Json.read(request.getBodyAsString(), ExtendedSettingsWrapper.class);\n+ Parameters newExtended = extendedSettingsWrapper.getExtended();\n+\n+ GlobalSettings existingSettings = admin.getGlobalSettings().getSettings();\n+ Parameters existingExtended = existingSettings.getExtended();\n+\n+ Parameters extended = existingExtended.merge(newExtended);\n+\n+ GlobalSettings newGlobalSettings = existingSettings\n+ .copy()\n+ .extended(extended)\n+ .build();\n+\n+ admin.updateGlobalSettings(newGlobalSettings);\n+\n+ return ResponseDefinition.okEmptyJson();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ExtendedSettingsWrapper.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+\n+public class ExtendedSettingsWrapper {\n+\n+ private final Parameters extended;\n+\n+ public ExtendedSettingsWrapper(@JsonProperty(\"extended\") Parameters extended) {\n+ this.extended = extended;\n+ }\n+\n+ public Parameters getExtended() {\n+ return extended;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/Parameters.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/Parameters.java",
"diff": "@@ -20,6 +20,7 @@ import com.github.tomakehurst.wiremock.common.Metadata;\nimport com.google.common.collect.ImmutableMap;\nimport java.util.HashMap;\n+import java.util.LinkedHashMap;\nimport java.util.Map;\nimport static com.google.common.base.Preconditions.checkArgument;\n@@ -44,4 +45,9 @@ public class Parameters extends Metadata {\nreturn from(Json.objectToMap(myData));\n}\n+ public Parameters merge(Parameters other) {\n+ Map<String, Object> attributes = new LinkedHashMap<>(this);\n+ attributes.putAll(other);\n+ return Parameters.from(attributes);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AdminApiTest.java",
"diff": "@@ -20,6 +20,7 @@ import com.github.tomakehurst.wiremock.common.Errors;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.TextFile;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.DelayDistribution;\nimport com.github.tomakehurst.wiremock.http.UniformDistribution;\n@@ -832,7 +833,27 @@ public class AdminApiTest extends AcceptanceTestBase {\nassertThat(settings.getExtended().getMetadata(\"two\").as(TestExtendedSettingsData.class).name, is(\"abc\"));\n}\n+ final String EXTENDED_JSON = \"{\\n\" +\n+ \" \\\"extended\\\": {\\n\" +\n+ \" \\\"one\\\": 11,\\n\" +\n+ \" \\\"three\\\": 3\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void patchExtendedGlobalSettings() {\n+ wireMockServer.updateGlobalSettings(GlobalSettings.builder()\n+ .extended(Parameters.one(\"two\", 2))\n+ .build());\n+\n+ WireMockResponse response = testClient.patchWithBody(\"/__admin/settings/extended\", EXTENDED_JSON, \"application/json\");\n+ assertThat(response.statusCode(), is(200));\n+ Parameters extended = wireMockServer.getGlobalSettings().getSettings().getExtended();\n+ assertThat(extended.getInt(\"one\"), is(11));\n+ assertThat(extended.getInt(\"two\"), is(2));\n+ assertThat(extended.getInt(\"three\"), is(3));\n+ }\nstatic final String STUB_IMPORT_JSON = \"{\\n\" +\n\" \\\"mappings\\\": [\\n\" +\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to patch extended global settings |
686,936 | 16.06.2019 20:16:38 | -3,600 | 89c747faefa2c6fbed9b176b7d8a3eb5173429c6 | Added a test case for Content-Length being correctly returned for gzipped responses | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/GzipAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/GzipAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n+import com.github.tomakehurst.wiremock.common.Gzip;\n+import com.github.tomakehurst.wiremock.core.Options;\n+import com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.apache.commons.lang3.JavaVersion;\n+import org.apache.commons.lang3.RandomStringUtils;\nimport org.apache.http.HttpEntity;\nimport org.apache.http.client.entity.GzipCompressingEntity;\nimport org.apache.http.entity.ContentType;\nimport org.apache.http.entity.StringEntity;\n+import org.eclipse.jetty.util.Jetty;\n+import org.junit.Before;\n+import org.junit.Rule;\nimport org.junit.Test;\n+import org.junit.experimental.runners.Enclosed;\n+import org.junit.runner.RunWith;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.common.Gzip.gzip;\nimport static com.github.tomakehurst.wiremock.common.Gzip.unGzipToString;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n+import static org.junit.Assume.assumeTrue;\n-public class GzipAcceptanceTest extends AcceptanceTestBase {\n+@RunWith(Enclosed.class)\n+public class GzipAcceptanceTest {\n+\n+ public static class ChunkedTransferEncoding extends AcceptanceTestBase {\n@Test\n- public void servesGzippedResponseForGet() throws Exception {\n+ public void servesGzippedResponseForGet() {\nwireMockServer.stubFor(get(urlEqualTo(\"/gzip-response\")).willReturn(aResponse().withBody(\"body text\")));\nWireMockResponse response = testClient.get(\"/gzip-response\", withHeader(\"Accept-Encoding\", \"gzip,deflate\"));\nassertThat(response.firstHeader(\"Content-Encoding\"), is(\"gzip\"));\n+ assertThat(response.firstHeader(\"Transfer-Encoding\"), is(\"chunked\"));\n+ assertThat(response.headers().containsKey(\"Content-Length\"), is(false));\nbyte[] gzippedContent = response.binaryContent();\n@@ -71,3 +90,41 @@ public class GzipAcceptanceTest extends AcceptanceTestBase {\nassertThat(response.content(), is(\"response body\"));\n}\n}\n+\n+ public static class NoChunkedTransferEncoding {\n+\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(wireMockConfig()\n+ .dynamicPort()\n+ .useChunkedTransferEncoding(Options.ChunkedEncodingPolicy.NEVER));\n+\n+ WireMockTestClient testClient;\n+\n+ @Before\n+ public void init() {\n+ testClient = new WireMockTestClient(wm.port());\n+ }\n+\n+ @Test\n+ public void returnsContentLengthHeaderWhenChunkedEncodingDisabled() {\n+ assumeTrue(isNotOldJettyVersion());\n+\n+ String bodyText = RandomStringUtils.randomAlphabetic(257); // 256 bytes is the minimum size for gzip to be used\n+ wm.stubFor(get(\"/gzip-response\").willReturn(ok(bodyText)));\n+\n+ WireMockResponse response = testClient.get(\"/gzip-response\", withHeader(\"Accept-Encoding\", \"gzip,deflate\"));\n+ assertThat(response.firstHeader(\"Content-Encoding\"), is(\"gzip\"));\n+ assertThat(response.headers().containsKey(\"Transfer-Encoding\"), is(false));\n+ assertThat(response.firstHeader(\"Content-Length\"), is(String.valueOf(gzip(bodyText).length)));\n+\n+ byte[] gzippedContent = response.binaryContent();\n+\n+ String plainText = unGzipToString(gzippedContent);\n+ assertThat(plainText, is(bodyText));\n+ }\n+\n+ private boolean isNotOldJettyVersion() {\n+ return !Jetty.VERSION.contains(\"9.2.\");\n+ }\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a test case for Content-Length being correctly returned for gzipped responses |
686,936 | 16.06.2019 20:46:14 | -3,600 | 87af1c9bcf0287f1545931d931da8c9203d2c3e6 | Fixed a bug causing a 500 to be returned when a plus is present in a query parameter and running in Java 8/Jetty 9.4+ | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyUtils.java",
"diff": "@@ -17,6 +17,7 @@ package com.github.tomakehurst.wiremock.jetty9;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.net.Socket;\nimport java.net.URI;\n@@ -27,6 +28,7 @@ import javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServletResponse;\nimport javax.servlet.http.HttpServletResponseWrapper;\n+import org.eclipse.jetty.http.HttpURI;\nimport org.eclipse.jetty.io.ssl.SslConnection;\nimport org.eclipse.jetty.server.HttpChannel;\nimport org.eclipse.jetty.server.Request;\n@@ -81,8 +83,22 @@ public class JettyUtils {\n}\npublic static URI getUri(Request request) {\n+ HttpURI httpUri = getHttpUri(request);\n+\n+ URI uri;\n+ try {\n+ Method getUriMethod = HttpURI.class.getDeclaredMethod(\"toURI\");\n+ uri = (URI) getUriMethod.invoke(httpUri);\n+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | InvocationTargetException e) {\n+ uri = URI.create(httpUri.toString());\n+ }\n+\n+ return uri;\n+ }\n+\n+ private static HttpURI getHttpUri(Request request) {\ntry {\n- return toUri(getURIMethodFromClass(request.getClass()).invoke(request));\n+ return (HttpURI) getURIMethodFromClass(request.getClass()).invoke(request);\n} catch (Exception e) {\nthrow new IllegalArgumentException(request + \" does not have a getUri or getHttpURI method\");\n}\n@@ -102,7 +118,5 @@ public class JettyUtils {\nreturn method;\n}\n- private static URI toUri(Object httpURI) {\n- return URI.create(httpURI.toString());\n- }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/NotMatchedPageAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/NotMatchedPageAcceptanceTest.java",
"diff": "@@ -160,6 +160,7 @@ public class NotMatchedPageAcceptanceTest {\nconfigure();\nWireMockResponse response = testClient.get(\"/some/api/records?sort=updated+asc&filter_updated_gt=2019-01-02\");\n+ System.err.println(response.content());\nassertThat(response.statusCode(), is(404));\nassertThat(response.content(), containsString(\"No response could be served\"));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed a bug causing a 500 to be returned when a plus is present in a query parameter and running in Java 8/Jetty 9.4+ |
686,936 | 16.06.2019 20:49:37 | -3,600 | 29cf401d0238f2fa9bf5d6a398d591f1b3f60a83 | Bumped up minor version | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -26,7 +26,7 @@ allprojects {\napply plugin: 'project-report'\ngroup = 'com.github.tomakehurst'\n- version = '2.23.2'\n+ version = '2.24.0'\nsourceCompatibility = 1.7\ntargetCompatibility = 1.7\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_config.yml",
"new_path": "docs-v2/_config.yml",
"diff": "@@ -216,4 +216,4 @@ compress_html:\nignore:\nenvs: development\n-wiremock_version: 2.23.2\n+wiremock_version: 2.24.0\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"new_path": "src/main/resources/swagger/wiremock-admin-api.yaml",
"diff": "@@ -2,7 +2,7 @@ openapi: 3.0.0\ninfo:\ntitle: WireMock\n- version: 2.23.2\n+ version: 2.24.0\nexternalDocs:\ndescription: WireMock user documentation\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Bumped up minor version |
686,983 | 24.06.2019 11:23:25 | -7,200 | 1ba634bdb676e8acc27ed2be4d07e1d2813c46ab | Upgrade jackson to avoid CVEs | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -40,8 +40,8 @@ allprojects {\nhandlebars : '4.0.7',\njetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\nguava : '20.0',\n- jackson : '2.9.8',\n- jacksonDatabind: '2.9.8',\n+ jackson : '2.9.9',\n+ jacksonDatabind: '2.9.9',\nxmlUnit : '2.6.2'\n],\n@@ -49,8 +49,8 @@ allprojects {\nhandlebars : '4.1.2',\njetty : '9.4.15.v20190215',\nguava : '27.0.1-jre',\n- jackson : '2.9.8',\n- jacksonDatabind: '2.9.8',\n+ jackson : '2.9.9',\n+ jacksonDatabind: '2.9.9',\nxmlUnit : '2.6.2'\n]\n]\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgrade jackson to avoid CVEs (#1140) |
686,936 | 30.06.2019 17:42:50 | -3,600 | eac0bfa811d36124397dd03470930fad4ff1d0ba | Fixed - NPE thrown from the diff renderer when verifying an absent body | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/AbsentPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/AbsentPattern.java",
"diff": "@@ -27,4 +27,9 @@ public class AbsentPattern extends StringValuePattern {\npublic MatchResult match(String value) {\nreturn MatchResult.of(value == null);\n}\n+\n+ @Override\n+ public String getExpected() {\n+ return \"(absent)\";\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPattern.java",
"diff": "@@ -27,6 +27,7 @@ import com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableMap;\n+import org.apache.commons.lang3.StringUtils;\nimport java.util.*;\n@@ -262,10 +263,13 @@ public class RequestPattern implements NamedValueMatcher<Request> {\n@Override\npublic MatchResult apply(ContentPattern pattern) {\nif (StringValuePattern.class.isAssignableFrom(pattern.getClass())) {\n- return pattern.match(request.getBodyAsString());\n+ String body = StringUtils.isEmpty(request.getBodyAsString()) ?\n+ null :\n+ request.getBodyAsString();\n+ return pattern.match(body);\n}\n- return ((BinaryEqualToPattern) pattern).match(request.getBody());\n+ return pattern.match(request.getBody());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"diff": "@@ -26,39 +26,18 @@ import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.RequestJournalDisabledException;\nimport com.google.common.base.Optional;\n+import org.apache.http.HttpEntity;\n+import org.apache.http.entity.ByteArrayEntity;\nimport org.apache.http.entity.StringEntity;\nimport org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\nimport org.junit.runner.RunWith;\n+import javax.swing.text.html.parser.Entity;\nimport java.util.List;\n-import static com.github.tomakehurst.wiremock.client.WireMock.containing;\n-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;\n-import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;\n-import static com.github.tomakehurst.wiremock.client.WireMock.equalToXml;\n-import static com.github.tomakehurst.wiremock.client.WireMock.exactly;\n-import static com.github.tomakehurst.wiremock.client.WireMock.findAll;\n-import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.lessThan;\n-import static com.github.tomakehurst.wiremock.client.WireMock.lessThanOrExactly;\n-import static com.github.tomakehurst.wiremock.client.WireMock.matching;\n-import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;\n-import static com.github.tomakehurst.wiremock.client.WireMock.matchingXPath;\n-import static com.github.tomakehurst.wiremock.client.WireMock.moreThan;\n-import static com.github.tomakehurst.wiremock.client.WireMock.moreThanOrExactly;\n-import static com.github.tomakehurst.wiremock.client.WireMock.notMatching;\n-import static com.github.tomakehurst.wiremock.client.WireMock.patchRequestedFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.requestMadeFor;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;\n-import static com.github.tomakehurst.wiremock.client.WireMock.verify;\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.forCustomMatcher;\n@@ -422,6 +401,20 @@ public class VerificationAcceptanceTest {\n.withoutHeader(\"Content-Type\"));\n}\n+ @Test\n+ public void verifiesBodyAbsent() throws Exception {\n+ testClient.post(\"/no/body\", new StringEntity(\"\"));\n+ verify(postRequestedFor(urlEqualTo(\"/no/body\"))\n+ .withRequestBody(absent()));\n+ }\n+\n+ @Test(expected = VerificationException.class)\n+ public void failsVerificationWhenAbsentBodyPresent() throws Exception {\n+ testClient.post(\"/no/body\", new StringEntity(\"not absent\"));\n+ verify(postRequestedFor(urlEqualTo(\"/no/body\"))\n+ .withRequestBody(absent()));\n+ }\n+\n@Test\npublic void showsDiffWithNearestMissWhenNoRequestsMatchedAndNearMissesAreAvailable() {\ntestClient.get(\"/my-near-miss\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/verification/diff/DiffTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/verification/diff/DiffTest.java",
"diff": "@@ -447,4 +447,27 @@ public class DiffTest {\n)\n));\n}\n+\n+ @Test\n+ public void handlesAbsentRequestBody() {\n+ Diff diff = new Diff(\n+ newRequestPattern(POST, urlEqualTo(\"/thing\"))\n+ .withRequestBody(absent())\n+ .build(),\n+ mockRequest()\n+ .method(POST)\n+ .body(\"not absent\")\n+ .url(\"/thing\")\n+ );\n+\n+ assertThat(diff.toString(), is(\n+ junitStyleDiffMessage(\n+ \"POST\\n\" +\n+ \"/thing\\n\\n\" +\n+ \"(absent)\",\n+ \"POST\\n\" +\n+ \"/thing\\n\\n\" +\n+ \"not absent\")\n+ ));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1144 - NPE thrown from the diff renderer when verifying an absent body |
686,936 | 02.07.2019 09:28:28 | -3,600 | d9cfd040ac86f48ce40b48e479cc46374dd057e8 | Added a before listener method for global settings, allowing changes to be vetoed | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -392,10 +392,15 @@ public class WireMockApp implements StubServer, Admin {\n@Override\npublic void updateGlobalSettings(GlobalSettings newSettings) {\nGlobalSettings oldSettings = globalSettingsHolder.get();\n+\n+ for (GlobalSettingsListener listener: globalSettingsListeners) {\n+ listener.beforeGlobalSettingsUpdated(oldSettings, newSettings);\n+ }\n+\nglobalSettingsHolder.replaceWith(newSettings);\nfor (GlobalSettingsListener listener: globalSettingsListeners) {\n- listener.globalSettingsUpdated(oldSettings, newSettings);\n+ listener.afterGlobalSettingsUpdated(oldSettings, newSettings);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/GlobalSettingsListener.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/GlobalSettingsListener.java",
"diff": "@@ -19,5 +19,6 @@ import com.github.tomakehurst.wiremock.global.GlobalSettings;\npublic interface GlobalSettingsListener extends Extension {\n- void globalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings);\n+ void beforeGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings);\n+ void afterGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/GlobalSettingsListenerExtensionTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/GlobalSettingsListenerExtensionTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n+import com.github.tomakehurst.wiremock.common.ClientError;\n+import com.github.tomakehurst.wiremock.common.Errors;\n+import com.github.tomakehurst.wiremock.common.JsonException;\nimport com.github.tomakehurst.wiremock.extension.GlobalSettingsListener;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport org.junit.Before;\nimport org.junit.Rule;\nimport org.junit.Test;\n+import org.junit.experimental.runners.Enclosed;\n+import org.junit.runner.RunWith;\nimport java.util.ArrayList;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\n-import static org.hamcrest.Matchers.endsWith;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\n+import static org.junit.Assert.fail;\n+@RunWith(Enclosed.class)\npublic class GlobalSettingsListenerExtensionTest {\n+ public static class Listening {\n+\nTestGlobalSettingsListener listener = new TestGlobalSettingsListener();\n@Rule\n@@ -50,12 +58,15 @@ public class GlobalSettingsListenerExtensionTest {\n.fixedDelay(100)\n.build());\n+ listener.events.clear();\n+\nwm.updateGlobalSettings(GlobalSettings.builder()\n.fixedDelay(200)\n.build());\nassertThat(listener.events.size(), is(2));\n- assertThat(listener.events.get(1), is(\"globalSettingsUpdated, old: 100, new: 200\"));\n+ assertThat(listener.events.get(0), is(\"beforeGlobalSettingsUpdated, old: 100, new: 200\"));\n+ assertThat(listener.events.get(1), is(\"afterGlobalSettingsUpdated, old: 100, new: 200\"));\n}\npublic static class TestGlobalSettingsListener implements GlobalSettingsListener {\n@@ -68,8 +79,52 @@ public class GlobalSettingsListenerExtensionTest {\n}\n@Override\n- public void globalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings) {\n- events.add(\"globalSettingsUpdated, old: \" + oldSettings.getFixedDelay() + \", new: \" + newSettings.getFixedDelay());\n+ public void beforeGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings) {\n+ events.add(\"beforeGlobalSettingsUpdated, old: \" + oldSettings.getFixedDelay() + \", new: \" + newSettings.getFixedDelay());\n+ }\n+\n+ @Override\n+ public void afterGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings) {\n+ events.add(\"afterGlobalSettingsUpdated, old: \" + oldSettings.getFixedDelay() + \", new: \" + newSettings.getFixedDelay());\n+ }\n+ }\n+ }\n+\n+ public static class Vetoing {\n+\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(options()\n+ .dynamicPort()\n+ .extensions(new VetoingTestGlobalSettingsListener()));\n+\n+ @Test\n+ public void settingsUpdateCanBeVetoedByThrowningAnException() {\n+ try {\n+ wm.updateGlobalSettings(GlobalSettings.builder()\n+ .fixedDelay(100)\n+ .build());\n+ fail();\n+ } catch (ClientError e) {\n+ assertThat(e.getErrors().first().getTitle(), is(\"missing required element\"));\n+ assertThat(wm.getGlobalSettings().getSettings().getFixedDelay(), nullValue());\n+ }\n+ }\n+\n+ public static class VetoingTestGlobalSettingsListener implements GlobalSettingsListener {\n+\n+ @Override\n+ public String getName() {\n+ return \"vetoing-settings-listener\";\n+ }\n+\n+ @Override\n+ public void beforeGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings) {\n+ throw JsonException.fromErrors(Errors.single(123, \"/one/two\", \"missing required element\"));\n}\n+\n+ @Override\n+ public void afterGlobalSettingsUpdated(GlobalSettings oldSettings, GlobalSettings newSettings) {}\n}\n}\n+\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a before listener method for global settings, allowing changes to be vetoed |
686,936 | 17.07.2019 17:06:38 | -3,600 | 3b46b0bcef963e675d7ea32a8bb968625c206486 | Fixed - Added ability to disable gzip | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"diff": "@@ -68,4 +68,5 @@ public interface Options {\nNotMatchedRenderer getNotMatchedRenderer();\nAsynchronousResponseSettings getAsynchronousResponseSettings();\nChunkedEncodingPolicy getChunkedEncodingPolicy();\n+ boolean getGzipDisabled();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"diff": "@@ -92,6 +92,7 @@ public class WireMockConfiguration implements Options {\nprivate boolean asynchronousResponseEnabled;\nprivate int asynchronousResponseThreads;\nprivate ChunkedEncodingPolicy chunkedEncodingPolicy;\n+ private boolean gzipDisabled = false;\nprivate MappingsSource getMappingsSource() {\nif (mappingsSource == null) {\n@@ -336,6 +337,11 @@ public class WireMockConfiguration implements Options {\nreturn this;\n}\n+ public WireMockConfiguration gzipDisabled(boolean gzipDisabled) {\n+ this.gzipDisabled = gzipDisabled;\n+ return this;\n+ }\n+\n@Override\npublic int portNumber() {\nreturn portNumber;\n@@ -475,4 +481,9 @@ public class WireMockConfiguration implements Options {\npublic ChunkedEncodingPolicy getChunkedEncodingPolicy() {\nreturn chunkedEncodingPolicy;\n}\n+\n+ @Override\n+ public boolean getGzipDisabled() {\n+ return gzipDisabled;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServer.java",
"diff": "@@ -112,7 +112,11 @@ public class JettyHttpServer implements HttpServer {\nHandlerCollection handlers = new HandlerCollection();\nhandlers.setHandlers(ArrayUtils.addAll(extensionHandlers(), adminContext));\n+ if (options.getGzipDisabled()) {\n+ handlers.addHandler(mockServiceContext);\n+ } else {\naddGZipHandler(mockServiceContext, handlers);\n+ }\nreturn handlers;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WarConfiguration.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WarConfiguration.java",
"diff": "@@ -176,4 +176,9 @@ public class WarConfiguration implements Options {\npublic ChunkedEncodingPolicy getChunkedEncodingPolicy() {\nreturn ChunkedEncodingPolicy.ALWAYS;\n}\n+\n+ @Override\n+ public boolean getGzipDisabled() {\n+ return false;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"diff": "@@ -92,6 +92,7 @@ public class CommandLineOptions implements Options {\nprivate static final String ASYNCHRONOUS_RESPONSE_THREADS = \"async-response-threads\";\nprivate static final String USE_CHUNKED_ENCODING = \"use-chunked-encoding\";\nprivate static final String MAX_TEMPLATE_CACHE_ENTRIES = \"max-template-cache-entries\";\n+ private static final String DISABLE_GZIP = \"disable-gzip\";\nprivate final OptionSet optionSet;\nprivate final FileSource fileSource;\n@@ -136,6 +137,7 @@ public class CommandLineOptions implements Options {\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_THREADS, \"Number of asynchronous response threads\").withRequiredArg().defaultsTo(\"10\");\noptionParser.accepts(USE_CHUNKED_ENCODING, \"Whether to use Transfer-Encoding: chunked in responses. Can be set to always, never or body_file.\").withRequiredArg().defaultsTo(\"always\");\noptionParser.accepts(MAX_TEMPLATE_CACHE_ENTRIES, \"The maximum number of response template fragments that can be cached. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg();\n+ optionParser.accepts(DISABLE_GZIP, \"Disable gzipping of request and response bodies\");\noptionParser.accepts(HELP, \"Print this message\");\n@@ -512,6 +514,11 @@ public class CommandLineOptions implements Options {\nChunkedEncodingPolicy.ALWAYS;\n}\n+ @Override\n+ public boolean getGzipDisabled() {\n+ return optionSet.has(DISABLE_GZIP);\n+ }\n+\nprivate Long getMaxTemplateCacheEntries() {\nreturn optionSet.has(MAX_TEMPLATE_CACHE_ENTRIES) ?\nLong.valueOf(optionSet.valueOf(MAX_TEMPLATE_CACHE_ENTRIES).toString()) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/GzipAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/GzipAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.common.Gzip;\nimport com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n-import org.apache.commons.lang3.JavaVersion;\nimport org.apache.commons.lang3.RandomStringUtils;\nimport org.apache.http.HttpEntity;\nimport org.apache.http.client.entity.GzipCompressingEntity;\n@@ -127,4 +125,34 @@ public class GzipAcceptanceTest {\nreturn !Jetty.VERSION.contains(\"9.2.\");\n}\n}\n+\n+ public static class GzipDisabled {\n+\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(wireMockConfig()\n+ .dynamicPort()\n+ .gzipDisabled(true));\n+\n+ WireMockTestClient testClient;\n+\n+ @Before\n+ public void init() {\n+ testClient = new WireMockTestClient(wm.port());\n+ }\n+\n+ @Test\n+ public void doesNotGzipWhenDisabledInConfiguration() {\n+ String url = \"/no-gzip-response\";\n+ String bodyText = \"body text\";\n+ wm.stubFor(get(urlEqualTo(url)).willReturn(ok(bodyText)));\n+\n+ WireMockResponse response = testClient.get(url, withHeader(\"Accept-Encoding\", \"gzip,deflate\"));\n+\n+ assertThat(response.statusCode(), is(200));\n+ assertThat(response.headers().containsKey(\"Content-Encoding\"), is(false));\n+\n+ String plainText = response.content();\n+ assertThat(plainText, is(bodyText));\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"diff": "@@ -420,6 +420,18 @@ public class CommandLineOptionsTest {\nassertThat(transformer.getMaxCacheEntries(), nullValue());\n}\n+ @Test\n+ public void disablesGzip() {\n+ CommandLineOptions options = new CommandLineOptions(\"--disable-gzip\");\n+ assertThat(options.getGzipDisabled(), is(true));\n+ }\n+\n+ @Test\n+ public void defaultsToGzipEnabled() {\n+ CommandLineOptions options = new CommandLineOptions();\n+ assertThat(options.getGzipDisabled(), is(false));\n+ }\n+\npublic static class ResponseDefinitionTransformerExt1 extends ResponseDefinitionTransformer {\n@Override\npublic ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource files, Parameters parameters) { return null; }\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1104 - Added ability to disable gzip |
687,055 | 17.07.2019 16:23:12 | 0 | a58680b11a0707c2f5c9f2119cc9aff4eab54046 | Add scenario index on record: differentiates per RequestPattern group
Without this playback gets confused when the same url is
hit (such as is typical with a SOAP API) but groups differently
based on payload or headers. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/ScenarioProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/ScenarioProcessor.java",
"diff": "@@ -45,14 +45,16 @@ public class ScenarioProcessor {\n}\n});\n+ int scenarioIndex = 0;\nfor (Map.Entry<RequestPattern, Collection<StubMapping>> entry: groupsWithMoreThanOneStub.entrySet()) {\n- putStubsInScenario(ImmutableList.copyOf(entry.getValue()));\n+ scenarioIndex++;\n+ putStubsInScenario(scenarioIndex, ImmutableList.copyOf(entry.getValue()));\n}\n}\n- private void putStubsInScenario(List<StubMapping> stubMappings) {\n+ private void putStubsInScenario(int scenarioIndex, List<StubMapping> stubMappings) {\nStubMapping firstScenario = stubMappings.get(0);\n- String scenarioName = \"scenario-\" + Urls.urlToPathParts(URI.create(firstScenario.getRequest().getUrl()));\n+ String scenarioName = \"scenario-\" + Integer.toString(scenarioIndex) + \"-\" + Urls.urlToPathParts(URI.create(firstScenario.getRequest().getUrl()));\nint count = 1;\nfor (StubMapping stub: stubMappings) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordApiAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordApiAcceptanceTest.java",
"diff": "@@ -327,9 +327,9 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\n\"{ \\n\" +\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n- \" \\\"scenarioName\\\" : \\\"scenario-bar-baz\\\", \\n\" +\n+ \" \\\"scenarioName\\\" : \\\"scenario-1-bar-baz\\\", \\n\" +\n\" \\\"requiredScenarioState\\\" : \\\"Started\\\", \\n\" +\n- \" \\\"newScenarioState\\\" : \\\"scenario-bar-baz-2\\\", \\n\" +\n+ \" \\\"newScenarioState\\\" : \\\"scenario-1-bar-baz-2\\\", \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n@@ -342,8 +342,8 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\n\" } \\n\" +\n\" }, \\n\" +\n\" { \\n\" +\n- \" \\\"scenarioName\\\" : \\\"scenario-bar-baz\\\", \\n\" +\n- \" \\\"requiredScenarioState\\\" : \\\"scenario-bar-baz-2\\\", \\n\" +\n+ \" \\\"scenarioName\\\" : \\\"scenario-1-bar-baz\\\", \\n\" +\n+ \" \\\"requiredScenarioState\\\" : \\\"scenario-1-bar-baz-2\\\", \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotDslAcceptanceTest.java",
"diff": "@@ -246,8 +246,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings, everyItem(WireMatchers.isInAScenario()));\nassertThat(mappings.get(0).getRequiredScenarioState(), is(Scenario.STARTED));\n- assertThat(mappings.get(1).getRequiredScenarioState(), is(\"scenario-stateful-2\"));\n- assertThat(mappings.get(2).getRequiredScenarioState(), is(\"scenario-stateful-3\"));\n+ assertThat(mappings.get(1).getRequiredScenarioState(), is(\"scenario-1-stateful-2\"));\n+ assertThat(mappings.get(2).getRequiredScenarioState(), is(\"scenario-1-stateful-3\"));\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ScenarioProcessorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ScenarioProcessorTest.java",
"diff": "@@ -39,21 +39,21 @@ public class ScenarioProcessorTest {\nprocessor.putRepeatedRequestsInScenarios(asList(foobar1, other1, foobar2, foobar3, other2));\n- assertThat(foobar1.getScenarioName(), is(\"scenario-foo-bar\"));\n+ assertThat(foobar1.getScenarioName(), is(\"scenario-1-foo-bar\"));\nassertThat(foobar1.getRequiredScenarioState(), is(Scenario.STARTED));\n- assertThat(\"scenario-foo-bar-2\", is(foobar1.getNewScenarioState()));\n+ assertThat(\"scenario-1-foo-bar-2\", is(foobar1.getNewScenarioState()));\nassertThat(foobar2.getScenarioName(), is(foobar1.getScenarioName()));\n- assertThat(foobar2.getRequiredScenarioState(), is(\"scenario-foo-bar-2\"));\n- assertThat(foobar2.getNewScenarioState(), is(\"scenario-foo-bar-3\"));\n+ assertThat(foobar2.getRequiredScenarioState(), is(\"scenario-1-foo-bar-2\"));\n+ assertThat(foobar2.getNewScenarioState(), is(\"scenario-1-foo-bar-3\"));\nassertThat(foobar1.getScenarioName(), is(foobar3.getScenarioName()));\n- assertThat(foobar3.getRequiredScenarioState(), is(\"scenario-foo-bar-3\"));\n+ assertThat(foobar3.getRequiredScenarioState(), is(\"scenario-1-foo-bar-3\"));\nassertThat(\"Last mapping should not have a state transition\", foobar3.getNewScenarioState(), nullValue());\n- assertThat(other1.getScenarioName(), is(\"scenario-other\"));\n- assertThat(other1.getNewScenarioState(), is(\"scenario-other-2\"));\n- assertThat(other2.getRequiredScenarioState(), is(\"scenario-other-2\"));\n+ assertThat(other1.getScenarioName(), is(\"scenario-2-other\"));\n+ assertThat(other1.getNewScenarioState(), is(\"scenario-2-other-2\"));\n+ assertThat(other2.getRequiredScenarioState(), is(\"scenario-2-other-2\"));\n}\n@Test\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add scenario index on record: differentiates per RequestPattern group (#1134)
Without this playback gets confused when the same url is
hit (such as is typical with a SOAP API) but groups differently
based on payload or headers. |
686,936 | 18.07.2019 08:46:10 | -3,600 | 07bbb44562c6b1ce6356abebc9f9f03552c0f3b8 | Added docs for request filtering | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/extending-wiremock.md",
"new_path": "docs-v2/_docs/extending-wiremock.md",
"diff": "@@ -384,3 +384,73 @@ new WireMockServer(wireMockConfig()\nIf you would like to collect the traffic\nand for example add it to your acceptance test's output,\nyou can use the ```CollectingNetworkTrafficListener```.\n+\n+\n+## Intercepting and modifying requests\n+\n+Requests to both stubs and the admin API can be intercepted and either modified or halted with an immediate response.\n+This supports a number of use cases including: authentication, URL rewriting and request header injection.\n+\n+To intercept stub requests, create a class that extends `StubRequestFilter`. For instance, to perform simple authentication:\n+\n+```java\n+public class SimpleAuthRequestFilter extends StubRequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ if (request.header(\"Authorization\").firstValue().equals(\"Basic abc123\")) {\n+ return RequestFilterAction.continueWith(request);\n+ }\n+\n+ return RequestFilterAction.stopWith(ResponseDefinition.notAuthorised());\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"simple-auth\";\n+ }\n+}\n+```\n+\n+Then add it as an extension as usual e.g.\n+\n+```java\n+new WireMockRule(wireMockConfig().extensions(new SimpleAuthRequestFilter()));\n+```\n+\n+\n+To intercept admin API follow the same process, but extend `AdminRequestFilter`.\n+\n+### Modifying the request during interception\n+\n+To modify the HTTP request, the simplest approach is to wrap the original request with a `RequestWrapper` then continue e.g.\n+\n+```java\n+public static class UrlAndHeadersModifyingFilter extends StubRequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformAbsoluteUrl(url -> url + \"?extraQueryParam=123\")\n+ .addHeader(\"X-Custom-Header\", \"headerval\")\n+ .wrap(request);\n+\n+ return RequestFilterAction.continueWith(wrappedRequest);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"url-and-header-modifier\";\n+ }\n+}\n+```\n+\n+`RequestWrapper` is a builder pattern and allows any number of changes to the request. It supports the following changes:\n+\n+* Transformation of the URL. `transformAbsoluteUrl` takes a `FieldTransformer` as a parameter (or equivalent lambda) which maps\n+from the old to the new URL. Note that the URL passed in is absolute, and the returned URL must also be.\n+* Addition, removal and transformation (via `FieldTransformer`) of headers.\n+* Addition, removal and transformation of cookies.\n+* Changing the HTTP method.\n+* Transformation of the request body.\n+* Transformation of body parts (if a multipart encoded request).\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/ignored/Examples.java",
"new_path": "src/test/java/ignored/Examples.java",
"diff": "@@ -21,8 +21,14 @@ import com.github.tomakehurst.wiremock.common.ConsoleNotifier;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.FieldTransformer;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestFilterAction;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.RequestWrapper;\n+import com.github.tomakehurst.wiremock.extension.requestfilter.StubRequestFilter;\nimport com.github.tomakehurst.wiremock.http.Fault;\nimport com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport com.github.tomakehurst.wiremock.matching.MatchResult;\nimport com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n@@ -37,6 +43,7 @@ import java.util.List;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;\nimport static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.containsString;\n@@ -539,4 +546,44 @@ public class Examples extends AcceptanceTestBase {\n.willReturn(ok())\n.build()));\n}\n+\n+ public static class SimpleAuthRequestFilter extends StubRequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ if (request.header(\"Authorization\").firstValue().equals(\"Basic abc123\")) {\n+ return RequestFilterAction.continueWith(request);\n+ }\n+\n+ return RequestFilterAction.stopWith(ResponseDefinition.notAuthorised());\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"simple-auth\";\n+ }\n+ }\n+\n+ public static class UrlAndHeadersModifyingFilter extends StubRequestFilter {\n+\n+ @Override\n+ public RequestFilterAction filter(Request request) {\n+ Request wrappedRequest = RequestWrapper.create()\n+ .transformAbsoluteUrl(new FieldTransformer<String>() {\n+ @Override\n+ public String transform(String url) {\n+ return url + \"extraparam=123\";\n+ }\n+ })\n+ .addHeader(\"X-Custom-Header\", \"headerval\")\n+ .wrap(request);\n+\n+ return RequestFilterAction.continueWith(wrappedRequest);\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"url-and-header-modifier\";\n+ }\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added docs for request filtering |
686,936 | 18.07.2019 10:20:02 | -3,600 | 463196bd708410cc64473a04f44af84811e60146 | Added disable gzip docs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/configuration.md",
"new_path": "docs-v2/_docs/configuration.md",
"diff": "@@ -138,6 +138,14 @@ WireMock wraps all logging in its own ``Notifier`` interface. It ships with no-o\n.notifier(new ConsoleNotifier(true))\n```\n+## Gzip\n+\n+Gzipping of responses can be disabled.\n+\n+```java\n+.gzipDisabled(true)\n+```\n+\n## Extensions\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -124,6 +124,8 @@ com.mycorp.HeaderTransformer,com.mycorp.BodyTransformer. See extending-wiremock.\n`--use-chunked-encoding`: Set the policy for sending responses with `Transfer-Encoding: chunked`. Valid values are `always`, `never` and `body_file`.\nThe last of these will cause chunked encoding to be used only when a stub defines its response body from a file.\n+`--disable-gzip`: Prevent response bodies from being gzipped.\n+\n`--help`: Show command line help\n## Configuring WireMock using the Java client\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added disable gzip docs |
686,983 | 24.07.2019 17:19:19 | -7,200 | f07fd6fd7fdc6f372fa1394fa3d7425de0aee1ab | Upgrade jackson databind to fix CVEs | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -41,7 +41,7 @@ allprojects {\njetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\nguava : '20.0',\njackson : '2.9.9',\n- jacksonDatabind: '2.9.9',\n+ jacksonDatabind: '2.9.9.1',\nxmlUnit : '2.6.2'\n],\n@@ -50,7 +50,7 @@ allprojects {\njetty : '9.4.15.v20190215',\nguava : '27.0.1-jre',\njackson : '2.9.9',\n- jacksonDatabind: '2.9.9',\n+ jacksonDatabind: '2.9.9.1',\nxmlUnit : '2.6.2'\n]\n]\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgrade jackson databind to fix CVEs (#1160) |
686,936 | 06.08.2019 15:57:44 | -3,600 | fcaa9a632e2a1b00b3fb5235858cf1c5dbcfadd9 | Fixed - Bumped up Jetty versions to latest | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -38,7 +38,7 @@ allprojects {\ndef versionSets = [\njava7: [\nhandlebars : '4.0.7',\n- jetty : '9.2.26.v20180806', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\n+ jetty : '9.2.28.v20190418', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details\nguava : '20.0',\njackson : '2.9.9',\njacksonDatabind: '2.9.9.1',\n@@ -47,7 +47,7 @@ allprojects {\n],\njava8: [\nhandlebars : '4.1.2',\n- jetty : '9.4.15.v20190215',\n+ jetty : '9.4.19.v20190610',\nguava : '27.0.1-jre',\njackson : '2.9.9',\njacksonDatabind: '2.9.9.1',\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1167 - Bumped up Jetty versions to latest |
686,936 | 21.08.2019 22:13:59 | -3,600 | e967931b09718c5bf9081bf7aaf932b6c91b8bb7 | Fixed - prevented NPE being thrown when attempting to use response templates with response bodies supplied via the jsonBody attribute | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -137,7 +137,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n.build();\nif (responseDefinition.specifiesTextBodyContent()) {\n- HandlebarsOptimizedTemplate bodyTemplate = getTemplate(TemplateCacheKey.forInlineBody(responseDefinition), responseDefinition.getBody());\n+ HandlebarsOptimizedTemplate bodyTemplate = getTemplate(TemplateCacheKey.forInlineBody(responseDefinition), responseDefinition.getTextBody());\napplyTemplatedResponseBody(newResponseDefBuilder, model, bodyTemplate);\n} else if (responseDefinition.specifiesBodyFile()) {\nHandlebarsOptimizedTemplate filePathTemplate = new HandlebarsOptimizedTemplate(handlebars, responseDefinition.getBodyFileName());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java",
"diff": "@@ -242,6 +242,11 @@ public class ResponseDefinition {\nreturn (!body.isBinary() && !body.isJson()) ? body.asString() : null;\n}\n+ @JsonIgnore\n+ public String getTextBody() {\n+ return !body.isBinary() ? body.asString() : null;\n+ }\n+\n@JsonIgnore\npublic byte[] getByteBody() {\nreturn body.asBytes();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/ResponseDefinitionBodyMatcher.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/ResponseDefinitionBodyMatcher.java",
"diff": "@@ -55,7 +55,7 @@ public class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefin\nresponseDefinition.getHeaders() != null\n&& ContentTypes.determineIsTextFromMimeType(responseDefinition.getHeaders().getContentTypeHeader().mimeTypePart())\n) {\n- if (responseDefinition.getBody().length() > textSizeThreshold) {\n+ if (responseDefinition.getTextBody().length() > textSizeThreshold) {\nreturn MatchResult.exactMatch();\n} else {\nreturn MatchResult.noMatch();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -32,6 +32,7 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options\nimport static com.github.tomakehurst.wiremock.testsupport.TestFiles.defaultTestFilesRoot;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n+import static org.junit.Assert.assertTrue;\n@RunWith(Enclosed.class)\npublic class ResponseTemplatingAcceptanceTest {\n@@ -180,5 +181,31 @@ public class ResponseTemplatingAcceptanceTest {\nassertThat(client.get(\"/templated/1\").content(), is(\"{{request.path.[0]}}\"));\n}\n+ @Test\n+ public void supportsJsonBodiesWithTemplating() {\n+ String stubJson = \"{\\n\" +\n+ \" \\\"request\\\": {\\n\" +\n+ \" \\\"method\\\": \\\"POST\\\",\\n\" +\n+ \" \\\"url\\\" : \\\"/json-body-templating\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"response\\\": {\\n\" +\n+ \" \\\"status\\\": 200,\\n\" +\n+ \" \\\"jsonBody\\\": {\\n\" +\n+ \" \\\"modified\\\": \\\"{{jsonPath request.body '$.arrayprop.length()'}}\\\"\\n\" +\n+ \" },\\n\" +\n+ \" \\\"headers\\\": {\\n\" +\n+ \" \\\"Content-Type\\\": \\\"application/json\\\"\\n\" +\n+ \" }\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ client.postJson(\"/__admin/mappings\", stubJson);\n+\n+ WireMockResponse response = client.postJson(\"/json-body-templating\", \"{ \\\"arrayprop\\\": [1,2,3] }\");\n+ assertThat(\n+ response.content(),\n+ response.statusCode(), is(200));\n+ }\n+\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1174 - prevented NPE being thrown when attempting to use response templates with response bodies supplied via the jsonBody attribute |
686,936 | 27.08.2019 18:59:52 | -3,600 | eb3e9fc140e4abf4674ee829ca7f86a821cd1376 | Shaded the servlet API | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -214,12 +214,15 @@ subprojects {\nrelocate \"net.sf\", \"wiremock.net.sf\"\nrelocate \"com.github.jknack\", \"wiremock.com.github.jknack\"\nrelocate \"org.antlr\", \"wiremock.org.antlr\"\n+ relocate \"javax.servlet\", \"wiremock.javax.servlet\"\ndependencies {\nexclude(dependency('junit:junit'))\n}\nmergeServiceFiles()\n+\n+ exclude 'META-INF/maven/javax.servlet/**'\n}\ndef repoUser\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Shaded the servlet API |
686,936 | 27.08.2019 19:51:52 | -3,600 | 762fa82ade9c7e806d607c733616cb5a6f50a92d | Fixed - equals method for path matchers did not include value pattern | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPattern.java",
"diff": "@@ -17,6 +17,8 @@ package com.github.tomakehurst.wiremock.matching;\nimport com.fasterxml.jackson.annotation.JsonIgnore;\n+import java.util.Objects;\n+\npublic abstract class PathPattern extends StringValuePattern {\nprotected final StringValuePattern valuePattern;\n@@ -46,4 +48,18 @@ public abstract class PathPattern extends StringValuePattern {\nprotected abstract MatchResult isSimpleMatch(String value);\nprotected abstract MatchResult isAdvancedMatch(String value);\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ if (!super.equals(o)) return false;\n+ PathPattern that = (PathPattern) o;\n+ return Objects.equals(expectedValue, that.expectedValue) && Objects.equals(valuePattern, that.valuePattern);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(super.hashCode(), getValuePattern());\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPatternTest.java",
"diff": "@@ -21,6 +21,7 @@ import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.JsonException;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.common.Notifier;\n+import org.hamcrest.Matchers;\nimport org.jmock.Expectations;\nimport org.jmock.Mockery;\nimport org.junit.After;\n@@ -29,8 +30,7 @@ import org.junit.Test;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n-import static org.hamcrest.Matchers.instanceOf;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.*;\npublic class MatchesJsonPathPatternTest {\n@@ -318,6 +318,19 @@ public class MatchesJsonPathPatternTest {\nStringValuePattern.class);\n}\n+ @Test\n+ public void equalsIncludesValuePattern() {\n+ StringValuePattern pattern1 = matchingJsonPath(\"$.LinkageDetails.AccountId\", equalTo(\"1000\"));\n+ StringValuePattern pattern2 = matchingJsonPath(\"$.LinkageDetails.AccountId\", equalTo(\"1001\"));\n+ StringValuePattern pattern3 = matchingJsonPath(\"$.LinkageDetails.AccountId\", equalTo(\"1000\"));\n+\n+ assertThat(pattern1, not(Matchers.equalTo(pattern2)));\n+ assertThat(pattern1.hashCode(), not(Matchers.equalTo(pattern2.hashCode())));\n+\n+ assertThat(pattern1, Matchers.equalTo(pattern3));\n+ assertThat(pattern1.hashCode(), Matchers.equalTo(pattern3.hashCode()));\n+ }\n+\nprivate void expectInfoNotification(final String message) {\nfinal Notifier notifier = context.mock(Notifier.class);\ncontext.checking(new Expectations() {{\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1178 - equals method for path matchers did not include value pattern |
687,040 | 28.08.2019 16:24:31 | -28,800 | d06f3aa60b9a2a887d6d0b7a89c45b3193dcc5f3 | Added hostname and systemValue helpers. See
Add Handlebars helpers for fetching system properties, environment variables and the local hostname | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -364,6 +364,19 @@ Random strings of various kinds can be generated:\n{% endraw %}\n+## Hostname and SystemValue helpers\n+A helper is present to render the current hostname/system environment variable/property value which can be used in container.\n+\n+\n+{% raw %}\n+```\n+{{hostname}}\n+{{systemValue type='ENVIRONMENT' key='PATH'}}\n+{{systemValue type='PROPERTY' key='os.path'}}\n+```\n+{% endraw %}\n+\n+\n## String trim helper\nUse the `trim` helper to remove whitespace from the start and end of the input:\n@@ -472,7 +485,6 @@ The `size` helper returns the size of a string, list or map:\n{% endraw %}\n-\n## Custom helpers\nCustom Handlebars helpers can be registered with the transformer on construction:\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -121,6 +121,8 @@ com.mycorp.HeaderTransformer,com.mycorp.BodyTransformer. See extending-wiremock.\n`--max-template-cache-entries`: Set the maximum number of compiled template fragments to cache. Only has any effect when response templating is enabled. Defaults to no limit.\n+`--permitted-system-keys`: Set the list of regular expressions for names of permitted env vars to access. Only has any effect when templating is enabled. Defaults to no limit.\n+\n`--use-chunked-encoding`: Set the policy for sending responses with `Transfer-Encoding: chunked`. Valid values are `always`, `never` and `body_file`.\nThe last of these will cause chunked encoding to be used only when a stub defines its response body from a file.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -28,6 +28,7 @@ import com.github.tomakehurst.wiremock.common.TextFile;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WireMockHelpers;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\n@@ -40,13 +41,12 @@ import com.google.common.cache.CacheBuilder;\nimport com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableMap;\nimport com.google.common.collect.Iterables;\n-import com.google.common.collect.Lists;\nimport java.io.IOException;\nimport java.util.Collections;\nimport java.util.HashMap;\n-import java.util.List;\nimport java.util.Map;\n+import java.util.Set;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.ExecutionException;\n@@ -76,10 +76,10 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\n}\npublic ResponseTemplateTransformer(boolean global, Map<String, Helper> helpers) {\n- this(global, new Handlebars(), helpers, null);\n+ this(global, new Handlebars(), helpers, null, null);\n}\n- public ResponseTemplateTransformer(boolean global, Handlebars handlebars, Map<String, Helper> helpers, Long maxCacheEntries) {\n+ public ResponseTemplateTransformer(boolean global, Handlebars handlebars, Map<String, Helper> helpers, Long maxCacheEntries, Set<String> permittedSystemKeys) {\nthis.global = global;\nthis.handlebars = handlebars;\n@@ -114,6 +114,11 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\ncacheBuilder.maximumSize(maxCacheEntries);\n}\ncache = cacheBuilder.build();\n+\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.clear();\n+ if (permittedSystemKeys != null && !permittedSystemKeys.isEmpty()) {\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.addAll(permittedSystemKeys);\n+ }\n}\n@Override\n@@ -258,6 +263,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nprivate Handlebars handlebars = new Handlebars();\nprivate Map<String, Helper> helpers = new HashMap<>();\nprivate Long maxCacheEntries = null;\n+ private Set<String> permittedSystemKeys = Collections.emptySet();\npublic Builder global(boolean global) {\nthis.global = global;\n@@ -284,8 +290,13 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nreturn this;\n}\n+ public Builder permittedSystemKeys(Set<String> keys) {\n+ this.permittedSystemKeys = keys;\n+ return this;\n+ }\n+\npublic ResponseTemplateTransformer build() {\n- return new ResponseTemplateTransformer(global, handlebars, helpers, maxCacheEntries);\n+ return new ResponseTemplateTransformer(global, handlebars, helpers, maxCacheEntries, permittedSystemKeys);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelper.java",
"diff": "@@ -17,6 +17,9 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Helper;\n+import java.util.HashSet;\n+import java.util.Set;\n+\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n/**\n@@ -29,6 +32,7 @@ public abstract class HandlebarsHelper<T> implements Helper<T> {\npublic static final String ERROR_PREFIX = \"[ERROR: \";\npublic static final String ERROR_SUFFIX = \"]\";\n+ public static final Set<String> PERMITTED_SYSTEM_KEYS = new HashSet<>();\n/**\n* Handle invalid helper data without exception details or because none was thrown.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HostnameHelper.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+\n+import java.net.InetAddress;\n+import java.net.UnknownHostException;\n+\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+\n+public class HostnameHelper extends HandlebarsHelper<Object> {\n+\n+ private static String HOSTNAME;\n+\n+ static {\n+ try {\n+ HOSTNAME = InetAddress.getLocalHost().getHostName();\n+ } catch (UnknownHostException e) {\n+ throwUnchecked(e, String.class);\n+ }\n+ }\n+\n+ @Override\n+ public Object apply(Object context, Options options) {\n+ return HOSTNAME;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelper.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import org.apache.commons.lang3.StringUtils;\n+\n+import java.security.AccessControlException;\n+import java.util.regex.Pattern;\n+\n+public class SystemValueHelper extends HandlebarsHelper<Void> {\n+ @Override\n+ public String apply(Void context, Options options) {\n+ String key = options.hash(\"key\", \"\");\n+ String type = options.hash(\"type\", \"ENVIRONMENT\");\n+ if (StringUtils.isEmpty(key)) {\n+ return this.handleError(\"The key cannot be empty\");\n+ }\n+ if (!isPermittedKey(key)) {\n+ return this.handleError(\"Access to \" + key + \" is denied\");\n+ }\n+ String rawValue = \"\";\n+\n+ try {\n+ switch (type) {\n+ case \"ENVIRONMENT\":\n+ rawValue = getSystemEnvironment(key);\n+ break;\n+ case \"PROPERTY\":\n+ rawValue = getSystemProperties(key);\n+ break;\n+ }\n+ return rawValue;\n+\n+ } catch (AccessControlException e) {\n+ return this.handleError(\"Access to \" + key + \" is denied\");\n+ }\n+ }\n+\n+ private String getSystemEnvironment(final String key) {\n+ return System.getenv(key);\n+ }\n+\n+ private String getSystemProperties(final String key) {\n+ return System.getProperty(key);\n+ }\n+\n+ private boolean isPermittedKey(final String key) {\n+ return PERMITTED_SYSTEM_KEYS.isEmpty() || matchedKey(key);\n+ }\n+\n+ private boolean matchedKey(String key) {\n+ for (String reg : PERMITTED_SYSTEM_KEYS) {\n+ if (Pattern.compile(reg).matcher(key).find()) {\n+ return true;\n+ }\n+ }\n+ return false;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"diff": "@@ -58,6 +58,22 @@ public enum WireMockHelpers implements Helper<Object> {\nreturn this.helper.apply(null, options);\n}\n},\n+ hostname {\n+ private HostnameHelper helper = new HostnameHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return this.helper.apply(context, options);\n+ }\n+ },\n+ systemValue {\n+ private SystemValueHelper helper = new SystemValueHelper();\n+\n+ @Override\n+ public Object apply(Object context, Options options) throws IOException {\n+ return this.helper.apply(null, options);\n+ }\n+ },\ndate {\nprivate HandlebarsCurrentDateHelper helper = new HandlebarsCurrentDateHelper();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"diff": "@@ -45,9 +45,7 @@ import joptsimple.OptionSet;\nimport java.io.IOException;\nimport java.io.StringWriter;\nimport java.net.URI;\n-import java.util.Collections;\n-import java.util.List;\n-import java.util.Map;\n+import java.util.*;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.github.tomakehurst.wiremock.common.ProxySettings.NO_PROXY;\n@@ -92,8 +90,11 @@ public class CommandLineOptions implements Options {\nprivate static final String ASYNCHRONOUS_RESPONSE_THREADS = \"async-response-threads\";\nprivate static final String USE_CHUNKED_ENCODING = \"use-chunked-encoding\";\nprivate static final String MAX_TEMPLATE_CACHE_ENTRIES = \"max-template-cache-entries\";\n+ private static final String PERMITTED_SYSTEM_KEYS = \"permitted-system-keys\";\n+\nprivate static final String DISABLE_GZIP = \"disable-gzip\";\n+\nprivate final OptionSet optionSet;\nprivate final FileSource fileSource;\nprivate final MappingsSource mappingsSource;\n@@ -137,8 +138,10 @@ public class CommandLineOptions implements Options {\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_THREADS, \"Number of asynchronous response threads\").withRequiredArg().defaultsTo(\"10\");\noptionParser.accepts(USE_CHUNKED_ENCODING, \"Whether to use Transfer-Encoding: chunked in responses. Can be set to always, never or body_file.\").withRequiredArg().defaultsTo(\"always\");\noptionParser.accepts(MAX_TEMPLATE_CACHE_ENTRIES, \"The maximum number of response template fragments that can be cached. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg();\n+ optionParser.accepts(PERMITTED_SYSTEM_KEYS, \"A list of regular expressions for names of permitted env vars. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg().ofType(String.class).withValuesSeparatedBy(\",\");\noptionParser.accepts(DISABLE_GZIP, \"Disable gzipping of request and response bodies\");\n+\noptionParser.accepts(HELP, \"Print this message\");\noptionSet = optionParser.parse(args);\n@@ -320,12 +323,14 @@ public class CommandLineOptions implements Options {\nResponseTemplateTransformer transformer = ResponseTemplateTransformer.builder()\n.global(true)\n.maxCacheEntries(getMaxTemplateCacheEntries())\n+ .permittedSystemKeys(getPermittedSystemKeys())\n.build();\nbuilder.put(transformer.getName(), (T) transformer);\n} else if (optionSet.has(LOCAL_RESPONSE_TEMPLATING) && ResponseDefinitionTransformer.class.isAssignableFrom(extensionType)) {\nResponseTemplateTransformer transformer = ResponseTemplateTransformer.builder()\n.global(false)\n.maxCacheEntries(getMaxTemplateCacheEntries())\n+ .permittedSystemKeys(getPermittedSystemKeys())\n.build();\nbuilder.put(transformer.getName(), (T) transformer);\n}\n@@ -525,6 +530,12 @@ public class CommandLineOptions implements Options {\nnull;\n}\n+ private Set<String> getPermittedSystemKeys() {\n+ return optionSet.has(PERMITTED_SYSTEM_KEYS) ?\n+ new HashSet(optionSet.valuesOf(PERMITTED_SYSTEM_KEYS)) :\n+ Collections.<String>emptySet();\n+ }\n+\nprivate boolean isAsynchronousResponseEnabled() {\nreturn optionSet.has(ASYNCHRONOUS_RESPONSE_ENABLED) ?\nBoolean.valueOf((String) optionSet.valueOf(ASYNCHRONOUS_RESPONSE_ENABLED)) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -30,7 +30,7 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static com.github.tomakehurst.wiremock.testsupport.TestFiles.defaultTestFilesRoot;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -103,6 +103,7 @@ public class ResponseTemplatingAcceptanceTest {\n.willReturn(aResponse()\n.withBodyFile(\"templated-example-1.txt\")));\n+\nassertThat(client.get(\"/templated\").content(), is(\"templated\"));\n}\n@@ -119,6 +120,32 @@ public class ResponseTemplatingAcceptanceTest {\n}\n@Test\n+ public void appliesResponseTemplateWithHostname() {\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{hostname}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), notNullValue());\n+ }\n+\n+ @Test\n+ public void appliesResponseTemplateShouldEmptyWithNonExistingSystemValue() {\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{systemValue type='ENVIRONMENT' key='TEST'}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), isEmptyOrNullString());\n+ }\n+\n+ @Test\n+ public void appliesResponseTemplateShouldNotEmptyWithExistingSystemValue() {\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{systemValue type='ENVIRONMENT' key='PATH'}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), notNullValue());\n+ }\n+\npublic void supportsSelectionResponseBodyTemplateViaTemplate() {\nwm.stubFor(get(urlPathMatching(\"/templated/.*\"))\n.willReturn(aResponse()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HostnameHelperTest.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.ConsoleNotifier;\n+import com.github.tomakehurst.wiremock.common.LocalNotifier;\n+import com.google.common.collect.ImmutableMap;\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+import java.net.InetAddress;\n+import java.net.UnknownHostException;\n+\n+import static org.hamcrest.Matchers.equalToIgnoringWhiteSpace;\n+import static org.junit.Assert.assertThat;\n+\n+public class HostnameHelperTest {\n+\n+ private HostnameHelper helper;\n+ private String hostname;\n+\n+ @Before\n+ public void init() throws UnknownHostException {\n+ helper = new HostnameHelper();\n+ hostname = InetAddress.getLocalHost().getHostName();\n+\n+ LocalNotifier.set(new ConsoleNotifier(true));\n+ }\n+\n+ @Test\n+ public void generatesHostname() throws Exception {\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ );\n+\n+ String output = render(optionsHash);\n+ assertThat(output, equalToIgnoringWhiteSpace(hostname));\n+ }\n+\n+ private String render(ImmutableMap<String, Object> optionsHash) throws IOException {\n+ return helper.apply(null,\n+ new Options.Builder(null, null, null, null, null)\n+ .setHash(optionsHash).build()\n+ ).toString();\n+ }\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelperTest.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.ConsoleNotifier;\n+import com.github.tomakehurst.wiremock.common.LocalNotifier;\n+import com.google.common.collect.ImmutableMap;\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+import static org.junit.Assert.*;\n+\n+public class SystemValueHelperTest {\n+\n+ private SystemValueHelper helper;\n+\n+ @Before\n+ public void init() {\n+ helper = new SystemValueHelper();\n+ LocalNotifier.set(new ConsoleNotifier(true));\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.clear();\n+ }\n+\n+ @Test\n+ public void getExistingEnvironmentVariableShouldNotNull() throws Exception {\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"PATH\",\n+ \"type\", \"ENVIRONMENT\"\n+ );\n+\n+ String output = render(optionsHash);\n+ assertNotNull(output);\n+ assertTrue(output.length() > 0);\n+ }\n+\n+ @Test\n+ public void getNonExistingEnvironmentVariableShouldNull() throws Exception {\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"NON_EXISTING_VAR\",\n+ \"type\", \"ENVIRONMENT\"\n+ );\n+\n+ String output = render(optionsHash);\n+ assertNull(output);\n+ }\n+\n+ @Test\n+ public void getForbiddenEnvironmentVariableShouldReturnError() throws Exception {\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"JAVA*\");\n+\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"TEST_VAR\",\n+ \"type\", \"ENVIRONMENT\"\n+ );\n+ String value = render(optionsHash);\n+ assertEquals(\"[ERROR: Access to TEST_VAR is denied]\", value);\n+ }\n+\n+ @Test\n+ public void getEmptyKeyShouldReturnError() throws Exception {\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"\",\n+ \"type\", \"PROPERTY\"\n+ );\n+ String value = render(optionsHash);\n+ assertEquals(\"[ERROR: The key cannot be empty]\", value);\n+ }\n+\n+ @Test\n+ public void getAllowedPropertyShouldSuccess() throws Exception {\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"test*\");\n+ System.setProperty(\"test.key\", \"aaa\");\n+ assertEquals(\"aaa\", System.getProperty(\"test.key\"));\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"test.key\",\n+ \"type\", \"PROPERTY\"\n+ );\n+ String value = render(optionsHash);\n+ assertEquals(\"aaa\", value);\n+ }\n+\n+ @Test\n+ public void getForbiddenPropertyShouldReturnError() throws Exception {\n+ HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"JAVA*\");\n+ System.setProperty(\"test.key\", \"aaa\");\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"test.key\",\n+ \"type\", \"PROPERTY\"\n+ );\n+ String value = render(optionsHash);\n+ assertEquals(\"[ERROR: Access to test.key is denied]\", value);\n+ }\n+\n+ @Test\n+ public void getNonExistingSystemPropertyShouldNull() throws Exception {\n+ ImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n+ \"key\", \"not.existing.prop\",\n+ \"type\", \"PROPERTY\"\n+ );\n+ String output = render(optionsHash);\n+ assertNull(output);\n+ }\n+\n+ private String render(ImmutableMap<String, Object> optionsHash) throws IOException {\n+ return helper.apply(null,\n+ new Options.Builder(null, null, null, null, null)\n+ .setHash(optionsHash).build()\n+ );\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"diff": "@@ -22,6 +22,7 @@ import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;\nimport com.github.tomakehurst.wiremock.http.CaseInsensitiveKey;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n@@ -420,6 +421,24 @@ public class CommandLineOptionsTest {\nassertThat(transformer.getMaxCacheEntries(), nullValue());\n}\n+ @Test\n+ public void configuresPermittedSystemKeysIfSpecified() {\n+ CommandLineOptions options = new CommandLineOptions(\"--global-response-templating\", \"--permitted-system-keys\", \"java*,path*\");\n+ Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n+ ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n+\n+ assertThat(HandlebarsHelper.PERMITTED_SYSTEM_KEYS.size(), is(2));\n+ }\n+\n+ @Test\n+ public void configuresPermittedSystemKeysToEmptyIfNotSpecified() {\n+ CommandLineOptions options = new CommandLineOptions(\"--global-response-templating\");\n+ Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n+ ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n+\n+ assertThat(HandlebarsHelper.PERMITTED_SYSTEM_KEYS.size(), is(0));\n+ }\n+\n@Test\npublic void disablesGzip() {\nCommandLineOptions options = new CommandLineOptions(\"--disable-gzip\");\n@@ -430,6 +449,7 @@ public class CommandLineOptionsTest {\npublic void defaultsToGzipEnabled() {\nCommandLineOptions options = new CommandLineOptions();\nassertThat(options.getGzipDisabled(), is(false));\n+\n}\npublic static class ResponseDefinitionTransformerExt1 extends ResponseDefinitionTransformer {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added hostname and systemValue helpers. See #1075 (#1106)
Add Handlebars helpers for fetching system properties, environment variables and the local hostname |
686,936 | 28.08.2019 19:21:43 | -3,600 | b4389b8cd709c319b4d51d69a3e3da56cf8819d7 | Some refactorings to the environment and system property helper. Restricted helper's access to vars/props matching wiremock.* by default to avoid accidentally exposing all environment variables. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Options.java",
"diff": "@@ -22,6 +22,7 @@ import com.github.tomakehurst.wiremock.common.JettySettings;\nimport com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.common.ProxySettings;\nimport com.github.tomakehurst.wiremock.extension.Extension;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.SystemKeyAuthoriser;\nimport com.github.tomakehurst.wiremock.http.CaseInsensitiveKey;\nimport com.github.tomakehurst.wiremock.http.HttpServerFactory;\nimport com.github.tomakehurst.wiremock.http.ThreadPoolFactory;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java",
"diff": "@@ -93,6 +93,7 @@ public class WireMockConfiguration implements Options {\nprivate int asynchronousResponseThreads;\nprivate ChunkedEncodingPolicy chunkedEncodingPolicy;\nprivate boolean gzipDisabled = false;\n+ private String permittedSystemKeys = null;\nprivate MappingsSource getMappingsSource() {\nif (mappingsSource == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformer.java",
"diff": "@@ -29,6 +29,7 @@ import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.extension.StubLifecycleListener;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.SystemValueHelper;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WireMockHelpers;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\n@@ -40,6 +41,7 @@ import com.google.common.cache.Cache;\nimport com.google.common.cache.CacheBuilder;\nimport com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableMap;\n+import com.google.common.collect.ImmutableSet;\nimport com.google.common.collect.Iterables;\nimport java.io.IOException;\n@@ -104,6 +106,8 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nthis.handlebars.registerHelper(helper.name(), helper);\n}\n+ this.handlebars.registerHelper(\"systemValue\", new SystemValueHelper(new SystemKeyAuthoriser(permittedSystemKeys)));\n+\nfor (Map.Entry<String, Helper> entry: helpers.entrySet()) {\nthis.handlebars.registerHelper(entry.getKey(), entry.getValue());\n}\n@@ -114,11 +118,6 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\ncacheBuilder.maximumSize(maxCacheEntries);\n}\ncache = cacheBuilder.build();\n-\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.clear();\n- if (permittedSystemKeys != null && !permittedSystemKeys.isEmpty()) {\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.addAll(permittedSystemKeys);\n- }\n}\n@Override\n@@ -263,7 +262,7 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nprivate Handlebars handlebars = new Handlebars();\nprivate Map<String, Helper> helpers = new HashMap<>();\nprivate Long maxCacheEntries = null;\n- private Set<String> permittedSystemKeys = Collections.emptySet();\n+ private Set<String> permittedSystemKeys = null;\npublic Builder global(boolean global) {\nthis.global = global;\n@@ -295,6 +294,11 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer i\nreturn this;\n}\n+ public Builder permittedSystemKeys(String... keys) {\n+ this.permittedSystemKeys = ImmutableSet.copyOf(keys);\n+ return this;\n+ }\n+\npublic ResponseTemplateTransformer build() {\nreturn new ResponseTemplateTransformer(global, handlebars, helpers, maxCacheEntries, permittedSystemKeys);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/SystemKeyAuthoriser.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating;\n+\n+import com.google.common.collect.ImmutableSet;\n+\n+import java.util.Set;\n+import java.util.regex.Pattern;\n+\n+import static java.util.regex.Pattern.CASE_INSENSITIVE;\n+\n+public class SystemKeyAuthoriser {\n+\n+ private final ImmutableSet<Pattern> regexes;\n+\n+ public SystemKeyAuthoriser(Set<String> patterns) {\n+ if (patterns == null || patterns.isEmpty()) {\n+ patterns = ImmutableSet.of(\"wiremock.*\");\n+ }\n+\n+ ImmutableSet.Builder<Pattern> builder = ImmutableSet.builder();\n+ for (String pattern: patterns) {\n+ builder.add(Pattern.compile(pattern, CASE_INSENSITIVE));\n+ }\n+\n+ regexes = builder.build();\n+ }\n+\n+ public boolean isPermitted(String key) {\n+ for (Pattern regex: regexes) {\n+ if (regex.matcher(key).matches()) {\n+ return true;\n+ }\n+ }\n+\n+ return false;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelper.java",
"diff": "@@ -32,7 +32,6 @@ public abstract class HandlebarsHelper<T> implements Helper<T> {\npublic static final String ERROR_PREFIX = \"[ERROR: \";\npublic static final String ERROR_SUFFIX = \"]\";\n- public static final Set<String> PERMITTED_SYSTEM_KEYS = new HashSet<>();\n/**\n* Handle invalid helper data without exception details or because none was thrown.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelper.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.SystemKeyAuthoriser;\nimport org.apache.commons.lang3.StringUtils;\nimport java.security.AccessControlException;\nimport java.util.regex.Pattern;\n-public class SystemValueHelper extends HandlebarsHelper<Void> {\n+public class SystemValueHelper extends HandlebarsHelper<Object> {\n+\n+ private final SystemKeyAuthoriser systemKeyAuthoriser;\n+\n+ public SystemValueHelper(SystemKeyAuthoriser systemKeyAuthoriser) {\n+ this.systemKeyAuthoriser = systemKeyAuthoriser;\n+ }\n+\n@Override\n- public String apply(Void context, Options options) {\n+ public String apply(Object context, Options options) {\nString key = options.hash(\"key\", \"\");\nString type = options.hash(\"type\", \"ENVIRONMENT\");\nif (StringUtils.isEmpty(key)) {\nreturn this.handleError(\"The key cannot be empty\");\n}\n- if (!isPermittedKey(key)) {\n+ if (!systemKeyAuthoriser.isPermitted(key)) {\nreturn this.handleError(\"Access to \" + key + \" is denied\");\n}\n+\nString rawValue = \"\";\ntry {\n@@ -57,17 +66,4 @@ public class SystemValueHelper extends HandlebarsHelper<Void> {\nprivate String getSystemProperties(final String key) {\nreturn System.getProperty(key);\n}\n-\n- private boolean isPermittedKey(final String key) {\n- return PERMITTED_SYSTEM_KEYS.isEmpty() || matchedKey(key);\n- }\n-\n- private boolean matchedKey(String key) {\n- for (String reg : PERMITTED_SYSTEM_KEYS) {\n- if (Pattern.compile(reg).matcher(key).find()) {\n- return true;\n- }\n- }\n- return false;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WireMockHelpers.java",
"diff": "@@ -66,14 +66,6 @@ public enum WireMockHelpers implements Helper<Object> {\nreturn this.helper.apply(context, options);\n}\n},\n- systemValue {\n- private SystemValueHelper helper = new SystemValueHelper();\n-\n- @Override\n- public Object apply(Object context, Options options) throws IOException {\n- return this.helper.apply(null, options);\n- }\n- },\ndate {\nprivate HandlebarsCurrentDateHelper helper = new HandlebarsCurrentDateHelper();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java",
"diff": "@@ -35,6 +35,7 @@ import com.github.tomakehurst.wiremock.security.BasicAuthenticator;\nimport com.github.tomakehurst.wiremock.security.NoAuthenticator;\nimport com.github.tomakehurst.wiremock.verification.notmatched.NotMatchedRenderer;\nimport com.github.tomakehurst.wiremock.verification.notmatched.PlainTextStubNotMatchedRenderer;\n+import com.google.common.annotations.VisibleForTesting;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Strings;\nimport com.google.common.collect.*;\n@@ -138,7 +139,7 @@ public class CommandLineOptions implements Options {\noptionParser.accepts(ASYNCHRONOUS_RESPONSE_THREADS, \"Number of asynchronous response threads\").withRequiredArg().defaultsTo(\"10\");\noptionParser.accepts(USE_CHUNKED_ENCODING, \"Whether to use Transfer-Encoding: chunked in responses. Can be set to always, never or body_file.\").withRequiredArg().defaultsTo(\"always\");\noptionParser.accepts(MAX_TEMPLATE_CACHE_ENTRIES, \"The maximum number of response template fragments that can be cached. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg();\n- optionParser.accepts(PERMITTED_SYSTEM_KEYS, \"A list of regular expressions for names of permitted env vars. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg().ofType(String.class).withValuesSeparatedBy(\",\");\n+ optionParser.accepts(PERMITTED_SYSTEM_KEYS, \"A list of case-insensitive regular expressions for names of permitted system properties and environment vars. Only has any effect when templating is enabled. Defaults to no limit.\").withOptionalArg().ofType(String.class).withValuesSeparatedBy(\",\");\noptionParser.accepts(DISABLE_GZIP, \"Disable gzipping of request and response bodies\");\n@@ -530,9 +531,11 @@ public class CommandLineOptions implements Options {\nnull;\n}\n- private Set<String> getPermittedSystemKeys() {\n+ @SuppressWarnings(\"unchecked\")\n+ @VisibleForTesting\n+ public Set<String> getPermittedSystemKeys() {\nreturn optionSet.has(PERMITTED_SYSTEM_KEYS) ?\n- new HashSet(optionSet.valuesOf(PERMITTED_SYSTEM_KEYS)) :\n+ ImmutableSet.copyOf((List<String>) optionSet.valuesOf(PERMITTED_SYSTEM_KEYS)) :\nCollections.<String>emptySet();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ResponseTemplatingAcceptanceTest.java",
"diff": "@@ -25,6 +25,7 @@ import org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\nimport org.junit.runner.RunWith;\n+import java.net.InetAddress;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n@@ -120,32 +121,6 @@ public class ResponseTemplatingAcceptanceTest {\n}\n@Test\n- public void appliesResponseTemplateWithHostname() {\n- wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n- .willReturn(aResponse()\n- .withBody(\"{{hostname}}\")));\n-\n- assertThat(client.get(\"/templated\").content(), notNullValue());\n- }\n-\n- @Test\n- public void appliesResponseTemplateShouldEmptyWithNonExistingSystemValue() {\n- wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n- .willReturn(aResponse()\n- .withBody(\"{{systemValue type='ENVIRONMENT' key='TEST'}}\")));\n-\n- assertThat(client.get(\"/templated\").content(), isEmptyOrNullString());\n- }\n-\n- @Test\n- public void appliesResponseTemplateShouldNotEmptyWithExistingSystemValue() {\n- wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n- .willReturn(aResponse()\n- .withBody(\"{{systemValue type='ENVIRONMENT' key='PATH'}}\")));\n-\n- assertThat(client.get(\"/templated\").content(), notNullValue());\n- }\n-\npublic void supportsSelectionResponseBodyTemplateViaTemplate() {\nwm.stubFor(get(urlPathMatching(\"/templated/.*\"))\n.willReturn(aResponse()\n@@ -235,4 +210,67 @@ public class ResponseTemplatingAcceptanceTest {\n}\n}\n+\n+ public static class RestrictedSystemPropertiesAndEnvVars {\n+\n+ WireMockTestClient client;\n+\n+ @Rule\n+ public WireMockRule wm = new WireMockRule(options()\n+ .dynamicPort()\n+ .withRootDirectory(defaultTestFilesRoot())\n+ .extensions(new ResponseTemplateTransformer.Builder()\n+ .global(true)\n+ .permittedSystemKeys(\"allowed.*\")\n+ .build()\n+ )\n+ );\n+\n+ @Before\n+ public void init() {\n+ client = new WireMockTestClient(wm.port());\n+ }\n+\n+ @Test\n+ public void appliesResponseTemplateWithHostname() throws Exception {\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{hostname}}\")));\n+\n+ String expectedHostname = InetAddress.getLocalHost().getHostName();\n+\n+ assertThat(client.get(\"/templated\").content(), is(expectedHostname));\n+ }\n+\n+ @Test\n+ public void rendersPermittedSystemProperty() {\n+ System.setProperty(\"allowed.thing\", \"123\");\n+\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{systemValue type='PROPERTY' key='allowed.thing'}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), is(\"123\"));\n+ }\n+\n+ @Test\n+ public void refusesToRenderForbiddenSystemProperty() {\n+ System.setProperty(\"forbidden.thing\", \"456\");\n+\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{systemValue type='PROPERTY' key='forbidden.thing'}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), is(\"[ERROR: Access to forbidden.thing is denied]\"));\n+ }\n+\n+ @Test\n+ public void appliesResponseTemplateShouldNotEmptyWithExistingSystemValue() {\n+ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n+ .willReturn(aResponse()\n+ .withBody(\"{{systemValue type='ENVIRONMENT' key='PATH'}}\")));\n+\n+ assertThat(client.get(\"/templated\").content(), notNullValue());\n+ }\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/SystemKeyAuthorisorTest.java",
"diff": "+/*\n+ * Copyright (C) 2011 Thomas Akehurst\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package com.github.tomakehurst.wiremock.extension.responsetemplating;\n+\n+import com.google.common.collect.ImmutableSet;\n+import org.junit.Test;\n+\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\n+\n+public class SystemKeyAuthorisorTest {\n+\n+ @Test\n+ public void permitsAllowedKeys() {\n+ SystemKeyAuthoriser authoriser = new SystemKeyAuthoriser(ImmutableSet.of(\"allowed_.*\", \"permitted_.*\"));\n+\n+ assertTrue(authoriser.isPermitted(\"allowed_key_1\"));\n+ assertTrue(authoriser.isPermitted(\"ALLOWED_KEY_2\"));\n+ assertTrue(authoriser.isPermitted(\"permitted_key_3\"));\n+ }\n+\n+ @Test\n+ public void forbidsNonAllowedKeys() {\n+ SystemKeyAuthoriser authoriser = new SystemKeyAuthoriser(ImmutableSet.of(\"allowed_.*\", \"permitted_.*\"));\n+\n+ assertFalse(authoriser.isPermitted(\"forbidden_key_1\"));\n+ assertFalse(authoriser.isPermitted(\"notallowed_key_2\"));\n+ assertFalse(authoriser.isPermitted(\"notpermitted_key_3\"));\n+ }\n+\n+ @Test\n+ public void defaultsToWireMockPrefixIfNoPatternsSpecified() {\n+ SystemKeyAuthoriser authoriser = new SystemKeyAuthoriser(null);\n+\n+ assertTrue(authoriser.isPermitted(\"wiremock_key_1\"));\n+ assertTrue(authoriser.isPermitted(\"wiremock.thing.2\"));\n+ assertFalse(authoriser.isPermitted(\"notallowed_key_2\"));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/SystemValueHelperTest.java",
"diff": "@@ -18,7 +18,9 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.SystemKeyAuthoriser;\nimport com.google.common.collect.ImmutableMap;\n+import com.google.common.collect.ImmutableSet;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -31,9 +33,8 @@ public class SystemValueHelperTest {\n@Before\npublic void init() {\n- helper = new SystemValueHelper();\n+ helper = new SystemValueHelper(new SystemKeyAuthoriser(ImmutableSet.of(\".*\")));\nLocalNotifier.set(new ConsoleNotifier(true));\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.clear();\n}\n@Test\n@@ -61,7 +62,7 @@ public class SystemValueHelperTest {\n@Test\npublic void getForbiddenEnvironmentVariableShouldReturnError() throws Exception {\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"JAVA*\");\n+ helper = new SystemValueHelper(new SystemKeyAuthoriser(ImmutableSet.of(\"JAVA*\")));\nImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n\"key\", \"TEST_VAR\",\n@@ -83,7 +84,7 @@ public class SystemValueHelperTest {\n@Test\npublic void getAllowedPropertyShouldSuccess() throws Exception {\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"test*\");\n+ helper = new SystemValueHelper(new SystemKeyAuthoriser(ImmutableSet.of(\"test.*\")));\nSystem.setProperty(\"test.key\", \"aaa\");\nassertEquals(\"aaa\", System.getProperty(\"test.key\"));\nImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n@@ -96,7 +97,7 @@ public class SystemValueHelperTest {\n@Test\npublic void getForbiddenPropertyShouldReturnError() throws Exception {\n- HandlebarsHelper.PERMITTED_SYSTEM_KEYS.add(\"JAVA*\");\n+ helper = new SystemValueHelper(new SystemKeyAuthoriser(ImmutableSet.of(\"JAVA.*\")));\nSystem.setProperty(\"test.key\", \"aaa\");\nImmutableMap<String, Object> optionsHash = ImmutableMap.<String, Object>of(\n\"key\", \"test.key\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptionsTest.java",
"diff": "@@ -424,19 +424,13 @@ public class CommandLineOptionsTest {\n@Test\npublic void configuresPermittedSystemKeysIfSpecified() {\nCommandLineOptions options = new CommandLineOptions(\"--global-response-templating\", \"--permitted-system-keys\", \"java*,path*\");\n- Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n- ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n-\n- assertThat(HandlebarsHelper.PERMITTED_SYSTEM_KEYS.size(), is(2));\n+ assertThat(options.getPermittedSystemKeys(), hasItems(\"java*\", \"path*\"));\n}\n@Test\n- public void configuresPermittedSystemKeysToEmptyIfNotSpecified() {\n+ public void returnsEmptyPermittedKeysIfNotSpecified() {\nCommandLineOptions options = new CommandLineOptions(\"--global-response-templating\");\n- Map<String, ResponseTemplateTransformer> extensions = options.extensionsOfType(ResponseTemplateTransformer.class);\n- ResponseTemplateTransformer transformer = extensions.get(ResponseTemplateTransformer.NAME);\n-\n- assertThat(HandlebarsHelper.PERMITTED_SYSTEM_KEYS.size(), is(0));\n+ assertThat(options.getPermittedSystemKeys(), emptyCollectionOf(String.class));\n}\n@Test\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Some refactorings to the environment and system property helper. Restricted helper's access to vars/props matching wiremock.* by default to avoid accidentally exposing all environment variables. |
686,936 | 30.08.2019 09:39:25 | -3,600 | d72b8c65f14bbe9d6f900e968415cc0237815aa5 | Tweaked permitted keys (response templating) docs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -364,19 +364,6 @@ Random strings of various kinds can be generated:\n{% endraw %}\n-## Hostname and SystemValue helpers\n-A helper is present to render the current hostname/system environment variable/property value which can be used in container.\n-\n-\n-{% raw %}\n-```\n-{{hostname}}\n-{{systemValue type='ENVIRONMENT' key='PATH'}}\n-{{systemValue type='PROPERTY' key='os.path'}}\n-```\n-{% endraw %}\n-\n-\n## String trim helper\nUse the `trim` helper to remove whitespace from the start and end of the input:\n@@ -484,6 +471,46 @@ The `size` helper returns the size of a string, list or map:\n```\n{% endraw %}\n+## Hostname helper\n+\n+The local machine's hostname can be printed:\n+\n+{% raw %}\n+```\n+{{hostname}}\n+```\n+{% endraw %}\n+\n+\n+## System property helper\n+Environment variables and system properties can be printed:\n+\n+{% raw %}\n+```\n+{{systemValue type='ENVIRONMENT' key='PATH'}}\n+{{systemValue type='PROPERTY' key='os.path'}}\n+```\n+{% endraw %}\n+\n+To avoid disclosure of sensitive variables, only permitted variables can be read. Permitted variable names\n+are defined via a set of regular expressions. These can be configured when constructing the response template extension:\n+\n+```java\n+@Rule\n+public WireMockRule wm = new WireMockRule(options()\n+ .dynamicPort()\n+ .withRootDirectory(defaultTestFilesRoot())\n+ .extensions(new ResponseTemplateTransformer.Builder()\n+ .global(true)\n+ .permittedSystemKeys(\"allowed.*\",\"also_permitted.*\")\n+ .build()\n+ )\n+);\n+```\n+\n+The regular expressions are matched in a case-insensitive manner.\n+\n+If no permitted system key patterns are set, a single default of `wiremock.*` will be used.\n## Custom helpers\nCustom Handlebars helpers can be registered with the transformer on construction:\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -121,13 +121,13 @@ com.mycorp.HeaderTransformer,com.mycorp.BodyTransformer. See extending-wiremock.\n`--max-template-cache-entries`: Set the maximum number of compiled template fragments to cache. Only has any effect when response templating is enabled. Defaults to no limit.\n-`--permitted-system-keys`: Set the list of regular expressions for names of permitted env vars to access. Only has any effect when templating is enabled. Defaults to no limit.\n-\n`--use-chunked-encoding`: Set the policy for sending responses with `Transfer-Encoding: chunked`. Valid values are `always`, `never` and `body_file`.\nThe last of these will cause chunked encoding to be used only when a stub defines its response body from a file.\n`--disable-gzip`: Prevent response bodies from being gzipped.\n+`--permitted-system-keys`: Comma-separated list of regular expressions for names of permitted environment variables and system properties accessible from response templates. Only has any effect when templating is enabled. Defaults to `wiremock.*`.\n+\n`--help`: Show command line help\n## Configuring WireMock using the Java client\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked permitted keys (response templating) docs |
687,042 | 03.09.2019 17:20:07 | -7,200 | 8cea0b6e7404ef72e119a53da46110598f1dc798 | Documenting NPM package | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/external-resources/index.md",
"new_path": "docs-v2/external-resources/index.md",
"diff": "@@ -60,6 +60,8 @@ Groovy binding by Tom Jankes:<br>\nPython client by Cody Lee:<br>\n[https://pypi.python.org/pypi/wiremock/1.1.1](https://pypi.python.org/pypi/wiremock/1.1.1)\n+NodeJS wrapper:<br>\n+[https://www.npmjs.com/package/wiremock](https://www.npmjs.com/package/wiremock)\n## Articles\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Documenting NPM package (#1182) |
686,936 | 03.09.2019 19:25:45 | -3,600 | 42efe359c9a77ab01bf8e7f0c120b84f34760231 | Fixed - wwitched request part parsing to use Apache commons fileupload, in order to avoid empty input stream problem with mixed body types | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -88,6 +88,8 @@ allprojects {\nexclude group: 'org.mozilla', module: 'rhino'\n}\n+ compile 'commons-fileupload:commons-fileupload:1.4'\n+\ntestCompile \"org.hamcrest:hamcrest-all:1.3\"\ntestCompile(\"org.jmock:jmock:2.5.1\") {\nexclude group: \"junit\", module: \"junit-dep\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/multipart/FileItemPartAdapter.java",
"diff": "+package com.github.tomakehurst.wiremock.http.multipart;\n+\n+import com.github.tomakehurst.wiremock.http.Body;\n+import com.github.tomakehurst.wiremock.http.HttpHeader;\n+import com.github.tomakehurst.wiremock.http.HttpHeaders;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.google.common.base.Function;\n+import com.google.common.collect.ImmutableList;\n+import com.google.common.collect.Iterators;\n+import org.apache.commons.fileupload.FileItem;\n+import org.apache.commons.fileupload.FileItemHeaders;\n+\n+import java.util.Iterator;\n+\n+public class FileItemPartAdapter implements Request.Part {\n+\n+ private final FileItem fileItem;\n+\n+ public FileItemPartAdapter(FileItem fileItem) {\n+ this.fileItem = fileItem;\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return fileItem.getFieldName();\n+ }\n+\n+ @Override\n+ public HttpHeader getHeader(String name) {\n+ Iterator<String> headerValues = fileItem.getHeaders().getHeaders(name);\n+ return new HttpHeader(name, Iterators.toArray(headerValues, String.class));\n+ }\n+\n+ @Override\n+ public HttpHeaders getHeaders() {\n+ FileItemHeaders headers = fileItem.getHeaders();\n+ Iterator<String> i = headers.getHeaderNames();\n+ ImmutableList.Builder<HttpHeader> builder = ImmutableList.builder();\n+ while (i.hasNext()) {\n+ String name = i.next();\n+ builder.add(getHeader(name));\n+ }\n+\n+ return new HttpHeaders(builder.build());\n+ }\n+\n+ @Override\n+ public Body getBody() {\n+ return new Body(fileItem.get());\n+ }\n+\n+ public static final Function<FileItem, Request.Part> TO_PARTS = new Function<FileItem, Request.Part>() {\n+ @Override\n+ public Request.Part apply(FileItem fileItem) {\n+ return new FileItemPartAdapter(fileItem);\n+ }\n+ };\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/multipart/PartParser.java",
"diff": "+package com.github.tomakehurst.wiremock.http.multipart;\n+\n+import com.github.tomakehurst.wiremock.common.Exceptions;\n+import com.github.tomakehurst.wiremock.http.HttpHeader;\n+import com.github.tomakehurst.wiremock.http.HttpHeaders;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.google.common.collect.Lists;\n+import org.apache.commons.fileupload.*;\n+import org.apache.commons.fileupload.disk.DiskFileItemFactory;\n+\n+import java.io.ByteArrayInputStream;\n+import java.io.File;\n+import java.io.IOException;\n+import java.io.InputStream;\n+import java.util.Collection;\n+import java.util.List;\n+\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static com.github.tomakehurst.wiremock.http.multipart.FileItemPartAdapter.TO_PARTS;\n+\n+public class PartParser {\n+\n+ @SuppressWarnings(\"unchecked\")\n+ public static Collection<Request.Part> parseFrom(Request request) {\n+ FileItemFactory fileItemFactory = new DiskFileItemFactory(\n+ Integer.MAX_VALUE,\n+ new File(System.getProperty(\"java.io.tmpdir\"))\n+ );\n+\n+ HttpHeaders headers = request.getHeaders();\n+ ByteArrayUploadContext uploadContext = new ByteArrayUploadContext(\n+ request.getBody(),\n+ headerValueOrNull(\"Content-Encoding\", headers),\n+ headers.getContentTypeHeader().firstValue()\n+ );\n+\n+ FileUpload upload = new FileUpload(fileItemFactory);\n+\n+ try {\n+ List<FileItem> items = upload.parseRequest(uploadContext);\n+ return Lists.transform(items, TO_PARTS);\n+ } catch (FileUploadException e) {\n+ return throwUnchecked(e, Collection.class);\n+ }\n+ }\n+\n+ private static String headerValueOrNull(String key, HttpHeaders httpHeaders) {\n+ HttpHeader header = httpHeaders.getHeader(key);\n+ return header.isPresent() ? header.firstValue() : null;\n+ }\n+\n+ public static class ByteArrayUploadContext implements UploadContext {\n+\n+ private final byte[] content;\n+ private final String encoding;\n+ private final String contentType;\n+\n+ public ByteArrayUploadContext(byte[] content, String encoding, String contentType) {\n+ this.content = content;\n+ this.encoding = encoding;\n+ this.contentType = contentType;\n+ }\n+\n+ @Override\n+ public long contentLength() {\n+ return content.length;\n+ }\n+\n+ @Override\n+ public String getCharacterEncoding() {\n+ return encoding;\n+ }\n+\n+ @Override\n+ public String getContentType() {\n+ return contentType;\n+ }\n+\n+ @Override\n+ public int getContentLength() {\n+ return content.length;\n+ }\n+\n+ @Override\n+ public InputStream getInputStream() throws IOException {\n+ return new ByteArrayInputStream(content);\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockHttpServletRequestAdapter.java",
"diff": "@@ -23,6 +23,7 @@ import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.QueryParameter;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n+import com.github.tomakehurst.wiremock.http.multipart.PartParser;\nimport com.github.tomakehurst.wiremock.jetty9.JettyUtils;\nimport com.google.common.base.Function;\nimport com.google.common.base.Optional;\n@@ -260,41 +261,18 @@ public class WireMockHttpServletRequestAdapter implements Request {\n}\n@Override\n- @SuppressWarnings(\"unchecked\")\npublic Collection<Part> getParts() {\nif (!isMultipart()) {\nreturn null;\n}\nif (cachedMultiparts == null) {\n- try {\n- multipartRequestConfigurer.configure(request);\n- cachedMultiparts = from(safelyGetRequestParts()).transform(new Function<javax.servlet.http.Part, Part>() {\n- @Override\n- public Part apply(javax.servlet.http.Part input) {\n- return WireMockHttpServletMultipartAdapter.from(input);\n- }\n- }).toList();\n- } catch (IOException | ServletException exception) {\n- return throwUnchecked(exception, Collection.class);\n- }\n+ cachedMultiparts = PartParser.parseFrom(this);\n}\nreturn (cachedMultiparts.size() > 0) ? cachedMultiparts : null;\n}\n- private Collection<javax.servlet.http.Part> safelyGetRequestParts() throws IOException, ServletException {\n- try {\n- return request.getParts();\n- } catch (IOException ioe) {\n- if (ioe.getMessage().contains(\"Missing content for multipart\")) {\n- return Collections.emptyList();\n- }\n-\n- throw ioe;\n- }\n- }\n-\n@Override\npublic boolean isMultipart() {\nString header = getHeader(\"Content-Type\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/MultipartBodyMatchingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/MultipartBodyMatchingAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport org.apache.http.HttpResponse;\nimport org.apache.http.client.HttpClient;\nimport org.apache.http.client.methods.HttpUriRequest;\n@@ -23,10 +24,14 @@ import org.apache.http.client.methods.RequestBuilder;\nimport org.apache.http.entity.ContentType;\nimport org.apache.http.entity.StringEntity;\nimport org.apache.http.entity.mime.MultipartEntityBuilder;\n+import org.apache.http.util.EntityUtils;\nimport org.junit.Test;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.testsupport.MultipartBody.part;\n+import static java.util.Collections.singletonList;\nimport static org.apache.http.entity.ContentType.MULTIPART_FORM_DATA;\n+import static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -57,7 +62,9 @@ public class MultipartBodyMatchingAcceptanceTest extends AcceptanceTestBase {\nHttpResponse response = httpClient.execute(request);\n- assertThat(response.getStatusLine().getStatusCode(), is(200));\n+ assertThat(\n+ EntityUtils.toString(response.getEntity()),\n+ response.getStatusLine().getStatusCode(), is(200));\n}\n@Test\n@@ -96,4 +103,22 @@ public class MultipartBodyMatchingAcceptanceTest extends AcceptanceTestBase {\nassertThat(response.getStatusLine().getStatusCode(), is(200));\n}\n+\n+ // https://github.com/tomakehurst/wiremock/issues/1179\n+ @Test\n+ public void multipartBodiesCanBeMatchedWhenStubsWithOtherBodyMatchTypesArePresent() {\n+ stubFor(post(\"/multipart\")\n+ .withMultipartRequestBody(\n+ aMultipart()\n+ .withHeader(\"Content-Disposition\", containing(\"wiremocktest\")))\n+ .willReturn(ok()));\n+\n+ stubFor(post(\"/json\")\n+ .withRequestBody(equalToJson(\"{ \\\"stuff\\\": 123 }\"))\n+ .willReturn(ok()));\n+\n+ WireMockResponse response = testClient.postWithMultiparts(\"/multipart\", singletonList(part(\"wiremocktest\", \"Whatever\", TEXT_PLAIN)));\n+\n+ assertThat(response.statusCode(), is(200));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1179 - wwitched request part parsing to use Apache commons fileupload, in order to avoid empty input stream problem with mixed body types |
686,936 | 06.09.2019 18:33:04 | -3,600 | 25b057aac4083cf24cd75e87c76de16309cdaf98 | Added ability to remove serve events (logged requests) by ID | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -380,6 +380,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn wireMockApp.findUnmatchedRequests();\n}\n+ @Override\n+ public void removeServeEvent(UUID eventId) {\n+ wireMockApp.removeServeEvent(eventId);\n+ }\n+\n@Override\npublic void updateGlobalSettings(GlobalSettings newSettings) {\nwireMockApp.updateGlobalSettings(newSettings);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -89,6 +89,7 @@ public class AdminRoutes {\nrouter.add(GET, \"/requests/unmatched\", FindUnmatchedRequestsTask.class);\nrouter.add(GET, \"/requests/unmatched/near-misses\", FindNearMissesForUnmatchedTask.class);\nrouter.add(GET, \"/requests/{id}\", GetServedStubTask.class);\n+ router.add(DELETE, \"/requests/{id}\", RemoveServeEventTask.class);\nrouter.add(POST, \"/recordings/snapshot\", SnapshotTask.class);\nrouter.add(POST, \"/recordings/start\", StartRecordingTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/RemoveServeEventTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+\n+import java.util.UUID;\n+\n+public class RemoveServeEventTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ String idString = pathParams.get(\"id\");\n+ UUID id = UUID.fromString(idString);\n+ admin.removeServeEvent(id);\n+ return ResponseDefinition.okEmptyJson();\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -241,6 +241,15 @@ public class HttpAdminClient implements Admin {\nreturn Json.read(body, FindRequestsResult.class);\n}\n+ @Override\n+ public void removeServeEvent(UUID eventId) {\n+ executeRequest(\n+ adminRoutes.requestSpecForTask(RemoveServeEventTask.class),\n+ PathParams.single(\"id\", eventId),\n+ Void.class\n+ );\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nString body = getJsonAssertOkAndReturnBody(urlFor(FindNearMissesForUnmatchedTask.class));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -581,6 +581,22 @@ public class WireMock {\nreturn admin.getServeEvents().getRequests();\n}\n+ public static void removeServeEvent(UUID eventId) {\n+ defaultInstance.get().removeEvent(eventId);\n+ }\n+\n+ public void removeEvent(UUID eventId) {\n+ admin.removeServeEvent(eventId);\n+ }\n+\n+ public void removeEvents(RequestPatternBuilder requestPatternBuilder) {\n+\n+ }\n+\n+ public static void removeServeEvents(RequestPatternBuilder requestPatternBuilder) {\n+ defaultInstance.get().removeEvents(requestPatternBuilder);\n+ }\n+\npublic static RequestPatternBuilder getRequestedFor(UrlPattern urlPattern) {\nreturn new RequestPatternBuilder(RequestMethod.GET, urlPattern);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -53,6 +53,8 @@ public interface Admin {\nFindRequestsResult findRequestsMatching(RequestPattern requestPattern);\nFindRequestsResult findUnmatchedRequests();\n+ void removeServeEvent(UUID eventId);\n+\nFindNearMissesResult findTopNearMissesFor(LoggedRequest loggedRequest);\nFindNearMissesResult findTopNearMissesFor(RequestPattern requestPattern);\nFindNearMissesResult findNearMissesForUnmatchedRequests();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -348,6 +348,11 @@ public class WireMockApp implements StubServer, Admin {\n}\n}\n+ @Override\n+ public void removeServeEvent(UUID eventId) {\n+ requestJournal.removeEvent(eventId);\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nImmutableList.Builder<NearMiss> listBuilder = ImmutableList.builder();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"diff": "@@ -51,4 +51,8 @@ public class DisabledRequestJournal implements RequestJournal {\n@Override\npublic void requestReceived(ServeEvent serveEvent) {\n}\n+\n+ @Override\n+ public void removeEvent(UUID eventId) {\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"diff": "@@ -22,7 +22,9 @@ import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.google.common.base.Function;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\n+import com.google.common.collect.FluentIterable;\nimport com.google.common.collect.ImmutableList;\n+import com.google.common.collect.Iterables;\nimport java.util.Collections;\nimport java.util.List;\n@@ -56,20 +58,26 @@ public class InMemoryRequestJournal implements RequestJournal {\nreturn ImmutableList.copyOf(filter(getRequests(), thatMatch(requestPattern)));\n}\n- private Predicate<Request> matchedBy(final RequestPattern requestPattern) {\n- return new Predicate<Request>() {\n- public boolean apply(Request input) {\n- return requestPattern.isMatchedBy(input, Collections.<String, RequestMatcherExtension>emptyMap());\n- }\n- };\n- }\n-\n@Override\npublic void requestReceived(ServeEvent serveEvent) {\nserveEvents.add(serveEvent);\nremoveOldEntries();\n}\n+ @Override\n+ public void removeEvent(final UUID eventId) {\n+ Iterable<ServeEvent> toDelete = filter(serveEvents, new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent input) {\n+ return input.getId().equals(eventId);\n+ }\n+ });\n+\n+ for (ServeEvent event: toDelete) {\n+ serveEvents.remove(event);\n+ }\n+ }\n+\n@Override\npublic List<ServeEvent> getAllServeEvents() {\nreturn ImmutableList.copyOf(serveEvents).reverse();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"diff": "@@ -33,4 +33,6 @@ public interface RequestJournal {\nvoid reset();\nvoid requestReceived(ServeEvent serveEvent);\n+\n+ void removeEvent(UUID eventId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"diff": "@@ -22,6 +22,8 @@ import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\nimport com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.RequestJournalDisabledException;\n@@ -29,6 +31,7 @@ import com.google.common.base.Optional;\nimport org.apache.http.HttpEntity;\nimport org.apache.http.entity.ByteArrayEntity;\nimport org.apache.http.entity.StringEntity;\n+import org.junit.Ignore;\nimport org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\n@@ -36,18 +39,18 @@ import org.junit.runner.RunWith;\nimport javax.swing.text.html.parser.Entity;\nimport java.util.List;\n+import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.forCustomMatcher;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findServeEventWithUrl;\nimport static com.github.tomakehurst.wiremock.verification.diff.JUnitStyleDiffRenderer.junitStyleDiffMessage;\nimport static java.lang.System.lineSeparator;\nimport static org.apache.http.entity.ContentType.TEXT_PLAIN;\n-import static org.hamcrest.Matchers.allOf;\n-import static org.hamcrest.Matchers.containsString;\n-import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\nimport static org.junit.Assert.fail;\n@@ -645,6 +648,64 @@ public class VerificationAcceptanceTest {\n}));\n}\n+ @Test\n+ public void removesEventsById() {\n+ stubFor(get(anyUrl()).willReturn(ok()));\n+\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n+ testClient.get(\"/two\");\n+\n+ List<ServeEvent> initialServeEvents = getAllServeEvents();\n+ assertThat(initialServeEvents.size(), is(3));\n+\n+ removeServeEvent(initialServeEvents.get(0).getId());\n+ removeServeEvent(initialServeEvents.get(2).getId());\n+\n+ List<ServeEvent> finalServeEvents = getAllServeEvents();\n+\n+ assertThat(finalServeEvents.size(), is(1));\n+ assertThat(finalServeEvents.get(0).getRequest().header(\"My-Header\").firstValue(), is(\"two\"));\n+ }\n+\n+ @Test\n+ public void doesNothingWhenAttemptingToRemoveANonExistentServeEvent() {\n+ stubFor(get(anyUrl()).willReturn(ok()));\n+\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n+ testClient.get(\"/two\");\n+\n+ List<ServeEvent> initialServeEvents = getAllServeEvents();\n+ assertThat(initialServeEvents.size(), is(3));\n+\n+ removeServeEvent(UUID.randomUUID());\n+\n+ List<ServeEvent> finalServeEvents = getAllServeEvents();\n+\n+ assertThat(finalServeEvents.size(), is(3));\n+ }\n+\n+// @Test\n+// public void removesEventsPerSuppliedFilter() {\n+// stubFor(get(anyUrl()).willReturn(ok()));\n+//\n+// testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n+// testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n+// testClient.get(\"/two\");\n+//\n+// removeServeEvents(getRequestedFor(urlPathEqualTo(\"/one\")).withHeader(\"My-Header\", equalTo(\"two\")));\n+//\n+// List<ServeEvent> serveEvents = getAllServeEvents();\n+// assertThat(serveEvents.size(), is(2));\n+//\n+// ServeEvent event1 = findServeEventWithUrl(serveEvents, \"/one\");\n+// assertThat(event1.getRequest().header(\"My-Header\").firstValue(), is(\"one\"));\n+//\n+// ServeEvent event2 = findServeEventWithUrl(serveEvents, \"/two\");\n+// assertThat(event2, notNullValue());\n+// }\n+\n}\npublic static class JournalDisabled {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to remove serve events (logged requests) by ID |
686,936 | 06.09.2019 19:19:05 | -3,600 | 5b6a3666f3c04b8d6e99799a9d8ace09ab05cd64 | Added ability to remove serve events (logged requests) via a request pattern | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -110,7 +110,8 @@ allprojects {\ntestCompile 'org.littleshoot:littleproxy:1.1.2:littleproxy-shade'\ntestCompile 'org.apache.httpcomponents:httpmime:4.5'\n- testRuntime 'org.slf4j:slf4j-log4j12:1.7.12'\n+ // This is coming in via the shaded littleproxy already. Adding it a 2nd time breaks it.\n+// testRuntime 'org.slf4j:slf4j-log4j12:1.7.12'\ntestRuntime files('src/test/resources/classpath file source/classpathfiles.zip', 'src/test/resources/classpath-filesource.jar')\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -385,6 +385,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nwireMockApp.removeServeEvent(eventId);\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsMatching(RequestPattern requestPattern) {\n+ return wireMockApp.removeServeEventsMatching(requestPattern);\n+ }\n+\n@Override\npublic void updateGlobalSettings(GlobalSettings newSettings) {\nwireMockApp.updateGlobalSettings(newSettings);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -90,6 +90,7 @@ public class AdminRoutes {\nrouter.add(GET, \"/requests/unmatched/near-misses\", FindNearMissesForUnmatchedTask.class);\nrouter.add(GET, \"/requests/{id}\", GetServedStubTask.class);\nrouter.add(DELETE, \"/requests/{id}\", RemoveServeEventTask.class);\n+ router.add(POST, \"/requests/remove\", RemoveServeEventsByRequestPatternTask.class);\nrouter.add(POST, \"/recordings/snapshot\", SnapshotTask.class);\nrouter.add(POST, \"/recordings/start\", StartRecordingTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/RemoveServeEventsByRequestPatternTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.common.Json;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.verification.FindServeEventsResult;\n+\n+public class RemoveServeEventsByRequestPatternTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ RequestPattern requestPattern = Json.read(request.getBodyAsString(), RequestPattern.class);\n+ FindServeEventsResult findServeEventsResult = admin.removeServeEventsMatching(requestPattern);\n+ return ResponseDefinition.okForJson(findServeEventsResult);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -36,10 +36,7 @@ import com.github.tomakehurst.wiremock.security.ClientAuthenticator;\nimport com.github.tomakehurst.wiremock.security.NotAuthorisedException;\nimport com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\n-import com.github.tomakehurst.wiremock.verification.FindRequestsResult;\n-import com.github.tomakehurst.wiremock.verification.LoggedRequest;\n-import com.github.tomakehurst.wiremock.verification.VerificationResult;\n+import com.github.tomakehurst.wiremock.verification.*;\nimport org.apache.commons.lang3.StringUtils;\nimport org.apache.http.client.methods.*;\nimport org.apache.http.entity.StringEntity;\n@@ -250,6 +247,14 @@ public class HttpAdminClient implements Admin {\n);\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsMatching(RequestPattern requestPattern) {\n+ String body = postJsonAssertOkAndReturnBody(\n+ urlFor(RemoveServeEventsByRequestPatternTask.class),\n+ Json.write(requestPattern));\n+ return Json.read(body, FindServeEventsResult.class);\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nString body = getJsonAssertOkAndReturnBody(urlFor(FindNearMissesForUnmatchedTask.class));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -589,12 +589,12 @@ public class WireMock {\nadmin.removeServeEvent(eventId);\n}\n- public void removeEvents(RequestPatternBuilder requestPatternBuilder) {\n-\n+ public List<ServeEvent> removeEvents(RequestPatternBuilder requestPatternBuilder) {\n+ return admin.removeServeEventsMatching(requestPatternBuilder.build()).getServeEvents();\n}\n- public static void removeServeEvents(RequestPatternBuilder requestPatternBuilder) {\n- defaultInstance.get().removeEvents(requestPatternBuilder);\n+ public static List<ServeEvent> removeServeEvents(RequestPatternBuilder requestPatternBuilder) {\n+ return defaultInstance.get().removeEvents(requestPatternBuilder);\n}\npublic static RequestPatternBuilder getRequestedFor(UrlPattern urlPattern) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -25,10 +25,7 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\n-import com.github.tomakehurst.wiremock.verification.FindRequestsResult;\n-import com.github.tomakehurst.wiremock.verification.LoggedRequest;\n-import com.github.tomakehurst.wiremock.verification.VerificationResult;\n+import com.github.tomakehurst.wiremock.verification.*;\nimport java.util.UUID;\n@@ -54,6 +51,7 @@ public interface Admin {\nFindRequestsResult findUnmatchedRequests();\nvoid removeServeEvent(UUID eventId);\n+ FindServeEventsResult removeServeEventsMatching(RequestPattern requestPattern);\nFindNearMissesResult findTopNearMissesFor(LoggedRequest loggedRequest);\nFindNearMissesResult findTopNearMissesFor(RequestPattern requestPattern);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -353,6 +353,11 @@ public class WireMockApp implements StubServer, Admin {\nrequestJournal.removeEvent(eventId);\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsMatching(RequestPattern requestPattern) {\n+ return new FindServeEventsResult(requestJournal.removeEventsMatching(requestPattern));\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nImmutableList.Builder<NearMiss> listBuilder = ImmutableList.builder();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java",
"diff": "@@ -93,6 +93,9 @@ public class AdminRequestHandler extends AbstractRequestHandler {\nreturn ServeEvent.forBadRequest(LoggedRequest.createFrom(request), iie.getErrors());\n} catch (NotPermittedException npe) {\nreturn ServeEvent.forNotAllowedRequest(LoggedRequest.createFrom(request), npe.getErrors());\n+ } catch (Throwable t) {\n+ notifier().error(\"Unrecoverable error handling admin request\", t);\n+ throw t;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPattern.java",
"diff": "@@ -24,6 +24,7 @@ import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.http.Cookie;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableMap;\n@@ -422,4 +423,13 @@ public class RequestPattern implements NamedValueMatcher<Request> {\n}\n};\n}\n+\n+ public static Predicate<ServeEvent> withRequstMatching(final RequestPattern pattern) {\n+ return new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent serveEvent) {\n+ return pattern.match(serveEvent.getRequest()).isExactMatch();\n+ }\n+ };\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"diff": "@@ -55,4 +55,9 @@ public class DisabledRequestJournal implements RequestJournal {\n@Override\npublic void removeEvent(UUID eventId) {\n}\n+\n+ @Override\n+ public List<ServeEvent> removeEventsMatching(RequestPattern requestPattern) {\n+ throw new RequestJournalDisabledException();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.verification;\n-import com.github.tomakehurst.wiremock.http.Request;\n-import com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.google.common.base.Function;\n@@ -24,15 +22,14 @@ import com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.FluentIterable;\nimport com.google.common.collect.ImmutableList;\n-import com.google.common.collect.Iterables;\n-import java.util.Collections;\nimport java.util.List;\nimport java.util.Queue;\nimport java.util.UUID;\nimport java.util.concurrent.ConcurrentLinkedQueue;\nimport static com.github.tomakehurst.wiremock.matching.RequestPattern.thatMatch;\n+import static com.github.tomakehurst.wiremock.matching.RequestPattern.withRequstMatching;\nimport static com.google.common.collect.Iterables.*;\npublic class InMemoryRequestJournal implements RequestJournal {\n@@ -78,6 +75,19 @@ public class InMemoryRequestJournal implements RequestJournal {\n}\n}\n+ @Override\n+ public List<ServeEvent> removeEventsMatching(RequestPattern requestPattern) {\n+ List<ServeEvent> toDelete = FluentIterable.from(serveEvents)\n+ .filter(withRequstMatching(requestPattern))\n+ .toList();\n+\n+ for (ServeEvent event: toDelete) {\n+ serveEvents.remove(event);\n+ }\n+\n+ return toDelete;\n+ }\n+\n@Override\npublic List<ServeEvent> getAllServeEvents() {\nreturn ImmutableList.copyOf(serveEvents).reverse();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"diff": "@@ -35,4 +35,5 @@ public interface RequestJournal {\nvoid requestReceived(ServeEvent serveEvent);\nvoid removeEvent(UUID eventId);\n+ List<ServeEvent> removeEventsMatching(RequestPattern requestPattern);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"diff": "@@ -686,25 +686,48 @@ public class VerificationAcceptanceTest {\nassertThat(finalServeEvents.size(), is(3));\n}\n-// @Test\n-// public void removesEventsPerSuppliedFilter() {\n-// stubFor(get(anyUrl()).willReturn(ok()));\n-//\n-// testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n-// testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n-// testClient.get(\"/two\");\n-//\n-// removeServeEvents(getRequestedFor(urlPathEqualTo(\"/one\")).withHeader(\"My-Header\", equalTo(\"two\")));\n-//\n-// List<ServeEvent> serveEvents = getAllServeEvents();\n-// assertThat(serveEvents.size(), is(2));\n-//\n-// ServeEvent event1 = findServeEventWithUrl(serveEvents, \"/one\");\n-// assertThat(event1.getRequest().header(\"My-Header\").firstValue(), is(\"one\"));\n-//\n-// ServeEvent event2 = findServeEventWithUrl(serveEvents, \"/two\");\n-// assertThat(event2, notNullValue());\n-// }\n+ @Test\n+ public void removesEventsPerSuppliedFilter() {\n+ stubFor(get(anyUrl()).willReturn(ok()));\n+\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n+ testClient.get(\"/two\");\n+\n+ List<ServeEvent> removedEvents = removeServeEvents(\n+ getRequestedFor(urlPathEqualTo(\"/one\")).withHeader(\"My-Header\", equalTo(\"two\"))\n+ );\n+\n+ assertThat(removedEvents.size(), is(1));\n+ assertThat(removedEvents.get(0).getRequest().header(\"My-Header\").firstValue(), is(\"two\"));\n+\n+ List<ServeEvent> serveEvents = getAllServeEvents();\n+ assertThat(serveEvents.size(), is(2));\n+\n+ ServeEvent event1 = findServeEventWithUrl(serveEvents, \"/one\");\n+ assertThat(event1.getRequest().header(\"My-Header\").firstValue(), is(\"one\"));\n+\n+ ServeEvent event2 = findServeEventWithUrl(serveEvents, \"/two\");\n+ assertThat(event2, notNullValue());\n+ }\n+\n+ @Test\n+ public void returnsEmptyListWhenNoEventsMatchedForRemoval() {\n+ stubFor(get(anyUrl()).willReturn(ok()));\n+\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"one\"));\n+ testClient.get(\"/one\", withHeader(\"My-Header\", \"two\"));\n+ testClient.get(\"/two\");\n+\n+ List<ServeEvent> removedEvents = removeServeEvents(\n+ getRequestedFor(urlPathEqualTo(\"/one\")).withHeader(\"My-Header\", equalTo(\"wrong\"))\n+ );\n+\n+ assertThat(removedEvents.size(), is(0));\n+\n+ List<ServeEvent> serveEvents = getAllServeEvents();\n+ assertThat(serveEvents.size(), is(3));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to remove serve events (logged requests) via a request pattern |
686,936 | 10.09.2019 09:47:15 | -3,600 | e0c18ef70c9f6e8c2c7b48a0b20fe56c024a1099 | Added ability to remove serve events by stub metadata | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java",
"diff": "@@ -390,6 +390,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn wireMockApp.removeServeEventsMatching(requestPattern);\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern) {\n+ return wireMockApp.removeServeEventsForStubsMatchingMetadata(metadataPattern);\n+ }\n+\n@Override\npublic void updateGlobalSettings(GlobalSettings newSettings) {\nwireMockApp.updateGlobalSettings(newSettings);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java",
"diff": "@@ -91,6 +91,7 @@ public class AdminRoutes {\nrouter.add(GET, \"/requests/{id}\", GetServedStubTask.class);\nrouter.add(DELETE, \"/requests/{id}\", RemoveServeEventTask.class);\nrouter.add(POST, \"/requests/remove\", RemoveServeEventsByRequestPatternTask.class);\n+ router.add(POST, \"/requests/remove-by-metadata\", RemoveServeEventsByStubMetadataTask.class);\nrouter.add(POST, \"/recordings/snapshot\", SnapshotTask.class);\nrouter.add(POST, \"/recordings/start\", StartRecordingTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/RemoveServeEventsByStubMetadataTask.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.common.Json;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.StringValuePattern;\n+import com.github.tomakehurst.wiremock.verification.FindServeEventsResult;\n+\n+public class RemoveServeEventsByStubMetadataTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ StringValuePattern metadataPattern = Json.read(request.getBodyAsString(), StringValuePattern.class);\n+ FindServeEventsResult findServeEventsResult = admin.removeServeEventsForStubsMatchingMetadata(metadataPattern);\n+ return ResponseDefinition.okForJson(findServeEventsResult);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java",
"diff": "@@ -255,6 +255,14 @@ public class HttpAdminClient implements Admin {\nreturn Json.read(body, FindServeEventsResult.class);\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern) {\n+ String body = postJsonAssertOkAndReturnBody(\n+ urlFor(RemoveServeEventsByStubMetadataTask.class),\n+ Json.write(metadataPattern));\n+ return Json.read(body, FindServeEventsResult.class);\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nString body = getJsonAssertOkAndReturnBody(urlFor(FindNearMissesForUnmatchedTask.class));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -597,6 +597,14 @@ public class WireMock {\nreturn defaultInstance.get().removeEvents(requestPatternBuilder);\n}\n+ public static List<ServeEvent> removeEventsByStubMetadata(StringValuePattern pattern) {\n+ return defaultInstance.get().removeEventsByMetadata(pattern);\n+ }\n+\n+ public List<ServeEvent> removeEventsByMetadata(StringValuePattern pattern) {\n+ return admin.removeServeEventsForStubsMatchingMetadata(pattern).getServeEvents();\n+ }\n+\npublic static RequestPatternBuilder getRequestedFor(UrlPattern urlPattern) {\nreturn new RequestPatternBuilder(RequestMethod.GET, urlPattern);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/Admin.java",
"diff": "@@ -23,10 +23,12 @@ import com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubImport;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.verification.*;\n+import java.util.List;\nimport java.util.UUID;\npublic interface Admin {\n@@ -52,6 +54,7 @@ public interface Admin {\nvoid removeServeEvent(UUID eventId);\nFindServeEventsResult removeServeEventsMatching(RequestPattern requestPattern);\n+ FindServeEventsResult removeServeEventsForStubsMatchingMetadata(StringValuePattern pattern);\nFindNearMissesResult findTopNearMissesFor(LoggedRequest loggedRequest);\nFindNearMissesResult findTopNearMissesFor(RequestPattern requestPattern);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java",
"diff": "@@ -358,6 +358,11 @@ public class WireMockApp implements StubServer, Admin {\nreturn new FindServeEventsResult(requestJournal.removeEventsMatching(requestPattern));\n}\n+ @Override\n+ public FindServeEventsResult removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern) {\n+ return new FindServeEventsResult(requestJournal.removeServeEventsForStubsMatchingMetadata(metadataPattern));\n+ }\n+\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\nImmutableList.Builder<NearMiss> listBuilder = ImmutableList.builder();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/DisabledRequestJournal.java",
"diff": "package com.github.tomakehurst.wiremock.verification;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.google.common.base.Optional;\n@@ -60,4 +61,9 @@ public class DisabledRequestJournal implements RequestJournal {\npublic List<ServeEvent> removeEventsMatching(RequestPattern requestPattern) {\nthrow new RequestJournalDisabledException();\n}\n+\n+ @Override\n+ public List<ServeEvent> removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern) {\n+ throw new RequestJournalDisabledException();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/InMemoryRequestJournal.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.verification;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Function;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\n@@ -63,22 +66,27 @@ public class InMemoryRequestJournal implements RequestJournal {\n@Override\npublic void removeEvent(final UUID eventId) {\n- Iterable<ServeEvent> toDelete = filter(serveEvents, new Predicate<ServeEvent>() {\n+ removeServeEvents(new Predicate<ServeEvent>() {\n@Override\npublic boolean apply(ServeEvent input) {\nreturn input.getId().equals(eventId);\n}\n});\n-\n- for (ServeEvent event: toDelete) {\n- serveEvents.remove(event);\n- }\n}\n@Override\npublic List<ServeEvent> removeEventsMatching(RequestPattern requestPattern) {\n+ return removeServeEvents(withRequstMatching(requestPattern));\n+ }\n+\n+ @Override\n+ public List<ServeEvent> removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern) {\n+ return removeServeEvents(withStubMetadataMatching(metadataPattern));\n+ }\n+\n+ private List<ServeEvent> removeServeEvents(Predicate<ServeEvent> predicate) {\nList<ServeEvent> toDelete = FluentIterable.from(serveEvents)\n- .filter(withRequstMatching(requestPattern))\n+ .filter(predicate)\n.toList();\nfor (ServeEvent event: toDelete) {\n@@ -124,4 +132,19 @@ public class InMemoryRequestJournal implements RequestJournal {\n}\n}\n+ private static Predicate<ServeEvent> withStubMetadataMatching(final StringValuePattern metadataPattern) {\n+ return new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent serveEvent) {\n+ StubMapping stub = serveEvent.getStubMapping();\n+ if (stub != null) {\n+ String metadataJson = Json.write(stub.getMetadata());\n+ return metadataPattern.match(metadataJson).isExactMatch();\n+ }\n+\n+ return false;\n+ }\n+ };\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/RequestJournal.java",
"diff": "package com.github.tomakehurst.wiremock.verification;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.google.common.base.Optional;\n@@ -36,4 +37,5 @@ public interface RequestJournal {\nvoid removeEvent(UUID eventId);\nList<ServeEvent> removeEventsMatching(RequestPattern requestPattern);\n+ List<ServeEvent> removeServeEventsForStubsMatchingMetadata(StringValuePattern metadataPattern);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"diff": "@@ -21,27 +21,28 @@ import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.junit.WireMockRule;\n-import com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.matching.MatchResult;\n+import com.github.tomakehurst.wiremock.matching.RequestMatcher;\n+import com.github.tomakehurst.wiremock.matching.RequestMatcherExtension;\n+import com.github.tomakehurst.wiremock.matching.ValueMatcher;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n-import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.RequestJournalDisabledException;\nimport com.google.common.base.Optional;\n-import org.apache.http.HttpEntity;\n-import org.apache.http.entity.ByteArrayEntity;\nimport org.apache.http.entity.StringEntity;\n-import org.junit.Ignore;\nimport org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\nimport org.junit.runner.RunWith;\n-import javax.swing.text.html.parser.Entity;\nimport java.util.List;\nimport java.util.UUID;\n+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;\n+import static com.github.tomakehurst.wiremock.client.WireMock.lessThan;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.common.Metadata.metadata;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.forCustomMatcher;\n@@ -52,7 +53,6 @@ import static java.lang.System.lineSeparator;\nimport static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\n-import static org.junit.Assert.assertTrue;\nimport static org.junit.Assert.fail;\n@RunWith(Enclosed.class)\n@@ -729,6 +729,24 @@ public class VerificationAcceptanceTest {\nassertThat(serveEvents.size(), is(3));\n}\n+ @Test\n+ public void removesEventsAssociatedWithStubsMatchingMetadata() {\n+ stubFor(get(\"/with-metadata\")\n+ .withMetadata(metadata()\n+ .list(\"tags\", \"delete-me\")\n+ ));\n+ stubFor(get(\"/without-metadata\"));\n+\n+ testClient.get(\"/with-metadata\");\n+ testClient.get(\"/without-metadata\");\n+\n+ removeEventsByStubMetadata(matchingJsonPath(\"$.tags[0]\", equalTo(\"delete-me\")));\n+\n+ List<ServeEvent> serveEvents = getAllServeEvents();\n+ assertThat(serveEvents.size(), is(1));\n+ assertThat(serveEvents.get(0).getRequest().getUrl(), is(\"/without-metadata\"));\n+ }\n+\n}\npublic static class JournalDisabled {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added ability to remove serve events by stub metadata |
686,936 | 12.09.2019 17:56:20 | -3,600 | f0cd8f2d1614fbd332b07654e303707b77736fda | Added docs for request journal event removal | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/stub-metadata.md",
"new_path": "docs-v2/_docs/stub-metadata.md",
"diff": "@@ -71,7 +71,7 @@ POST /__admin/mappings/find-by-metadata\n}\n```\n-## Delete stubs by metadata\n+## Remove stubs by metadata\nSimilarly, stubs with matching metadata can be removed:\n@@ -94,3 +94,6 @@ POST /__admin/mappings/remove-by-metadata\n}\n```\n+## Remove request journal events by metadata\n+\n+See [Removing items from the journal](/docs/verifying/#by-criteria)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/verifying.md",
"new_path": "docs-v2/_docs/verifying.md",
"diff": "@@ -208,6 +208,76 @@ which will return a response like this:\n}\n```\n+## Removing items from the journal\n+\n+### By ID\n+\n+An individual journal event can be removed via the Java API:\n+\n+```java\n+removeServeEvent(id);\n+```\n+\n+Or via the HTTP API by issuing a `DELETE` to `http://<host>:<port>/__admin/requests/{id}`.\n+\n+\n+### By criteria\n+\n+Events can also be removed from the request journal by criteria (in the same manner as for finding them described in [Criteria queries](#criteria-queries)).\n+\n+Using the Java DSL:\n+\n+```java\n+removeServeEvents(putRequestedFor(urlMatching(\"/api/.*\")\n+ .withHeader(\"X-Trace-Id\", equalTo(\"123\"))));\n+```\n+\n+Or via the HTTP API:\n+\n+```\n+POST http://<host>:<port>/__admin/requests/remove\n+\n+{\n+ \"method\": \"PUT\",\n+ \"urlPattern\": \"/api/.*\",\n+ \"headers\": {\n+ \"X-Trace-Id\": {\n+ \"equalTo\": \"123\"\n+ }\n+ }\n+}\n+```\n+\n+### By stub metadata\n+\n+In situations where it isn't possible to precisely identify log events for removal from request attributes alone, the metadata\n+associated with stubs matching requests can be used for selection. For instance, your test code might create stubs tagged\n+with test case identifiers, then use these to clean up events created by the test:\n+\n+```java\n+stubFor(get(\"/api/dosomething/123\")\n+ .withMetadata(metadata()\n+ .list(\"tags\", \"test-57\")\n+ ));\n+\n+testClient.get(\"/api/dosomething/123\");\n+\n+List<ServeEvent> removedServeEvents = removeEventsByStubMetadata(matchingJsonPath(\"$.tags[0]\", equalTo(\"test-57\")));\n+```\n+\n+```\n+POST /__admin/requests/remove-by-metadata\n+\n+{\n+ \"matchesJsonPath\" : {\n+ \"expression\" : \"$.tags[0]\",\n+ \"equalTo\" : \"test-57\"\n+ }\n+}\n+```\n+\n+For more info about stub metadata see [Stub Metadata](/docs/stub-metadata/)\n+\n## Resetting the request journal\nThe request log can be reset at any time. If you're using either of the\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/VerificationAcceptanceTest.java",
"diff": "@@ -740,7 +740,10 @@ public class VerificationAcceptanceTest {\ntestClient.get(\"/with-metadata\");\ntestClient.get(\"/without-metadata\");\n- removeEventsByStubMetadata(matchingJsonPath(\"$.tags[0]\", equalTo(\"delete-me\")));\n+ List<ServeEvent> removedServeEvents = removeEventsByStubMetadata(matchingJsonPath(\"$.tags[0]\", equalTo(\"delete-me\")));\n+\n+ assertThat(removedServeEvents.size(), is(1));\n+ assertThat(removedServeEvents.get(0).getRequest().getUrl(), is(\"/with-metadata\"));\nList<ServeEvent> serveEvents = getAllServeEvents();\nassertThat(serveEvents.size(), is(1));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added docs for request journal event removal |
686,936 | 12.09.2019 18:49:59 | -3,600 | f5e34843cc78720bc9745ec4e7ca1832eb42a6ae | Fixed - unable to use absent() with matchesJsonPath due to serialisation error | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java",
"diff": "@@ -229,7 +229,7 @@ public class WireMock {\n}\npublic static StringValuePattern absent() {\n- return StringValuePattern.ABSENT;\n+ return AbsentPattern.ABSENT;\n}\npublic void saveMappings() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/AbsentPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/AbsentPattern.java",
"diff": "@@ -19,10 +19,17 @@ import com.fasterxml.jackson.annotation.JsonProperty;\npublic class AbsentPattern extends StringValuePattern {\n+ public static final AbsentPattern ABSENT = new AbsentPattern(null);\n+\npublic AbsentPattern(@JsonProperty(\"absent\") String expectedValue) {\nsuper(expectedValue);\n}\n+ @Override\n+ public boolean nullSafeIsAbsent() {\n+ return true;\n+ }\n+\n@Override\npublic MatchResult match(String value) {\nreturn MatchResult.of(value == null);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/ContentPatternDeserialiser.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/ContentPatternDeserialiser.java",
"diff": "@@ -33,7 +33,7 @@ public class ContentPatternDeserialiser extends JsonDeserializer<ContentPattern<\nJsonNode rootNode = parser.readValueAsTree();\nif (isAbsent(rootNode)) {\n- return StringValuePattern.ABSENT;\n+ return AbsentPattern.ABSENT;\n}\nif (!rootNode.has(\"binaryEqualTo\")) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePattern.java",
"diff": "@@ -27,24 +27,22 @@ import java.lang.reflect.Constructor;\n@JsonDeserialize(using = StringValuePatternJsonDeserializer.class)\npublic abstract class StringValuePattern extends ContentPattern<String> {\n- public static final AbsentPattern ABSENT = new AbsentPattern(null);\n-\npublic StringValuePattern(String expectedValue) {\nsuper(expectedValue);\n}\n@JsonIgnore\npublic boolean isPresent() {\n- return this != ABSENT;\n+ return !nullSafeIsAbsent();\n}\npublic Boolean isAbsent() {\n- return this != ABSENT ? null : true;\n+ return !nullSafeIsAbsent() ? null : true;\n}\n@JsonIgnore\n- public Boolean nullSafeIsAbsent() {\n- return this == ABSENT;\n+ public boolean nullSafeIsAbsent() {\n+ return false;\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/StringValuePatternJsonDeserializer.java",
"diff": "@@ -50,6 +50,7 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n.put(\"matches\", RegexPattern.class)\n.put(\"doesNotMatch\", NegativeRegexPattern.class)\n.put(\"anything\", AnythingPattern.class)\n+ .put(\"absent\", AbsentPattern.class)\n.build();\n@Override\n@@ -57,7 +58,7 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nJsonNode rootNode = parser.readValueAsTree();\nif (isAbsent(rootNode)) {\n- return StringValuePattern.ABSENT;\n+ return AbsentPattern.ABSENT;\n}\nreturn buildStringValuePattern(rootNode);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n-import com.fasterxml.jackson.databind.ObjectMapper;\n-import com.fasterxml.jackson.databind.node.ArrayNode;\n-import com.fasterxml.jackson.databind.node.ObjectNode;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\nimport com.github.tomakehurst.wiremock.http.Fault;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\n@@ -27,7 +24,6 @@ import org.apache.http.MalformedChunkCodingException;\nimport org.apache.http.NoHttpResponseException;\nimport org.apache.http.client.ClientProtocolException;\nimport org.apache.http.entity.ByteArrayEntity;\n-import org.apache.http.entity.StringEntity;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matcher;\nimport org.hamcrest.TypeSafeMatcher;\n@@ -37,12 +33,9 @@ import org.junit.Rule;\nimport org.junit.Test;\nimport org.junit.rules.ExpectedException;\n-import java.io.IOException;\n-import java.io.UnsupportedEncodingException;\nimport java.net.SocketException;\nimport java.util.HashMap;\nimport java.util.Map;\n-import java.util.Objects;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.any;\n@@ -58,7 +51,8 @@ import static java.net.HttpURLConnection.HTTP_OK;\nimport static java.util.Collections.singletonList;\nimport static org.apache.http.entity.ContentType.*;\nimport static org.hamcrest.Matchers.*;\n-import static org.junit.Assert.*;\n+import static org.junit.Assert.assertThat;\n+import static org.junit.Assert.assertTrue;\npublic class StubbingAcceptanceTest extends AcceptanceTestBase {\n@@ -331,6 +325,7 @@ public class StubbingAcceptanceTest extends AcceptanceTestBase {\npublic void matchingOnRequestBodyWithAdvancedJsonPath() {\nstubFor(post(\"/jsonpath/advanced\")\n.withRequestBody(matchingJsonPath(\"$.counter\", equalTo(\"123\")))\n+ .withRequestBody(matchingJsonPath(\"$.wrong\", absent()))\n.willReturn(ok())\n);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/AbsentPatternTest.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.github.tomakehurst.wiremock.common.Json;\n+import org.junit.Test;\n+\n+import static org.hamcrest.Matchers.instanceOf;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class AbsentPatternTest {\n+\n+ @Test\n+ public void correctlyDeserialisesFromJson() {\n+ StringValuePattern stringValuePattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"absent\\\": \\\"(absent)\\\" \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+\n+ assertThat(stringValuePattern, instanceOf(AbsentPattern.class));\n+ assertThat(stringValuePattern.isAbsent(), is(true));\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesJsonPathPatternTest.java",
"diff": "@@ -294,6 +294,25 @@ public class MatchesJsonPathPatternTest {\nassertThat(subMatcher.getExpected(), is(\"the value\"));\n}\n+ @Test\n+ public void correctlyDeserialisesWithAbsentValuePattern() {\n+ StringValuePattern stringValuePattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"$..thing\\\", \\n\" +\n+ \" \\\"absent\\\": \\\"(absent)\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+\n+ assertThat(stringValuePattern, instanceOf(MatchesJsonPathPattern.class));\n+ assertThat(stringValuePattern.getExpected(), is(\"$..thing\"));\n+\n+ StringValuePattern subMatcher = ((MatchesJsonPathPattern) stringValuePattern).getValuePattern();\n+ assertThat(subMatcher, instanceOf(AbsentPattern.class));\n+ assertThat(subMatcher.nullSafeIsAbsent(), is(true));\n+ }\n+\n@Test(expected = JsonException.class)\npublic void throwsSensibleErrorOnDeserialisationWhenPatternIsBadlyFormedWithMissingExpression() {\nJson.read(\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #1175 - unable to use absent() with matchesJsonPath due to serialisation error |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.