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,965 | 19.06.2017 00:40:17 | 25,200 | 516095a7ee151e451887d8f159c6cf9fae7fb10b | Work on body file extraction | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/LoggedResponseDefinitionTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/LoggedResponseDefinitionTransformer.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\nimport com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\n-import com.github.tomakehurst.wiremock.http.HttpHeader;\n-import com.github.tomakehurst.wiremock.http.HttpHeaders;\n-import com.github.tomakehurst.wiremock.http.LoggedResponse;\n-import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.common.ContentTypes;\n+import com.github.tomakehurst.wiremock.http.*;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\n@@ -20,7 +18,15 @@ public class LoggedResponseDefinitionTransformer implements Function<LoggedRespo\n.withStatus(response.getStatus());\nif (response.getBody() != null && !response.getBody().isEmpty()) {\n+ if (\n+ response.getHeaders() != null\n+ && response.getHeaders().getContentTypeHeader().mimeTypePart() != null\n+ && ContentTypes.determineIsTextFromMimeType(response.getHeaders().getContentTypeHeader().mimeTypePart())\n+ ) {\nresponseDefinitionBuilder.withBody(response.getBody());\n+ } else {\n+ responseDefinitionBuilder.withBody(response.getBodyBytes());\n+ }\n}\nif (response.getHeaders() != null) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;\n+import com.github.tomakehurst.wiremock.common.ContentTypes;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.MatchResult;\n+import com.github.tomakehurst.wiremock.matching.ValueMatcher;\n+\n+// Matches the size of the body of a ResponseDefinition, for use by the Snapshot API\n+// when determining if the body should be extracted to a file\n+@JsonDeserialize(using = ResponseDefinitionBodyMatcherDeserializer.class)\n+public class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefinition> {\n+ private final long textSizeThreshold;\n+ private final long binarySizeThreshold;\n+\n+ public ResponseDefinitionBodyMatcher(long textSizeThreshold, long binarySizeThreshold) {\n+ this.textSizeThreshold = textSizeThreshold;\n+ this.binarySizeThreshold = binarySizeThreshold;\n+ }\n+\n+ @Override\n+ public MatchResult match(ResponseDefinition responseDefinition) {\n+ if (!responseDefinition.specifiesBodyContent()) {\n+ return MatchResult.noMatch();\n+ } else if (\n+ responseDefinition.getHeaders() != null\n+ && responseDefinition.getHeaders().getContentTypeHeader().mimeTypePart() != null\n+ && ContentTypes.determineIsTextFromMimeType(responseDefinition.getHeaders().getContentTypeHeader().mimeTypePart())\n+ ) {\n+ if (responseDefinition.getBody().length() > textSizeThreshold) {\n+ return MatchResult.exactMatch();\n+ } else {\n+ return MatchResult.noMatch();\n+ }\n+ } else {\n+ if (responseDefinition.getByteBody().length > binarySizeThreshold) {\n+ return MatchResult.exactMatch();\n+ } else {\n+ return MatchResult.noMatch();\n+ }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcherDeserializer.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.core.JsonParser;\n+import com.fasterxml.jackson.databind.DeserializationContext;\n+import com.fasterxml.jackson.databind.JsonDeserializer;\n+import com.fasterxml.jackson.databind.JsonNode;\n+\n+import java.io.IOException;\n+import java.util.regex.Matcher;\n+import java.util.regex.Pattern;\n+\n+public class ResponseDefinitionBodyMatcherDeserializer extends JsonDeserializer<ResponseDefinitionBodyMatcher> {\n+ @Override\n+ public ResponseDefinitionBodyMatcher deserialize(JsonParser parser, DeserializationContext context) throws IOException {\n+ JsonNode rootNode = parser.readValueAsTree();\n+ return new ResponseDefinitionBodyMatcher(\n+ parseJsonNode(rootNode.get(\"textSizeThreshold\")),\n+ parseJsonNode(rootNode.get(\"binarySizeThreshold\"))\n+ );\n+ }\n+\n+ public static long parseJsonNode(JsonNode node) {\n+ if (node == null || node.isNull()) {\n+ return Long.MAX_VALUE;\n+ } else if (node.isNumber()) {\n+ return node.asLong();\n+ } else {\n+ return parseFilesize(node.textValue());\n+ }\n+ }\n+\n+ // Converts a human-readable file size string (e.g. \"10,100 KB\") to bytes\n+ // Partiall based off https://stackoverflow.com/a/12090818\n+ public static long parseFilesize(String in) {\n+ String cleanedInput = in.trim().replaceAll(\",\",\".\");\n+\n+ final Matcher m = Pattern\n+ .compile(\"^([\\\\d.]+)\\\\s*(\\\\w)?b?$\", Pattern.CASE_INSENSITIVE)\n+ .matcher(cleanedInput);\n+ if (!m.find()) {\n+ throw new IllegalArgumentException(\"Invalid size string: \\\"\" + in + \"\\\"\");\n+ }\n+\n+ int scale = 1;\n+ if (m.group(2) != null) {\n+ switch (m.group(2).toUpperCase()) {\n+ case \"G\":\n+ scale *= 1024;\n+ case \"M\":\n+ scale *= 1024;\n+ case \"K\":\n+ scale *= 1024;\n+ break;\n+ default:\n+ throw new IllegalArgumentException(\"Invalid size unit: \" + m.group(2));\n+ }\n+ }\n+ return Math.round(Double.parseDouble(m.group(1)) * scale);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"diff": "@@ -9,8 +9,6 @@ import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\n-import static java.lang.Math.min;\n-\n/**\n* Counts unique RequestPatterns from StubMappings. If shouldRecordRepeatsAsScenarios is enabled, then multiple\n* identical requests will be recorded as scenarios. Otherwise, they're skipped.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -17,6 +17,8 @@ public class SnapshotSpec {\nprivate ServeEventRequestFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\nprivate RequestPatternTransformer captureHeaders;\n+ // Criteria for extracting body from responses\n+ private ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n// Either \"full\" (meaning return an array of rendered StubMappings) or \"ids\", which returns an array of UUIDs\nprivate SnapshotOutputFormat outputFormat;\n@@ -33,6 +35,7 @@ public class SnapshotSpec {\npublic SnapshotSpec(\n@JsonProperty(\"filters\") ServeEventRequestFilters filters ,\n@JsonProperty(\"captureHeaders\") Map<String, MultiValuePattern> captureHeaders,\n+ @JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n@JsonProperty(\"outputFormat\") SnapshotOutputFormat outputFormat,\n@JsonProperty(\"persist\") JsonNode persistNode,\n@JsonProperty(\"repeatsAsScenarios\") JsonNode repeatsNode,\n@@ -42,6 +45,7 @@ public class SnapshotSpec {\nthis.filters = filters;\nthis.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\nthis.captureHeaders = new RequestPatternTransformer(captureHeaders);\n+ this.extractBodyCriteria = extractBodyCriteria;\nthis.persist = persistNode.asBoolean(true);\nthis.repeatsAsScenarios = repeatsNode.asBoolean(false);\nthis.transformers = transformers;\n@@ -63,4 +67,6 @@ public class SnapshotSpec {\npublic List<String> getTransformers() { return transformers; }\npublic Parameters getTransformerParameters() { return transformerParameters; }\n+\n+ public ResponseDefinitionBodyMatcher getExtractBodyCriteria() { return extractBodyCriteria; }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingBodyExtractor.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\n+import com.github.tomakehurst.wiremock.common.*;\n+import com.github.tomakehurst.wiremock.core.WireMockApp;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+public class SnapshotStubMappingBodyExtractor {\n+ private final FileSource fileSource;\n+ private final IdGenerator idGenerator;\n+\n+ public SnapshotStubMappingBodyExtractor(FileSource fileSource) {\n+ this(fileSource, new VeryShortIdGenerator());\n+ }\n+\n+ public SnapshotStubMappingBodyExtractor(FileSource fileSource, IdGenerator idGenerator) {\n+ this.fileSource = fileSource;\n+ this.idGenerator = idGenerator;\n+ }\n+\n+ /**\n+ * Extracts body of the ResponseDefinition to a file written to the FILES_ROOT.\n+ * Modifies the ResponseDefinition to point to the file in-place\n+ *\n+ * @fixme Generates multiple files for identical requests when scenarios enabled\n+ * @param stubMapping Stub mapping to extract\n+ */\n+ public void extractInPlace(StubMapping stubMapping) {\n+ String fileId = idGenerator.generate();\n+ byte[] body = stubMapping.getResponse().getByteBody();\n+ String extension = ContentTypes.determineFileExtension(\n+ stubMapping.getRequest().getUrl(),\n+ stubMapping.getResponse().getHeaders().getContentTypeHeader(),\n+ body);\n+\n+ String bodyFileName = new StringBuilder(WireMockApp.FILES_ROOT)\n+ .append(\"/body\")\n+ .append(\"-\")\n+ .append(UniqueFilenameGenerator.urlToPathParts(stubMapping.getRequest().getUrl()))\n+ .append(\"-\")\n+ .append(fileId)\n+ .append(\".\")\n+ .append(extension)\n+ .toString();\n+\n+ String noBody = null; // used to prevent ambiguous method call error for withBody()\n+\n+ stubMapping.setResponse(\n+ ResponseDefinitionBuilder\n+ .like(stubMapping.getResponse())\n+ .withBodyFile(bodyFileName)\n+ .withBody(noBody)\n+ .withBase64Body(noBody)\n+ .build()\n+ );\n+\n+ fileSource.writeBinaryFile(bodyFileName, body);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -20,7 +20,6 @@ import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.j\nimport static com.google.common.collect.FluentIterable.from;\nimport static java.net.HttpURLConnection.HTTP_OK;\n-\npublic class SnapshotTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n@@ -39,17 +38,20 @@ public class SnapshotTask implements AdminTask {\nList<StubMapping> stubMappings = new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders())\n.generateFrom(serveEvents);\n+ // Handle repeated requests by either skipping them or generating scenarios\nstubMappings = new SnapshotRepeatedRequestHandler(snapshotSpec.shouldRecordRepeatsAsScenarios())\n.processStubMappings(stubMappings);\n- final SnapshotStubMappingTransformerRunner transformerRunner = getTransformerRunner(\n- admin.getOptions(),\n- snapshotSpec\n+ stubMappings = postProcessStubMappings(\n+ stubMappings,\n+ getTransformerRunner(admin.getOptions(), snapshotSpec),\n+ snapshotSpec.getExtractBodyCriteria(),\n+ new SnapshotStubMappingBodyExtractor(admin.getOptions().filesRoot())\n);\n- final ArrayList<Object> response = new ArrayList<>();\n+\n+ final ArrayList<Object> response = new ArrayList<>(stubMappings.size());\nfor (StubMapping stubMapping : stubMappings) {\n- stubMapping = transformerRunner.apply(stubMapping);\nif (snapshotSpec.shouldPersist()) {\nstubMapping.setPersistent(true);\nadmin.addStubMapping(stubMapping);\n@@ -60,6 +62,37 @@ public class SnapshotTask implements AdminTask {\nreturn jsonResponse(response.toArray(), HTTP_OK);\n}\n+ /**\n+ * Transform stub mappings using any applicable StubMappingTransformers and extract response body when applicable\n+ *\n+ * @param stubMappings List of generated stub mappings\n+ * @param transformerRunner Runs any applicable StubMappingTransformer extensions\n+ * @param bodyExtractMatcher Matcher to determine if response body should be extracted\n+ * @param bodyExtractor Extracts response body in place\n+ * @return Processed stub mappings\n+ */\n+ private List<StubMapping> postProcessStubMappings(\n+ List<StubMapping> stubMappings,\n+ SnapshotStubMappingTransformerRunner transformerRunner,\n+ ResponseDefinitionBodyMatcher bodyExtractMatcher,\n+ SnapshotStubMappingBodyExtractor bodyExtractor\n+ ) {\n+ final ArrayList<StubMapping> transformedStubMappings = new ArrayList<>(stubMappings.size());\n+\n+ for (StubMapping stubMapping : stubMappings) {\n+ StubMapping transformedStubMapping = transformerRunner.apply(stubMapping);\n+ if (\n+ bodyExtractMatcher != null\n+ && bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()\n+ ) {\n+ bodyExtractor.extractInPlace(transformedStubMapping);\n+ }\n+ transformedStubMappings.add(transformedStubMapping);\n+ }\n+\n+ return transformedStubMappings;\n+ }\n+\nprivate SnapshotStubMappingTransformerRunner getTransformerRunner(Options options, SnapshotSpec snapshotSpec) {\nfinal Iterable<StubMappingTransformer> registeredTransformers = options\n.extensionsOfType(StubMappingTransformer.class)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"diff": "@@ -7,14 +7,17 @@ public class LoggedResponse {\nprivate final int status;\nprivate final HttpHeaders headers;\nprivate final String body;\n+ private final byte[] bodyBytes;\nprivate final Fault fault;\npublic LoggedResponse(@JsonProperty(\"status\") int status,\n@JsonProperty(\"headers\") HttpHeaders headers,\n@JsonProperty(\"body\") String body,\n+ @JsonProperty(\"bodyBytes\") byte[] bodyBytes,\n@JsonProperty(\"fault\") Fault fault) {\nthis.status = status;\nthis.headers = headers;\n+ this.bodyBytes = bodyBytes;\nthis.body = body;\nthis.fault = fault;\n}\n@@ -24,6 +27,7 @@ public class LoggedResponse {\nresponse.getStatus(),\nresponse.getHeaders() == null || response.getHeaders().all().isEmpty() ? null : response.getHeaders(),\nresponse.getBody() != null ? response.getBodyAsString() : null,\n+ response.getBody(),\nresponse.getFault()\n);\n}\n@@ -36,6 +40,10 @@ public class LoggedResponse {\nreturn headers;\n}\n+ public byte[] getBodyBytes() {\n+ return bodyBytes;\n+ }\n+\npublic String getBody() {\nreturn body;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/LoggedResponseDefinitionTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/LoggedResponseDefinitionTransformerTest.java",
"diff": "@@ -5,6 +5,7 @@ import com.github.tomakehurst.wiremock.http.*;\nimport org.junit.Test;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;\n+import static com.google.common.base.Charsets.UTF_8;\nimport static org.junit.Assert.assertEquals;\npublic class LoggedResponseDefinitionTransformerTest {\n@@ -14,20 +15,44 @@ public class LoggedResponseDefinitionTransformerTest {\n@Test\npublic void applyWithEmptyHeadersAndBody() {\n- LoggedResponse response = LoggedResponse.from(Response.response().status(401).build());\n+ final LoggedResponse response = LoggedResponse.from(Response.response().status(401).build());\nassertEquals(responseDefinition().withStatus(401).build(), aTransformer().apply(response));\n}\n@Test\n- public void applyWithEmptyHeadersAndRegularBody() {\n- LoggedResponse response = LoggedResponse.from(Response.response().body(\"foo\").build());\n- ResponseDefinition expected = responseDefinition().withBody(\"foo\").build();\n+ public void applyWithTextBody() {\n+ final LoggedResponse response = LoggedResponse.from(Response\n+ .response()\n+ .headers(new HttpHeaders(new ContentTypeHeader(\"text/plain\")))\n+ .body(\"foo\")\n+ .build()\n+ );\n+ final ResponseDefinition expected = responseDefinition()\n+ .withHeader(\"Content-Type\", \"text/plain\")\n+ .withBody(\"foo\")\n+ .build();\n+ assertEquals(expected, aTransformer().apply(response));\n+ }\n+\n+ @Test\n+ public void applyWithBinaryBody() {\n+ final byte[] body = new byte[] { 0x1, 0xc, 0x3, 0xb, 0x1 };\n+ final LoggedResponse response = LoggedResponse.from(Response\n+ .response()\n+ .headers(new HttpHeaders(new ContentTypeHeader(\"application/octet-stream\")))\n+ .body(body)\n+ .build()\n+ );\n+ final ResponseDefinition expected = responseDefinition()\n+ .withHeader(\"Content-Type\", \"application/octet-stream\")\n+ .withBody(body)\n+ .build();\nassertEquals(expected, aTransformer().apply(response));\n}\n@Test\n- public void applyWithHeaders() {\n- LoggedResponse response = LoggedResponse.from(Response\n+ public void applyWithExtraHeaders() {\n+ final LoggedResponse response = LoggedResponse.from(Response\n.response()\n.headers(new HttpHeaders(\nHttpHeader.httpHeader(\"Content-Encoding\", \"gzip\"),\n@@ -37,7 +62,7 @@ public class LoggedResponseDefinitionTransformerTest {\n))\n.build()\n);\n- ResponseDefinition expected = responseDefinition()\n+ final ResponseDefinition expected = responseDefinition()\n.withHeader(\"Accept\", \"application/json\")\n.withHeader(\"X-foo\", \"Bar\")\n.build();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherDeserializerTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcherDeserializer;\n+import com.google.common.collect.ImmutableMap;\n+import org.junit.Test;\n+\n+import java.util.Map;\n+\n+import static org.junit.Assert.assertEquals;\n+\n+public class ResponseDefinitionBodyMatcherDeserializerTest {\n+ @Test\n+ public void correctlyParsesFileSize() {\n+ final Map<String, Long> testCases = ImmutableMap.<String, Long>builder()\n+ .put(\"100\", 100L)\n+ .put(\"1KB\", 1024L)\n+ .put(\"1 kb\", 1024L)\n+ .put(\"1024 K\", 1024L * 1024)\n+ .put(\"10 Mb\", 10L * 1024 * 1024)\n+ .put(\"10.5 GB\", Math.round(10.5 * 1024 * 1024 * 1024))\n+ .build();\n+\n+ for (String input : testCases.keySet()) {\n+ Long expected = testCases.get(input);\n+ Long actual = ResponseDefinitionBodyMatcherDeserializer.parseFilesize(input);\n+ assertEquals(\"Failed with \" + input, expected, actual);\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import org.junit.Test;\n+\n+import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;\n+import static junit.framework.TestCase.assertFalse;\n+\n+public class ResponseDefinitionBodyMatcherTest {\n+ @Test\n+ public void doesNotMatchEmptyBody() {\n+ ResponseDefinition emptyBody = responseDefinition().build();\n+ ResponseDefinitionBodyMatcher matcher = new ResponseDefinitionBodyMatcher(0, 0);\n+ assertFalse(matcher.match(emptyBody).isExactMatch());\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Work on body file extraction |
687,038 | 26.06.2017 23:40:18 | 0 | 5b0d397243b644a0389b62edfdb0a4433f2ffd93 | obeying the charset specified in the content-type header | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/ContentTypes.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/ContentTypes.java",
"diff": "@@ -90,7 +90,7 @@ public class ContentTypes {\nreturn substringAfterLast(lastPathSegment, \".\");\n}\n- return determineTextFileExtension(stringFromBytes(responseBody));\n+ return determineTextFileExtension(stringFromBytes(responseBody, contentTypeHeader.charset()));\n}\npublic static String determineTextFileExtension(String content) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Strings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Strings.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n+import java.nio.charset.Charset;\nimport static com.google.common.base.Charsets.UTF_8;\npublic class Strings {\npublic static String stringFromBytes(byte[] bytes) {\n+ return stringFromBytes(bytes, UTF_8);\n+ }\n+\n+ public static String stringFromBytes(byte[] bytes, Charset cset) {\nif (bytes == null) {\nreturn null;\n}\n- return new String(bytes, UTF_8);\n+ return new String(bytes, cset);\n}\npublic static byte[] bytesFromString(String str) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/ContentTypeHeader.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/ContentTypeHeader.java",
"diff": "package com.github.tomakehurst.wiremock.http;\nimport com.google.common.base.Optional;\n+import java.nio.charset.Charset;\n+import static com.google.common.base.Charsets.UTF_8;\npublic class ContentTypeHeader extends HttpHeader {\n@@ -53,4 +55,14 @@ public class ContentTypeHeader extends HttpHeader {\nreturn Optional.absent();\n}\n+\n+ public Charset charset() {\n+ if (isPresent()) {\n+ Optional<String> encoding = encodingPart();\n+ if (encoding.isPresent()) {\n+ return Charset.forName(encoding.get());\n+ }\n+ }\n+ return UTF_8;\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": "@@ -96,11 +96,7 @@ public class Response {\nprivate Charset encodingFromContentTypeHeaderOrUtf8() {\nContentTypeHeader contentTypeHeader = headers.getContentTypeHeader();\n- if (contentTypeHeader.isPresent() && contentTypeHeader.encodingPart().isPresent()) {\n- return Charset.forName(contentTypeHeader.encodingPart().get());\n- }\n-\n- return UTF_8;\n+ return contentTypeHeader.charset();\n}\npublic boolean wasConfigured() {\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": "@@ -24,6 +24,9 @@ import javax.servlet.http.HttpServletRequest;\nimport java.io.IOException;\nimport java.util.*;\n+import java.nio.charset.Charset;\n+import static com.google.common.base.Charsets.UTF_8;\n+\nimport static com.github.tomakehurst.wiremock.common.Encoding.encodeBase64;\nimport static com.github.tomakehurst.wiremock.common.Strings.stringFromBytes;\nimport static com.github.tomakehurst.wiremock.common.Urls.splitQuery;\n@@ -103,6 +106,14 @@ public class WireMockHttpServletRequestAdapter implements Request {\nreturn cachedBody;\n}\n+ private Charset encodingFromContentTypeHeaderOrUtf8() {\n+ ContentTypeHeader contentTypeHeader = contentTypeHeader();\n+ if (contentTypeHeader != null) {\n+ return contentTypeHeader.charset();\n+ }\n+ return UTF_8;\n+ }\n+\nprivate boolean hasGzipEncoding() {\nString encodingHeader = request.getHeader(\"Content-Encoding\");\nreturn encodingHeader != null && encodingHeader.contains(\"gzip\");\n@@ -110,7 +121,7 @@ public class WireMockHttpServletRequestAdapter implements Request {\n@Override\npublic String getBodyAsString() {\n- return stringFromBytes(getBody());\n+ return stringFromBytes(getBody(), encodingFromContentTypeHeaderOrUtf8());\n}\n@Override\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": "@@ -29,6 +29,9 @@ import java.util.Date;\nimport java.util.Map;\nimport java.util.Set;\n+import java.nio.charset.Charset;\n+import static com.google.common.base.Charsets.UTF_8;\n+\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@@ -125,8 +128,19 @@ public class LoggedRequest implements Request {\n@Override\npublic ContentTypeHeader contentTypeHeader() {\n+ if (headers != null) {\nreturn headers.getContentTypeHeader();\n}\n+ return null;\n+ }\n+\n+ private Charset encodingFromContentTypeHeaderOrUtf8() {\n+ ContentTypeHeader contentTypeHeader = contentTypeHeader();\n+ if (contentTypeHeader != null) {\n+ return contentTypeHeader.charset();\n+ }\n+ return UTF_8;\n+ }\n@Override\npublic boolean containsHeader(String key) {\n@@ -146,7 +160,7 @@ public class LoggedRequest implements Request {\n@Override\n@JsonProperty(\"body\")\npublic String getBodyAsString() {\n- return stringFromBytes(body);\n+ return stringFromBytes(body, encodingFromContentTypeHeaderOrUtf8());\n}\n@Override\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | obeying the charset specified in the content-type header |
686,945 | 01.07.2017 06:54:02 | -19,080 | 5350879c1df321b012e93ede17c4ef95bc77fd49 | [Bala] Documentation typos & formatting | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/junit-rule.md",
"new_path": "docs-v2/_docs/junit-rule.md",
"diff": "@@ -65,7 +65,7 @@ public WireMockClassRule instanceRule = wireMockRule;\n## Accessing the stubbing and verification DSL from the rule\n-In addition the the static methods on the `WireMock` class, it is also\n+In addition to the static methods on the `WireMock` class, it is also\npossible to configure stubs etc. via the rule object directly. There are\ntwo advantages to this - 1) it's a bit faster as it avoids sending\ncommands over HTTP, and 2) if you want to mock multiple services you can\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/running-standalone.md",
"new_path": "docs-v2/_docs/running-standalone.md",
"diff": "@@ -118,6 +118,7 @@ WireMock.configureFor(\"https\", \"my.remote.host\", 8443);\n```\nAlternatively you can create an instance of the client (or as many as there are servers to configure):\n+\n```java\nWireMock wireMock1 = new WireMock(\"1st.remote.host\", 8000);\nWireMock wireMock2 = new WireMock(\"https\", \"2nd.remote.host\", 8001);\n@@ -171,7 +172,7 @@ $ curl http://localhost:8080/api/mytest\nMore content\n```\n-See stubbing and verifying for more on the JSON API.\n+See [stubbing](/docs/stubbing/) and [verifying](/docs/verifying/) for more on the JSON API.\n## Pushing JSON files to a remote WireMock instance\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | [Bala] Documentation typos & formatting |
687,038 | 03.07.2017 13:49:48 | 0 | d1431b4fe397bc6455e42942277509af5a9ccda5 | add tests to verify non-utf8 charset handling | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -351,6 +351,7 @@ task npmInstall(type: Exec) {\ncommandLine 'npm', 'i'\n}\n+/*\ntask generateApiDocs(type: Exec) {\ndependsOn npmInstall\nworkingDir 'docs-v2'\n@@ -358,6 +359,7 @@ task generateApiDocs(type: Exec) {\n}\njar.dependsOn generateApiDocs\nprocessResources.dependsOn generateApiDocs\n+*/\ntask deleteGeneratedApiDocs(type: Delete) {\ndelete \"src/main/resources/swagger\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMockTestClient.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMockTestClient.java",
"diff": "@@ -185,7 +185,11 @@ public class WireMockTestClient {\n}\npublic void addResponse(String responseSpecJson) {\n- int status = postJsonAndReturnStatus(newMappingUrl(), responseSpecJson);\n+ addResponse(responseSpecJson, \"utf-8\");\n+ }\n+\n+ public void addResponse(String responseSpecJson, String charset) {\n+ int status = postJsonAndReturnStatus(newMappingUrl(), responseSpecJson, charset);\nif (status != HTTP_CREATED) {\nthrow new RuntimeException(\"Returned status code was \" + status);\n}\n@@ -206,10 +210,14 @@ public class WireMockTestClient {\n}\nprivate int postJsonAndReturnStatus(String url, String json) {\n+ return postJsonAndReturnStatus(url, json, \"utf-8\");\n+ }\n+\n+ private int postJsonAndReturnStatus(String url, String json, String charset) {\nHttpPost post = new HttpPost(url);\ntry {\nif (json != null) {\n- post.setEntity(new StringEntity(json, ContentType.create(JSON.toString(), \"utf-8\")));\n+ post.setEntity(new StringEntity(json, ContentType.create(JSON.toString(), charset)));\n}\nHttpResponse httpResponse = httpClient().execute(post);\nreturn httpResponse.getStatusLine().getStatusCode();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | add tests to verify non-utf8 charset handling |
686,965 | 04.07.2017 17:09:33 | 25,200 | 331ba0a148ffd8e75f061c788c21ee692b36dd14 | Make all parameters final in Snapshotspec and switch JsonNode arguments to Boolean | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -2,7 +2,6 @@ package com.github.tomakehurst.wiremock.admin.model;\nimport com.fasterxml.jackson.annotation.JsonCreator;\nimport com.fasterxml.jackson.annotation.JsonProperty;\n-import com.fasterxml.jackson.databind.JsonNode;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.matching.MultiValuePattern;\n@@ -14,22 +13,22 @@ import java.util.Map;\n*/\npublic class SnapshotSpec {\n// Whitelist requests to generate StubMappings for\n- private ServeEventRequestFilters filters;\n+ private final ServeEventRequestFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\n- private RequestPatternTransformer captureHeaders;\n+ private final RequestPatternTransformer captureHeaders;\n// Criteria for extracting body from responses\n- private ResponseDefinitionBodyMatcher extractBodyCriteria;\n+ private final ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n// Either \"full\" (meaning return an array of rendered StubMappings) or \"ids\", which returns an array of UUIDs\n- private SnapshotOutputFormat outputFormat;\n+ private final SnapshotOutputFormat outputFormat;\n// Whether to persist stub mappings\n- private boolean persist = true;\n+ private final Boolean persist;\n// Whether duplicate requests should be recorded as scenarios or just discarded\n- private boolean repeatsAsScenarios = false;\n+ private final Boolean repeatsAsScenarios;\n// Stub mapping transformers\n- private List<String> transformers;\n+ private final List<String> transformers;\n// Parameters for stub mapping transformers\n- private Parameters transformerParameters;\n+ private final Parameters transformerParameters;\n@JsonCreator\npublic SnapshotSpec(\n@@ -37,22 +36,24 @@ public class SnapshotSpec {\n@JsonProperty(\"captureHeaders\") Map<String, MultiValuePattern> captureHeaders,\n@JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n@JsonProperty(\"outputFormat\") SnapshotOutputFormat outputFormat,\n- @JsonProperty(\"persist\") JsonNode persistNode,\n- @JsonProperty(\"repeatsAsScenarios\") JsonNode repeatsNode,\n+ @JsonProperty(\"persist\") Boolean persist,\n+ @JsonProperty(\"repeatsAsScenarios\") Boolean repeatsAsScenarios,\n@JsonProperty(\"transformers\") List<String> transformers,\n@JsonProperty(\"transformerParameters\") Parameters transformerParameters\n) {\nthis.filters = filters;\n- this.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\nthis.captureHeaders = new RequestPatternTransformer(captureHeaders);\nthis.extractBodyCriteria = extractBodyCriteria;\n- this.persist = persistNode.asBoolean(true);\n- this.repeatsAsScenarios = repeatsNode.asBoolean(false);\n+ this.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\n+ this.persist = persist == null ? true : persist;\n+ this.repeatsAsScenarios = repeatsAsScenarios == null ? false : repeatsAsScenarios;\nthis.transformers = transformers;\nthis.transformerParameters = transformerParameters;\n}\n- public SnapshotSpec() {}\n+ public SnapshotSpec() {\n+ this(null, null, null, null, null, null, null, null);\n+ }\npublic ServeEventRequestFilters getFilters() { return filters; }\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Make all parameters final in Snapshotspec and switch JsonNode arguments to Boolean |
686,965 | 04.07.2017 17:19:47 | 25,200 | a47e65bda237d6dfff8506febd7e450900803732 | Cleanup to have SnapshotSpec.getCaptureHeaders() just return the capture headers | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -15,7 +15,7 @@ public class SnapshotSpec {\n// Whitelist requests to generate StubMappings for\nprivate final ServeEventRequestFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\n- private final RequestPatternTransformer captureHeaders;\n+ private final Map<String, MultiValuePattern> captureHeaders;\n// Criteria for extracting body from responses\nprivate final ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n@@ -42,7 +42,7 @@ public class SnapshotSpec {\n@JsonProperty(\"transformerParameters\") Parameters transformerParameters\n) {\nthis.filters = filters;\n- this.captureHeaders = new RequestPatternTransformer(captureHeaders);\n+ this.captureHeaders = captureHeaders;\nthis.extractBodyCriteria = extractBodyCriteria;\nthis.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\nthis.persist = persist == null ? true : persist;\n@@ -57,7 +57,7 @@ public class SnapshotSpec {\npublic ServeEventRequestFilters getFilters() { return filters; }\n- public RequestPatternTransformer getCaptureHeaders() { return captureHeaders; }\n+ public Map<String, MultiValuePattern> getCaptureHeaders() { return captureHeaders; }\npublic SnapshotOutputFormat getOutputFormat() { return outputFormat; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport java.util.ArrayList;\nimport java.util.List;\n+import java.util.Map;\n/**\n* Transforms ServeEvents to StubMappings using SnapshotRequestPatternTransformer and SnapshotResponseDefinitionTransformer\n@@ -24,9 +26,9 @@ public class SnapshotStubMappingGenerator {\nthis.responseTransformer = responseTransformer;\n}\n- public SnapshotStubMappingGenerator(RequestPatternTransformer requestTransformer) {\n+ public SnapshotStubMappingGenerator(Map<String, MultiValuePattern> captureHeaders) {\nthis(\n- requestTransformer == null ? new RequestPatternTransformer() : requestTransformer,\n+ new RequestPatternTransformer(captureHeaders),\nnew LoggedResponseDefinitionTransformer()\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"diff": "@@ -26,7 +26,8 @@ public class SnapshotStubMappingGeneratorTest {\n@Test\npublic void generateFromWithEmptyList() {\nList<StubMapping> actual = new SnapshotStubMappingGenerator(\n- requestPatternTransformer(null)\n+ requestPatternTransformer(null),\n+ responseDefinitionTransformer(null)\n).generateFrom(Lists.<ServeEvent>newArrayList());\nassertEquals(new ArrayList<>(), actual);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Cleanup to have SnapshotSpec.getCaptureHeaders() just return the capture headers |
686,965 | 04.07.2017 18:15:00 | 25,200 | 7c36645fd4c6288a80f47ab9af709fce78aa4796 | Refactoring for ServeEventRequestFilters: rename to ProxiedServeEventFilters and move proxy filtering logic over | [
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ServeEventRequestFilters.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ProxiedServeEventFilters.java",
"diff": "@@ -11,15 +11,20 @@ import java.util.List;\nimport java.util.UUID;\n/**\n- * A collection a RequestPattern filters and IDs to apply to ServeEvents\n+ * A predicate to filter proxied ServeEvents against RequestPattern filters and IDs\n*/\n-public class ServeEventRequestFilters implements Predicate<ServeEvent> {\n+public class ProxiedServeEventFilters implements Predicate<ServeEvent> {\n@JsonUnwrapped\nprivate final RequestPattern filters;\nprivate final List<UUID> ids;\n+ public ProxiedServeEventFilters() {\n+ this.filters = null;\n+ this.ids = null;\n+ }\n+\n@JsonCreator\n- public ServeEventRequestFilters(\n+ public ProxiedServeEventFilters(\n@JsonProperty(\"filters\") RequestPattern filters,\n@JsonProperty(\"ids\") List<UUID> ids\n) {\n@@ -29,15 +34,18 @@ public class ServeEventRequestFilters implements Predicate<ServeEvent> {\n@Override\npublic boolean apply(ServeEvent serveEvent) {\n- if (\n- filters != null\n- && !filters.match(serveEvent.getRequest()).isExactMatch()\n- ) {\n+ if (!serveEvent.getResponseDefinition().isProxyResponse()) {\n+ return false;\n+ }\n+\n+ if (filters != null && !filters.match(serveEvent.getRequest()).isExactMatch()) {\nreturn false;\n}\n+\nif (ids != null && !ids.contains(serveEvent.getId())) {\nreturn false;\n}\n+\nreturn true;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"diff": "@@ -21,10 +21,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;\npublic class RequestPatternTransformer implements Function<Request, RequestPatternBuilder> {\nprivate final Map<String, MultiValuePattern> headers;\n- public RequestPatternTransformer() {\n- this.headers = null;\n- }\n-\n@JsonCreator\npublic RequestPatternTransformer(@JsonProperty(\"headers\") Map<String, MultiValuePattern> headers) {\nthis.headers = headers;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -13,7 +13,7 @@ import java.util.Map;\n*/\npublic class SnapshotSpec {\n// Whitelist requests to generate StubMappings for\n- private final ServeEventRequestFilters filters;\n+ private final ProxiedServeEventFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\nprivate final Map<String, MultiValuePattern> captureHeaders;\n// Criteria for extracting body from responses\n@@ -32,7 +32,7 @@ public class SnapshotSpec {\n@JsonCreator\npublic SnapshotSpec(\n- @JsonProperty(\"filters\") ServeEventRequestFilters filters ,\n+ @JsonProperty(\"filters\") ProxiedServeEventFilters filters ,\n@JsonProperty(\"captureHeaders\") Map<String, MultiValuePattern> captureHeaders,\n@JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n@JsonProperty(\"outputFormat\") SnapshotOutputFormat outputFormat,\n@@ -41,7 +41,7 @@ public class SnapshotSpec {\n@JsonProperty(\"transformers\") List<String> transformers,\n@JsonProperty(\"transformerParameters\") Parameters transformerParameters\n) {\n- this.filters = filters;\n+ this.filters = filters == null ? new ProxiedServeEventFilters() : filters;\nthis.captureHeaders = captureHeaders;\nthis.extractBodyCriteria = extractBodyCriteria;\nthis.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\n@@ -55,7 +55,7 @@ public class SnapshotSpec {\nthis(null, null, null, null, null, null, null, null);\n}\n- public ServeEventRequestFilters getFilters() { return filters; }\n+ public ProxiedServeEventFilters getFilters() { return filters; }\npublic Map<String, MultiValuePattern> getCaptureHeaders() { return captureHeaders; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -10,8 +10,6 @@ import com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.google.common.base.Predicate;\n-import com.google.common.collect.FluentIterable;\nimport java.util.ArrayList;\nimport java.util.List;\n@@ -30,10 +28,8 @@ public class SnapshotTask implements AdminTask {\n}\nprivate ResponseDefinition execute(Admin admin, SnapshotSpec snapshotSpec) {\n- final Iterable<ServeEvent> serveEvents = filterServeEvents(\n- admin.getServeEvents(),\n- snapshotSpec.getFilters()\n- );\n+ final Iterable<ServeEvent> serveEvents = from(admin.getServeEvents().getServeEvents())\n+ .filter(snapshotSpec.getFilters());\nList<StubMapping> stubMappings = new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders())\n.generateFrom(serveEvents);\n@@ -104,27 +100,4 @@ public class SnapshotTask implements AdminTask {\noptions.filesRoot()\n);\n}\n-\n- private Iterable<ServeEvent> filterServeEvents(\n- GetServeEventsResult serveEventsResult,\n- ServeEventRequestFilters snapshotFilters\n- ) {\n- FluentIterable<ServeEvent> serveEvents = from(serveEventsResult.getServeEvents())\n- .filter(onlyProxied());\n-\n- if (snapshotFilters != null) {\n- serveEvents = serveEvents.filter(snapshotFilters);\n- }\n-\n- return serveEvents;\n- }\n-\n- private Predicate<ServeEvent> onlyProxied() {\n- return new Predicate<ServeEvent>() {\n- @Override\n- public boolean apply(ServeEvent serveEvent) {\n- return serveEvent.getResponseDefinition().isProxyResponse();\n- }\n- };\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"diff": "@@ -3,6 +3,12 @@ package com.github.tomakehurst.wiremock.extension;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+/**\n+ * Base class for stub mapping transformer extensions. These allow transforming stub mappings recorded via the\n+ * snapshot API endpoint.\n+ *\n+ * @see com.github.tomakehurst.wiremock.admin.tasks.SnapshotTask\n+ */\npublic abstract class StubMappingTransformer implements Extension {\npublic abstract StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ProxiedServeEventFiltersTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.ProxiedServeEventFilters;\n+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.MockRequest;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import org.junit.Test;\n+\n+import java.util.Arrays;\n+import java.util.List;\n+import java.util.UUID;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;\n+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n+import static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\n+import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\n+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n+import static org.junit.Assert.*;\n+\n+public class ProxiedServeEventFiltersTest {\n+ @Test\n+ public void applyWithUniversalRequestPattern() {\n+ ServeEvent serveEvent = proxiedServeEvent(mockRequest());\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(RequestPattern.ANYTHING, null);\n+ assertTrue(filters.apply(serveEvent));\n+\n+ // Should default to RequestPattern.ANYTHING when passing null for filters\n+ filters = new ProxiedServeEventFilters(null, null);\n+ assertTrue(filters.apply(serveEvent));\n+ }\n+\n+ @Test\n+ public void applyWithUnproxiedServeEvent() {\n+ ServeEvent serveEvent = toServeEvent(null, null, ResponseDefinition.ok());\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(null, null);\n+ assertFalse(filters.apply(serveEvent));\n+ }\n+\n+ @Test\n+ public void applyWithMethodPattern() {\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(newRequestPattern(GET, anyUrl()).build(), null);\n+ MockRequest request = mockRequest().method(GET).url(\"/foo\");\n+\n+ assertTrue(filters.apply(proxiedServeEvent(request)));\n+ assertTrue(filters.apply(proxiedServeEvent(request.url(\"/bar\"))));\n+ assertFalse(filters.apply(proxiedServeEvent(request.method(POST))));\n+ }\n+\n+ @Test\n+ public void applyWithIds() {\n+ List<UUID> ids = Arrays.asList(\n+ UUID.fromString(\"00000000-0000-0000-0000-000000000000\"),\n+ UUID.fromString(\"00000000-0000-0000-0000-000000000001\")\n+ );\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(null, ids);\n+\n+ assertTrue(filters.apply(proxiedServeEvent(ids.get(0))));\n+ assertTrue(filters.apply(proxiedServeEvent(ids.get(1))));\n+ assertFalse(filters.apply(proxiedServeEvent(UUID.fromString(\"00000000-0000-0000-0000-000000000002\"))));\n+ }\n+\n+ @Test\n+ public void applyWithMethodAndUrlPattern() {\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(\n+ newRequestPattern(GET, urlEqualTo(\"/foo\")).build(),\n+ null\n+ );\n+ MockRequest request = mockRequest().method(GET).url(\"/foo\");\n+\n+ assertTrue(filters.apply(proxiedServeEvent(request)));\n+ assertFalse(filters.apply(proxiedServeEvent(request.url(\"/bar\"))));\n+ assertFalse(filters.apply(proxiedServeEvent(request.method(POST))));\n+ }\n+\n+ @Test\n+ public void applyWithIdsAndMethodPattern() {\n+ MockRequest request = mockRequest().method(GET).url(\"/foo\");\n+ List<UUID> ids = Arrays.asList(\n+ UUID.fromString(\"00000000-0000-0000-0000-000000000000\"),\n+ UUID.fromString(\"00000000-0000-0000-0000-000000000001\")\n+ );\n+ ProxiedServeEventFilters filters = new ProxiedServeEventFilters(\n+ newRequestPattern(GET, anyUrl()).build(),\n+ ids\n+ );\n+\n+ assertTrue(filters.apply(proxiedServeEvent(ids.get(0), request)));\n+ assertFalse(filters.apply(proxiedServeEvent(UUID.fromString(\"00000000-0000-0000-0000-000000000002\"), request)));\n+ assertFalse(filters.apply(proxiedServeEvent(ids.get(0), request.method(POST))));\n+ }\n+\n+ private ServeEvent toServeEvent(UUID id, MockRequest request, ResponseDefinition responseDefinition) {\n+ return new ServeEvent(\n+ id,\n+ request != null ? request.asLoggedRequest() : null,\n+ null,\n+ responseDefinition,\n+ null,\n+ true\n+ );\n+ }\n+\n+ private ServeEvent proxiedServeEvent(UUID id, MockRequest request) {\n+ return toServeEvent(\n+ id,\n+ request,\n+ new ResponseDefinitionBuilder().proxiedFrom(\"http://localhost\").build()\n+ );\n+ }\n+\n+ private ServeEvent proxiedServeEvent(MockRequest request) {\n+ return proxiedServeEvent(null, request);\n+ }\n+\n+ private ServeEvent proxiedServeEvent(UUID id) {\n+ return proxiedServeEvent(id, null);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"diff": "@@ -26,7 +26,7 @@ public class RequestPatternTransformerTest {\nRequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.GET, urlEqualTo(\"/foo\"));\n// Default is to include method and URL exactly\n- assertEquals(expected.build(), new RequestPatternTransformer().apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n}\n@Test\n@@ -80,7 +80,7 @@ public class RequestPatternTransformerTest {\n.withUrl(\"/somewhere\")\n.withRequestBody(equalToJson(\"['hello']\"));\n- assertEquals(expected.build(), new RequestPatternTransformer().apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n}\n@Test\n@@ -94,6 +94,6 @@ public class RequestPatternTransformerTest {\n.withUrl(\"/somewhere\")\n.withRequestBody(equalToXml(\"<foo/>\"));\n- assertEquals(expected.build(), new RequestPatternTransformer().apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ServeEventRequestFiltersTest.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin;\n-\n-import com.github.tomakehurst.wiremock.admin.model.ServeEventRequestFilters;\n-import com.github.tomakehurst.wiremock.matching.MockRequest;\n-import com.github.tomakehurst.wiremock.matching.RequestPattern;\n-import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n-import org.junit.Test;\n-\n-import java.util.Arrays;\n-import java.util.List;\n-import java.util.UUID;\n-\n-import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n-import static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\n-import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\n-import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n-import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n-import static org.junit.Assert.*;\n-\n-public class ServeEventRequestFiltersTest {\n- @Test\n- public void applyWithUniversalRequestPattern() {\n- ServeEventRequestFilters filters = new ServeEventRequestFilters(RequestPattern.ANYTHING, null);\n- assertTrue(filters.apply(toServeEvent(mockRequest())));\n- }\n-\n- @Test\n- public void applyWithMethodPattern() {\n- ServeEventRequestFilters filters = new ServeEventRequestFilters(newRequestPattern(GET, anyUrl()).build(), null);\n- MockRequest request = mockRequest().method(GET).url(\"/foo\");\n-\n- assertTrue(filters.apply(toServeEvent(request)));\n- assertTrue(filters.apply(toServeEvent(request.url(\"/bar\"))));\n- assertFalse(filters.apply(toServeEvent(request.method(POST))));\n- }\n-\n- @Test\n- public void applyWithIds() {\n- List<UUID> ids = Arrays.asList(\n- UUID.fromString(\"00000000-0000-0000-0000-000000000000\"),\n- UUID.fromString(\"00000000-0000-0000-0000-000000000001\")\n- );\n- ServeEventRequestFilters filters = new ServeEventRequestFilters(null, ids);\n-\n- assertTrue(filters.apply(toServeEvent(ids.get(0))));\n- assertTrue(filters.apply(toServeEvent(ids.get(1))));\n- assertFalse(filters.apply(toServeEvent(UUID.fromString(\"00000000-0000-0000-0000-000000000002\"))));\n- }\n-\n- @Test\n- public void applyWithMethodAndUrlPattern() {\n- ServeEventRequestFilters filters = new ServeEventRequestFilters(newRequestPattern(GET, urlEqualTo(\"/foo\")).build(), null);\n- MockRequest request = mockRequest().method(GET).url(\"/foo\");\n-\n- assertTrue(filters.apply(toServeEvent(request)));\n- assertFalse(filters.apply(toServeEvent(request.url(\"/bar\"))));\n- assertFalse(filters.apply(toServeEvent(request.method(POST))));\n- }\n-\n- @Test\n- public void applyWithIdsAndMethodPattern() {\n- MockRequest request = mockRequest().method(GET).url(\"/foo\");\n- List<UUID> ids = Arrays.asList(\n- UUID.fromString(\"00000000-0000-0000-0000-000000000000\"),\n- UUID.fromString(\"00000000-0000-0000-0000-000000000001\")\n- );\n- ServeEventRequestFilters filters = new ServeEventRequestFilters(\n- newRequestPattern(GET, anyUrl()).build(),\n- ids\n- );\n-\n- assertTrue(filters.apply(toServeEvent(ids.get(0), request)));\n- assertFalse(filters.apply(toServeEvent(UUID.fromString(\"00000000-0000-0000-0000-000000000002\"), request)));\n- assertFalse(filters.apply(toServeEvent(ids.get(0), request.method(POST))));\n- }\n-\n- private ServeEvent toServeEvent(UUID id, MockRequest request) {\n- return new ServeEvent(\n- id,\n- request != null ? request.asLoggedRequest() : null,\n- null,\n- null,\n- null,\n- true\n- );\n- }\n-\n- private ServeEvent toServeEvent(MockRequest request) {\n- return toServeEvent(null, request);\n- }\n-\n- private ServeEvent toServeEvent(UUID id) {\n- return toServeEvent(id, null);\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"diff": "@@ -78,7 +78,7 @@ public class SnapshotStubMappingGeneratorTest {\n}\nprivate static RequestPatternTransformer requestPatternTransformer(final RequestPatternBuilder requestPatternBuilder) {\n- return new RequestPatternTransformer() {\n+ return new RequestPatternTransformer(null) {\n@Override\npublic RequestPatternBuilder apply(Request request) {\nreturn requestPatternBuilder;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Refactoring for ServeEventRequestFilters: rename to ProxiedServeEventFilters and move proxy filtering logic over |
686,965 | 04.07.2017 19:30:17 | 25,200 | 82f4f1243bc74098eb3647ce13f5a42a06f8f57e | Lots of cleanup: move post-processing logic out of SnapshotTask and into new class and make snapshot generation a bit more functional | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"diff": "@@ -23,9 +23,9 @@ public class SnapshotRepeatedRequestHandler {\nthis.requestStubMappingTracker = new HashMap<>();\n}\n- public List<StubMapping> processStubMappings(List<StubMapping> stubMappings) {\n+ public List<StubMapping> processStubMappings(Iterable<StubMapping> stubMappings) {\nthis.requestStubMappingTracker.clear();\n- ArrayList<StubMapping> processedMappings = new ArrayList<>(stubMappings.size());\n+ ArrayList<StubMapping> processedMappings = new ArrayList<>();\nfor (StubMapping stubMapping : stubMappings) {\nStubMappingTracker tracker = requestStubMappingTracker.get(stubMapping.getRequest());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"diff": "@@ -5,15 +5,14 @@ import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.base.Function;\n-import java.util.ArrayList;\n-import java.util.List;\nimport java.util.Map;\n/**\n* Transforms ServeEvents to StubMappings using SnapshotRequestPatternTransformer and SnapshotResponseDefinitionTransformer\n*/\n-public class SnapshotStubMappingGenerator {\n+public class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMapping> {\nprivate final RequestPatternTransformer requestTransformer;\nprivate final LoggedResponseDefinitionTransformer responseTransformer;\n@@ -33,15 +32,8 @@ public class SnapshotStubMappingGenerator {\n);\n}\n- public List<StubMapping> generateFrom(Iterable<ServeEvent> events) {\n- final ArrayList<StubMapping> stubMappings = new ArrayList<>();\n- for (ServeEvent event : events) {\n- stubMappings.add(generateFrom(event));\n- }\n- return stubMappings;\n- }\n-\n- private StubMapping generateFrom(ServeEvent event) {\n+ @Override\n+ public StubMapping apply(ServeEvent event) {\nfinal RequestPattern requestPattern = requestTransformer.apply(event.getRequest()).build();\nfinal ResponseDefinition responseDefinition = responseTransformer.apply(event.getResponse());\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.collect.Lists;\n+\n+import java.util.List;\n+\n+/**\n+ * Transform stub mappings using any applicable StubMappingTransformers and extract response body when applicable\n+ */\n+public class SnapshotStubMappingPostProcessor {\n+ private final SnapshotRepeatedRequestHandler repeatedRequestHandler;\n+ private final SnapshotStubMappingTransformerRunner transformerRunner;\n+ private final ResponseDefinitionBodyMatcher bodyExtractMatcher;\n+ private final SnapshotStubMappingBodyExtractor bodyExtractor;\n+\n+ public SnapshotStubMappingPostProcessor(\n+ SnapshotRepeatedRequestHandler repeatedRequestHandler,\n+ SnapshotStubMappingTransformerRunner transformerRunner,\n+ ResponseDefinitionBodyMatcher bodyExtractMatcher,\n+ SnapshotStubMappingBodyExtractor bodyExtractor\n+ ) {\n+ this.repeatedRequestHandler = repeatedRequestHandler;\n+ this.transformerRunner = transformerRunner;\n+ this.bodyExtractMatcher = bodyExtractMatcher;\n+ this.bodyExtractor = bodyExtractor;\n+ }\n+\n+ public List<StubMapping> process(Iterable<StubMapping> stubMappings) {\n+ List<StubMapping> transformedStubMappings;\n+\n+ // Handle repeated requests by either skipping them or generating scenarios\n+ transformedStubMappings = repeatedRequestHandler.processStubMappings(stubMappings);\n+\n+ // Extract response bodies, if applicable\n+ if (bodyExtractMatcher != null) {\n+ for (StubMapping stubMapping : stubMappings) {\n+ if (bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()) {\n+ bodyExtractor.extractInPlace(stubMapping);\n+ }\n+ }\n+ }\n+\n+ // Run any stub mapping transformer extensions\n+ transformedStubMappings = Lists.transform(transformedStubMappings, transformerRunner);\n+\n+ return transformedStubMappings;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -8,7 +8,6 @@ import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport java.util.ArrayList;\n@@ -28,21 +27,11 @@ public class SnapshotTask implements AdminTask {\n}\nprivate ResponseDefinition execute(Admin admin, SnapshotSpec snapshotSpec) {\n- final Iterable<ServeEvent> serveEvents = from(admin.getServeEvents().getServeEvents())\n- .filter(snapshotSpec.getFilters());\n-\n- List<StubMapping> stubMappings = new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders())\n- .generateFrom(serveEvents);\n-\n- // Handle repeated requests by either skipping them or generating scenarios\n- stubMappings = new SnapshotRepeatedRequestHandler(snapshotSpec.shouldRecordRepeatsAsScenarios())\n- .processStubMappings(stubMappings);\n-\n- stubMappings = postProcessStubMappings(\n- stubMappings,\n- getTransformerRunner(admin.getOptions(), snapshotSpec),\n- snapshotSpec.getExtractBodyCriteria(),\n- new SnapshotStubMappingBodyExtractor(admin.getOptions().filesRoot())\n+ final List<StubMapping> stubMappings = serveEventsToStubMappings(\n+ admin.getServeEvents(),\n+ snapshotSpec.getFilters(),\n+ new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders()),\n+ getStubMappingPostProcessor(admin.getOptions(), snapshotSpec)\n);\nfinal ArrayList<Object> response = new ArrayList<>(stubMappings.size());\n@@ -58,46 +47,38 @@ public class SnapshotTask implements AdminTask {\nreturn jsonResponse(response.toArray(), HTTP_OK);\n}\n- /**\n- * Transform stub mappings using any applicable StubMappingTransformers and extract response body when applicable\n- *\n- * @param stubMappings List of generated stub mappings\n- * @param transformerRunner Runs any applicable StubMappingTransformer extensions\n- * @param bodyExtractMatcher Matcher to determine if response body should be extracted\n- * @param bodyExtractor Extracts response body in place\n- * @return Processed stub mappings\n- */\n- private List<StubMapping> postProcessStubMappings(\n- List<StubMapping> stubMappings,\n- SnapshotStubMappingTransformerRunner transformerRunner,\n- ResponseDefinitionBodyMatcher bodyExtractMatcher,\n- SnapshotStubMappingBodyExtractor bodyExtractor\n+ private List<StubMapping> serveEventsToStubMappings(\n+ GetServeEventsResult serveEventsResult,\n+ ProxiedServeEventFilters serveEventFilters,\n+ SnapshotStubMappingGenerator stubMappingGenerator,\n+ SnapshotStubMappingPostProcessor snapshotStubMappingPostProcessor\n) {\n- final ArrayList<StubMapping> transformedStubMappings = new ArrayList<>(stubMappings.size());\n-\n- for (StubMapping stubMapping : stubMappings) {\n- if (\n- bodyExtractMatcher != null\n- && bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()\n- ) {\n- bodyExtractor.extractInPlace(stubMapping);\n- }\n- transformedStubMappings.add(transformerRunner.apply(stubMapping));\n- }\n+ final Iterable<StubMapping> stubMappings = from(serveEventsResult.getServeEvents())\n+ .filter(serveEventFilters)\n+ .transform(stubMappingGenerator);\n- return transformedStubMappings;\n+ return snapshotStubMappingPostProcessor.process(stubMappings);\n}\n- private SnapshotStubMappingTransformerRunner getTransformerRunner(Options options, SnapshotSpec snapshotSpec) {\n- final Iterable<StubMappingTransformer> registeredTransformers = options\n- .extensionsOfType(StubMappingTransformer.class)\n- .values();\n-\n- return new SnapshotStubMappingTransformerRunner(\n- registeredTransformers,\n+ private SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n+ final SnapshotRepeatedRequestHandler repeatedRequestHandler = new SnapshotRepeatedRequestHandler(\n+ snapshotSpec.shouldRecordRepeatsAsScenarios()\n+ );\n+ final SnapshotStubMappingBodyExtractor stubMappingBodyExtractor = new SnapshotStubMappingBodyExtractor(\n+ options.filesRoot()\n+ );\n+ final SnapshotStubMappingTransformerRunner stubMappingTransformerRunner = new SnapshotStubMappingTransformerRunner(\n+ options.extensionsOfType(StubMappingTransformer.class).values(),\nsnapshotSpec.getTransformers(),\nsnapshotSpec.getTransformerParameters(),\noptions.filesRoot()\n);\n+\n+ return new SnapshotStubMappingPostProcessor(\n+ repeatedRequestHandler,\n+ stubMappingTransformerRunner,\n+ snapshotSpec.getExtractBodyCriteria(),\n+ stubMappingBodyExtractor\n+ );\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"diff": "@@ -11,50 +11,16 @@ import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n-import com.google.common.collect.Lists;\nimport org.jmock.Mockery;\nimport org.junit.Test;\n-import java.util.ArrayList;\n-import java.util.List;\n-\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\nimport static com.github.tomakehurst.wiremock.testsupport.MockRequestBuilder.aRequest;\nimport static org.junit.Assert.assertEquals;\npublic class SnapshotStubMappingGeneratorTest {\n@Test\n- public void generateFromWithEmptyList() {\n- List<StubMapping> actual = new SnapshotStubMappingGenerator(\n- requestPatternTransformer(null),\n- responseDefinitionTransformer(null)\n- ).generateFrom(Lists.<ServeEvent>newArrayList());\n-\n- assertEquals(new ArrayList<>(), actual);\n- }\n-\n- @Test\n- public void generateFromWithSingleServeEvent() {\n- final RequestPatternBuilder requestPatternBuilder = newRequestPattern();\n- final ResponseDefinition responseDefinition = ResponseDefinition.ok();\n-\n- SnapshotStubMappingGenerator stubMappingTransformer = new SnapshotStubMappingGenerator(\n- requestPatternTransformer(requestPatternBuilder),\n- responseDefinitionTransformer(responseDefinition)\n- );\n-\n- List<StubMapping> actual = stubMappingTransformer.generateFrom(\n- Lists.newArrayList(serveEvent())\n- );\n-\n- StubMapping expected = new StubMapping(requestPatternBuilder.build(), responseDefinition);\n- expected.setId(actual.get(0).getId());\n-\n- assertEquals(expected, actual.get(0));\n- }\n-\n- @Test\n- public void generateWithMultipleServeEvents() {\n+ public void apply() {\nfinal RequestPatternBuilder requestPatternBuilder = newRequestPattern().withUrl(\"/foo\");\nfinal ResponseDefinition responseDefinition = ResponseDefinition.ok();\n@@ -63,16 +29,9 @@ public class SnapshotStubMappingGeneratorTest {\nresponseDefinitionTransformer(responseDefinition)\n);\n- List<StubMapping> actual = stubMappingTransformer.generateFrom(\n- Lists.newArrayList(serveEvent(), serveEvent())\n- );\n-\n- ArrayList<StubMapping> expected = new ArrayList<>();\n- for (int i = 0; i < 2; i++ ) {\n- StubMapping stubMapping = new StubMapping(requestPatternBuilder.build(), responseDefinition);\n- stubMapping.setId(actual.get(i).getId());\n- expected.add(stubMapping);\n- }\n+ StubMapping actual = stubMappingTransformer.apply(serveEvent());\n+ StubMapping expected = new StubMapping(requestPatternBuilder.build(), responseDefinition);\n+ expected.setId(actual.getId());\nassertEquals(expected, actual);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Lots of cleanup: move post-processing logic out of SnapshotTask and into new class and make snapshot generation a bit more functional |
686,965 | 04.07.2017 21:27:48 | 25,200 | fc66370a402947ebf4c0d75057f75b0cb42459b9 | Change output formats to return object with appropriate key instead of an array | [
{
"change_type": "DELETE",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormat.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin.model;\n-\n-import com.fasterxml.jackson.annotation.JsonCreator;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-\n-/**\n- * Possible output formats for snapshot task\n- */\n-public enum SnapshotOutputFormat {\n- FULL {\n- @Override\n- public Object format(StubMapping stubMapping) {\n- return stubMapping;\n- }\n- },\n- IDS {\n- @Override\n- public Object format(StubMapping stubMapping) {\n- return stubMapping.getId();\n- }\n- };\n-\n- public abstract Object format(StubMapping stubMapping);\n-\n- @JsonCreator\n- public static SnapshotOutputFormat fromString(String value) {\n- if (value == null || value.equalsIgnoreCase(\"ids\")) {\n- return IDS;\n- }\n- return FULL;\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormatter.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+import java.util.*;\n+\n+/**\n+ * Generates response for calls to snapshot endpoint using the recorded stub mappings\n+ */\n+public enum SnapshotOutputFormatter {\n+ FULL {\n+ @Override\n+ public Map<String, List> format(List<StubMapping> stubMappings) {\n+ final Map<String, List> output = new HashMap<>();\n+ output.put(\"mappings\", stubMappings);\n+ return output;\n+ }\n+ },\n+ IDS {\n+ @Override\n+ public Map<String, List> format(List<StubMapping> stubMappings) {\n+ final List<UUID> stubMappingIds = new ArrayList<>(stubMappings.size());\n+ for (StubMapping stubMapping : stubMappings) {\n+ stubMappingIds.add(stubMapping.getId());\n+ }\n+\n+ final Map<String, List> output = new HashMap<>();\n+ output.put(\"ids\", stubMappingIds);\n+ return output;\n+ }\n+ };\n+\n+ public abstract Map<String, List> format(List<StubMapping> stubMappings);\n+\n+ @JsonCreator\n+ public static SnapshotOutputFormatter fromString(String value) {\n+ if (value == null || value.equalsIgnoreCase(\"full\")) {\n+ return FULL;\n+ } else if (value.equalsIgnoreCase(\"ids\")) {\n+ return IDS;\n+ } else {\n+ throw new IllegalArgumentException(\"Invalid output format\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -20,7 +20,7 @@ public class SnapshotSpec {\nprivate final ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n// Either \"full\" (meaning return an array of rendered StubMappings) or \"ids\", which returns an array of UUIDs\n- private final SnapshotOutputFormat outputFormat;\n+ private final SnapshotOutputFormatter outputFormat;\n// Whether to persist stub mappings\nprivate final Boolean persist;\n// Whether duplicate requests should be recorded as scenarios or just discarded\n@@ -35,7 +35,7 @@ public class SnapshotSpec {\n@JsonProperty(\"filters\") ProxiedServeEventFilters filters ,\n@JsonProperty(\"captureHeaders\") Map<String, MultiValuePattern> captureHeaders,\n@JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n- @JsonProperty(\"outputFormat\") SnapshotOutputFormat outputFormat,\n+ @JsonProperty(\"outputFormat\") SnapshotOutputFormatter outputFormat,\n@JsonProperty(\"persist\") Boolean persist,\n@JsonProperty(\"repeatsAsScenarios\") Boolean repeatsAsScenarios,\n@JsonProperty(\"transformers\") List<String> transformers,\n@@ -44,7 +44,7 @@ public class SnapshotSpec {\nthis.filters = filters == null ? new ProxiedServeEventFilters() : filters;\nthis.captureHeaders = captureHeaders;\nthis.extractBodyCriteria = extractBodyCriteria;\n- this.outputFormat = outputFormat == null ? SnapshotOutputFormat.FULL : outputFormat;\n+ this.outputFormat = outputFormat == null ? SnapshotOutputFormatter.FULL : outputFormat;\nthis.persist = persist == null ? true : persist;\nthis.repeatsAsScenarios = repeatsAsScenarios == null ? false : repeatsAsScenarios;\nthis.transformers = transformers;\n@@ -59,7 +59,7 @@ public class SnapshotSpec {\npublic Map<String, MultiValuePattern> getCaptureHeaders() { return captureHeaders; }\n- public SnapshotOutputFormat getOutputFormat() { return outputFormat; }\n+ public SnapshotOutputFormatter getOutputFormatter() { return outputFormat; }\npublic boolean shouldPersist() { return persist; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -10,7 +10,6 @@ import com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import java.util.ArrayList;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n@@ -34,17 +33,17 @@ public class SnapshotTask implements AdminTask {\ngetStubMappingPostProcessor(admin.getOptions(), snapshotSpec)\n);\n- final ArrayList<Object> response = new ArrayList<>(stubMappings.size());\n-\nfor (StubMapping stubMapping : stubMappings) {\nif (snapshotSpec.shouldPersist()) {\nstubMapping.setPersistent(true);\nadmin.addStubMapping(stubMapping);\n}\n- response.add(snapshotSpec.getOutputFormat().format(stubMapping));\n}\n- return jsonResponse(response.toArray(), HTTP_OK);\n+ return jsonResponse(\n+ snapshotSpec.getOutputFormatter().format(stubMappings),\n+ HTTP_OK\n+ );\n}\nprivate List<StubMapping> serveEventsToStubMappings(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"diff": "@@ -50,7 +50,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n}\nprivate static final String DEFAULT_SNAPSHOT_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n@@ -69,7 +70,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \" ] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsRequestsWithDefaultOptions() throws Exception {\n@@ -95,7 +97,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String FILTER_BY_REQUEST_PATTERN_SNAPSHOT_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n@@ -114,7 +117,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \" ] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsFilteredRequestsWithJustRequestPatternsAndFullOutputFormat() throws Exception {\n@@ -146,7 +150,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String FILTER_BY_REQUEST_PATTERN_AND_IDS_SNAPSHOT_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n@@ -156,7 +161,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \" ] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsFilteredRequestsWithRequestPatternAndIdsWithFullOutputFormat() {\n@@ -196,7 +202,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String CAPTURE_HEADERS_SNAPSHOT_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n@@ -211,7 +218,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \"] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsStubMappingWithCapturedHeaders() {\n@@ -234,7 +242,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String REPEATS_AS_SCENARIOS_SNAPSHOT_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"scenarioName\\\" : \\\"scenario-bar-baz\\\", \\n\" +\n\" \\\"requiredScenarioState\\\" : \\\"Started\\\", \\n\" +\n@@ -258,7 +267,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \" ] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsStubMappingsWithScenariosForRepeatedRequests() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotTransformerAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotTransformerAcceptanceTest.java",
"diff": "@@ -59,7 +59,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String GLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo?transformed=true\\\", \\n\" +\n@@ -78,7 +79,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \" ] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsTransformedStubMappingWithGlobalTransformer() {\n@@ -106,7 +108,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\"} \";\nprivate static final String NONGLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE =\n- \"[ \\n\" +\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/foo\\\", \\n\" +\n@@ -135,7 +138,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n- \"] \";\n+ \" ] \\n\" +\n+ \"} \";\n@Test\npublic void returnsTransformedStubMappingWithNonGlobalTransformer() {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotOutputFormatterTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.SnapshotOutputFormatter;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.collect.Lists;\n+import org.junit.Test;\n+\n+import java.util.*;\n+\n+import static com.github.tomakehurst.wiremock.admin.model.SnapshotOutputFormatter.FULL;\n+import static com.github.tomakehurst.wiremock.admin.model.SnapshotOutputFormatter.IDS;\n+import static org.junit.Assert.assertEquals;\n+\n+public class SnapshotOutputFormatterTest {\n+ @Test\n+ public void fromStringDefault() {\n+ assertEquals(FULL, SnapshotOutputFormatter.fromString(null));\n+ }\n+\n+ @Test(expected = IllegalArgumentException.class)\n+ public void fromStringWithInvalidFormat() {\n+ SnapshotOutputFormatter.fromString(\"invalid output format\");\n+ }\n+\n+ @Test\n+ public void fromStringWithFull() {\n+ assertEquals(FULL, SnapshotOutputFormatter.fromString(\"full\"));\n+ }\n+\n+ @Test\n+ public void fromStringWithIds() {\n+ assertEquals(IDS, SnapshotOutputFormatter.fromString(\"ids\"));\n+ }\n+\n+ @Test\n+ public void formatIds() {\n+ List<StubMapping> stubMappings = Lists.newArrayList(new StubMapping(), new StubMapping());\n+\n+ Map<String, List<UUID>> expected = new HashMap<>();\n+ expected.put(\"ids\", Lists.newArrayList(\n+ stubMappings.get(0).getId(),\n+ stubMappings.get(1).getId()\n+ ));\n+\n+ assertEquals(expected, IDS.format(stubMappings));\n+ }\n+\n+ @Test\n+ public void formatFull() {\n+ List<StubMapping> stubMappings = Lists.newArrayList(new StubMapping(), new StubMapping());\n+\n+ Map<String, List<StubMapping>> expected = new HashMap<>();\n+ expected.put(\"mappings\", stubMappings);\n+\n+ assertEquals(expected, FULL.format(stubMappings));\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotTaskTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotTaskTest.java",
"diff": "@@ -27,7 +27,9 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMoc\nimport static com.github.tomakehurst.wiremock.http.RequestMethod.GET;\nimport static com.github.tomakehurst.wiremock.http.Response.response;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\nimport static java.net.HttpURLConnection.HTTP_OK;\n+import static org.hamcrest.MatcherAssert.assertThat;\nimport static org.junit.Assert.assertEquals;\n@RunWith(JMock.class)\n@@ -57,12 +59,14 @@ public class SnapshotTaskTest {\n// Check when explicitly set\nJsonAssertion.assertThat(execute(\"{ \\\"persist\\\": true, \\\"outputFormat\\\": \\\"ids\\\"}\"))\n+ .field(\"ids\")\n.hasSize(1)\n.arrayField()\n.matches(\"[a-z0-9\\\\-]{36}\");\n// Check with default value of true\nJsonAssertion.assertThat(execute(\"{ \\\"outputFormat\\\": \\\"ids\\\"}\"))\n+ .field(\"ids\")\n.hasSize(1)\n.arrayField()\n.matches(\"[a-z0-9\\\\-]{36}\");\n@@ -73,6 +77,7 @@ public class SnapshotTaskTest {\nwithOptions(wireMockConfig());\nsetServeEvents(serveEvent(mockRequest(), response(), true));\nJsonAssertion.assertThat(executeWithoutPersist())\n+ .field(\"ids\")\n.hasSize(1)\n.arrayField()\n.matches(\"[a-z0-9\\\\-]{36}\");\n@@ -82,14 +87,14 @@ public class SnapshotTaskTest {\npublic void returnsEmptyArrayWithNoServeEvents() {\nwithOptions(wireMockConfig());\nsetServeEvents();\n- assertEquals(\"[ ]\", executeWithoutPersist());\n+ assertThat(executeWithoutPersist(), equalToJson(\"{ \\\"ids\\\": [] }\"));\n}\n@Test\npublic void returnsEmptyArrayWithUnproxiedServeEvent() {\nwithOptions(wireMockConfig());\nsetServeEvents(serveEvent(mockRequest(), response(), false));\n- assertEquals(\"[ ]\", executeWithoutPersist());\n+ assertThat(executeWithoutPersist(), equalToJson(\"{ \\\"ids\\\": [] }\"));\n}\n@Test\n@@ -100,6 +105,7 @@ public class SnapshotTaskTest {\nserveEvent(mockRequest().url(\"/foo\"), response(), true)\n);\nJsonAssertion.assertThat(executeWithoutPersist())\n+ .field(\"ids\")\n.hasSize(1)\n.arrayField()\n.matches(\"[a-z0-9\\\\-]{36}\");\n@@ -113,6 +119,7 @@ public class SnapshotTaskTest {\nserveEvent(mockRequest().url(\"/foo\"), response(), true)\n);\nJsonAssertion.assertThat(executeWithoutPersist())\n+ .field(\"ids\")\n.hasSize(2)\n.arrayField();\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Change output formats to return object with appropriate key instead of an array |
686,965 | 04.07.2017 21:40:37 | 25,200 | 25f17edcc63a72b7de6e46079dc78e4ef7b37503 | Reduce some duplication in stub mapping transformer tests | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotTransformerAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotTransformerAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.client.WireMock;\n-import com.github.tomakehurst.wiremock.common.FileSource;\n-import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.testsupport.GlobalStubMappingTransformer;\n+import com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport org.junit.After;\nimport org.junit.Test;\n@@ -63,8 +61,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo?transformed=true\\\", \\n\" +\n- \" \\\"method\\\" : \\\"PUT\\\" \\n\" +\n+ \" \\\"url\\\" : \\\"/foo?transformed=global\\\", \\n\" +\n+ \" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n\" \\\"status\\\" : 200 \\n\" +\n@@ -72,8 +70,8 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/?transformed=true\\\", \\n\" +\n- \" \\\"method\\\" : \\\"PUT\\\" \\n\" +\n+ \" \\\"url\\\" : \\\"/?transformed=global\\\", \\n\" +\n+ \" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n\" \\\"status\\\" : 200 \\n\" +\n@@ -112,7 +110,7 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo?transformed=nonglobal\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\", \\n\" +\n\" \\\"headers\\\": { \\n\" +\n\" \\\"Accept\\\": { \\n\" +\n@@ -126,7 +124,7 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/?transformed=nonglobal\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\", \\n\" +\n\" \\\"headers\\\": { \\n\" +\n\" \\\"Accept\\\": { \\n\" +\n@@ -153,38 +151,4 @@ public class SnapshotTransformerAcceptanceTest extends AcceptanceTestBase {\nequalToJson(NONGLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE, JSONCompareMode.STRICT_ORDER)\n);\n}\n-\n- public static class GlobalStubMappingTransformer extends StubMappingTransformer {\n- @Override\n- public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n- return WireMock\n- .put(urlEqualTo(stubMapping.getRequest().getUrl() + \"?transformed=true\"))\n- .build();\n- }\n-\n- @Override\n- public String getName() {\n- return \"stub-transformer\";\n- }\n- }\n-\n- public static class NonGlobalStubMappingTransformer extends StubMappingTransformer {\n- @Override\n- public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n- return WireMock\n- .request(\"GET\", stubMapping.getRequest().getUrlMatcher())\n- .withHeader(\"Accept\", equalTo(\"B\"))\n- .build();\n- }\n-\n- @Override\n- public boolean applyGlobally() {\n- return false;\n- }\n-\n- @Override\n- public String getName() {\n- return \"nonglobal-transformer\";\n- }\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingTransformerRunnerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingTransformerRunnerTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.SnapshotStubMappingTransformerRunner;\n-import com.github.tomakehurst.wiremock.client.WireMock;\n-import com.github.tomakehurst.wiremock.common.FileSource;\n-import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.testsupport.GlobalStubMappingTransformer;\n+import com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransformer;\nimport com.google.common.collect.Lists;\nimport org.junit.Test;\nimport java.util.ArrayList;\n-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\nimport static org.junit.Assert.assertEquals;\n@@ -63,38 +61,6 @@ public class SnapshotStubMappingTransformerRunnerTest {\nassertEquals(\"/foo?transformed=global\", result.getRequest().getUrl());\n}\n- public static class GlobalStubMappingTransformer extends StubMappingTransformer {\n- @Override\n- public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n- return WireMock\n- .get(urlEqualTo(stubMapping.getRequest().getUrl() + \"?transformed=global\"))\n- .build();\n- }\n-\n- @Override\n- public String getName() {\n- return \"stub-transformer\";\n- }\n- }\n-\n- public static class NonGlobalStubMappingTransformer extends StubMappingTransformer {\n- @Override\n- public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n- return WireMock\n- .get(urlEqualTo(stubMapping.getRequest().getUrl() + \"?transformed=nonglobal\"))\n- .build();\n- }\n-\n- @Override\n- public boolean applyGlobally() {\n- return false;\n- }\n-\n- @Override\n- public String getName() {\n- return \"nonglobal-transformer\";\n- }\n- }\nprivate StubMapping stubMappingForUrl(String url) {\nreturn new StubMapping(\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/GlobalStubMappingTransformer.java",
"diff": "+package com.github.tomakehurst.wiremock.testsupport;\n+\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.FileSource;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n+\n+public class GlobalStubMappingTransformer extends StubMappingTransformer {\n+ @Override\n+ public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n+ return WireMock\n+ .get(urlEqualTo(stubMapping.getRequest().getUrl() + \"?transformed=global\"))\n+ .build();\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"stub-transformer\";\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/NonGlobalStubMappingTransformer.java",
"diff": "+package com.github.tomakehurst.wiremock.testsupport;\n+\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.FileSource;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;\n+\n+public class NonGlobalStubMappingTransformer extends StubMappingTransformer {\n+ @Override\n+ public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n+ return WireMock\n+ .get(stubMapping.getRequest().getUrl() + \"?transformed=nonglobal\")\n+ .withHeader(\"Accept\", equalTo(\"B\"))\n+ .build();\n+ }\n+\n+ @Override\n+ public boolean applyGlobally() {\n+ return false;\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"nonglobal-transformer\";\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Reduce some duplication in stub mapping transformer tests |
686,965 | 05.07.2017 14:12:50 | 25,200 | 3a4421d463a79d42824dffbcd13301ee16a3fa32 | Lots of small cleanup and refactoring | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"diff": "@@ -14,7 +14,7 @@ import java.util.Map;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n/**\n- * Creates a RequestPatternBuilder from a Request's URL and method, and optional headers.\n+ * Creates a RequestPatternBuilder from a Request's URL and method, and optionally headers from a whitelist.\n* If headers patterns are supplied, the header will be only included in the RequestPatternBuilder if the predicate\n* matches the request\n*/\n@@ -28,7 +28,7 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\n/**\n* Returns a RequestPatternBuilder matching the URL and method of the Request. If header patterns are supplied,\n- * match them against the request and include them in the RequestPatternBuilder if there's a match.\n+ * this will match them against the request and include them in the RequestPatternBuilder if there's a match.\n*/\n@Override\npublic RequestPatternBuilder apply(Request request) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"diff": "@@ -6,8 +6,8 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.MatchResult;\nimport com.github.tomakehurst.wiremock.matching.ValueMatcher;\n-// Matches the size of the body of a ResponseDefinition, for use by the Snapshot API\n-// when determining if the body should be extracted to a file\n+// Matches the size of the body of a ResponseDefinition, for use by the Snapshot API when determining if the body\n+// should be extracted to a file.\n@JsonDeserialize(using = ResponseDefinitionBodyMatcherDeserializer.class)\npublic class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefinition> {\nprivate final long textSizeThreshold;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcherDeserializer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcherDeserializer.java",
"diff": "@@ -30,7 +30,7 @@ public class ResponseDefinitionBodyMatcherDeserializer extends JsonDeserializer<\n}\n// Converts a human-readable file size string (e.g. \"10,100 KB\") to bytes\n- // Partiall based off https://stackoverflow.com/a/12090818\n+ // Partially based off https://stackoverflow.com/a/12090818\npublic static long parseFilesize(String in) {\nString cleanedInput = in.trim().replaceAll(\",\",\".\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormatter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormatter.java",
"diff": "@@ -6,7 +6,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport java.util.*;\n/**\n- * Generates response for calls to snapshot endpoint using the recorded stub mappings\n+ * Generates response for calls to snapshot API endpoint using the recorded stub mappings\n*/\npublic enum SnapshotOutputFormatter {\nFULL {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"diff": "@@ -5,9 +5,8 @@ import com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import java.util.ArrayList;\nimport java.util.HashMap;\n-import java.util.List;\n+import java.util.Iterator;\n/**\n* Counts unique RequestPatterns from StubMappings. If shouldRecordRepeatsAsScenarios is enabled, then multiple\n@@ -23,32 +22,32 @@ public class SnapshotRepeatedRequestHandler {\nthis.requestStubMappingTracker = new HashMap<>();\n}\n- public List<StubMapping> processStubMappings(Iterable<StubMapping> stubMappings) {\n+ public void processStubMappingsInPlace(Iterable<StubMapping> stubMappings) {\nthis.requestStubMappingTracker.clear();\n- ArrayList<StubMapping> processedMappings = new ArrayList<>();\n- for (StubMapping stubMapping : stubMappings) {\n+ final Iterator<StubMapping> stubMappingIterator = stubMappings.iterator();\n+ while (stubMappingIterator.hasNext()) {\n+ StubMapping stubMapping = stubMappingIterator.next();\nStubMappingTracker tracker = requestStubMappingTracker.get(stubMapping.getRequest());\n// If tracker is null, this request has not been seen before. Otherwise, it's a repeat.\n- if (tracker == null || shouldRecordRepeatsAsScenarios) {\nif (tracker == null) {\nrequestStubMappingTracker.put(stubMapping.getRequest(), new StubMappingTracker(stubMapping));\n- } else {\n+ } else if (shouldRecordRepeatsAsScenarios) {\ntracker.count++;\nsetScenarioDetailsIfApplicable(stubMapping, tracker);\ntracker.previousStubMapping = stubMapping;\n- }\n- processedMappings.add(stubMapping);\n+ } else {\n+ // we have a duplicate and aren't recording repeats as scenarios, so remove it\n+ stubMappingIterator.remove();\n}\n}\n-\n- return processedMappings;\n}\nprivate void setScenarioDetailsIfApplicable(StubMapping stubMapping, StubMappingTracker tracker) {\nif (tracker.count == 2) {\n- // We have multiple identical requests. Go back and make previous stub the start\n+ // Start the scenario because we have multiple identical requests. Retrieve previous stub mapping from\n+ // the tracker and mark it as the start.\nString name = SCENARIO_NAME_PREFIX + \"-\" + UniqueFilenameGenerator.urlToPathParts(\nstubMapping.getRequest().getUrl()\n);\n@@ -56,6 +55,7 @@ public class SnapshotRepeatedRequestHandler {\ntracker.previousStubMapping.setRequiredScenarioState(Scenario.STARTED);\nstubMapping.setRequiredScenarioState(Scenario.STARTED);\n} else {\n+ // More than two identical requests. Continue the scenario.\nString previousState = tracker.previousStubMapping.getNewScenarioState();\nstubMapping.setRequiredScenarioState(previousState);\n}\n@@ -66,13 +66,14 @@ public class SnapshotRepeatedRequestHandler {\n}\n/**\n- * Simple container class to store the previous stub mapping and sequence count for building scenarios\n+ * Simple container class for building scenarios. Tracks the number of times a request has been seen and the\n+ * last-seen stub mapping for that request.\n*/\n- private class StubMappingTracker {\n+ private static class StubMappingTracker {\nprivate int count;\nprivate StubMapping previousStubMapping;\n- public StubMappingTracker(StubMapping stubMapping) {\n+ private StubMappingTracker(StubMapping stubMapping) {\nthis.count = 1;\nthis.previousStubMapping = stubMapping;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -19,7 +19,6 @@ public class SnapshotSpec {\n// Criteria for extracting body from responses\nprivate final ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n- // Either \"full\" (meaning return an array of rendered StubMappings) or \"ids\", which returns an array of UUIDs\nprivate final SnapshotOutputFormatter outputFormat;\n// Whether to persist stub mappings\nprivate final Boolean persist;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"diff": "@@ -16,7 +16,6 @@ public class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMa\nprivate final RequestPatternTransformer requestTransformer;\nprivate final LoggedResponseDefinitionTransformer responseTransformer;\n-\npublic SnapshotStubMappingGenerator(\nRequestPatternTransformer requestTransformer,\nLoggedResponseDefinitionTransformer responseTransformer\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "@@ -6,7 +6,10 @@ import com.google.common.collect.Lists;\nimport java.util.List;\n/**\n- * Transform stub mappings using any applicable StubMappingTransformers and extract response body when applicable\n+ * Performs post-processing tasks on stub mappings generated from ServeEvents:\n+ * 1. Detect and process duplicate requests\n+ * 2. Extract response bodies to a separate file, if applicable\n+ * 3. Run any applicable StubMappingTransformers against the stub mappings\n*/\npublic class SnapshotStubMappingPostProcessor {\nprivate final SnapshotRepeatedRequestHandler repeatedRequestHandler;\n@@ -27,10 +30,10 @@ public class SnapshotStubMappingPostProcessor {\n}\npublic List<StubMapping> process(Iterable<StubMapping> stubMappings) {\n- List<StubMapping> transformedStubMappings;\n+ final List<StubMapping> processedStubMappings = Lists.newLinkedList(stubMappings);\n- // Handle repeated requests by either skipping them or generating scenarios\n- transformedStubMappings = repeatedRequestHandler.processStubMappings(stubMappings);\n+ // Handle repeated requests by either removing them or generating scenarios\n+ repeatedRequestHandler.processStubMappingsInPlace(processedStubMappings);\n// Extract response bodies, if applicable\nif (bodyExtractMatcher != null) {\n@@ -42,8 +45,6 @@ public class SnapshotStubMappingPostProcessor {\n}\n// Run any stub mapping transformer extensions\n- transformedStubMappings = Lists.transform(transformedStubMappings, transformerRunner);\n-\n- return transformedStubMappings;\n+ return Lists.transform(processedStubMappings, transformerRunner);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingTransformerRunner.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingTransformerRunner.java",
"diff": "@@ -8,6 +8,10 @@ import com.google.common.base.Function;\nimport java.util.List;\n+/**\n+ * Applies all registered StubMappingTransformer extensions against a stub mapping when applicable,\n+ * passing them any supplied Parameters.\n+ */\npublic class SnapshotStubMappingTransformerRunner implements Function<StubMapping, StubMapping> {\nprivate final FileSource fileSource;\nprivate final Parameters parameters;\n@@ -30,6 +34,7 @@ public class SnapshotStubMappingTransformerRunner implements Function<StubMappin\nthis.fileSource = fileSource;\n}\n+ @Override\npublic StubMapping apply(StubMapping stubMapping) {\nfor (StubMappingTransformer transformer : registeredTransformers) {\nif (\n@@ -39,7 +44,7 @@ public class SnapshotStubMappingTransformerRunner implements Function<StubMappin\nstubMapping = transformer.transform(stubMapping, fileSource, parameters);\n}\n}\n- return stubMapping;\n+ return stubMapping;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -20,7 +20,7 @@ public class SnapshotTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\nSnapshotSpec snapshotSpec = request.getBody().length == 0\n- ? new SnapshotSpec()\n+ ? new SnapshotSpec() // no request body, so use defaults\n: Json.read(request.getBodyAsString(), SnapshotSpec.class);\nreturn execute(admin, snapshotSpec);\n}\n@@ -50,23 +50,23 @@ public class SnapshotTask implements AdminTask {\nGetServeEventsResult serveEventsResult,\nProxiedServeEventFilters serveEventFilters,\nSnapshotStubMappingGenerator stubMappingGenerator,\n- SnapshotStubMappingPostProcessor snapshotStubMappingPostProcessor\n+ SnapshotStubMappingPostProcessor stubMappingPostProcessor\n) {\nfinal Iterable<StubMapping> stubMappings = from(serveEventsResult.getServeEvents())\n.filter(serveEventFilters)\n.transform(stubMappingGenerator);\n- return snapshotStubMappingPostProcessor.process(stubMappings);\n+ return stubMappingPostProcessor.process(stubMappings);\n}\nprivate SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\nfinal SnapshotRepeatedRequestHandler repeatedRequestHandler = new SnapshotRepeatedRequestHandler(\nsnapshotSpec.shouldRecordRepeatsAsScenarios()\n);\n- final SnapshotStubMappingBodyExtractor stubMappingBodyExtractor = new SnapshotStubMappingBodyExtractor(\n+ final SnapshotStubMappingBodyExtractor bodyExtractor = new SnapshotStubMappingBodyExtractor(\noptions.filesRoot()\n);\n- final SnapshotStubMappingTransformerRunner stubMappingTransformerRunner = new SnapshotStubMappingTransformerRunner(\n+ final SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\noptions.extensionsOfType(StubMappingTransformer.class).values(),\nsnapshotSpec.getTransformers(),\nsnapshotSpec.getTransformerParameters(),\n@@ -75,9 +75,9 @@ public class SnapshotTask implements AdminTask {\nreturn new SnapshotStubMappingPostProcessor(\nrepeatedRequestHandler,\n- stubMappingTransformerRunner,\n+ transformerRunner,\nsnapshotSpec.getExtractBodyCriteria(),\n- stubMappingBodyExtractor\n+ bodyExtractor\n);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"diff": "@@ -4,7 +4,7 @@ import com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n/**\n- * Base class for stub mapping transformer extensions. These allow transforming stub mappings recorded via the\n+ * Base class for stub mapping transformer extensions. This allows transforming stub mappings recorded via the\n* snapshot API endpoint.\n*\n* @see com.github.tomakehurst.wiremock.admin.tasks.SnapshotTask\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotRepeatedRequestHandlerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotRepeatedRequestHandlerTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.SnapshotRepeatedRequestHandler;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.collect.ImmutableList;\nimport com.google.common.collect.Lists;\nimport org.junit.Test;\n@@ -16,64 +18,85 @@ import static org.junit.Assert.assertNull;\npublic class SnapshotRepeatedRequestHandlerTest {\n@Test\npublic void processSingleStubMapping() {\n- List<StubMapping> mappings = Lists.newArrayList(stubMappingForUrl(\"\"));\n- List<StubMapping> results = new SnapshotRepeatedRequestHandler(true)\n- .processStubMappings(mappings);\n+ List<StubMapping> mappings = ImmutableList.of(stubMappingForUrl(\"\"));\n+ String serialized = Json.write(mappings);\n+ new SnapshotRepeatedRequestHandler(true).processStubMappingsInPlace(mappings);\n// Shouldn't have changed anything, since there hasn't been multiple identical requests\n- assertEquals(mappings, results);\n+ assertEquals(serialized, Json.write(mappings));\n}\n@Test\npublic void resetsAfterRun() {\n- List<StubMapping> mappings = Lists.newArrayList(stubMappingForUrl(\"\"));\n+ List<StubMapping> mappings = ImmutableList.of(stubMappingForUrl(\"\"));\n+ String serialized = Json.write(mappings);\n+\nSnapshotRepeatedRequestHandler handler = new SnapshotRepeatedRequestHandler(false);\n+ handler.processStubMappingsInPlace(mappings);\n+ handler.processStubMappingsInPlace(mappings);\n- List<StubMapping> results1 = handler.processStubMappings(mappings);\n- // Should not have persisted request tracking state\n- List<StubMapping> results2 = handler.processStubMappings(mappings);\n+ assertEquals(serialized, Json.write(mappings));\n+ }\n- assertEquals(mappings, results1);\n- assertEquals(results1, results2);\n+ @Test\n+ public void discardsDuplicatesWhenNotUsingScenarios() {\n+ List<StubMapping> stubMappings = Lists.newArrayList(\n+ stubMappingForUrl(\"/dupe\"),\n+ stubMappingForUrl(\"/dupe\"),\n+ stubMappingForUrl(\"/different\"),\n+ stubMappingForUrl(\"/dupe\")\n+ );\n+ new SnapshotRepeatedRequestHandler(false).processStubMappingsInPlace(stubMappings);\n+\n+ assertEquals(2, stubMappings.size());\n+\n+ assertEquals(\"/dupe\", stubMappings.get(0).getRequest().getUrl());\n+ assertNull(stubMappings.get(0).getScenarioName());\n+ assertNull(stubMappings.get(0).getRequiredScenarioState());\n+ assertNull(stubMappings.get(0).getNewScenarioState());\n+\n+ assertEquals(\"/different\", stubMappings.get(1).getRequest().getUrl());\n+ assertNull(stubMappings.get(1).getScenarioName());\n+ assertNull(stubMappings.get(1).getRequiredScenarioState());\n+ assertNull(stubMappings.get(1).getNewScenarioState());\n}\n@Test\npublic void trackMultipleStubMappingsAsScenarios() {\n- List<StubMapping> stubMappings = Lists.newArrayList(\n+ List<StubMapping> stubMappings = ImmutableList.of(\nstubMappingForUrl(\"/foo/bar\"),\nstubMappingForUrl(\"/foo/bar\"),\nstubMappingForUrl(\"/not/part/of/scenario\"),\nstubMappingForUrl(\"/foo/bar\")\n);\n- SnapshotRepeatedRequestHandler handler = new SnapshotRepeatedRequestHandler(true);\n- List<StubMapping> results = handler.processStubMappings(stubMappings);\n+ new SnapshotRepeatedRequestHandler(true).processStubMappingsInPlace(stubMappings);\n- assertEquals(4, results.size());\n+ assertEquals(4, stubMappings.size());\n// Check first stub mapping, which should be the start of the scenario\n- assertEquals(\"/foo/bar\", results.get(0).getRequest().getUrl());\n- assertEquals(\"scenario-foo-bar\", results.get(0).getScenarioName());\n- assertEquals(Scenario.STARTED, results.get(0).getRequiredScenarioState());\n- assertNull(results.get(0).getNewScenarioState());\n+ assertEquals(\"/foo/bar\", stubMappings.get(0).getRequest().getUrl());\n+ assertEquals(\"scenario-foo-bar\", stubMappings.get(0).getScenarioName());\n+ assertEquals(Scenario.STARTED, stubMappings.get(0).getRequiredScenarioState());\n+ assertNull(stubMappings.get(0).getNewScenarioState());\n// Check second stub mapping\n- assertEquals(results.get(0).getRequest(), results.get(1).getRequest());\n- assertEquals(results.get(1).getScenarioName(), results.get(1).getScenarioName());\n- assertEquals(Scenario.STARTED, results.get(1).getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-2\", results.get(1).getNewScenarioState());\n+ assertEquals(stubMappings.get(0).getRequest(), stubMappings.get(1).getRequest());\n+ assertEquals(stubMappings.get(1).getScenarioName(), stubMappings.get(1).getScenarioName());\n+ assertEquals(Scenario.STARTED, stubMappings.get(1).getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-2\", stubMappings.get(1).getNewScenarioState());\n// Check third stub mapping, which is not part of the scenario\n- assertEquals(\"/not/part/of/scenario\", results.get(2).getRequest().getUrl());\n- assertNull(results.get(2).getScenarioName());\n- assertNull(results.get(2).getRequiredScenarioState());\n- assertNull(results.get(2).getNewScenarioState());\n+ assertEquals(\"/not/part/of/scenario\", stubMappings.get(2).getRequest().getUrl());\n+ assertNull(stubMappings.get(2).getScenarioName());\n+ assertNull(stubMappings.get(2).getRequiredScenarioState());\n+ assertNull(stubMappings.get(2).getNewScenarioState());\n// Check fourth stub mapping, which is the final state in the scenario\n- assertEquals(results.get(0).getRequest(), results.get(3).getRequest());\n- assertEquals(results.get(3).getScenarioName(), results.get(3).getScenarioName());\n- assertEquals(\"scenario-foo-bar-2\", results.get(3).getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-3\", results.get(3).getNewScenarioState());\n+ assertEquals(stubMappings.get(0).getRequest(), stubMappings.get(3).getRequest());\n+ assertEquals(stubMappings.get(3).getScenarioName(), stubMappings.get(3).getScenarioName());\n+ assertEquals(\"scenario-foo-bar-2\", stubMappings.get(3).getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-3\", stubMappings.get(3).getNewScenarioState());\n}\nprivate StubMapping stubMappingForUrl(String url) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotTaskTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotTaskTest.java",
"diff": "@@ -36,6 +36,7 @@ import static org.junit.Assert.assertEquals;\npublic class SnapshotTaskTest {\nprivate Mockery context;\nprivate Admin mockAdmin;\n+ private static final String UUID_REGEX = \"[a-z0-9\\\\-]{36}\";\n@Before\npublic void init() {\n@@ -62,14 +63,14 @@ public class SnapshotTaskTest {\n.field(\"ids\")\n.hasSize(1)\n.arrayField()\n- .matches(\"[a-z0-9\\\\-]{36}\");\n+ .matches(UUID_REGEX);\n// Check with default value of true\nJsonAssertion.assertThat(execute(\"{ \\\"outputFormat\\\": \\\"ids\\\"}\"))\n.field(\"ids\")\n.hasSize(1)\n.arrayField()\n- .matches(\"[a-z0-9\\\\-]{36}\");\n+ .matches(UUID_REGEX);\n}\n@Test\n@@ -80,7 +81,7 @@ public class SnapshotTaskTest {\n.field(\"ids\")\n.hasSize(1)\n.arrayField()\n- .matches(\"[a-z0-9\\\\-]{36}\");\n+ .matches(UUID_REGEX);\n}\n@Test\n@@ -108,7 +109,7 @@ public class SnapshotTaskTest {\n.field(\"ids\")\n.hasSize(1)\n.arrayField()\n- .matches(\"[a-z0-9\\\\-]{36}\");\n+ .matches(UUID_REGEX);\n}\n@Test\n@@ -120,8 +121,7 @@ public class SnapshotTaskTest {\n);\nJsonAssertion.assertThat(executeWithoutPersist())\n.field(\"ids\")\n- .hasSize(2)\n- .arrayField();\n+ .hasSize(2);\n}\nprivate String executeWithoutPersist() {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Lots of small cleanup and refactoring |
686,965 | 05.07.2017 15:45:51 | 25,200 | ac4692e213f7090d10dc565c6b787b6c02f76aaf | Add more tests for ResponseDefinitionBodyMatcher | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher;\n+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Test;\n-import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;\n-import static junit.framework.TestCase.assertFalse;\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\npublic class ResponseDefinitionBodyMatcherTest {\n@Test\n- public void doesNotMatchEmptyBody() {\n- ResponseDefinition emptyBody = responseDefinition().build();\n+ public void noThresholds() {\nResponseDefinitionBodyMatcher matcher = new ResponseDefinitionBodyMatcher(0, 0);\n- assertFalse(matcher.match(emptyBody).isExactMatch());\n+ assertFalse(matcher.match(new ResponseDefinition()).isExactMatch());\n+ assertTrue(matcher.match(textResponseDefinition(\"a\")).isExactMatch());\n+ assertTrue(matcher.match(binaryResponseDefinition(new byte[] { 0x1 })).isExactMatch());\n+ }\n+\n+ @Test\n+ public void textBodyMatchingWithThreshold() {\n+ ResponseDefinitionBodyMatcher matcher = new ResponseDefinitionBodyMatcher(2, 0);\n+ assertFalse(matcher.match(textResponseDefinition(\"f\")).isExactMatch());\n+ assertFalse(matcher.match(textResponseDefinition(\"fo\")).isExactMatch());\n+ assertTrue(matcher.match(textResponseDefinition(\"foo\")).isExactMatch());\n+ }\n+\n+ @Test\n+ public void binaryBodyMatchingWithThreshold() {\n+ ResponseDefinitionBodyMatcher matcher = new ResponseDefinitionBodyMatcher(0, 2);\n+ assertFalse(matcher.match(binaryResponseDefinition(new byte[] { 0x1 })).isExactMatch());\n+ assertFalse(matcher.match(binaryResponseDefinition(new byte[] { 0x1, 0xc })).isExactMatch());\n+ assertTrue(matcher.match(binaryResponseDefinition(new byte[] { 0x1, 0xc, 0xf })).isExactMatch());\n+ }\n+\n+ private static ResponseDefinition textResponseDefinition(String body) {\n+ return new ResponseDefinitionBuilder()\n+ .withHeader(\"Content-Type\", \"text/plain\")\n+ .withBody(body)\n+ .build();\n+ }\n+\n+ private static ResponseDefinition binaryResponseDefinition(byte[] body) {\n+ return new ResponseDefinitionBuilder()\n+ .withBody(body)\n+ .build();\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add more tests for ResponseDefinitionBodyMatcher |
686,965 | 06.07.2017 00:39:11 | 25,200 | 778781ba4278e637fb27daa0a47768aeac85b1aa | Refactoring to consolidate charset logic into Strings | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Strings.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Strings.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n+import java.nio.charset.Charset;\n+\nimport static com.google.common.base.Charsets.UTF_8;\npublic class Strings {\n+ public static final Charset DEFAULT_CHARSET = UTF_8;\npublic static String stringFromBytes(byte[] bytes) {\n+ return stringFromBytes(bytes, DEFAULT_CHARSET);\n+ }\n+\n+ public static String stringFromBytes(byte[] bytes, Charset charset) {\nif (bytes == null) {\nreturn null;\n}\n- return new String(bytes, UTF_8);\n+ return new String(bytes, charset);\n}\npublic static byte[] bytesFromString(String str) {\n+ return bytesFromString(str, DEFAULT_CHARSET);\n+ }\n+\n+ public static byte[] bytesFromString(String str, Charset charset) {\nif (str == null) {\nreturn null;\n}\n- return str.getBytes();\n+ return str.getBytes(charset);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/ContentTypeHeader.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/ContentTypeHeader.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.http;\n+import com.github.tomakehurst.wiremock.common.Strings;\nimport com.google.common.base.Optional;\nimport java.nio.charset.Charset;\n-import java.nio.charset.StandardCharsets;\npublic class ContentTypeHeader extends HttpHeader {\n@@ -57,11 +57,11 @@ public class ContentTypeHeader extends HttpHeader {\nreturn Optional.absent();\n}\n- public Charset encodingOrUtf8() {\n+ public Charset charset() {\nif (isPresent() && encodingPart().isPresent()) {\nreturn Charset.forName(encodingPart().get());\n}\n- return StandardCharsets.UTF_8;\n+ return Strings.DEFAULT_CHARSET;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"diff": "@@ -3,8 +3,9 @@ package com.github.tomakehurst.wiremock.http;\nimport com.fasterxml.jackson.annotation.JsonIgnore;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.common.Encoding;\n+import com.github.tomakehurst.wiremock.common.Strings;\n-import java.nio.charset.*;\n+import java.nio.charset.Charset;\npublic class LoggedResponse {\n@@ -43,9 +44,10 @@ public class LoggedResponse {\n}\n/**\n- * Retrieve body as a String encoded in the charset in the \"Content-Type\" header, or, if that's not present, UTF-8.\n+ * Retrieve body as a String encoded in the charset in the \"Content-Type\" header, or, if that's not present, the\n+ * default character set (UTF-8)\n*\n- * @return String encoded using detected charset or UTF-8\n+ * @return Encoded string\n*/\n@JsonProperty(\"body\")\npublic String getBodyAsString() {\n@@ -53,8 +55,8 @@ public class LoggedResponse {\nreturn \"\";\n}\n- Charset charset = (headers == null) ? StandardCharsets.UTF_8 : headers.getContentTypeHeader().encodingOrUtf8();\n- return new String(body, charset);\n+ Charset charset = headers == null ? Strings.DEFAULT_CHARSET : headers.getContentTypeHeader().charset();\n+ return Strings.stringFromBytes(body, charset);\n}\n@JsonIgnore\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.Strings;\nimport com.google.common.base.Optional;\nimport static com.github.tomakehurst.wiremock.http.HttpHeaders.noHeaders;\n@@ -61,7 +62,7 @@ public class Response {\nthis.status = status;\nthis.statusMessage = statusMessage;\nthis.headers = headers;\n- this.body = body == null ? null : body.getBytes(headers.getContentTypeHeader().encodingOrUtf8());\n+ this.body = body == null ? null : Strings.bytesFromString(body, headers.getContentTypeHeader().charset());\nthis.configured = configured;\nthis.fault = fault;\nthis.fromProxy = fromProxy;\n@@ -80,7 +81,7 @@ public class Response {\n}\npublic String getBodyAsString() {\n- return new String(body, headers.getContentTypeHeader().encodingOrUtf8());\n+ return Strings.stringFromBytes(body, headers.getContentTypeHeader().charset());\n}\npublic HttpHeaders getHeaders() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/http/ContentTypeHeaderTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/http/ContentTypeHeaderTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.http;\n+import com.github.tomakehurst.wiremock.common.Strings;\nimport com.github.tomakehurst.wiremock.testsupport.MockRequestBuilder;\nimport com.google.common.base.Optional;\nimport org.jmock.Mockery;\n@@ -104,20 +105,20 @@ public class ContentTypeHeaderTest {\n}\n@Test\n- public void returnsEncodingWhenPresent() {\n+ public void returnsCharsetWhenPresent() {\nContentTypeHeader header = new ContentTypeHeader(\"text/plain; charset=iso-8859-1\");\n- assertThat(header.encodingOrUtf8(), is(StandardCharsets.ISO_8859_1));\n+ assertThat(header.charset(), is(StandardCharsets.ISO_8859_1));\n}\n@Test\n- public void returnsUtf8WhenEncodingNotPresent() {\n+ public void returnsDefaultCharsetWhenEncodingNotPresent() {\nContentTypeHeader header = new ContentTypeHeader(\"text/plain\");\n- assertThat(header.encodingOrUtf8(), is(StandardCharsets.UTF_8));\n+ assertThat(header.charset(), is(Strings.DEFAULT_CHARSET));\n}\n@Test\n- public void returnsUtf8WhenAbsent() {\n+ public void returnsDefaultCharsetWhenAbsent() {\nContentTypeHeader header = ContentTypeHeader.absent();\n- assertThat(header.encodingOrUtf8(), is(StandardCharsets.UTF_8));\n+ assertThat(header.charset(), is(Strings.DEFAULT_CHARSET));\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Refactoring to consolidate charset logic into Strings |
686,965 | 07.07.2017 17:04:46 | 25,200 | e6aa8ab31d7eec1155078e6ce127d9832fdc2438 | Refactoring SnapshotRepeatedRequestHandler to split up the logic | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"diff": "@@ -4,78 +4,81 @@ import com.github.tomakehurst.wiremock.common.UniqueFilenameGenerator;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.apache.commons.collections4.MultiSet;\n+import org.apache.commons.collections4.multiset.HashMultiSet;\nimport java.util.HashMap;\nimport java.util.Iterator;\n+import java.util.Map;\n/**\n* Counts unique RequestPatterns from StubMappings. If shouldRecordRepeatsAsScenarios is enabled, then multiple\n- * identical requests will be recorded as scenarios. Otherwise, they're skipped.\n+ * identical requests will be recorded as scenarios. Otherwise, they're removed.\n*/\npublic class SnapshotRepeatedRequestHandler {\nprivate final static String SCENARIO_NAME_PREFIX = \"scenario\";\nprivate final boolean shouldRecordRepeatsAsScenarios;\n- private final HashMap<RequestPattern, StubMappingTracker> requestStubMappingTracker;\npublic SnapshotRepeatedRequestHandler(boolean shouldRecordRepeatsAsScenarios) {\nthis.shouldRecordRepeatsAsScenarios = shouldRecordRepeatsAsScenarios;\n- this.requestStubMappingTracker = new HashMap<>();\n}\n- public void processStubMappingsInPlace(Iterable<StubMapping> stubMappings) {\n- this.requestStubMappingTracker.clear();\n-\n+ public void filterOrCreateScenarios(Iterable<StubMapping> stubMappings) {\n+ final MultiSet<RequestPattern> requestCounts = new HashMultiSet<>();\nfinal Iterator<StubMapping> stubMappingIterator = stubMappings.iterator();\n+\nwhile (stubMappingIterator.hasNext()) {\nStubMapping stubMapping = stubMappingIterator.next();\n- StubMappingTracker tracker = requestStubMappingTracker.get(stubMapping.getRequest());\n-\n- // If tracker is null, this request has not been seen before. Otherwise, it's a repeat.\n- if (tracker == null) {\n- requestStubMappingTracker.put(stubMapping.getRequest(), new StubMappingTracker(stubMapping));\n- } else if (shouldRecordRepeatsAsScenarios) {\n- tracker.count++;\n- setScenarioDetailsIfApplicable(stubMapping, tracker);\n- tracker.previousStubMapping = stubMapping;\n- } else {\n- // we have a duplicate and aren't recording repeats as scenarios, so remove it\n+ requestCounts.add(stubMapping.getRequest());\n+\n+ if (!shouldRecordRepeatsAsScenarios && requestCounts.getCount(stubMapping.getRequest()) > 1) {\nstubMappingIterator.remove();\n}\n}\n+\n+ if (shouldRecordRepeatsAsScenarios) {\n+ this.createScenarios(stubMappings, requestCounts);\n+ }\n}\n- private void setScenarioDetailsIfApplicable(StubMapping stubMapping, StubMappingTracker tracker) {\n- if (tracker.count == 2) {\n- // Start the scenario because we have multiple identical requests. Retrieve previous stub mapping from\n- // the tracker and mark it as the start.\n- String name = SCENARIO_NAME_PREFIX + \"-\" + UniqueFilenameGenerator.urlToPathParts(\n- stubMapping.getRequest().getUrl()\n- );\n- tracker.previousStubMapping.setScenarioName(name);\n- tracker.previousStubMapping.setRequiredScenarioState(Scenario.STARTED);\n- stubMapping.setRequiredScenarioState(Scenario.STARTED);\n- } else {\n- // More than two identical requests. Continue the scenario.\n- String previousState = tracker.previousStubMapping.getNewScenarioState();\n- stubMapping.setRequiredScenarioState(previousState);\n+ private void createScenarios(Iterable<StubMapping> stubMappings, MultiSet<RequestPattern> requestCounts) {\n+ final Map<RequestPattern, ScenarioDetails> tracker = new HashMap<>();\n+\n+ for (StubMapping stubMapping : stubMappings) {\n+ if (requestCounts.getCount(stubMapping.getRequest()) == 1) {\n+ continue; // not a repeated request\n}\n- String name = tracker.previousStubMapping.getScenarioName();\n- stubMapping.setScenarioName(name);\n- stubMapping.setNewScenarioState(name + \"-\" + tracker.count);\n+ if (!tracker.containsKey(stubMapping.getRequest())) {\n+ tracker.put(stubMapping.getRequest(), new ScenarioDetails(stubMapping.getRequest()));\n+ }\n+\n+ tracker.get(stubMapping.getRequest()).updateStubMapping(stubMapping);\n+ }\n}\n/**\n- * Simple container class for building scenarios. Tracks the number of times a request has been seen and the\n- * last-seen stub mapping for that request.\n+ * Simple container class for building scenarios. Tracks the number of times a request has been seen, the associated\n+ * scenario name, and the current scenario state;\n*/\n- private static class StubMappingTracker {\n- private int count;\n- private StubMapping previousStubMapping;\n+ private static class ScenarioDetails {\n+ private final String name;\n+ private int count = 1;\n+ private String currentState = Scenario.STARTED;\n+\n+ private ScenarioDetails(RequestPattern request) {\n+ this.name = SCENARIO_NAME_PREFIX + \"-\" + UniqueFilenameGenerator.urlToPathParts(request.getUrl());\n+ }\n- private StubMappingTracker(StubMapping stubMapping) {\n- this.count = 1;\n- this.previousStubMapping = stubMapping;\n+ private void updateStubMapping(StubMapping stubMapping) {\n+ stubMapping.setScenarioName(name);\n+ stubMapping.setRequiredScenarioState(currentState);\n+\n+ if (count > 1) {\n+ currentState = name + \"-\" + count;\n+ stubMapping.setNewScenarioState(currentState);\n+ }\n+ count += 1;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "@@ -6,8 +6,8 @@ import com.google.common.collect.Lists;\nimport java.util.List;\n/**\n- * Performs post-processing tasks on stub mappings generated from ServeEvents:\n- * 1. Detect and process duplicate requests\n+ * Performs stateful post-processing tasks on stub mappings generated from ServeEvents:\n+ * 1. Detect duplicate requests and either discard them or turn them into scenarios\n* 2. Extract response bodies to a separate file, if applicable\n* 3. Run any applicable StubMappingTransformers against the stub mappings\n*/\n@@ -33,7 +33,7 @@ public class SnapshotStubMappingPostProcessor {\nfinal List<StubMapping> processedStubMappings = Lists.newLinkedList(stubMappings);\n// Handle repeated requests by either removing them or generating scenarios\n- repeatedRequestHandler.processStubMappingsInPlace(processedStubMappings);\n+ repeatedRequestHandler.filterOrCreateScenarios(processedStubMappings);\n// Extract response bodies, if applicable\nif (bodyExtractMatcher != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotRepeatedRequestHandlerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotRepeatedRequestHandlerTest.java",
"diff": "@@ -20,24 +20,12 @@ public class SnapshotRepeatedRequestHandlerTest {\npublic void processSingleStubMapping() {\nList<StubMapping> mappings = ImmutableList.of(stubMappingForUrl(\"\"));\nString serialized = Json.write(mappings);\n- new SnapshotRepeatedRequestHandler(true).processStubMappingsInPlace(mappings);\n+ new SnapshotRepeatedRequestHandler(true).filterOrCreateScenarios(mappings);\n// Shouldn't have changed anything, since there hasn't been multiple identical requests\nassertEquals(serialized, Json.write(mappings));\n}\n- @Test\n- public void resetsAfterRun() {\n- List<StubMapping> mappings = ImmutableList.of(stubMappingForUrl(\"\"));\n- String serialized = Json.write(mappings);\n-\n- SnapshotRepeatedRequestHandler handler = new SnapshotRepeatedRequestHandler(false);\n- handler.processStubMappingsInPlace(mappings);\n- handler.processStubMappingsInPlace(mappings);\n-\n- assertEquals(serialized, Json.write(mappings));\n- }\n-\n@Test\npublic void discardsDuplicatesWhenNotUsingScenarios() {\nList<StubMapping> stubMappings = Lists.newArrayList(\n@@ -46,7 +34,7 @@ public class SnapshotRepeatedRequestHandlerTest {\nstubMappingForUrl(\"/different\"),\nstubMappingForUrl(\"/dupe\")\n);\n- new SnapshotRepeatedRequestHandler(false).processStubMappingsInPlace(stubMappings);\n+ new SnapshotRepeatedRequestHandler(false).filterOrCreateScenarios(stubMappings);\nassertEquals(2, stubMappings.size());\n@@ -70,7 +58,7 @@ public class SnapshotRepeatedRequestHandlerTest {\nstubMappingForUrl(\"/foo/bar\")\n);\n- new SnapshotRepeatedRequestHandler(true).processStubMappingsInPlace(stubMappings);\n+ new SnapshotRepeatedRequestHandler(true).filterOrCreateScenarios(stubMappings);\nassertEquals(4, stubMappings.size());\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Refactoring SnapshotRepeatedRequestHandler to split up the logic |
686,965 | 07.07.2017 17:05:05 | 25,200 | 0f8c6a9977994cff151e019736ad3f4409cebc9f | Some more tests for ResponseDefinitionBodyMatcher | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"diff": "@@ -6,6 +6,8 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.MatchResult;\nimport com.github.tomakehurst.wiremock.matching.ValueMatcher;\n+import java.util.Objects;\n+\n// Matches the size of the body of a ResponseDefinition, for use by the Snapshot API when determining if the body\n// should be extracted to a file.\n@JsonDeserialize(using = ResponseDefinitionBodyMatcherDeserializer.class)\n@@ -40,4 +42,20 @@ public class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefin\n}\n}\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+\n+ ResponseDefinitionBodyMatcher that = (ResponseDefinitionBodyMatcher) o;\n+\n+ return Objects.equals(textSizeThreshold, that.textSizeThreshold)\n+ && Objects.equals(binarySizeThreshold, that.binarySizeThreshold);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(textSizeThreshold, binarySizeThreshold);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherDeserializerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/ResponseDefinitionBodyMatcherDeserializerTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\n+import com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher;\nimport com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcherDeserializer;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.google.common.collect.ImmutableMap;\nimport org.junit.Test;\n@@ -26,4 +28,22 @@ public class ResponseDefinitionBodyMatcherDeserializerTest {\nassertEquals(\"Failed with \" + input, expected, actual);\n}\n}\n+\n+ @Test\n+ public void correctlyDeserializesWithEmptyNode() {\n+ ResponseDefinitionBodyMatcher matcher = Json.read(\"{}\", ResponseDefinitionBodyMatcher.class);\n+ assertEquals(new ResponseDefinitionBodyMatcher(Long.MAX_VALUE, Long.MAX_VALUE), matcher);\n+ }\n+\n+ @Test\n+ public void correctlyDeserializesWithSingleValue() {\n+ ResponseDefinitionBodyMatcher matcher = Json.read(\"{ \\\"textSizeThreshold\\\": 100 }\", ResponseDefinitionBodyMatcher.class);\n+ assertEquals(new ResponseDefinitionBodyMatcher(100, Long.MAX_VALUE), matcher);\n+ }\n+\n+ @Test\n+ public void correctlyDeserializesWithBothValues() {\n+ ResponseDefinitionBodyMatcher matcher = Json.read(\"{ \\\"textSizeThreshold\\\": 100, \\\"binarySizeThreshold\\\": 10 }\", ResponseDefinitionBodyMatcher.class);\n+ assertEquals(new ResponseDefinitionBodyMatcher(100, 10), matcher);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingTransformerRunnerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingTransformerRunnerTest.java",
"diff": "@@ -17,16 +17,17 @@ import static org.junit.Assert.assertEquals;\npublic class SnapshotStubMappingTransformerRunnerTest {\n@Test\npublic void applyWithNoTransformers() {\n- StubMapping stubMapping = stubMappingForUrl(\"/foo\");\n+ StubMapping stubMapping = stubMapping();\nStubMapping result = new SnapshotStubMappingTransformerRunner(\nnew ArrayList<StubMappingTransformer>()\n).apply(stubMapping);\n+\nassertEquals(stubMapping, result);\n}\n@Test\npublic void applyWithUnregisteredNonGlobalTransformer() {\n- StubMapping stubMapping = stubMappingForUrl(\"/foo\");\n+ StubMapping stubMapping = stubMapping();\n// Should not apply the transformer as it isn't registered\nStubMapping result = new SnapshotStubMappingTransformerRunner(\n@@ -38,33 +39,28 @@ public class SnapshotStubMappingTransformerRunnerTest {\n@Test\npublic void applyWithRegisteredNonGlobalTransformer() {\n- StubMapping stubMapping = stubMappingForUrl(\"/foo\");\n-\nStubMapping result = new SnapshotStubMappingTransformerRunner(\nLists.<StubMappingTransformer>newArrayList(new NonGlobalStubMappingTransformer()),\nLists.newArrayList(\"nonglobal-transformer\"),\nnull,\nnull\n- ).apply(stubMapping);\n+ ).apply(stubMapping());\n- assertEquals(\"/foo?transformed=nonglobal\", result.getRequest().getUrl());\n+ assertEquals(\"/?transformed=nonglobal\", result.getRequest().getUrl());\n}\n@Test\npublic void applyWithGlobalTransformer() {\n- StubMapping stubMapping = stubMappingForUrl(\"/foo\");\n-\nStubMapping result = new SnapshotStubMappingTransformerRunner(\nLists.<StubMappingTransformer>newArrayList(new GlobalStubMappingTransformer())\n- ).apply(stubMapping);\n+ ).apply(stubMapping());\n- assertEquals(\"/foo?transformed=global\", result.getRequest().getUrl());\n+ assertEquals(\"/?transformed=global\", result.getRequest().getUrl());\n}\n-\n- private StubMapping stubMappingForUrl(String url) {\n+ private StubMapping stubMapping() {\nreturn new StubMapping(\n- newRequestPattern().withUrl(url).build(),\n+ newRequestPattern().withUrl(\"/\").build(),\nResponseDefinition.ok()\n);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Some more tests for ResponseDefinitionBodyMatcher |
686,965 | 09.07.2017 20:29:20 | 25,200 | e190c978ecb5bd19b569c5d5e5330f3bc178acbb | Refactoring: move UniqueFilenameGenerator.urlToPathParts() to Urls class | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\n-import com.github.tomakehurst.wiremock.common.UniqueFilenameGenerator;\n+import com.github.tomakehurst.wiremock.common.Urls;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport org.apache.commons.collections4.MultiSet;\nimport org.apache.commons.collections4.multiset.HashMultiSet;\n+import java.net.URI;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.Map;\n@@ -67,7 +68,7 @@ public class SnapshotRepeatedRequestHandler {\nprivate String currentState = Scenario.STARTED;\nprivate ScenarioDetails(RequestPattern request) {\n- this.name = SCENARIO_NAME_PREFIX + \"-\" + UniqueFilenameGenerator.urlToPathParts(request.getUrl());\n+ this.name = SCENARIO_NAME_PREFIX + \"-\" + Urls.urlToPathParts(URI.create(request.getUrl()));\n}\nprivate void updateStubMapping(StubMapping stubMapping) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingBodyExtractor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingBodyExtractor.java",
"diff": "@@ -5,6 +5,8 @@ import com.github.tomakehurst.wiremock.common.*;\nimport com.github.tomakehurst.wiremock.core.WireMockApp;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import java.net.URI;\n+\npublic class SnapshotStubMappingBodyExtractor {\nprivate final FileSource fileSource;\nprivate final IdGenerator idGenerator;\n@@ -32,16 +34,12 @@ public class SnapshotStubMappingBodyExtractor {\nstubMapping.getRequest().getUrl(),\nstubMapping.getResponse().getHeaders().getContentTypeHeader(),\nbody);\n-\n- String bodyFileName = new StringBuilder(WireMockApp.FILES_ROOT)\n- .append(\"/body\")\n- .append(\"-\")\n- .append(UniqueFilenameGenerator.urlToPathParts(stubMapping.getRequest().getUrl()))\n- .append(\"-\")\n- .append(fileId)\n- .append(\".\")\n- .append(extension)\n- .toString();\n+ String bodyFileName = UniqueFilenameGenerator.generate(\n+ stubMapping.getRequest().getUrl(),\n+ WireMockApp.FILES_ROOT + \"/body\",\n+ fileId,\n+ extension\n+ );\n// used to prevent ambiguous method call error for withBody()\nString noStringBody = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java",
"diff": "package com.github.tomakehurst.wiremock.common;\nimport com.github.tomakehurst.wiremock.http.Request;\n-import com.google.common.base.Joiner;\nimport java.net.URI;\n-import static com.google.common.base.Splitter.on;\n-import static com.google.common.collect.FluentIterable.from;\n-import static com.google.common.collect.Iterables.size;\n-import static java.lang.Math.min;\n-\npublic class UniqueFilenameGenerator {\n- public static String generate(Request request, String prefix, String id) {\n- return generate(request, prefix, id, \"json\");\n+ public static String generate(String url, String prefix, String id) {\n+ return generate(url, prefix, id, \"json\");\n}\n- public static String generate(Request request, String prefix, String id, String extension) {\n- String pathPart = urlToPathParts(request.getUrl());\n+ public static String generate(String url, String prefix, String id, String extension) {\n+ String pathPart = Urls.urlToPathParts(URI.create(url));\n+ pathPart = pathPart.equals(\"\") ? \"(root)\" : sanitise(pathPart);\nreturn new StringBuilder(prefix)\n.append(\"-\")\n@@ -44,21 +39,6 @@ public class UniqueFilenameGenerator {\n.toString();\n}\n- public static String urlToPathParts(String url) {\n- URI uri = URI.create(url);\n- Iterable<String> uriPathNodes = on(\"/\").omitEmptyStrings().split(uri.getPath());\n- int nodeCount = size(uriPathNodes);\n-\n- return nodeCount > 0 ?\n- sanitise(\n- Joiner.on(\"-\")\n- .join(from(uriPathNodes)\n- .skip(nodeCount - min(nodeCount, 2))\n- )\n- ):\n- \"(root)\";\n- }\n-\nprivate static String sanitise(String input) {\nreturn input.replaceAll(\"[,~:/?#\\\\[\\\\]@!\\\\$&'()*+;=]\", \"_\");\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": "package com.github.tomakehurst.wiremock.common;\nimport com.github.tomakehurst.wiremock.http.QueryParameter;\n+import com.google.common.base.Joiner;\nimport com.google.common.base.Splitter;\nimport com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableListMultimap;\n+import com.google.common.collect.Iterables;\nimport com.google.common.collect.Maps;\nimport java.io.UnsupportedEncodingException;\n@@ -29,6 +31,7 @@ import java.util.Collections;\nimport java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static com.google.common.collect.FluentIterable.from;\npublic class Urls {\n@@ -57,6 +60,18 @@ public class Urls {\n});\n}\n+ public static String urlToPathParts(URI uri) {\n+ Iterable<String> uriPathNodes = Splitter.on(\"/\").omitEmptyStrings().split(uri.getPath());\n+ int nodeCount = Iterables.size(uriPathNodes);\n+\n+ return nodeCount > 0 ?\n+ Joiner.on(\"-\")\n+ .join(from(uriPathNodes)\n+ .skip(nodeCount - Math.min(nodeCount, 2))\n+ ):\n+ \"\";\n+ }\n+\npublic static Map<String, QueryParameter> splitQuery(URI uri) {\nif (uri == null) {\nreturn Collections.emptyMap();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMappingJsonRecorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMappingJsonRecorder.java",
"diff": "@@ -99,9 +99,9 @@ public class StubMappingJsonRecorder implements RequestListener {\nString fileId = idGenerator.generate();\nbyte[] body = bodyDecompressedIfRequired(response);\n- String mappingFileName = UniqueFilenameGenerator.generate(request, \"mapping\", fileId);\n+ String mappingFileName = UniqueFilenameGenerator.generate(request.getUrl(), \"mapping\", fileId);\nString bodyFileName = UniqueFilenameGenerator.generate(\n- request,\n+ request.getUrl(),\n\"body\",\nfileId,\nContentTypes.determineFileExtension(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGeneratorTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n-import org.jmock.Mockery;\n-import org.jmock.integration.junit4.JMock;\n-import org.junit.Before;\nimport org.junit.Test;\n-import org.junit.runner.RunWith;\n-import static com.github.tomakehurst.wiremock.testsupport.MockRequestBuilder.aRequest;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n-@RunWith(JMock.class)\npublic class UniqueFilenameGeneratorTest {\n- private Mockery context;\n-\n- @Before\n- public void init() {\n- context = new Mockery();\n- }\n-\n@Test\npublic void generatesValidNameWhenRequestHasUrlWithTwoPathNodes() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/some/path\").build(),\n+ \"/some/path\",\n\"body\",\n\"random123\");\n@@ -48,7 +35,7 @@ public class UniqueFilenameGeneratorTest {\n@Test\npublic void generatesValidNameWhenRequestHasUrlWithOnePathNode() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/thing\").build(),\n+ \"/thing\",\n\"body\",\n\"random123\");\n@@ -58,7 +45,7 @@ public class UniqueFilenameGeneratorTest {\n@Test\npublic void generatesValidNameWhenRequestHasRootPath() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/\").build(),\n+ \"/\",\n\"body\",\n\"random123\");\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": "@@ -58,4 +58,22 @@ public class UrlsTest {\nMap<String, QueryParameter> query = Urls.splitQuery(url);\nassertThat(query.get(\"q\").firstValue(), is(\"a%b\"));\n}\n+\n+ @Test\n+ public void returnsEmptyStringForEmptyUrlPathParts() {\n+ assertThat(Urls.urlToPathParts(URI.create(\"/\")), is(\"\"));\n+ assertThat(Urls.urlToPathParts(URI.create(\"http://www.wiremock.org/\")), is(\"\"));\n+ }\n+\n+ @Test\n+ public void returnsNonDelimitedStringForUrlWithOnePathPart() {\n+ String pathParts = Urls.urlToPathParts(URI.create(\"/foo?param=value\"));\n+ assertThat(pathParts, is(\"foo\"));\n+ }\n+\n+ @Test\n+ public void returnsDelimitedStringForUrlWithTwoPathParts() {\n+ String pathParts = Urls.urlToPathParts(URI.create(\"/foo/bar/?param=value\"));\n+ assertThat(pathParts, is(\"foo-bar\"));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Refactoring: move UniqueFilenameGenerator.urlToPathParts() to Urls class |
686,965 | 09.07.2017 23:04:34 | 25,200 | 5192a752fbcdce2ff3d6f1024f3f0159595fa814 | Refactoring to extract URL path logic to a method
This extracts some logic in UniqueFilenameGenerator for turning URL
paths into a hyphen-delimited string over to a method in Urls. This
makes it easier to test and will be necessary for PR since it also
uses this logic. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGenerator.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n-import com.github.tomakehurst.wiremock.http.Request;\n-import com.google.common.base.Joiner;\n-\nimport java.net.URI;\n-import static com.google.common.base.Splitter.on;\n-import static com.google.common.collect.FluentIterable.from;\n-import static com.google.common.collect.Iterables.size;\n-import static java.lang.Math.min;\n-\npublic class UniqueFilenameGenerator {\n- public static String generate(Request request, String prefix, String id) {\n- return generate(request, prefix, id, \"json\");\n+ public static String generate(String url, String prefix, String id) {\n+ return generate(url, prefix, id, \"json\");\n}\n- public static String generate(Request request, String prefix, String id, String extension) {\n- URI uri = URI.create(request.getUrl());\n- Iterable<String> uriPathNodes = on(\"/\").omitEmptyStrings().split(uri.getPath());\n- int nodeCount = size(uriPathNodes);\n-\n- String pathPart = nodeCount > 0 ?\n- sanitise(\n- Joiner.on(\"-\")\n- .join(from(uriPathNodes)\n- .skip(nodeCount - min(nodeCount, 2))\n- )\n- ):\n- \"(root)\";\n-\n+ public static String generate(String url, String prefix, String id, String extension) {\n+ String pathPart = Urls.urlToPathParts(URI.create(url));\n+ pathPart = pathPart.equals(\"\") ? \"(root)\" : sanitise(pathPart);\nreturn new StringBuilder(prefix)\n.append(\"-\")\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": "package com.github.tomakehurst.wiremock.common;\nimport com.github.tomakehurst.wiremock.http.QueryParameter;\n+import com.google.common.base.Joiner;\nimport com.google.common.base.Splitter;\nimport com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableListMultimap;\n+import com.google.common.collect.Iterables;\nimport com.google.common.collect.Maps;\nimport java.io.UnsupportedEncodingException;\n@@ -29,6 +31,7 @@ import java.util.Collections;\nimport java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static com.google.common.collect.FluentIterable.from;\npublic class Urls {\n@@ -57,6 +60,18 @@ public class Urls {\n});\n}\n+ public static String urlToPathParts(URI uri) {\n+ Iterable<String> uriPathNodes = Splitter.on(\"/\").omitEmptyStrings().split(uri.getPath());\n+ int nodeCount = Iterables.size(uriPathNodes);\n+\n+ return nodeCount > 0 ?\n+ Joiner.on(\"-\")\n+ .join(from(uriPathNodes)\n+ .skip(nodeCount - Math.min(nodeCount, 2))\n+ ):\n+ \"\";\n+ }\n+\npublic static Map<String, QueryParameter> splitQuery(URI uri) {\nif (uri == null) {\nreturn Collections.emptyMap();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMappingJsonRecorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/stubbing/StubMappingJsonRecorder.java",
"diff": "@@ -99,9 +99,9 @@ public class StubMappingJsonRecorder implements RequestListener {\nString fileId = idGenerator.generate();\nbyte[] body = bodyDecompressedIfRequired(response);\n- String mappingFileName = UniqueFilenameGenerator.generate(request, \"mapping\", fileId);\n+ String mappingFileName = UniqueFilenameGenerator.generate(request.getUrl(), \"mapping\", fileId);\nString bodyFileName = UniqueFilenameGenerator.generate(\n- request,\n+ request.getUrl(),\n\"body\",\nfileId,\nContentTypes.determineFileExtension(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/common/UniqueFilenameGeneratorTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.common;\n-import org.jmock.Mockery;\n-import org.jmock.integration.junit4.JMock;\n-import org.junit.Before;\nimport org.junit.Test;\n-import org.junit.runner.RunWith;\n-import static com.github.tomakehurst.wiremock.testsupport.MockRequestBuilder.aRequest;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n-@RunWith(JMock.class)\npublic class UniqueFilenameGeneratorTest {\n- private Mockery context;\n-\n- @Before\n- public void init() {\n- context = new Mockery();\n- }\n-\n@Test\npublic void generatesValidNameWhenRequestHasUrlWithTwoPathNodes() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/some/path\").build(),\n+ \"/some/path\",\n\"body\",\n\"random123\");\n@@ -48,7 +35,7 @@ public class UniqueFilenameGeneratorTest {\n@Test\npublic void generatesValidNameWhenRequestHasUrlWithOnePathNode() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/thing\").build(),\n+ \"/thing\",\n\"body\",\n\"random123\");\n@@ -58,7 +45,7 @@ public class UniqueFilenameGeneratorTest {\n@Test\npublic void generatesValidNameWhenRequestHasRootPath() {\nString fileName = UniqueFilenameGenerator.generate(\n- aRequest(context).withUrl(\"/\").build(),\n+ \"/\",\n\"body\",\n\"random123\");\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": "@@ -58,4 +58,22 @@ public class UrlsTest {\nMap<String, QueryParameter> query = Urls.splitQuery(url);\nassertThat(query.get(\"q\").firstValue(), is(\"a%b\"));\n}\n+\n+ @Test\n+ public void returnsEmptyStringForEmptyUrlPathParts() {\n+ assertThat(Urls.urlToPathParts(URI.create(\"/\")), is(\"\"));\n+ assertThat(Urls.urlToPathParts(URI.create(\"http://www.wiremock.org/\")), is(\"\"));\n+ }\n+\n+ @Test\n+ public void returnsNonDelimitedStringForUrlWithOnePathPart() {\n+ String pathParts = Urls.urlToPathParts(URI.create(\"/foo?param=value\"));\n+ assertThat(pathParts, is(\"foo\"));\n+ }\n+\n+ @Test\n+ public void returnsDelimitedStringForUrlWithTwoPathParts() {\n+ String pathParts = Urls.urlToPathParts(URI.create(\"/foo/bar/?param=value\"));\n+ assertThat(pathParts, is(\"foo-bar\"));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Refactoring to extract URL path logic to a method
This extracts some logic in UniqueFilenameGenerator for turning URL
paths into a hyphen-delimited string over to a method in Urls. This
makes it easier to test and will be necessary for PR #674, since it also
uses this logic. |
686,936 | 10.07.2017 16:54:48 | -3,600 | e4db43863bc951b231a950979bdd2ad52ae3ead5 | Upgraded to Guava 20.0 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -47,7 +47,7 @@ dependencies {\ncompile \"org.eclipse.jetty:jetty-servlet:$versions.jetty\"\ncompile \"org.eclipse.jetty:jetty-servlets:$versions.jetty\"\ncompile \"org.eclipse.jetty:jetty-webapp:$versions.jetty\"\n- compile \"com.google.guava:guava:18.0\"\n+ compile \"com.google.guava:guava:20.0\"\ncompile \"com.fasterxml.jackson.core:jackson-core:$versions.jackson\",\n\"com.fasterxml.jackson.core:jackson-annotations:$versions.jackson\",\n\"com.fasterxml.jackson.core:jackson-databind:$versions.jackson\"\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to Guava 20.0 |
686,936 | 10.07.2017 16:56:49 | -3,600 | e8e96f6fb0ef67395e76d8d7050c87565e487610 | Upgraded to httpclient 4.5.3 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -51,7 +51,7 @@ dependencies {\ncompile \"com.fasterxml.jackson.core:jackson-core:$versions.jackson\",\n\"com.fasterxml.jackson.core:jackson-annotations:$versions.jackson\",\n\"com.fasterxml.jackson.core:jackson-databind:$versions.jackson\"\n- compile \"org.apache.httpcomponents:httpclient:4.5.1\"\n+ compile \"org.apache.httpcomponents:httpclient:4.5.3\"\ncompile 'org.xmlunit:xmlunit-core:2.3.0'\ncompile 'org.xmlunit:xmlunit-legacy:2.3.0'\ncompile \"com.jayway.jsonpath:json-path:2.2.0\"\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to httpclient 4.5.3 |
686,936 | 10.07.2017 16:57:57 | -3,600 | 317023a7eab285878221da4235c8845f5eb0d5c5 | Factored out a variable for xmlunit version in the build | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -35,7 +35,8 @@ def shouldPublishLocally = System.getProperty('LOCAL_PUBLISH')\ndef versions = [\njackson: '2.8.9',\n- jetty : '9.2.22.v20170606'\n+ jetty : '9.2.22.v20170606',\n+ xmlUnit: '2.3.0'\n]\nrepositories {\n@@ -52,8 +53,8 @@ dependencies {\n\"com.fasterxml.jackson.core:jackson-annotations:$versions.jackson\",\n\"com.fasterxml.jackson.core:jackson-databind:$versions.jackson\"\ncompile \"org.apache.httpcomponents:httpclient:4.5.3\"\n- compile 'org.xmlunit:xmlunit-core:2.3.0'\n- compile 'org.xmlunit:xmlunit-legacy:2.3.0'\n+ compile \"org.xmlunit:xmlunit-core:$versions.xmlUnit\"\n+ compile \"org.xmlunit:xmlunit-legacy:$versions.xmlUnit\"\ncompile \"com.jayway.jsonpath:json-path:2.2.0\"\ncompile \"org.slf4j:slf4j-api:1.7.12\"\ncompile \"net.sf.jopt-simple:jopt-simple:4.9\"\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Factored out a variable for xmlunit version in the build |
686,936 | 10.07.2017 16:59:09 | -3,600 | 881a3542dcda784d252e8bb032803dbe791e7b7b | Upgraded to JSONPath 2.4.0 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -55,7 +55,7 @@ dependencies {\ncompile \"org.apache.httpcomponents:httpclient:4.5.3\"\ncompile \"org.xmlunit:xmlunit-core:$versions.xmlUnit\"\ncompile \"org.xmlunit:xmlunit-legacy:$versions.xmlUnit\"\n- compile \"com.jayway.jsonpath:json-path:2.2.0\"\n+ compile \"com.jayway.jsonpath:json-path:2.4.0\"\ncompile \"org.slf4j:slf4j-api:1.7.12\"\ncompile \"net.sf.jopt-simple:jopt-simple:4.9\"\ncompile(\"junit:junit:4.12\") {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to JSONPath 2.4.0 |
686,936 | 10.07.2017 17:00:32 | -3,600 | 2731aaefead843792194609b656522a9810f4ccd | Upgraded to jopt-simple 5.0.3 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -57,7 +57,7 @@ dependencies {\ncompile \"org.xmlunit:xmlunit-legacy:$versions.xmlUnit\"\ncompile \"com.jayway.jsonpath:json-path:2.4.0\"\ncompile \"org.slf4j:slf4j-api:1.7.12\"\n- compile \"net.sf.jopt-simple:jopt-simple:4.9\"\n+ compile \"net.sf.jopt-simple:jopt-simple:5.0.3\"\ncompile(\"junit:junit:4.12\") {\nexclude group: \"org.hamcrest\", module: \"hamcrest-core\"\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to jopt-simple 5.0.3 |
686,936 | 10.07.2017 17:03:41 | -3,600 | ce74c429bd155447bfdd09450d5a7b1ed70a4b5c | Upgraded to commons-lang 3.6 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -61,7 +61,7 @@ dependencies {\ncompile(\"junit:junit:4.12\") {\nexclude group: \"org.hamcrest\", module: \"hamcrest-core\"\n}\n- compile 'org.apache.commons:commons-lang3:3.5'\n+ compile 'org.apache.commons:commons-lang3:3.6'\ncompile 'com.flipkart.zjsonpatch:zjsonpatch:0.3.0'\ncompile 'com.github.jknack:handlebars:4.0.6', {\nexclude group: 'org.mozilla', module: 'rhino'\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded to commons-lang 3.6 |
686,965 | 10.07.2017 22:53:35 | 25,200 | 901db8d6ea955b868eca9e7b19eba702569902ee | More refactoring for repeated request/scenario handling | [
{
"change_type": "DELETE",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRepeatedRequestHandler.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin.model;\n-\n-import com.github.tomakehurst.wiremock.common.Urls;\n-import com.github.tomakehurst.wiremock.matching.RequestPattern;\n-import com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import org.apache.commons.collections4.MultiSet;\n-import org.apache.commons.collections4.multiset.HashMultiSet;\n-\n-import java.net.URI;\n-import java.util.HashMap;\n-import java.util.Iterator;\n-import java.util.Map;\n-\n-/**\n- * Counts unique RequestPatterns from StubMappings. If shouldRecordRepeatsAsScenarios is enabled, then multiple\n- * identical requests will be recorded as scenarios. Otherwise, they're removed.\n- */\n-public class SnapshotRepeatedRequestHandler {\n- private final static String SCENARIO_NAME_PREFIX = \"scenario\";\n- private final boolean shouldRecordRepeatsAsScenarios;\n-\n- public SnapshotRepeatedRequestHandler(boolean shouldRecordRepeatsAsScenarios) {\n- this.shouldRecordRepeatsAsScenarios = shouldRecordRepeatsAsScenarios;\n- }\n-\n- public void filterOrCreateScenarios(Iterable<StubMapping> stubMappings) {\n- final MultiSet<RequestPattern> requestCounts = new HashMultiSet<>();\n- final Iterator<StubMapping> stubMappingIterator = stubMappings.iterator();\n-\n- while (stubMappingIterator.hasNext()) {\n- StubMapping stubMapping = stubMappingIterator.next();\n- requestCounts.add(stubMapping.getRequest());\n-\n- if (!shouldRecordRepeatsAsScenarios && requestCounts.getCount(stubMapping.getRequest()) > 1) {\n- stubMappingIterator.remove();\n- }\n- }\n-\n- if (shouldRecordRepeatsAsScenarios) {\n- this.createScenarios(stubMappings, requestCounts);\n- }\n- }\n-\n- private void createScenarios(Iterable<StubMapping> stubMappings, MultiSet<RequestPattern> requestCounts) {\n- final Map<RequestPattern, ScenarioDetails> tracker = new HashMap<>();\n-\n- for (StubMapping stubMapping : stubMappings) {\n- if (requestCounts.getCount(stubMapping.getRequest()) == 1) {\n- continue; // not a repeated request\n- }\n-\n- if (!tracker.containsKey(stubMapping.getRequest())) {\n- tracker.put(stubMapping.getRequest(), new ScenarioDetails(stubMapping.getRequest()));\n- }\n-\n- tracker.get(stubMapping.getRequest()).updateStubMapping(stubMapping);\n- }\n- }\n-\n- /**\n- * Simple container class for building scenarios. Tracks the number of times a request has been seen, the associated\n- * scenario name, and the current scenario state;\n- */\n- private static class ScenarioDetails {\n- private final String name;\n- private int count = 1;\n- private String currentState = Scenario.STARTED;\n-\n- private ScenarioDetails(RequestPattern request) {\n- this.name = SCENARIO_NAME_PREFIX + \"-\" + Urls.urlToPathParts(URI.create(request.getUrl()));\n- }\n-\n- private void updateStubMapping(StubMapping stubMapping) {\n- stubMapping.setScenarioName(name);\n- stubMapping.setRequiredScenarioState(currentState);\n-\n- if (count > 1) {\n- currentState = name + \"-\" + count;\n- stubMapping.setNewScenarioState(currentState);\n- }\n- count += 1;\n- }\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotScenarioBuilder.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.github.tomakehurst.wiremock.common.Urls;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+\n+import java.net.URI;\n+import java.util.HashMap;\n+import java.util.Map;\n+\n+/**\n+ * Generates scenarios for repeated requests.\n+ */\n+public class SnapshotScenarioBuilder {\n+ private final Map<RequestPattern, ScenarioDetails> tracker = new HashMap<>();\n+\n+ public void addToScenario(StubMapping stubMapping) {\n+ ScenarioDetails details = tracker.get(stubMapping.getRequest());\n+\n+ if (details == null) {\n+ details = new ScenarioDetails(stubMapping.getRequest());\n+ tracker.put(stubMapping.getRequest(), details);\n+ }\n+\n+ details.setScenarioDetails(stubMapping);\n+ }\n+\n+ /**\n+ * Simple container class for building scenarios. Tracks the number of times a request has been seen, the associated\n+ * scenario name, and the current scenario state;\n+ */\n+ private static class ScenarioDetails {\n+ private final static String SCENARIO_NAME_PREFIX = \"scenario\";\n+ private final String name;\n+ private int count = 1;\n+ private String currentState = Scenario.STARTED;\n+\n+ private ScenarioDetails(RequestPattern request) {\n+ this.name = SCENARIO_NAME_PREFIX + \"-\" + Urls.urlToPathParts(URI.create(request.getUrl()));\n+ }\n+\n+ private void setScenarioDetails(StubMapping stubMapping) {\n+ stubMapping.setScenarioName(name);\n+ stubMapping.setRequiredScenarioState(currentState);\n+\n+ if (count > 1) {\n+ currentState = name + \"-\" + count;\n+ stubMapping.setNewScenarioState(currentState);\n+ }\n+ count += 1;\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingBodyExtractor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingBodyExtractor.java",
"diff": "@@ -5,8 +5,6 @@ import com.github.tomakehurst.wiremock.common.*;\nimport com.github.tomakehurst.wiremock.core.WireMockApp;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import java.net.URI;\n-\npublic class SnapshotStubMappingBodyExtractor {\nprivate final FileSource fileSource;\nprivate final IdGenerator idGenerator;\n@@ -24,7 +22,7 @@ public class SnapshotStubMappingBodyExtractor {\n* Extracts body of the ResponseDefinition to a file written to the FILES_ROOT.\n* Modifies the ResponseDefinition to point to the file in-place\n*\n- * @fixme Generates multiple files for identical requests when scenarios enabled\n+ * @fixme Generates multiple files for stub mappings with identical responses\n* @param stubMapping Stub mapping to extract\n*/\npublic void extractInPlace(StubMapping stubMapping) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.collect.HashMultiset;\nimport com.google.common.collect.Lists;\n+import com.google.common.collect.Multiset;\n+import java.util.ArrayList;\nimport java.util.List;\n/**\n@@ -12,36 +16,52 @@ import java.util.List;\n* 3. Run any applicable StubMappingTransformers against the stub mappings\n*/\npublic class SnapshotStubMappingPostProcessor {\n- private final SnapshotRepeatedRequestHandler repeatedRequestHandler;\n+ private final boolean shouldRecordRepeatsAsScenarios;\nprivate final SnapshotStubMappingTransformerRunner transformerRunner;\nprivate final ResponseDefinitionBodyMatcher bodyExtractMatcher;\nprivate final SnapshotStubMappingBodyExtractor bodyExtractor;\npublic SnapshotStubMappingPostProcessor(\n- SnapshotRepeatedRequestHandler repeatedRequestHandler,\n+ boolean shouldRecordRepeatsAsScenarios,\nSnapshotStubMappingTransformerRunner transformerRunner,\nResponseDefinitionBodyMatcher bodyExtractMatcher,\nSnapshotStubMappingBodyExtractor bodyExtractor\n) {\n- this.repeatedRequestHandler = repeatedRequestHandler;\n+ this.shouldRecordRepeatsAsScenarios = shouldRecordRepeatsAsScenarios;\nthis.transformerRunner = transformerRunner;\nthis.bodyExtractMatcher = bodyExtractMatcher;\nthis.bodyExtractor = bodyExtractor;\n}\npublic List<StubMapping> process(Iterable<StubMapping> stubMappings) {\n- final List<StubMapping> processedStubMappings = Lists.newLinkedList(stubMappings);\n+ final Multiset<RequestPattern> requestCounts = HashMultiset.create();\n+ final List<StubMapping> processedStubMappings = new ArrayList<>();\n- // Handle repeated requests by either removing them or generating scenarios\n- repeatedRequestHandler.filterOrCreateScenarios(processedStubMappings);\n-\n- // Extract response bodies, if applicable\n- if (bodyExtractMatcher != null) {\nfor (StubMapping stubMapping : stubMappings) {\n- if (bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()) {\n+ requestCounts.add(stubMapping.getRequest());\n+\n+ // Skip duplicate requests if shouldRecordRepeatsAsScenarios is not enabled\n+ if (\n+ requestCounts.count(stubMapping.getRequest()) > 1\n+ && !shouldRecordRepeatsAsScenarios\n+ ) {\n+ continue;\n+ }\n+\n+ processedStubMappings.add(stubMapping);\n+ if (bodyExtractMatcher != null && bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()) {\nbodyExtractor.extractInPlace(stubMapping);\n}\n}\n+\n+ if (shouldRecordRepeatsAsScenarios) {\n+ // Build scenarios for repeated requests\n+ final SnapshotScenarioBuilder scenarioBuilder = new SnapshotScenarioBuilder();\n+ for (StubMapping stubMapping : processedStubMappings) {\n+ if (requestCounts.count(stubMapping.getRequest()) > 1) {\n+ scenarioBuilder.addToScenario(stubMapping);\n+ }\n+ }\n}\n// Run any stub mapping transformer extensions\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -60,12 +60,6 @@ public class SnapshotTask implements AdminTask {\n}\nprivate SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n- final SnapshotRepeatedRequestHandler repeatedRequestHandler = new SnapshotRepeatedRequestHandler(\n- snapshotSpec.shouldRecordRepeatsAsScenarios()\n- );\n- final SnapshotStubMappingBodyExtractor bodyExtractor = new SnapshotStubMappingBodyExtractor(\n- options.filesRoot()\n- );\nfinal SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\noptions.extensionsOfType(StubMappingTransformer.class).values(),\nsnapshotSpec.getTransformers(),\n@@ -74,10 +68,10 @@ public class SnapshotTask implements AdminTask {\n);\nreturn new SnapshotStubMappingPostProcessor(\n- repeatedRequestHandler,\n+ snapshotSpec.shouldRecordRepeatsAsScenarios(),\ntransformerRunner,\nsnapshotSpec.getExtractBodyCriteria(),\n- bodyExtractor\n+ new SnapshotStubMappingBodyExtractor(options.filesRoot())\n);\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotRepeatedRequestHandlerTest.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin;\n-\n-import com.github.tomakehurst.wiremock.admin.model.SnapshotRepeatedRequestHandler;\n-import com.github.tomakehurst.wiremock.common.Json;\n-import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.google.common.collect.ImmutableList;\n-import com.google.common.collect.Lists;\n-import org.junit.Test;\n-\n-import java.util.List;\n-\n-import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n-import static org.junit.Assert.assertEquals;\n-import static org.junit.Assert.assertNull;\n-\n-public class SnapshotRepeatedRequestHandlerTest {\n- @Test\n- public void processSingleStubMapping() {\n- List<StubMapping> mappings = ImmutableList.of(stubMappingForUrl(\"\"));\n- String serialized = Json.write(mappings);\n- new SnapshotRepeatedRequestHandler(true).filterOrCreateScenarios(mappings);\n-\n- // Shouldn't have changed anything, since there hasn't been multiple identical requests\n- assertEquals(serialized, Json.write(mappings));\n- }\n-\n- @Test\n- public void discardsDuplicatesWhenNotUsingScenarios() {\n- List<StubMapping> stubMappings = Lists.newArrayList(\n- stubMappingForUrl(\"/dupe\"),\n- stubMappingForUrl(\"/dupe\"),\n- stubMappingForUrl(\"/different\"),\n- stubMappingForUrl(\"/dupe\")\n- );\n- new SnapshotRepeatedRequestHandler(false).filterOrCreateScenarios(stubMappings);\n-\n- assertEquals(2, stubMappings.size());\n-\n- assertEquals(\"/dupe\", stubMappings.get(0).getRequest().getUrl());\n- assertNull(stubMappings.get(0).getScenarioName());\n- assertNull(stubMappings.get(0).getRequiredScenarioState());\n- assertNull(stubMappings.get(0).getNewScenarioState());\n-\n- assertEquals(\"/different\", stubMappings.get(1).getRequest().getUrl());\n- assertNull(stubMappings.get(1).getScenarioName());\n- assertNull(stubMappings.get(1).getRequiredScenarioState());\n- assertNull(stubMappings.get(1).getNewScenarioState());\n- }\n-\n- @Test\n- public void trackMultipleStubMappingsAsScenarios() {\n- List<StubMapping> stubMappings = ImmutableList.of(\n- stubMappingForUrl(\"/foo/bar\"),\n- stubMappingForUrl(\"/foo/bar\"),\n- stubMappingForUrl(\"/not/part/of/scenario\"),\n- stubMappingForUrl(\"/foo/bar\")\n- );\n-\n- new SnapshotRepeatedRequestHandler(true).filterOrCreateScenarios(stubMappings);\n-\n- assertEquals(4, stubMappings.size());\n-\n- // Check first stub mapping, which should be the start of the scenario\n- assertEquals(\"/foo/bar\", stubMappings.get(0).getRequest().getUrl());\n- assertEquals(\"scenario-foo-bar\", stubMappings.get(0).getScenarioName());\n- assertEquals(Scenario.STARTED, stubMappings.get(0).getRequiredScenarioState());\n- assertNull(stubMappings.get(0).getNewScenarioState());\n-\n- // Check second stub mapping\n- assertEquals(stubMappings.get(0).getRequest(), stubMappings.get(1).getRequest());\n- assertEquals(stubMappings.get(1).getScenarioName(), stubMappings.get(1).getScenarioName());\n- assertEquals(Scenario.STARTED, stubMappings.get(1).getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-2\", stubMappings.get(1).getNewScenarioState());\n-\n- // Check third stub mapping, which is not part of the scenario\n- assertEquals(\"/not/part/of/scenario\", stubMappings.get(2).getRequest().getUrl());\n- assertNull(stubMappings.get(2).getScenarioName());\n- assertNull(stubMappings.get(2).getRequiredScenarioState());\n- assertNull(stubMappings.get(2).getNewScenarioState());\n-\n- // Check fourth stub mapping, which is the final state in the scenario\n- assertEquals(stubMappings.get(0).getRequest(), stubMappings.get(3).getRequest());\n- assertEquals(stubMappings.get(3).getScenarioName(), stubMappings.get(3).getScenarioName());\n- assertEquals(\"scenario-foo-bar-2\", stubMappings.get(3).getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-3\", stubMappings.get(3).getNewScenarioState());\n- }\n-\n- private StubMapping stubMappingForUrl(String url) {\n- return new StubMapping(\n- newRequestPattern().withUrl(url).build(),\n- ResponseDefinition.ok()\n- );\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotScenarioBuilderTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.SnapshotScenarioBuilder;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.junit.Test;\n+\n+import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n+import static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertNull;\n+\n+public class SnapshotScenarioBuilderTest {\n+ @Test\n+ public void addToScenarioWithSingleRequestSeries() {\n+ StubMapping mapping1 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping mapping2 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping mapping3 = stubMappingForUrl(\"/foo/bar\");\n+ SnapshotScenarioBuilder builder = new SnapshotScenarioBuilder();\n+\n+ builder.addToScenario(mapping1);\n+ assertEquals(\"scenario-foo-bar\", mapping1.getScenarioName());\n+ assertEquals(Scenario.STARTED, mapping1.getRequiredScenarioState());\n+ assertNull(mapping1.getNewScenarioState());\n+\n+ builder.addToScenario(mapping2);\n+ assertEquals(mapping1.getScenarioName(), mapping2.getScenarioName());\n+ assertEquals(Scenario.STARTED, mapping2.getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-2\", mapping2.getNewScenarioState());\n+\n+ builder.addToScenario(mapping3);\n+ assertEquals(mapping1.getScenarioName(), mapping3.getScenarioName());\n+ assertEquals(mapping2.getNewScenarioState(), mapping3.getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-3\", mapping3.getNewScenarioState());\n+ }\n+\n+ @Test\n+ public void addToScenarioWithMultipleRequestSeries() {\n+ StubMapping mapping1 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping mapping2 = stubMappingForUrl(\"/foo\");\n+ StubMapping mapping3 = stubMappingForUrl(\"/foo/bar\");\n+\n+ SnapshotScenarioBuilder builder = new SnapshotScenarioBuilder();\n+\n+ builder.addToScenario(mapping1);\n+ assertEquals(\"scenario-foo-bar\", mapping1.getScenarioName());\n+ assertEquals(Scenario.STARTED, mapping1.getRequiredScenarioState());\n+ assertNull(mapping1.getNewScenarioState());\n+\n+ builder.addToScenario(mapping2);\n+ assertEquals(\"scenario-foo\", mapping2.getScenarioName());\n+ assertEquals(Scenario.STARTED, mapping2.getRequiredScenarioState());\n+ assertNull(mapping2.getNewScenarioState());\n+\n+ builder.addToScenario(mapping3);\n+ assertEquals(mapping1.getScenarioName(), mapping3.getScenarioName());\n+ assertEquals(Scenario.STARTED, mapping3.getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-2\", mapping3.getNewScenarioState());\n+ }\n+\n+ private StubMapping stubMappingForUrl(String url) {\n+ return new StubMapping(\n+ newRequestPattern().withUrl(url).build(),\n+ ResponseDefinition.ok()\n+ );\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | More refactoring for repeated request/scenario handling |
686,965 | 10.07.2017 23:18:32 | 25,200 | da6e0e721cce0e1b807e68db8747f55379e516f2 | Change SnapshotAcceptanceTest to use a temp file root so it test persistence | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/AcceptanceTestBase.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/AcceptanceTestBase.java",
"diff": "@@ -55,13 +55,17 @@ public class AcceptanceTestBase {\n}\npublic static void setupServerWithTempFileRoot() {\n+ setupServer(wireMockConfig().withRootDirectory(setupTempFileRoot().getAbsolutePath()));\n+ }\n+\n+ public static File setupTempFileRoot() {\ntry {\nFile root = Files.createTempDirectory(\"wiremock\").toFile();\nnew File(root, MAPPINGS_ROOT).mkdirs();\nnew File(root, FILES_ROOT).mkdirs();\n- setupServer(wireMockConfig().withRootDirectory(root.getAbsolutePath()));\n+ return root;\n} catch (IOException e) {\n- throwUnchecked(e);\n+ return throwUnchecked(e, File.class);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"diff": "@@ -27,6 +27,7 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMoc\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\nimport static junit.framework.TestCase.assertFalse;\n+import static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertThat;\npublic class SnapshotAcceptanceTest extends AcceptanceTestBase {\n@@ -36,7 +37,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\npublic void init() {\nproxyingService = new WireMockServer(wireMockConfig()\n.dynamicPort()\n- .withRootDirectory(\"src/test/resources/empty\"));\n+ .withRootDirectory(setupTempFileRoot().getAbsolutePath()));\nproxyingService.start();\nproxyingService.stubFor(proxyAllTo(\"http://localhost:\" + wireMockServer.port()));\n@@ -46,6 +47,8 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n@After\npublic void proxyServerShutdown() {\n+ // delete any persisted stub mappings to ensure test isolation\n+ proxyingService.resetMappings();\nproxyingService.stop();\n}\n@@ -79,9 +82,12 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\nproxyingTestClient.get(\"/foo/bar/baz\", withHeader(\"A\", \"B\"));\nassertThat(\n- proxyingTestClient.snapshot(\"{ \\\"persist\\\": false }\"),\n+ proxyingTestClient.snapshot(\"\"),\nequalToJson(DEFAULT_SNAPSHOT_RESPONSE, JSONCompareMode.STRICT_ORDER)\n);\n+\n+ // Should have persisted both stub mappings. The 3 is to account for the proxy mapping\n+ assertEquals(3, proxyingService.getStubMappings().size());\n}\nprivate static final String FILTER_BY_REQUEST_PATTERN_SNAPSHOT_REQUEST =\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Change SnapshotAcceptanceTest to use a temp file root so it test persistence |
686,936 | 11.07.2017 22:57:59 | -3,600 | d367d4d6699d3b6869c6a13f50ae9c027cc2524d | Added DSL support for specifying body file size criteria | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"diff": "@@ -12,6 +12,10 @@ import java.util.Objects;\n// should be extracted to a file.\n@JsonDeserialize(using = ResponseDefinitionBodyMatcherDeserializer.class)\npublic class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefinition> {\n+\n+ public static final long DEFAULT_MAX_TEXT_SIZE = 100 * 1024 * 1024;\n+ public static final long DEFAULT_MAX_BINARY_SIZE = 100 * 1024 * 1024;\n+\nprivate final long textSizeThreshold;\nprivate final long binarySizeThreshold;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "@@ -5,10 +5,15 @@ import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport java.util.List;\nimport java.util.UUID;\n+import static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_BINARY_SIZE;\n+import static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_TEXT_SIZE;\n+\npublic class SnapshotSpecBuilder {\nprivate RequestPatternBuilder filterRequestPattern;\nprivate List<UUID> filterIds;\n+ private long maxTextBodySize = DEFAULT_MAX_TEXT_SIZE;\n+ private long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPattern = filterRequestPattern;\n@@ -20,11 +25,27 @@ public class SnapshotSpecBuilder {\nreturn this;\n}\n+ public SnapshotSpecBuilder extractTextBodiesOver(long size) {\n+ this.maxTextBodySize = size;\n+ return this;\n+ }\n+\n+ public SnapshotSpecBuilder extractBinaryBodiesOver(long size) {\n+ this.maxBinaryBodySize = size;\n+ return this;\n+ }\n+\npublic SnapshotSpec build() {\n+ ProxiedServeEventFilters filters = filterRequestPattern != null || filterIds != null ?\n+ new ProxiedServeEventFilters(filterRequestPattern.build(), filterIds) :\n+ null;\n+\n+ ResponseDefinitionBodyMatcher responseDefinitionBodyMatcher = new ResponseDefinitionBodyMatcher(maxTextBodySize, maxBinaryBodySize);\n+\nreturn new SnapshotSpec(\n- new ProxiedServeEventFilters(filterRequestPattern.build(), filterIds),\n- null,\n+ filters,\nnull,\n+ responseDefinitionBodyMatcher,\nnull,\nnull,\nnull,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock;\n-import com.fasterxml.jackson.databind.JsonNode;\n-import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\n-import com.google.common.collect.Iterables;\nimport org.junit.After;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONCompareMode;\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": "@@ -5,8 +5,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\n+import com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import com.google.common.base.Predicate;\n+import com.google.common.collect.Iterables;\n+import org.apache.http.entity.ByteArrayEntity;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matchers;\nimport org.hamcrest.TypeSafeDiagnosingMatcher;\n@@ -18,6 +22,7 @@ import java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.google.common.collect.Iterables.find;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -98,6 +103,41 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n);\nassertThat(mappings.size(), is(3));\n+ assertThat(mappings, everyItem(stubMappingWithUrl(urlPathMatching(\"/things.*\"))));\n+ assertThat(mappings, not(hasItem(stubMappingWithUrl(urlPathMatching(\"/stuff.*\")))));\n+ }\n+\n+ @Test\n+ public void snapshotRecordsAllLoggedRequestsWhenExtractBodyCriteriaAreSpecified() throws Exception {\n+ targetService.stubFor(get(\"/small/text\").willReturn(aResponse()\n+ .withHeader(\"Content-Type\", \"text/plain\")\n+ .withBody(\"123\")));\n+ targetService.stubFor(get(\"/large/text\").willReturn(aResponse()\n+ .withHeader(\"Content-Type\", \"text/plain\")\n+ .withBody(\"12345678901234567\")));\n+ targetService.stubFor(get(\"/small/binary\").willReturn(aResponse()\n+ .withHeader(\"Content-Type\", \"application/octet-stream\")\n+ .withBody(new byte[] { 1, 2, 3 })));\n+ targetService.stubFor(get(\"/large/binary\").willReturn(aResponse()\n+ .withHeader(\"Content-Type\", \"application/octet-stream\")\n+ .withBody(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 })));\n+\n+ client.get(\"/small/text\");\n+ client.get(\"/large/text\");\n+ client.get(\"/small/binary\");\n+ client.get(\"/large/binary\");\n+\n+ List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ snapshotSpec()\n+ .extractTextBodiesOver(10)\n+ .extractBinaryBodiesOver(5)\n+ );\n+\n+ assertThat(mappings.size(), is(4));\n+ assertThat(findMappingWithUrl(mappings, \"/small/text\").getResponse().getBodyFileName(), nullValue());\n+ assertThat(findMappingWithUrl(mappings, \"/large/text\").getResponse().getBodyFileName(), containsString(\"large-text\"));\n+ assertThat(findMappingWithUrl(mappings, \"/small/binary\").getResponse().getBodyFileName(), nullValue());\n+ assertThat(findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large-binary\"));\n}\n@Test\n@@ -121,16 +161,29 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this-too\")));\n}\n+ private static StubMapping findMappingWithUrl(List<StubMapping> stubMappings, final String url) {\n+ return find(stubMappings, new Predicate<StubMapping>() {\n+ @Override\n+ public boolean apply(StubMapping input) {\n+ return url.equals(input.getRequest().getUrl());\n+ }\n+ });\n+ }\n+\nprivate static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final String url) {\n+ return stubMappingWithUrl(urlEqualTo(url));\n+ }\n+\n+ private static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final UrlPattern urlPattern) {\nreturn new TypeSafeDiagnosingMatcher<StubMapping>() {\n@Override\npublic void describeTo(Description description) {\n- description.appendText(\"a stub mapping with a request URL of \" + url);\n+ description.appendText(\"a stub mapping with a request URL matching \" + urlPattern);\n}\n@Override\nprotected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n- return url.equals(item.getRequest().getUrl());\n+ return urlPattern.match(item.getRequest().getUrl()).isExactMatch();\n}\n};\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added DSL support for specifying body file size criteria |
686,936 | 11.07.2017 23:15:54 | -3,600 | 6c3637138e4b1091ef6b13ed0bbb5201fe40495b | Added support for filtering by ID via the snapshot DSL | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport java.util.List;\n@@ -10,13 +11,13 @@ import static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBody\npublic class SnapshotSpecBuilder {\n- private RequestPatternBuilder filterRequestPattern;\n+ private RequestPatternBuilder filterRequestPatternBuilder;\nprivate List<UUID> filterIds;\nprivate long maxTextBodySize = DEFAULT_MAX_TEXT_SIZE;\nprivate long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\n- this.filterRequestPattern = filterRequestPattern;\n+ this.filterRequestPatternBuilder = filterRequestPattern;\nreturn this;\n}\n@@ -36,8 +37,11 @@ public class SnapshotSpecBuilder {\n}\npublic SnapshotSpec build() {\n- ProxiedServeEventFilters filters = filterRequestPattern != null || filterIds != null ?\n- new ProxiedServeEventFilters(filterRequestPattern.build(), filterIds) :\n+ RequestPattern filterRequestPattern = filterRequestPatternBuilder != null ?\n+ filterRequestPatternBuilder.build() :\n+ null;\n+ ProxiedServeEventFilters filters = filterRequestPatternBuilder != null || filterIds != null ?\n+ new ProxiedServeEventFilters(filterRequestPattern, filterIds) :\nnull;\nResponseDefinitionBodyMatcher responseDefinitionBodyMatcher = new ResponseDefinitionBodyMatcher(maxTextBodySize, maxBinaryBodySize);\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": "package com.github.tomakehurst.wiremock;\n-import com.github.tomakehurst.wiremock.admin.model.SnapshotSpec;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.matching.UrlPattern;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\n-import com.google.common.collect.Iterables;\n-import org.apache.http.entity.ByteArrayEntity;\nimport org.hamcrest.Description;\n-import org.hamcrest.Matchers;\nimport org.hamcrest.TypeSafeDiagnosingMatcher;\nimport org.junit.After;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONAssert;\nimport java.util.List;\n+import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.client.WireMock.any;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.google.common.collect.Iterables.find;\n+import static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -107,6 +107,23 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings, not(hasItem(stubMappingWithUrl(urlPathMatching(\"/stuff.*\")))));\n}\n+ @Test\n+ public void snapshotRecordsAllLoggedRequestsWhenIdFilterIsSpecified() throws Exception {\n+ client.get(\"/1\");\n+ client.get(\"/2\");\n+ client.get(\"/3\");\n+\n+ UUID serveEventId = findServeEventWithUrl(proxyingService.getAllServeEvents(), \"/2\").getId();\n+\n+ List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ snapshotSpec()\n+ .onlyRequestIds(singletonList(serveEventId))\n+ );\n+\n+ assertThat(mappings.size(), is(1));\n+ assertThat(mappings.get(0).getRequest().getUrl(), is(\"/2\"));\n+ }\n+\n@Test\npublic void snapshotRecordsAllLoggedRequestsWhenExtractBodyCriteriaAreSpecified() throws Exception {\ntargetService.stubFor(get(\"/small/text\").willReturn(aResponse()\n@@ -161,6 +178,16 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this-too\")));\n}\n+\n+ private static ServeEvent findServeEventWithUrl(List<ServeEvent> serveEvents, final String url) {\n+ return find(serveEvents, new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent input) {\n+ return url.equals(input.getRequest().getUrl());\n+ }\n+ });\n+ }\n+\nprivate static StubMapping findMappingWithUrl(List<StubMapping> stubMappings, final String url) {\nreturn find(stubMappings, new Predicate<StubMapping>() {\n@Override\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for filtering by ID via the snapshot DSL |
686,965 | 11.07.2017 21:41:01 | 25,200 | 91b05498bd244e2330a48d13223c343652fe1244 | Add tests for SnapshotStubMappingPostProcessor | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "@@ -48,23 +48,30 @@ public class SnapshotStubMappingPostProcessor {\ncontinue;\n}\n- processedStubMappings.add(stubMapping);\nif (bodyExtractMatcher != null && bodyExtractMatcher.match(stubMapping.getResponse()).isExactMatch()) {\nbodyExtractor.extractInPlace(stubMapping);\n}\n+\n+ processedStubMappings.add(stubMapping);\n}\nif (shouldRecordRepeatsAsScenarios) {\n- // Build scenarios for repeated requests\n+ this.createScenariosForRepeatedRequests(processedStubMappings, requestCounts);\n+ }\n+\n+ // Run any stub mapping transformer extensions\n+ return Lists.transform(processedStubMappings, transformerRunner);\n+ }\n+\n+ private void createScenariosForRepeatedRequests(\n+ Iterable<StubMapping> stubMappings,\n+ Multiset<RequestPattern> requestCounts\n+ ) {\nfinal SnapshotScenarioBuilder scenarioBuilder = new SnapshotScenarioBuilder();\n- for (StubMapping stubMapping : processedStubMappings) {\n+ for (StubMapping stubMapping : stubMappings) {\nif (requestCounts.count(stubMapping.getRequest()) > 1) {\nscenarioBuilder.addToScenario(stubMapping);\n}\n}\n}\n-\n- // Run any stub mapping transformer extensions\n- return Lists.transform(processedStubMappings, transformerRunner);\n- }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingPostProcessorTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin;\n+\n+import com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher;\n+import com.github.tomakehurst.wiremock.admin.model.SnapshotStubMappingBodyExtractor;\n+import com.github.tomakehurst.wiremock.admin.model.SnapshotStubMappingPostProcessor;\n+import com.github.tomakehurst.wiremock.admin.model.SnapshotStubMappingTransformerRunner;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.matching.MatchResult;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.collect.ImmutableList;\n+import org.junit.Test;\n+\n+import java.util.List;\n+\n+import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n+import static org.hamcrest.MatcherAssert.assertThat;\n+import static org.hamcrest.Matchers.*;\n+\n+public class SnapshotStubMappingPostProcessorTest {\n+ private static final List<StubMapping> TEST_STUB_MAPPINGS = ImmutableList.of(\n+ aMapping(\"/foo\"),\n+ aMapping(\"/bar\"),\n+ aMapping(\"/foo\")\n+ );\n+\n+ @Test\n+ public void processFiltersRepeatedRequestsWhenNotRecordingScenarios() {\n+ final List<StubMapping> actual = new SnapshotStubMappingPostProcessor(\n+ false, noopTransformerRunner(), null, null\n+ ).process(TEST_STUB_MAPPINGS);\n+\n+ assertThat(actual, hasSize(2));\n+ assertThat(actual.get(0).getRequest().getUrl(), equalTo(\"/foo\"));\n+ assertThat(actual.get(1).getRequest().getUrl(), equalTo(\"/bar\"));\n+ }\n+\n+ @Test\n+ public void processCreatesScenariosForRepeatedRequestsWhenEnabled() {\n+ final List<StubMapping> actual = new SnapshotStubMappingPostProcessor(\n+ true, noopTransformerRunner(), null, null\n+ ).process(TEST_STUB_MAPPINGS);\n+\n+ assertThat(actual, hasSize(3));\n+ assertThat(actual.get(0).getRequest().getUrl(), equalTo(\"/foo\"));\n+ assertThat(actual.get(0).getScenarioName(), equalTo(\"scenario-foo\"));\n+ assertThat(actual.get(0).getRequiredScenarioState(), is(Scenario.STARTED));\n+ assertThat(actual.get(0).getNewScenarioState(), is(nullValue()));\n+\n+ assertThat(actual.get(1).getRequest().getUrl(), equalTo(\"/bar\"));\n+ assertThat(actual.get(1).getScenarioName(), is(nullValue()));\n+ assertThat(actual.get(1).getRequiredScenarioState(), is(nullValue()));\n+\n+ assertThat(actual.get(2).getRequest().getUrl(), equalTo(\"/foo\"));\n+ assertThat(actual.get(2).getScenarioName(), equalTo(\"scenario-foo\"));\n+ assertThat(actual.get(2).getRequiredScenarioState(), is(Scenario.STARTED));\n+ assertThat(actual.get(2).getNewScenarioState(), equalTo(\"scenario-foo-2\"));\n+ }\n+\n+ @Test\n+ public void processRunsTransformers() {\n+ SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(null) {\n+ @Override\n+ public StubMapping apply(StubMapping stubMapping) {\n+ // Return StubMapping with \"/transformed\" at the end of the original URL\n+ String url = stubMapping.getRequest().getUrl();\n+ return new StubMapping(\n+ newRequestPattern().withUrl(url + \"/transformed\").build(),\n+ ResponseDefinition.ok()\n+ );\n+ }\n+ };\n+\n+ final List<StubMapping> actual = new SnapshotStubMappingPostProcessor(\n+ false, transformerRunner, null, null\n+ ).process(TEST_STUB_MAPPINGS);\n+\n+ assertThat(actual, hasSize(2));\n+ assertThat(actual.get(0).getRequest().getUrl(), equalTo(\"/foo/transformed\"));\n+ assertThat(actual.get(1).getRequest().getUrl(), equalTo(\"/bar/transformed\"));\n+ }\n+\n+ @Test\n+ public void processExtractsBodiesWhenMatched() {\n+ ResponseDefinitionBodyMatcher bodyMatcher = new ResponseDefinitionBodyMatcher(0, 0) {\n+ @Override\n+ public MatchResult match(ResponseDefinition responseDefinition) {\n+ // Only match the second stub mapping\n+ return responseDefinition == TEST_STUB_MAPPINGS.get(1).getResponse() ?\n+ MatchResult.exactMatch() :\n+ MatchResult.noMatch();\n+ }\n+ };\n+\n+ SnapshotStubMappingBodyExtractor bodyExtractor = new SnapshotStubMappingBodyExtractor(null) {\n+ @Override\n+ public void extractInPlace(StubMapping stubMapping) {\n+ stubMapping.setResponse(ResponseDefinition.noContent());\n+ }\n+ };\n+\n+ final List<StubMapping> actual = new SnapshotStubMappingPostProcessor(\n+ false,\n+ noopTransformerRunner(),\n+ bodyMatcher,\n+ bodyExtractor\n+ ).process(TEST_STUB_MAPPINGS);\n+\n+ assertThat(actual, hasSize(2));\n+ // Should've only modified second stub mapping\n+ assertThat(actual.get(0).getResponse(), equalTo(ResponseDefinition.ok()));\n+ assertThat(actual.get(1).getResponse(), equalTo(ResponseDefinition.noContent()));\n+ }\n+\n+ private static SnapshotStubMappingTransformerRunner noopTransformerRunner() {\n+ return new SnapshotStubMappingTransformerRunner(null) {\n+ @Override\n+ public StubMapping apply(StubMapping stubMapping) {\n+ return stubMapping;\n+ }\n+ };\n+ }\n+\n+ private static StubMapping aMapping(String url) {\n+ return new StubMapping(\n+ newRequestPattern().withUrl(url).build(),\n+ ResponseDefinition.ok()\n+ );\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add tests for SnapshotStubMappingPostProcessor |
686,936 | 12.07.2017 12:14:55 | -3,600 | e9205f01f13542fdc773e1b378233b42cfe1e969 | Added DSL support and tests for scenario building. Fixed bug with scenario state setting and refactored scenario building code. | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ScenarioProcessor.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.github.tomakehurst.wiremock.common.Urls;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.base.Function;\n+import com.google.common.base.Predicate;\n+import com.google.common.collect.*;\n+\n+import java.net.URI;\n+import java.util.Collection;\n+import java.util.List;\n+import java.util.Map;\n+\n+public class ScenarioProcessor {\n+\n+ public void putRepeatedRequestsInScenarios(List<StubMapping> stubMappings) {\n+ ImmutableListMultimap<RequestPattern, StubMapping> stubsGroupedByRequest = Multimaps.index(stubMappings, new Function<StubMapping, RequestPattern>() {\n+ @Override\n+ public RequestPattern apply(StubMapping mapping) {\n+ return mapping.getRequest();\n+ }\n+ });\n+\n+ Map<RequestPattern, Collection<StubMapping>> groupsWithMoreThanOneStub = Maps.filterEntries(stubsGroupedByRequest.asMap(), new Predicate<Map.Entry<RequestPattern, Collection<StubMapping>>>() {\n+ @Override\n+ public boolean apply(Map.Entry<RequestPattern, Collection<StubMapping>> input) {\n+ return input.getValue().size() > 1;\n+ }\n+ });\n+\n+ for (Map.Entry<RequestPattern, Collection<StubMapping>> entry: groupsWithMoreThanOneStub.entrySet()) {\n+ putStubsInScenario(ImmutableList.copyOf(entry.getValue()));\n+ }\n+ }\n+\n+ private void putStubsInScenario(List<StubMapping> stubMappings) {\n+ StubMapping firstScenario = stubMappings.get(0);\n+ String scenarioName = \"scenario-\" + Urls.urlToPathParts(URI.create(firstScenario.getRequest().getUrl()));\n+\n+ int count = 1;\n+ for (StubMapping stub: stubMappings) {\n+ stub.setScenarioName(scenarioName);\n+ if (count == 1) {\n+ stub.setRequiredScenarioState(Scenario.STARTED);\n+ } else {\n+ stub.setRequiredScenarioState(scenarioName + \"-\" + count);\n+ }\n+\n+ if (count < stubMappings.size()) {\n+ stub.setNewScenarioState(scenarioName + \"-\" + (count + 1));\n+ }\n+\n+ count++;\n+ }\n+\n+ }\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotScenarioBuilder.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin.model;\n-\n-import com.github.tomakehurst.wiremock.common.Urls;\n-import com.github.tomakehurst.wiremock.matching.RequestPattern;\n-import com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-\n-import java.net.URI;\n-import java.util.HashMap;\n-import java.util.Map;\n-\n-/**\n- * Generates scenarios for repeated requests.\n- */\n-public class SnapshotScenarioBuilder {\n- private final Map<RequestPattern, ScenarioDetails> tracker = new HashMap<>();\n-\n- public void addToScenario(StubMapping stubMapping) {\n- ScenarioDetails details = tracker.get(stubMapping.getRequest());\n-\n- if (details == null) {\n- details = new ScenarioDetails(stubMapping.getRequest());\n- tracker.put(stubMapping.getRequest(), details);\n- }\n-\n- details.setScenarioDetails(stubMapping);\n- }\n-\n- /**\n- * Simple container class for building scenarios. Tracks the number of times a request has been seen, the associated\n- * scenario name, and the current scenario state;\n- */\n- private static class ScenarioDetails {\n- private final static String SCENARIO_NAME_PREFIX = \"scenario\";\n- private final String name;\n- private int count = 1;\n- private String currentState = Scenario.STARTED;\n-\n- private ScenarioDetails(RequestPattern request) {\n- this.name = SCENARIO_NAME_PREFIX + \"-\" + Urls.urlToPathParts(URI.create(request.getUrl()));\n- }\n-\n- private void setScenarioDetails(StubMapping stubMapping) {\n- stubMapping.setScenarioName(name);\n- stubMapping.setRequiredScenarioState(currentState);\n-\n- if (count > 1) {\n- currentState = name + \"-\" + count;\n- stubMapping.setNewScenarioState(currentState);\n- }\n- count += 1;\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -60,7 +60,7 @@ public class SnapshotSpec {\npublic Map<String, MultiValuePattern> getCaptureHeaders() { return captureHeaders; }\n- public SnapshotOutputFormatter getOutputFormatter() { return outputFormat; }\n+ public SnapshotOutputFormatter getOutputFormat() { return outputFormat; }\npublic boolean shouldPersist() { return persist; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "@@ -15,6 +15,8 @@ public class SnapshotSpecBuilder {\nprivate List<UUID> filterIds;\nprivate long maxTextBodySize = DEFAULT_MAX_TEXT_SIZE;\nprivate long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\n+ private boolean persistentStubs = true;\n+ private boolean repeatsAsScenarios = false;\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPatternBuilder = filterRequestPattern;\n@@ -36,6 +38,16 @@ public class SnapshotSpecBuilder {\nreturn this;\n}\n+ public SnapshotSpecBuilder makeStubsPersistent(boolean persistent) {\n+ this.persistentStubs = persistent;\n+ return this;\n+ }\n+\n+ public SnapshotSpecBuilder buildScenariosForRepeatRequests() {\n+ this.repeatsAsScenarios = true;\n+ return this;\n+ }\n+\npublic SnapshotSpec build() {\nRequestPattern filterRequestPattern = filterRequestPatternBuilder != null ?\nfilterRequestPatternBuilder.build() :\n@@ -50,9 +62,9 @@ public class SnapshotSpecBuilder {\nfilters,\nnull,\nresponseDefinitionBodyMatcher,\n- null,\n- null,\n- null,\n+ SnapshotOutputFormatter.FULL,\n+ persistentStubs,\n+ repeatsAsScenarios,\nnull,\nnull\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingPostProcessor.java",
"diff": "@@ -56,22 +56,10 @@ public class SnapshotStubMappingPostProcessor {\n}\nif (shouldRecordRepeatsAsScenarios) {\n- this.createScenariosForRepeatedRequests(processedStubMappings, requestCounts);\n+ new ScenarioProcessor().putRepeatedRequestsInScenarios(processedStubMappings);\n}\n// Run any stub mapping transformer extensions\nreturn Lists.transform(processedStubMappings, transformerRunner);\n}\n-\n- private void createScenariosForRepeatedRequests(\n- Iterable<StubMapping> stubMappings,\n- Multiset<RequestPattern> requestCounts\n- ) {\n- final SnapshotScenarioBuilder scenarioBuilder = new SnapshotScenarioBuilder();\n- for (StubMapping stubMapping : stubMappings) {\n- if (requestCounts.count(stubMapping.getRequest()) > 1) {\n- scenarioBuilder.addToScenario(stubMapping);\n- }\n- }\n- }\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.SnapshotSpec;\nimport com.github.tomakehurst.wiremock.admin.model.SnapshotSpecBuilder;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\n@@ -666,10 +667,18 @@ public class WireMock {\nreturn defaultInstance.get().takeSnapshotRecording();\n}\n+ public static List<StubMapping> snapshotRecord(SnapshotSpecBuilder spec) {\n+ return defaultInstance.get().takeSnapshotRecording(spec);\n+ }\n+\npublic List<StubMapping> takeSnapshotRecording() {\nreturn admin.takeSnapshotRecording().getStubMappings();\n}\n+ public List<StubMapping> takeSnapshotRecording(SnapshotSpecBuilder spec) {\n+ return admin.takeSnapshotRecording(spec.build()).getStubMappings();\n+ }\n+\npublic static SnapshotSpecBuilder snapshotSpec() {\nreturn new SnapshotSpecBuilder();\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": "@@ -34,6 +34,7 @@ import com.github.tomakehurst.wiremock.verification.*;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n+import com.google.common.collect.Lists;\nimport java.util.List;\nimport java.util.Map;\n@@ -344,7 +345,7 @@ public class WireMockApp implements StubServer, Admin {\npublic SnapshotRecordResult takeSnapshotRecording(SnapshotSpec snapshotSpec) {\nfinal List<StubMapping> stubMappings = serveEventsToStubMappings(\n- getServeEvents(),\n+ Lists.reverse(getServeEvents().getServeEvents()),\nsnapshotSpec.getFilters(),\nnew SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders()),\ngetStubMappingPostProcessor(getOptions(), snapshotSpec)\n@@ -357,16 +358,16 @@ public class WireMockApp implements StubServer, Admin {\n}\n}\n- return snapshotSpec.getOutputFormatter().format(stubMappings);\n+ return snapshotSpec.getOutputFormat().format(stubMappings);\n}\nprivate List<StubMapping> serveEventsToStubMappings(\n- GetServeEventsResult serveEventsResult,\n+ List<ServeEvent> serveEventsResult,\nProxiedServeEventFilters serveEventFilters,\nSnapshotStubMappingGenerator stubMappingGenerator,\nSnapshotStubMappingPostProcessor stubMappingPostProcessor\n) {\n- final Iterable<StubMapping> stubMappings = from(serveEventsResult.getServeEvents())\n+ final Iterable<StubMapping> stubMappings = from(serveEventsResult)\n.filter(serveEventFilters)\n.transform(stubMappingGenerator);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPatternBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPatternBuilder.java",
"diff": "@@ -112,8 +112,6 @@ public class RequestPatternBuilder {\nreturn this;\n}\n-\n-\npublic RequestPattern build() {\nreturn customMatcher != null ?\nnew RequestPattern(customMatcher) :\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"diff": "@@ -22,6 +22,7 @@ import com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransform\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\nimport org.junit.After;\n+import org.junit.Before;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONCompareMode;\n@@ -54,6 +55,11 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\nproxyServerStart(wireMockConfig().withRootDirectory(\"src/test/resources/empty\"));\n}\n+ @Before\n+ public void clearTargetServerMappings() {\n+ wireMockServer.resetMappings();\n+ }\n+\n@After\npublic void proxyServerShutdown() {\n// delete any persisted stub mappings to ensure test isolation\n@@ -66,7 +72,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n@@ -75,13 +81,13 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n- \" } \\n\" +\n+ \" }, \\n\" +\n\" ] \\n\" +\n\"} \";\n@@ -117,7 +123,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n@@ -126,7 +132,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n@@ -278,6 +284,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" { \\n\" +\n\" \\\"scenarioName\\\" : \\\"scenario-bar-baz\\\", \\n\" +\n\" \\\"requiredScenarioState\\\" : \\\"Started\\\", \\n\" +\n+ \" \\\"newScenarioState\\\" : \\\"scenario-bar-baz-2\\\", \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n@@ -291,8 +298,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"scenarioName\\\" : \\\"scenario-bar-baz\\\", \\n\" +\n- \" \\\"requiredScenarioState\\\" : \\\"Started\\\", \\n\" +\n- \" \\\"newScenarioState\\\" : \\\"scenario-bar-baz-2\\\", \\n\" +\n+ \" \\\"requiredScenarioState\\\" : \\\"scenario-bar-baz-2\\\", \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/bar/baz\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n@@ -326,7 +332,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"mappings\\\": [ \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo?transformed=global\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/?transformed=global\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n@@ -335,13 +341,13 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/?transformed=global\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo?transformed=global\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\" \\n\" +\n\" }, \\n\" +\n\" \\\"response\\\" : { \\n\" +\n\" \\\"status\\\" : 200 \\n\" +\n\" } \\n\" +\n- \" } \\n\" +\n+ \" }, \\n\" +\n\" ] \\n\" +\n\"} \";\n@@ -377,9 +383,10 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\nprivate static final String NONGLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE =\n\"{ \\n\" +\n\" \\\"mappings\\\": [ \\n\" +\n+\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/foo?transformed=nonglobal\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/?transformed=nonglobal\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\", \\n\" +\n\" \\\"headers\\\": { \\n\" +\n\" \\\"Accept\\\": { \\n\" +\n@@ -393,7 +400,7 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" }, \\n\" +\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n- \" \\\"url\\\" : \\\"/?transformed=nonglobal\\\", \\n\" +\n+ \" \\\"url\\\" : \\\"/foo?transformed=nonglobal\\\", \\n\" +\n\" \\\"method\\\" : \\\"GET\\\", \\n\" +\n\" \\\"headers\\\": { \\n\" +\n\" \\\"Accept\\\": { \\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": "@@ -5,10 +5,12 @@ import com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.matching.UrlPattern;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\n+import com.google.common.collect.ImmutableList;\nimport org.hamcrest.Description;\nimport org.hamcrest.TypeSafeDiagnosingMatcher;\nimport org.junit.After;\n@@ -21,6 +23,7 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.client.WireMock.any;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.google.common.collect.Iterables.filter;\nimport static com.google.common.collect.Iterables.find;\nimport static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.*;\n@@ -32,6 +35,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nprivate WireMockServer targetService;\nprivate WireMockServer proxyingService;\nprivate WireMockTestClient client;\n+ private WireMock adminClient;\npublic void init() {\nproxyingService = new WireMockServer(wireMockConfig()\n@@ -45,6 +49,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient = new WireMockTestClient(proxyingService.port());\nWireMock.configureFor(proxyingService.port());\n+ adminClient = new WireMock(proxyingService.port());\n}\n@After\n@@ -70,17 +75,17 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertTrue(\"All of the returned mappings should be present in the server\", serverMappings.containsAll(returnedMappings));\nassertThat(returnedMappings.size(), is(3));\n- assertThat(returnedMappings.get(2).getRequest().getUrl(), is(\"/one\"));\n- assertThat(returnedMappings.get(2).getRequest().getHeaders(), nullValue());\n- assertThat(returnedMappings.get(2).getRequest().getMethod(), is(RequestMethod.GET));\n- assertThat(returnedMappings.get(2).getResponse().getHeaders().getHeader(\"Content-Type\").firstValue(), is(\"text/plain\"));\n- assertThat(returnedMappings.get(2).getResponse().getBody(), is(\"Number one\"));\n+ assertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/one\"));\n+ assertThat(returnedMappings.get(0).getRequest().getHeaders(), nullValue());\n+ assertThat(returnedMappings.get(0).getRequest().getMethod(), is(RequestMethod.GET));\n+ assertThat(returnedMappings.get(0).getResponse().getHeaders().getHeader(\"Content-Type\").firstValue(), is(\"text/plain\"));\n+ assertThat(returnedMappings.get(0).getResponse().getBody(), is(\"Number one\"));\nassertThat(returnedMappings.get(1).getRequest().getUrl(), is(\"/two\"));\n- assertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/three\"));\n+ assertThat(returnedMappings.get(2).getRequest().getUrl(), is(\"/three\"));\n- StringValuePattern bodyPattern = returnedMappings.get(0).getRequest().getBodyPatterns().get(0);\n+ StringValuePattern bodyPattern = returnedMappings.get(2).getRequest().getBodyPatterns().get(0);\nassertThat(bodyPattern, instanceOf(EqualToJsonPattern.class));\nJSONAssert.assertEquals(\"{ \\\"counter\\\": 55 }\", bodyPattern.getExpected(), true);\n@@ -125,7 +130,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void snapshotRecordsAllLoggedRequestsWhenExtractBodyCriteriaAreSpecified() throws Exception {\n+ public void snapshotRecordsLoggedRequestsWhenExtractBodyCriteriaAreSpecified() throws Exception {\ntargetService.stubFor(get(\"/small/text\").willReturn(aResponse()\n.withHeader(\"Content-Type\", \"text/plain\")\n.withBody(\"123\")));\n@@ -157,6 +162,44 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large-binary\"));\n}\n+ @Test\n+ public void snapshotRecordsLoggedRequestsWhenNoPersistenceSpecified() {\n+ client.get(\"/transient\");\n+\n+ List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ snapshotSpec()\n+ .makeStubsPersistent(false)\n+ );\n+\n+ assertThat(findMappingWithUrl(mappings, \"/transient\").isPersistent(), nullValue());\n+ }\n+\n+ @Test\n+ public void buildsAScenarioForRepeatedIdenticalRequests() {\n+ targetService.stubFor(get(\"/stateful\").willReturn(ok(\"One\")));\n+ client.get(\"/stateful\");\n+\n+ targetService.stubFor(get(\"/stateful\").willReturn(ok(\"Two\")));\n+ client.get(\"/stateful\");\n+\n+ targetService.stubFor(get(\"/stateful\").willReturn(ok(\"Three\")));\n+ client.get(\"/stateful\");\n+\n+ List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ snapshotSpec()\n+ .buildScenariosForRepeatRequests()\n+ );\n+\n+ assertThat(client.get(\"/stateful\").content(), is(\"One\"));\n+ assertThat(client.get(\"/stateful\").content(), is(\"Two\"));\n+ assertThat(client.get(\"/stateful\").content(), is(\"Three\"));\n+\n+ assertThat(mappings, everyItem(isInAScenario()));\n+ assertThat(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+ }\n+\n@Test\npublic void staticClientIsSupportedWithDefaultSpec() {\nclient.get(\"/get-this\");\n@@ -168,9 +211,19 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void instanceClientIsSupportedWithDefaultSpec() {\n- WireMock adminClient = new WireMock(proxyingService.port());\n+ public void staticClientIsSupportedWithSpecProvided() {\n+ client.get(\"/get-this\");\n+ client.get(\"/but-not-this\");\n+\n+ snapshotRecord(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\n+\n+ List<StubMapping> serverMappings = proxyingService.getStubMappings();\n+ assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this\")));\n+ assertThat(serverMappings, not(hasItem(stubMappingWithUrl(\"/but-not-this\"))));\n+ }\n+ @Test\n+ public void instanceClientIsSupportedWithDefaultSpec() {\nclient.get(\"/get-this-too\");\nadminClient.takeSnapshotRecording();\n@@ -178,6 +231,17 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this-too\")));\n}\n+ @Test\n+ public void instanceClientIsSupportedWithSpecProvided() {\n+ client.get(\"/get-this\");\n+ client.get(\"/but-not-this\");\n+\n+ adminClient.takeSnapshotRecording(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\n+\n+ List<StubMapping> serverMappings = proxyingService.getStubMappings();\n+ assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this\")));\n+ assertThat(serverMappings, not(hasItem(stubMappingWithUrl(\"/but-not-this\"))));\n+ }\nprivate static ServeEvent findServeEventWithUrl(List<ServeEvent> serveEvents, final String url) {\nreturn find(serveEvents, new Predicate<ServeEvent>() {\n@@ -189,12 +253,20 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\nprivate static StubMapping findMappingWithUrl(List<StubMapping> stubMappings, final String url) {\n- return find(stubMappings, new Predicate<StubMapping>() {\n+ return find(stubMappings, withUrl(url));\n+ }\n+\n+ private static List<StubMapping> findMappingsWithUrl(List<StubMapping> stubMappings, final String url) {\n+ return ImmutableList.copyOf(filter(stubMappings, withUrl(url)));\n+ }\n+\n+ private static Predicate<StubMapping> withUrl(final String url) {\n+ return new Predicate<StubMapping>() {\n@Override\npublic boolean apply(StubMapping input) {\nreturn url.equals(input.getRequest().getUrl());\n}\n- });\n+ };\n}\nprivate static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final String url) {\n@@ -214,4 +286,18 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n};\n}\n+\n+ private TypeSafeDiagnosingMatcher<StubMapping> isInAScenario() {\n+ return new TypeSafeDiagnosingMatcher<StubMapping>() {\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"a stub mapping with a scenario name\");\n+ }\n+\n+ @Override\n+ protected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n+ return item.getScenarioName() != null;\n+ }\n+ };\n+ }\n}\n"
},
{
"change_type": "DELETE",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotScenarioBuilderTest.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.admin;\n-\n-import com.github.tomakehurst.wiremock.admin.model.SnapshotScenarioBuilder;\n-import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import org.junit.Test;\n-\n-import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n-import static org.junit.Assert.assertEquals;\n-import static org.junit.Assert.assertNull;\n-\n-public class SnapshotScenarioBuilderTest {\n- @Test\n- public void addToScenarioWithSingleRequestSeries() {\n- StubMapping mapping1 = stubMappingForUrl(\"/foo/bar\");\n- StubMapping mapping2 = stubMappingForUrl(\"/foo/bar\");\n- StubMapping mapping3 = stubMappingForUrl(\"/foo/bar\");\n- SnapshotScenarioBuilder builder = new SnapshotScenarioBuilder();\n-\n- builder.addToScenario(mapping1);\n- assertEquals(\"scenario-foo-bar\", mapping1.getScenarioName());\n- assertEquals(Scenario.STARTED, mapping1.getRequiredScenarioState());\n- assertNull(mapping1.getNewScenarioState());\n-\n- builder.addToScenario(mapping2);\n- assertEquals(mapping1.getScenarioName(), mapping2.getScenarioName());\n- assertEquals(Scenario.STARTED, mapping2.getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-2\", mapping2.getNewScenarioState());\n-\n- builder.addToScenario(mapping3);\n- assertEquals(mapping1.getScenarioName(), mapping3.getScenarioName());\n- assertEquals(mapping2.getNewScenarioState(), mapping3.getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-3\", mapping3.getNewScenarioState());\n- }\n-\n- @Test\n- public void addToScenarioWithMultipleRequestSeries() {\n- StubMapping mapping1 = stubMappingForUrl(\"/foo/bar\");\n- StubMapping mapping2 = stubMappingForUrl(\"/foo\");\n- StubMapping mapping3 = stubMappingForUrl(\"/foo/bar\");\n-\n- SnapshotScenarioBuilder builder = new SnapshotScenarioBuilder();\n-\n- builder.addToScenario(mapping1);\n- assertEquals(\"scenario-foo-bar\", mapping1.getScenarioName());\n- assertEquals(Scenario.STARTED, mapping1.getRequiredScenarioState());\n- assertNull(mapping1.getNewScenarioState());\n-\n- builder.addToScenario(mapping2);\n- assertEquals(\"scenario-foo\", mapping2.getScenarioName());\n- assertEquals(Scenario.STARTED, mapping2.getRequiredScenarioState());\n- assertNull(mapping2.getNewScenarioState());\n-\n- builder.addToScenario(mapping3);\n- assertEquals(mapping1.getScenarioName(), mapping3.getScenarioName());\n- assertEquals(Scenario.STARTED, mapping3.getRequiredScenarioState());\n- assertEquals(\"scenario-foo-bar-2\", mapping3.getNewScenarioState());\n- }\n-\n- private StubMapping stubMappingForUrl(String url) {\n- return new StubMapping(\n- newRequestPattern().withUrl(url).build(),\n- ResponseDefinition.ok()\n- );\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingPostProcessorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingPostProcessorTest.java",
"diff": "@@ -35,28 +35,6 @@ public class SnapshotStubMappingPostProcessorTest {\nassertThat(actual.get(1).getRequest().getUrl(), equalTo(\"/bar\"));\n}\n- @Test\n- public void processCreatesScenariosForRepeatedRequestsWhenEnabled() {\n- final List<StubMapping> actual = new SnapshotStubMappingPostProcessor(\n- true, noopTransformerRunner(), null, null\n- ).process(TEST_STUB_MAPPINGS);\n-\n- assertThat(actual, hasSize(3));\n- assertThat(actual.get(0).getRequest().getUrl(), equalTo(\"/foo\"));\n- assertThat(actual.get(0).getScenarioName(), equalTo(\"scenario-foo\"));\n- assertThat(actual.get(0).getRequiredScenarioState(), is(Scenario.STARTED));\n- assertThat(actual.get(0).getNewScenarioState(), is(nullValue()));\n-\n- assertThat(actual.get(1).getRequest().getUrl(), equalTo(\"/bar\"));\n- assertThat(actual.get(1).getScenarioName(), is(nullValue()));\n- assertThat(actual.get(1).getRequiredScenarioState(), is(nullValue()));\n-\n- assertThat(actual.get(2).getRequest().getUrl(), equalTo(\"/foo\"));\n- assertThat(actual.get(2).getScenarioName(), equalTo(\"scenario-foo\"));\n- assertThat(actual.get(2).getRequiredScenarioState(), is(Scenario.STARTED));\n- assertThat(actual.get(2).getNewScenarioState(), equalTo(\"scenario-foo-2\"));\n- }\n-\n@Test\npublic void processRunsTransformers() {\nSnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(null) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/model/ScenarioProcessorTest.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.stubbing.Scenario;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.junit.Test;\n+\n+import static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n+import static java.util.Arrays.asList;\n+import static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertNull;\n+\n+public class ScenarioProcessorTest {\n+\n+ ScenarioProcessor processor = new ScenarioProcessor();\n+\n+ @Test\n+ public void placesStubMappingsIntoScenariosWhenRepetitionsArePresent() {\n+ StubMapping foobar1 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping other1 = stubMappingForUrl(\"/other\");\n+ StubMapping foobar2 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping foobar3 = stubMappingForUrl(\"/foo/bar\");\n+ StubMapping other2 = stubMappingForUrl(\"/other\");\n+\n+ processor.putRepeatedRequestsInScenarios(asList(foobar1, other1, foobar2, foobar3, other2));\n+\n+ assertEquals(\"scenario-foo-bar\", foobar1.getScenarioName());\n+ assertEquals(Scenario.STARTED, foobar1.getRequiredScenarioState());\n+ assertEquals(foobar1.getNewScenarioState(), \"scenario-foo-bar-2\");\n+\n+ assertEquals(foobar1.getScenarioName(), foobar2.getScenarioName());\n+ assertEquals(\"scenario-foo-bar-2\", foobar2.getRequiredScenarioState());\n+ assertEquals(\"scenario-foo-bar-3\", foobar2.getNewScenarioState());\n+\n+ assertEquals(foobar1.getScenarioName(), foobar3.getScenarioName());\n+ assertEquals(\"scenario-foo-bar-3\", foobar3.getRequiredScenarioState());\n+ assertNull(\"Last mapping should not have a state transition\", foobar3.getNewScenarioState());\n+\n+ assertEquals(\"scenario-other\", other1.getScenarioName());\n+ assertEquals(\"scenario-other-2\", other1.getNewScenarioState());\n+ assertEquals(\"scenario-other-2\", other2.getRequiredScenarioState());\n+ }\n+\n+ private StubMapping stubMappingForUrl(String url) {\n+ return new StubMapping(\n+ newRequestPattern().withUrl(url).build(),\n+ ResponseDefinition.ok()\n+ );\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added DSL support and tests for scenario building. Fixed bug with scenario state setting and refactored scenario building code. |
686,936 | 12.07.2017 12:53:37 | -3,600 | 7b55d023fdb73f98ff4acec6266824b56ed0d0b1 | Fixed some serialisation problems and ensured DSL tests for snapshot spec features all go over the wire (thus testing two-way serialisation). | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ProxiedServeEventFilters.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ProxiedServeEventFilters.java",
"diff": "@@ -14,8 +14,11 @@ import java.util.UUID;\n* A predicate to filter proxied ServeEvents against RequestPattern filters and IDs\n*/\npublic class ProxiedServeEventFilters implements Predicate<ServeEvent> {\n+\n@JsonUnwrapped\nprivate final RequestPattern filters;\n+\n+ @JsonUnwrapped\nprivate final List<UUID> ids;\npublic ProxiedServeEventFilters() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/ResponseDefinitionBodyMatcher.java",
"diff": "@@ -24,6 +24,14 @@ public class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefin\nthis.binarySizeThreshold = binarySizeThreshold;\n}\n+ public String getTextSizeThreshold() {\n+ return String.valueOf(textSizeThreshold);\n+ }\n+\n+ public String getBinarySizeThreshold() {\n+ return String.valueOf(binarySizeThreshold);\n+ }\n+\n@Override\npublic MatchResult match(ResponseDefinition responseDefinition) {\nif (!responseDefinition.specifiesBodyContent()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormatter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotOutputFormatter.java",
"diff": "@@ -18,7 +18,7 @@ public enum SnapshotOutputFormatter {\nIDS {\n@Override\npublic SnapshotRecordResult format(List<StubMapping> stubMappings) {\n- return SnapshotRecordResult.ids(stubMappings);\n+ return SnapshotRecordResult.idsFromMappings(stubMappings);\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResult.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResult.java",
"diff": "@@ -6,6 +6,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Function;\nimport com.google.common.collect.Lists;\n+import java.util.Collections;\nimport java.util.List;\nimport java.util.UUID;\n@@ -27,8 +28,17 @@ public class SnapshotRecordResult {\nreturn new Full(stubMappings);\n}\n- public static SnapshotRecordResult ids(List<StubMapping> stubMappings) {\n- return new Ids(stubMappings);\n+ public static SnapshotRecordResult idsFromMappings(List<StubMapping> stubMappings) {\n+ return new Ids(Lists.transform(stubMappings, new Function<StubMapping, UUID>() {\n+ @Override\n+ public UUID apply(StubMapping input) {\n+ return input.getId();\n+ }\n+ }));\n+ }\n+\n+ public static SnapshotRecordResult ids(List<UUID> ids) {\n+ return new Ids(ids);\n}\npublic static class Full extends SnapshotRecordResult {\n@@ -46,14 +56,9 @@ public class SnapshotRecordResult {\nprivate final List<UUID> ids;\n- public Ids(List<StubMapping> mappings) {\n- super(mappings);\n- this.ids = Lists.transform(mappings, new Function<StubMapping, UUID>() {\n- @Override\n- public UUID apply(StubMapping input) {\n- return input.getId();\n- }\n- });\n+ public Ids(List<UUID> ids) {\n+ super(Collections.<StubMapping>emptyList());\n+ this.ids = ids;\n}\npublic List<UUID> getIds() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResultDeserialiser.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResultDeserialiser.java",
"diff": "@@ -3,12 +3,15 @@ package com.github.tomakehurst.wiremock.admin.model;\nimport com.fasterxml.jackson.core.JsonParseException;\nimport com.fasterxml.jackson.core.JsonParser;\nimport com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.core.type.TypeReference;\nimport com.fasterxml.jackson.databind.DeserializationContext;\n+import com.fasterxml.jackson.databind.JavaType;\nimport com.fasterxml.jackson.databind.deser.std.StdDeserializer;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport java.io.IOException;\nimport java.util.List;\n+import java.util.UUID;\npublic class SnapshotRecordResultDeserialiser extends StdDeserializer<SnapshotRecordResult> {\n@@ -21,11 +24,15 @@ public class SnapshotRecordResultDeserialiser extends StdDeserializer<SnapshotRe\npublic SnapshotRecordResult deserialize(JsonParser parser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {\nString name = parser.nextFieldName();\nparser.nextToken();\n- List<StubMapping> mappings = deserializationContext.readValue(parser, List.class);\n+\nif (name.equals(\"mappings\")) {\n+ JavaType listType = deserializationContext.getTypeFactory().constructType(new TypeReference<List<StubMapping>>() {});\n+ List<StubMapping> mappings = deserializationContext.readValue(parser, listType);\nreturn SnapshotRecordResult.full(mappings);\n} else if (name.equals(\"ids\")) {\n- return SnapshotRecordResult.ids(mappings);\n+ JavaType listType = deserializationContext.getTypeFactory().constructType(new TypeReference<List<UUID>>() {});\n+ List<UUID> ids = deserializationContext.readValue(parser, listType);\n+ return SnapshotRecordResult.ids(ids);\n}\nthrow new JsonParseException(parser, \"Snapshot result must contain either mappings or ids element\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -62,8 +62,10 @@ public class SnapshotSpec {\npublic SnapshotOutputFormatter getOutputFormat() { return outputFormat; }\n+ @JsonProperty(\"persist\")\npublic boolean shouldPersist() { return persist; }\n+ @JsonProperty(\"repeatsAsScenarios\")\npublic boolean shouldRecordRepeatsAsScenarios() { return repeatsAsScenarios; }\npublic List<String> getTransformers() { return transformers; }\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": "@@ -120,7 +120,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nUUID serveEventId = findServeEventWithUrl(proxyingService.getAllServeEvents(), \"/2\").getId();\n- List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ List<StubMapping> mappings = adminClient.takeSnapshotRecording(\nsnapshotSpec()\n.onlyRequestIds(singletonList(serveEventId))\n);\n@@ -149,7 +149,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/small/binary\");\nclient.get(\"/large/binary\");\n- List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ List<StubMapping> mappings = snapshotRecord(\nsnapshotSpec()\n.extractTextBodiesOver(10)\n.extractBinaryBodiesOver(5)\n@@ -166,7 +166,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void snapshotRecordsLoggedRequestsWhenNoPersistenceSpecified() {\nclient.get(\"/transient\");\n- List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ List<StubMapping> mappings = snapshotRecord(\nsnapshotSpec()\n.makeStubsPersistent(false)\n);\n@@ -185,7 +185,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\ntargetService.stubFor(get(\"/stateful\").willReturn(ok(\"Three\")));\nclient.get(\"/stateful\");\n- List<StubMapping> mappings = proxyingService.snapshotRecord(\n+ List<StubMapping> mappings = snapshotRecord(\nsnapshotSpec()\n.buildScenariosForRepeatRequests()\n);\n@@ -200,6 +200,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings.get(2).getRequiredScenarioState(), is(\"scenario-stateful-3\"));\n}\n+\n+\n@Test\npublic void staticClientIsSupportedWithDefaultSpec() {\nclient.get(\"/get-this\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResultDeserialiserTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResultDeserialiserTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\nimport com.github.tomakehurst.wiremock.common.Json;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport org.junit.Test;\nimport static org.hamcrest.Matchers.instanceOf;\n@@ -31,6 +32,7 @@ public class SnapshotRecordResultDeserialiserTest {\nassertThat(result, instanceOf(SnapshotRecordResult.Full.class));\nassertThat(result.getStubMappings().size(), is(2));\n+ assertThat(result.getStubMappings().get(0), instanceOf(StubMapping.class));\n}\n@Test\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed some serialisation problems and ensured DSL tests for snapshot spec features all go over the wire (thus testing two-way serialisation). |
686,936 | 12.07.2017 15:54:44 | -3,600 | 9152458d5048dc80b13d46e5d9071b4b8ab57e0b | Added support for transformers and parameters in the snapshot DSL | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\n@@ -8,6 +9,7 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_BINARY_SIZE;\nimport static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_TEXT_SIZE;\n+import static java.util.Arrays.asList;\npublic class SnapshotSpecBuilder {\n@@ -17,6 +19,8 @@ public class SnapshotSpecBuilder {\nprivate long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\nprivate boolean persistentStubs = true;\nprivate boolean repeatsAsScenarios = false;\n+ private List<String> transformerNames;\n+ private Parameters transformerParameters;\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPatternBuilder = filterRequestPattern;\n@@ -65,8 +69,22 @@ public class SnapshotSpecBuilder {\nSnapshotOutputFormatter.FULL,\npersistentStubs,\nrepeatsAsScenarios,\n- null,\n- null\n+ transformerNames,\n+ transformerParameters\n);\n}\n+\n+ public SnapshotSpecBuilder transformers(String... transformerName) {\n+ return transformers(asList(transformerName));\n+ }\n+\n+ public SnapshotSpecBuilder transformers(List<String> transformerName) {\n+ this.transformerNames = transformerName;\n+ return this;\n+ }\n+\n+ public SnapshotSpecBuilder transformerParameters(Parameters parameters) {\n+ this.transformerParameters = parameters;\n+ return this;\n+ }\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": "package com.github.tomakehurst.wiremock;\n+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.FileSource;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.matching.UrlPattern;\n@@ -11,6 +16,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n+import com.google.common.collect.ImmutableMap;\nimport org.hamcrest.Description;\nimport org.hamcrest.TypeSafeDiagnosingMatcher;\nimport org.junit.After;\n@@ -40,6 +46,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void init() {\nproxyingService = new WireMockServer(wireMockConfig()\n.dynamicPort()\n+ .extensions(new TestParameterisedTransformer())\n.withRootDirectory(setupTempFileRoot().getAbsolutePath()));\nproxyingService.start();\nproxyingService.stubFor(proxyAllTo(\"http://localhost:\" + wireMockServer.port()));\n@@ -200,7 +207,22 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings.get(2).getRequiredScenarioState(), is(\"scenario-stateful-3\"));\n}\n+ @Test\n+ public void appliesTransformerWithParameters() {\n+ client.get(\"/transform-this\");\n+ List<StubMapping> mappings = snapshotRecord(\n+ snapshotSpec()\n+ .transformers(\"test-transformer\")\n+ .transformerParameters(Parameters.from(\n+ ImmutableMap.<String, Object>of(\n+ \"headerKey\", \"X-Key\",\n+ \"headerValue\", \"My value\"\n+ )\n+ )));\n+\n+ assertThat(mappings.get(0).getResponse().getHeaders().getHeader(\"X-Key\").firstValue(), is(\"My value\"));\n+ }\n@Test\npublic void staticClientIsSupportedWithDefaultSpec() {\n@@ -302,4 +324,27 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n};\n}\n+\n+ public static class TestParameterisedTransformer extends StubMappingTransformer {\n+\n+ @Override\n+ public StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters) {\n+ ResponseDefinition newResponse = ResponseDefinitionBuilder.like(stubMapping.getResponse())\n+ .but()\n+ .withHeader(parameters.getString(\"headerKey\"), parameters.getString(\"headerValue\"))\n+ .build();\n+ stubMapping.setResponse(newResponse);\n+ return stubMapping;\n+ }\n+\n+ @Override\n+ public boolean applyGlobally() {\n+ return false;\n+ }\n+\n+ @Override\n+ public String getName() {\n+ return \"test-transformer\";\n+ }\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for transformers and parameters in the snapshot DSL |
686,936 | 12.07.2017 15:58:52 | -3,600 | 370ae9ddd1c7640483007a942c119531875a1647 | Made scenario generation the default setting when snapshot recording | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -51,7 +51,7 @@ public class SnapshotSpec {\n}\npublic SnapshotSpec() {\n- this(null, null, null, null, null, null, null, null);\n+ this(null, null, null, null, null, true, null, null);\n}\npublic static final SnapshotSpec DEFAULTS = new SnapshotSpec();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "@@ -18,7 +18,7 @@ public class SnapshotSpecBuilder {\nprivate long maxTextBodySize = DEFAULT_MAX_TEXT_SIZE;\nprivate long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\nprivate boolean persistentStubs = true;\n- private boolean repeatsAsScenarios = false;\n+ private boolean repeatsAsScenarios = true;\nprivate List<String> transformerNames;\nprivate Parameters transformerParameters;\n@@ -47,8 +47,8 @@ public class SnapshotSpecBuilder {\nreturn this;\n}\n- public SnapshotSpecBuilder buildScenariosForRepeatRequests() {\n- this.repeatsAsScenarios = true;\n+ public SnapshotSpecBuilder ignoreRepeatRequests() {\n+ this.repeatsAsScenarios = false;\nreturn this;\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": "@@ -192,10 +192,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\ntargetService.stubFor(get(\"/stateful\").willReturn(ok(\"Three\")));\nclient.get(\"/stateful\");\n- List<StubMapping> mappings = snapshotRecord(\n- snapshotSpec()\n- .buildScenariosForRepeatRequests()\n- );\n+ // Scenario creation is the default\n+ List<StubMapping> mappings = snapshotRecord();\nassertThat(client.get(\"/stateful\").content(), is(\"One\"));\nassertThat(client.get(\"/stateful\").content(), is(\"Two\"));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Made scenario generation the default setting when snapshot recording |
686,936 | 12.07.2017 16:02:06 | -3,600 | d1f953870afb3c046629acbad966054911119553 | Made SnapshotSpec default constructor private for neatness | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -50,7 +50,7 @@ public class SnapshotSpec {\nthis.transformerParameters = transformerParameters;\n}\n- public SnapshotSpec() {\n+ private SnapshotSpec() {\nthis(null, null, null, null, null, true, null, null);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Made SnapshotSpec default constructor private for neatness |
686,936 | 12.07.2017 18:31:32 | -3,600 | 4cf3584541640072821f754adcb5fa2f1af9999a | Modified captured headers behaviour when snapshot recording to use the header value received in the request rather than a pre-supplied value | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/CaptureHeadersSpec.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+public class CaptureHeadersSpec {\n+\n+ private final Boolean caseInsensitive;\n+\n+ public CaptureHeadersSpec(@JsonProperty(\"caseInsensitive\") Boolean caseInsensitive) {\n+ this.caseInsensitive = caseInsensitive;\n+ }\n+\n+ public Boolean getCaseInsensitive() {\n+ return caseInsensitive;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"diff": "@@ -4,9 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.http.ContentTypeHeader;\nimport com.github.tomakehurst.wiremock.http.Request;\n-import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\n-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\n-import com.github.tomakehurst.wiremock.matching.StringValuePattern;\n+import com.github.tomakehurst.wiremock.matching.*;\nimport com.google.common.base.Function;\nimport java.util.Map;\n@@ -19,10 +17,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;\n* matches the request\n*/\npublic class RequestPatternTransformer implements Function<Request, RequestPatternBuilder> {\n- private final Map<String, MultiValuePattern> headers;\n+ private final Map<String, CaptureHeadersSpec> headers;\n@JsonCreator\n- public RequestPatternTransformer(@JsonProperty(\"headers\") Map<String, MultiValuePattern> headers) {\n+ public RequestPatternTransformer(@JsonProperty(\"headers\") Map<String, CaptureHeadersSpec> headers) {\nthis.headers = headers;\n}\n@@ -35,15 +33,13 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\nfinal RequestPatternBuilder builder = new RequestPatternBuilder(request.getMethod(), urlEqualTo(request.getUrl()));\nif (headers != null && !headers.isEmpty()) {\n- for (Map.Entry<String, MultiValuePattern> header : headers.entrySet()) {\n+ for (Map.Entry<String, CaptureHeadersSpec> header : headers.entrySet()) {\nString headerName = header.getKey();\n- MultiValuePattern matcher = header.getValue();\n- if (matcher.match(request.header(headerName)).isExactMatch()) {\n- StringValuePattern headerMatcher = equalTo(request.getHeader(headerName));\n+ CaptureHeadersSpec spec = header.getValue();\n+ StringValuePattern headerMatcher = new EqualToPattern(request.getHeader(headerName), spec.getCaseInsensitive());\nbuilder.withHeader(headerName, headerMatcher);\n}\n}\n- }\nString body = request.getBodyAsString();\nif (body != null && !body.isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -15,7 +15,7 @@ public class SnapshotSpec {\n// Whitelist requests to generate StubMappings for\nprivate final ProxiedServeEventFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\n- private final Map<String, MultiValuePattern> captureHeaders;\n+ private final Map<String, CaptureHeadersSpec> captureHeaders;\n// Criteria for extracting body from responses\nprivate final ResponseDefinitionBodyMatcher extractBodyCriteria;\n// How to format StubMappings in the response body\n@@ -32,7 +32,7 @@ public class SnapshotSpec {\n@JsonCreator\npublic SnapshotSpec(\n@JsonProperty(\"filters\") ProxiedServeEventFilters filters,\n- @JsonProperty(\"captureHeaders\") Map<String, MultiValuePattern> captureHeaders,\n+ @JsonProperty(\"captureHeaders\") Map<String, CaptureHeadersSpec> captureHeaders,\n@JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n@JsonProperty(\"outputFormat\") SnapshotOutputFormatter outputFormat,\n@JsonProperty(\"persist\") Boolean persist,\n@@ -58,7 +58,7 @@ public class SnapshotSpec {\npublic ProxiedServeEventFilters getFilters() { return filters; }\n- public Map<String, MultiValuePattern> getCaptureHeaders() { return captureHeaders; }\n+ public Map<String, CaptureHeadersSpec> getCaptureHeaders() { return captureHeaders; }\npublic SnapshotOutputFormatter getOutputFormat() { return outputFormat; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"diff": "@@ -24,7 +24,7 @@ public class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMa\nthis.responseTransformer = responseTransformer;\n}\n- public SnapshotStubMappingGenerator(Map<String, MultiValuePattern> captureHeaders) {\n+ public SnapshotStubMappingGenerator(Map<String, CaptureHeadersSpec> captureHeaders) {\nthis(\nnew RequestPatternTransformer(captureHeaders),\nnew LoggedResponseDefinitionTransformer()\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": "@@ -64,6 +64,8 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nreturn deserializeEqualToJson(rootNode);\n} else if (patternClass.equals(MatchesXPathPattern.class)) {\nreturn deserialiseMatchesXPathPattern(rootNode);\n+ } else if (patternClass.equals(EqualToPattern.class)) {\n+ return deserializeEqualTo(rootNode);\n}\nConstructor<? extends StringValuePattern> constructor = findConstructor(patternClass);\n@@ -77,6 +79,17 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n}\n}\n+ private EqualToPattern deserializeEqualTo(JsonNode rootNode) throws JsonMappingException {\n+ if (!rootNode.has(\"equalTo\")) {\n+ throw new JsonMappingException(rootNode.toString() + \" is not a valid comparison\");\n+ }\n+\n+ String operand = rootNode.findValue(\"equalTo\").textValue();\n+ boolean ignoreCase = fromNullable(rootNode.findValue(\"ignoreCase\"));\n+\n+ return new EqualToPattern(operand, ignoreCase);\n+ }\n+\nprivate EqualToJsonPattern deserializeEqualToJson(JsonNode rootNode) throws JsonMappingException {\nif (!rootNode.has(\"equalToJson\")) {\nthrow new JsonMappingException(rootNode.toString() + \" is not a valid comparison\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"diff": "@@ -33,7 +33,6 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMoc\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\nimport static com.google.common.collect.Iterables.find;\n-import static junit.framework.TestCase.assertFalse;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertThat;\n@@ -228,11 +227,9 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"persist\\\": \\\"false\\\", \\n\" +\n\" \\\"captureHeaders\\\": { \\n\" +\n\" \\\"Accept\\\": { \\n\" +\n- \" \\\"anything\\\": true \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n\" }, \\n\" +\n- \" \\\"X-NoMatch\\\": { \\n\" +\n- \" \\\"equalTo\\\": \\\"!\\\" \\n\" +\n- \" } \\n\" +\n+ \" \\\"X-Another\\\": {} \\n\" +\n\" } \\n\" +\n\"} \";\n@@ -245,7 +242,11 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n\" \\\"method\\\" : \\\"PUT\\\", \\n\" +\n\" \\\"headers\\\": { \\n\" +\n\" \\\"Accept\\\": { \\n\" +\n- \" \\\"equalTo\\\": \\\"B\\\" \\n\" +\n+ \" \\\"equalTo\\\": \\\"text/plain\\\", \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"X-Another\\\": { \\n\" +\n+ \" \\\"equalTo\\\": \\\"blah\\\" \\n\" +\n\" } \\n\" +\n\" } \\n\" +\n\" }, \\n\" +\n@@ -261,14 +262,13 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\nproxyServerStartWithEmptyFileRoot();\nproxyingTestClient.put(\"/foo/bar\",\n- withHeader(\"A\", \"B\"),\n- withHeader(\"Accept\", \"B\"),\n- withHeader(\"X-NoMatch\", \"should be ignored\")\n+ withHeader(\"Ignored\", \"whatever\"),\n+ withHeader(\"Accept\", \"text/plain\"),\n+ withHeader(\"X-Another\", \"blah\")\n);\nString actual = proxyingTestClient.snapshot(CAPTURE_HEADERS_SNAPSHOT_REQUEST);\nassertThat(actual, equalToJson(CAPTURE_HEADERS_SNAPSHOT_RESPONSE, JSONCompareMode.STRICT_ORDER));\n- assertFalse(actual.contains(\"X-NoMatch\"));\n}\nprivate static final String REPEATS_AS_SCENARIOS_SNAPSHOT_REQUEST =\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\n+import com.github.tomakehurst.wiremock.admin.model.CaptureHeadersSpec;\nimport com.github.tomakehurst.wiremock.admin.model.RequestPatternTransformer;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n@@ -29,28 +30,6 @@ public class RequestPatternTransformerTest {\nassertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n}\n- @Test\n- public void applyWithHeaders() {\n- Request request = mockRequest()\n- .url(\"/\")\n- .method(RequestMethod.POST)\n- .header(\"Accept\", \"foo\")\n- .header(\"X-Ignored\", \"ignored\")\n- .header(\"X-NoMatch\", \"not matching\")\n- .header(\"X-Matches\", \"Baz\");\n-\n- RequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.POST, urlEqualTo(\"/\"))\n- .withHeader(\"Accept\",equalTo(\"foo\"))\n- .withHeader(\"X-Matches\", equalTo(\"Baz\"));\n-\n- Map<String, MultiValuePattern> headers = newLinkedHashMap();\n- headers.put(\"Accept\", new MultiValuePattern(equalTo(\"foo\")));\n- headers.put(\"X-NoMatch\", new MultiValuePattern(absent()));\n- headers.put(\"X-Matches\", new MultiValuePattern(matching(\".az\")));\n-\n- assertEquals(expected.build(), new RequestPatternTransformer(headers).apply(request).build());\n- }\n-\n@Test\npublic void applyWithUrlAndPlainTextBody() {\nRequest request = mockRequest()\n@@ -61,11 +40,9 @@ public class RequestPatternTransformerTest {\n.header(\"User-Agent\", \"bar\");\nRequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.GET, urlEqualTo(\"/foo\"))\n- .withHeader(\"Accept\",equalTo(\"foo\"))\n.withRequestBody(equalTo(\"HELLO\"));\n- Map<String, MultiValuePattern> headers = newLinkedHashMap();\n- headers.put(\"Accept\", new MultiValuePattern(new AnythingPattern()));\n+ Map<String, CaptureHeadersSpec> headers = newLinkedHashMap();\nassertEquals(expected.build(), new RequestPatternTransformer(headers).apply(request).build());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToPatternTest.java",
"diff": "@@ -47,6 +47,12 @@ public class EqualToPatternTest {\nassertThat(pattern.match(\"matchthis\").getDistance(), is(0.0));\n}\n+ @Test\n+ public void matchesCaseInsensitive() {\n+ StringValuePattern pattern = WireMock.equalToIgnoreCase(\"MaTchtHis\");\n+ assertThat(pattern.match(\"matchthis\").isExactMatch(), is(true));\n+ }\n+\n@Test\npublic void correctlyDeserialisesEqualToFromJson() {\nStringValuePattern stringValuePattern = Json.read(\n@@ -59,6 +65,20 @@ public class EqualToPatternTest {\nassertThat(stringValuePattern.getValue(), is(\"something\"));\n}\n+ @Test\n+ public void correctlyDeserialisesEqualToFromJsonWithIgnoreCase() {\n+ StringValuePattern stringValuePattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"equalTo\\\": \\\"something\\\", \\n\" +\n+ \" \\\"ignoreCase\\\": true \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+\n+ assertThat(stringValuePattern, instanceOf(EqualToPattern.class));\n+ assertThat(stringValuePattern.getValue(), is(\"something\"));\n+ assertThat(((EqualToPattern) stringValuePattern).getCaseInsensitive(), is(true));\n+ }\n+\n@Test\npublic void correctlySerialisesToJson() throws Exception {\nassertEquals(\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Modified captured headers behaviour when snapshot recording to use the header value received in the request rather than a pre-supplied value |
686,936 | 12.07.2017 19:22:00 | -3,600 | 073daa311bbfbe940cf4a3cf992a31b5abcf68f4 | Added capture headers support to the snapshot DSL | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"diff": "@@ -35,11 +35,13 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\nif (headers != null && !headers.isEmpty()) {\nfor (Map.Entry<String, CaptureHeadersSpec> header : headers.entrySet()) {\nString headerName = header.getKey();\n+ if (request.containsHeader(headerName)) {\nCaptureHeadersSpec spec = header.getValue();\nStringValuePattern headerMatcher = new EqualToPattern(request.getHeader(headerName), spec.getCaseInsensitive());\nbuilder.withHeader(headerName, headerMatcher);\n}\n}\n+ }\nString body = request.getBodyAsString();\nif (body != null && !body.isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "@@ -5,16 +5,19 @@ import com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport java.util.List;\n+import java.util.Map;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_BINARY_SIZE;\nimport static com.github.tomakehurst.wiremock.admin.model.ResponseDefinitionBodyMatcher.DEFAULT_MAX_TEXT_SIZE;\n+import static com.google.common.collect.Maps.newLinkedHashMap;\nimport static java.util.Arrays.asList;\npublic class SnapshotSpecBuilder {\nprivate RequestPatternBuilder filterRequestPatternBuilder;\nprivate List<UUID> filterIds;\n+ private Map<String, CaptureHeadersSpec> headers = newLinkedHashMap();\nprivate long maxTextBodySize = DEFAULT_MAX_TEXT_SIZE;\nprivate long maxBinaryBodySize = DEFAULT_MAX_BINARY_SIZE;\nprivate boolean persistentStubs = true;\n@@ -52,6 +55,29 @@ public class SnapshotSpecBuilder {\nreturn this;\n}\n+ public SnapshotSpecBuilder transformers(String... transformerName) {\n+ return transformers(asList(transformerName));\n+ }\n+\n+ public SnapshotSpecBuilder transformers(List<String> transformerName) {\n+ this.transformerNames = transformerName;\n+ return this;\n+ }\n+\n+ public SnapshotSpecBuilder transformerParameters(Parameters parameters) {\n+ this.transformerParameters = parameters;\n+ return this;\n+ }\n+\n+ public SnapshotSpecBuilder captureHeader(String key) {\n+ return captureHeader(key, null);\n+ }\n+\n+ public SnapshotSpecBuilder captureHeader(String key, Boolean caseInsensitive) {\n+ headers.put(key, new CaptureHeadersSpec(caseInsensitive));\n+ return this;\n+ }\n+\npublic SnapshotSpec build() {\nRequestPattern filterRequestPattern = filterRequestPatternBuilder != null ?\nfilterRequestPatternBuilder.build() :\n@@ -64,7 +90,7 @@ public class SnapshotSpecBuilder {\nreturn new SnapshotSpec(\nfilters,\n- null,\n+ headers.isEmpty() ? null : headers,\nresponseDefinitionBodyMatcher,\nSnapshotOutputFormatter.FULL,\npersistentStubs,\n@@ -73,18 +99,4 @@ public class SnapshotSpecBuilder {\ntransformerParameters\n);\n}\n-\n- public SnapshotSpecBuilder transformers(String... transformerName) {\n- return transformers(asList(transformerName));\n- }\n-\n- public SnapshotSpecBuilder transformers(List<String> transformerName) {\n- this.transformerNames = transformerName;\n- return this;\n- }\n-\n- public SnapshotSpecBuilder transformerParameters(Parameters parameters) {\n- this.transformerParameters = parameters;\n- return this;\n- }\n}\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": "@@ -85,7 +85,7 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n}\nString operand = rootNode.findValue(\"equalTo\").textValue();\n- boolean ignoreCase = fromNullable(rootNode.findValue(\"ignoreCase\"));\n+ boolean ignoreCase = fromNullable(rootNode.findValue(\"caseInsensitive\"));\nreturn new EqualToPattern(operand, ignoreCase);\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": "@@ -8,11 +8,13 @@ import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n+import com.github.tomakehurst.wiremock.matching.EqualToPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.testsupport.TestHttpHeader;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n@@ -29,10 +31,12 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.client.WireMock.any;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.google.common.collect.Iterables.filter;\nimport static com.google.common.collect.Iterables.find;\nimport static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.*;\n+import static org.junit.Assert.assertFalse;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -102,7 +106,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void snapshotRecordsAllLoggedRequestsWhenFilterIsSpecified() throws Exception {\n+ public void supportsFilteringByCriteria() throws Exception {\nclient.get(\"/things/1\");\nclient.get(\"/things/2\");\nclient.get(\"/stuff/1\");\n@@ -120,7 +124,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void snapshotRecordsAllLoggedRequestsWhenIdFilterIsSpecified() throws Exception {\n+ public void supportsFilteringByServeEventId() throws Exception {\nclient.get(\"/1\");\nclient.get(\"/2\");\nclient.get(\"/3\");\n@@ -137,7 +141,28 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void snapshotRecordsLoggedRequestsWhenExtractBodyCriteriaAreSpecified() throws Exception {\n+ public void supportsRequestHeaderCriteria() {\n+ client.get(\"/one\", withHeader(\"Yes\", \"1\"), withHeader(\"No\", \"1\"));\n+ client.get(\"/two\", withHeader(\"Yes\", \"2\"), withHeader(\"Also-Yes\", \"BBB\"));\n+\n+ List<StubMapping> mappings = snapshotRecord(\n+ snapshotSpec()\n+ .captureHeader(\"Yes\")\n+ .captureHeader(\"Also-Yes\", true)\n+ );\n+\n+ StringValuePattern yesValuePattern = mappings.get(0).getRequest().getHeaders().get(\"Yes\").getValuePattern();\n+ assertThat(yesValuePattern, instanceOf(EqualToPattern.class));\n+ assertThat(((EqualToPattern) yesValuePattern).getCaseInsensitive(), is(false));\n+ assertFalse(mappings.get(0).getRequest().getHeaders().containsKey(\"No\"));\n+\n+ StringValuePattern alsoYesValuePattern = mappings.get(1).getRequest().getHeaders().get(\"Also-Yes\").getValuePattern();\n+ assertThat(alsoYesValuePattern, instanceOf(EqualToPattern.class));\n+ assertThat(((EqualToPattern) alsoYesValuePattern).getCaseInsensitive(), is(true));\n+ }\n+\n+ @Test\n+ public void supportsBodyExtractCriteria() throws Exception {\ntargetService.stubFor(get(\"/small/text\").willReturn(aResponse()\n.withHeader(\"Content-Type\", \"text/plain\")\n.withBody(\"123\")));\n@@ -170,7 +195,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test\n- public void snapshotRecordsLoggedRequestsWhenNoPersistenceSpecified() {\n+ public void supportsDisablingRecordedStubPersistence() {\nclient.get(\"/transient\");\nList<StubMapping> mappings = snapshotRecord(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/EqualToPatternTest.java",
"diff": "@@ -70,7 +70,7 @@ public class EqualToPatternTest {\nStringValuePattern stringValuePattern = Json.read(\n\"{ \\n\" +\n\" \\\"equalTo\\\": \\\"something\\\", \\n\" +\n- \" \\\"ignoreCase\\\": true \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n\"}\",\nStringValuePattern.class);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added capture headers support to the snapshot DSL |
686,998 | 13.07.2017 20:38:39 | 25,200 | e02b32ffd0b049e63baa312b4b866fea50249422 | Update docs to extending docs to new getName method | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/extending-wiremock.md",
"new_path": "docs-v2/_docs/extending-wiremock.md",
"diff": "@@ -77,7 +77,7 @@ public static class ExampleTransformer extends ResponseDefinitionTransformer {\n}\n@Override\n- public String name() {\n+ public String getName() {\nreturn \"example\";\n}\n}\n@@ -186,7 +186,7 @@ public static class StubResponseTransformerWithParams extends ResponseTransforme\n}\n@Override\n- public String name() {\n+ public String getName() {\nreturn \"stub-transformer-with-params\";\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Update docs to extending docs to new getName method |
687,000 | 14.07.2017 15:19:13 | 25,200 | 44d68e71470fa52aa5e90038448ba8744809fc35 | Add absolute url in the RequestTemplateModel tomakehurst/wiremock#717 | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/RequestTemplateModel.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/RequestTemplateModel.java",
"diff": "@@ -13,6 +13,7 @@ import java.util.Map;\npublic class RequestTemplateModel {\n+ private final String absoluteUrl;\nprivate final String url;\nprivate final UrlPath path;\nprivate final Map<String, ListOrSingle<String>> query;\n@@ -21,7 +22,8 @@ public class RequestTemplateModel {\nprivate final String body;\n- public RequestTemplateModel(String url, UrlPath path, Map<String, ListOrSingle<String>> query, Map<String, ListOrSingle<String>> headers, Map<String, ListOrSingle<String>> cookies, String body) {\n+ public RequestTemplateModel(String absoluteUrl, String url, UrlPath path, Map<String, ListOrSingle<String>> query, Map<String, ListOrSingle<String>> headers, Map<String, ListOrSingle<String>> cookies, String body) {\n+ this.absoluteUrl = absoluteUrl;\nthis.url = url;\nthis.path = path;\nthis.query = query;\n@@ -50,6 +52,7 @@ public class RequestTemplateModel {\nUrlPath path = new UrlPath(request.getUrl());\nreturn new RequestTemplateModel(\n+ request.getAbsoluteUrl(),\nrequest.getUrl(),\npath,\nadaptedQuery,\n@@ -59,6 +62,10 @@ public class RequestTemplateModel {\n);\n}\n+ public String getAbsoluteUrl() {\n+ return absoluteUrl;\n+ }\n+\npublic String getUrl() {\nreturn url;\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add absolute url in the RequestTemplateModel tomakehurst/wiremock#717 |
686,936 | 17.07.2017 13:17:16 | -3,600 | 592261588b6816bec254a3d848d856b4773ba394 | Added JSON matching flags to snapshot recording | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/JsonMatchingFlags.java",
"diff": "+package com.github.tomakehurst.wiremock.admin.model;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+public class JsonMatchingFlags {\n+\n+ private final Boolean ignoreArrayOrder;\n+ private final Boolean ignoreExtraElements;\n+\n+ public JsonMatchingFlags(@JsonProperty(\"ignoreArrayOrder\") Boolean ignoreArrayOrder,\n+ @JsonProperty(\"ignoreExtraElements\") Boolean ignoreExtraElements) {\n+ this.ignoreArrayOrder = ignoreArrayOrder;\n+ this.ignoreExtraElements = ignoreExtraElements;\n+ }\n+\n+ public Boolean isIgnoreArrayOrder() {\n+ return ignoreArrayOrder;\n+ }\n+\n+ public Boolean isIgnoreExtraElements() {\n+ return ignoreExtraElements;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/RequestPatternTransformer.java",
"diff": "@@ -18,10 +18,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;\n*/\npublic class RequestPatternTransformer implements Function<Request, RequestPatternBuilder> {\nprivate final Map<String, CaptureHeadersSpec> headers;\n+ private final JsonMatchingFlags jsonMatchingFlags;\n@JsonCreator\n- public RequestPatternTransformer(@JsonProperty(\"headers\") Map<String, CaptureHeadersSpec> headers) {\n+ public RequestPatternTransformer(@JsonProperty(\"headers\") Map<String, CaptureHeadersSpec> headers,\n+ @JsonProperty(\"jsonMatchingFlags\") JsonMatchingFlags jsonMatchingFlags) {\nthis.headers = headers;\n+ this.jsonMatchingFlags = jsonMatchingFlags;\n}\n/**\n@@ -59,7 +62,9 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\nfinal ContentTypeHeader contentType = request.getHeaders().getContentTypeHeader();\nif (contentType.mimeTypePart() != null) {\nif (contentType.mimeTypePart().contains(\"json\")) {\n- return equalToJson(request.getBodyAsString(), true, true);\n+ return jsonMatchingFlags == null ?\n+ equalToJson(request.getBodyAsString()) :\n+ equalToJson(request.getBodyAsString(), jsonMatchingFlags.isIgnoreArrayOrder(), jsonMatchingFlags.isIgnoreExtraElements());\n} else if (contentType.mimeTypePart().contains(\"xml\")) {\nreturn equalToXml(request.getBodyAsString());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpec.java",
"diff": "@@ -3,7 +3,6 @@ package com.github.tomakehurst.wiremock.admin.model;\nimport com.fasterxml.jackson.annotation.JsonCreator;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\n-import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\nimport java.util.List;\nimport java.util.Map;\n@@ -28,6 +27,7 @@ public class SnapshotSpec {\nprivate final List<String> transformers;\n// Parameters for stub mapping transformers\nprivate final Parameters transformerParameters;\n+ private final JsonMatchingFlags jsonMatchingFlags;\n@JsonCreator\npublic SnapshotSpec(\n@@ -38,8 +38,8 @@ public class SnapshotSpec {\n@JsonProperty(\"persist\") Boolean persist,\n@JsonProperty(\"repeatsAsScenarios\") Boolean repeatsAsScenarios,\n@JsonProperty(\"transformers\") List<String> transformers,\n- @JsonProperty(\"transformerParameters\") Parameters transformerParameters\n- ) {\n+ @JsonProperty(\"transformerParameters\") Parameters transformerParameters,\n+ @JsonProperty(\"jsonMatchingFlags\") JsonMatchingFlags jsonMatchingFlags) {\nthis.filters = filters == null ? new ProxiedServeEventFilters() : filters;\nthis.captureHeaders = captureHeaders;\nthis.extractBodyCriteria = extractBodyCriteria;\n@@ -48,10 +48,11 @@ public class SnapshotSpec {\nthis.repeatsAsScenarios = repeatsAsScenarios == null ? false : repeatsAsScenarios;\nthis.transformers = transformers;\nthis.transformerParameters = transformerParameters;\n+ this.jsonMatchingFlags = jsonMatchingFlags;\n}\nprivate SnapshotSpec() {\n- this(null, null, null, null, null, true, null, null);\n+ this(null, null, null, null, null, true, null, null, null);\n}\npublic static final SnapshotSpec DEFAULTS = new SnapshotSpec();\n@@ -73,4 +74,8 @@ public class SnapshotSpec {\npublic Parameters getTransformerParameters() { return transformerParameters; }\npublic ResponseDefinitionBodyMatcher getExtractBodyCriteria() { return extractBodyCriteria; }\n+\n+ public JsonMatchingFlags getJsonMatchingFlags() {\n+ return jsonMatchingFlags;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotSpecBuilder.java",
"diff": "@@ -24,6 +24,7 @@ public class SnapshotSpecBuilder {\nprivate boolean repeatsAsScenarios = true;\nprivate List<String> transformerNames;\nprivate Parameters transformerParameters;\n+ private JsonMatchingFlags jsonMatchingFlags;\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPatternBuilder = filterRequestPattern;\n@@ -96,7 +97,12 @@ public class SnapshotSpecBuilder {\npersistentStubs,\nrepeatsAsScenarios,\ntransformerNames,\n- transformerParameters\n- );\n+ transformerParameters,\n+ jsonMatchingFlags);\n+ }\n+\n+ public SnapshotSpecBuilder jsonBodyMatchFlags(boolean ignoreArrayOrder, boolean ignoreExtraElements) {\n+ this.jsonMatchingFlags = new JsonMatchingFlags(ignoreArrayOrder, ignoreExtraElements);\n+ return this;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/model/SnapshotStubMappingGenerator.java",
"diff": "package com.github.tomakehurst.wiremock.admin.model;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -24,9 +23,9 @@ public class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMa\nthis.responseTransformer = responseTransformer;\n}\n- public SnapshotStubMappingGenerator(Map<String, CaptureHeadersSpec> captureHeaders) {\n+ public SnapshotStubMappingGenerator(Map<String, CaptureHeadersSpec> captureHeaders, JsonMatchingFlags jsonMatchingFlags) {\nthis(\n- new RequestPatternTransformer(captureHeaders),\n+ new RequestPatternTransformer(captureHeaders, jsonMatchingFlags),\nnew LoggedResponseDefinitionTransformer()\n);\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": "@@ -347,7 +347,7 @@ public class WireMockApp implements StubServer, Admin {\nfinal List<StubMapping> stubMappings = serveEventsToStubMappings(\nLists.reverse(getServeEvents().getServeEvents()),\nsnapshotSpec.getFilters(),\n- new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders()),\n+ new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders(), snapshotSpec.getJsonMatchingFlags()),\ngetStubMappingPostProcessor(getOptions(), snapshotSpec)\n);\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": "@@ -85,7 +85,7 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n}\nString operand = rootNode.findValue(\"equalTo\").textValue();\n- boolean ignoreCase = fromNullable(rootNode.findValue(\"caseInsensitive\"));\n+ Boolean ignoreCase = fromNullable(rootNode.findValue(\"caseInsensitive\"));\nreturn new EqualToPattern(operand, ignoreCase);\n}\n@@ -96,8 +96,9 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\n}\nString operand = rootNode.findValue(\"equalToJson\").textValue();\n- boolean ignoreArrayOrder = fromNullable(rootNode.findValue(\"ignoreArrayOrder\"));\n- boolean ignoreExtraElements = fromNullable(rootNode.findValue(\"ignoreExtraElements\"));\n+\n+ Boolean ignoreArrayOrder = fromNullable(rootNode.findValue(\"ignoreArrayOrder\"));\n+ Boolean ignoreExtraElements = fromNullable(rootNode.findValue(\"ignoreExtraElements\"));\nreturn new EqualToJsonPattern(operand, ignoreArrayOrder, ignoreExtraElements);\n}\n@@ -127,8 +128,8 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nreturn builder.build();\n}\n- private static boolean fromNullable(JsonNode node) {\n- return node != null && node.asBoolean();\n+ private static Boolean fromNullable(JsonNode node) {\n+ return node == null ? null : node.asBoolean();\n}\n@SuppressWarnings(\"unchecked\")\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": "@@ -14,7 +14,6 @@ import com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import com.github.tomakehurst.wiremock.testsupport.TestHttpHeader;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n@@ -36,9 +35,7 @@ import static com.google.common.collect.Iterables.filter;\nimport static com.google.common.collect.Iterables.find;\nimport static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.*;\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.junit.Assert.*;\npublic class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n@@ -101,8 +98,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nJSONAssert.assertEquals(\"{ \\\"counter\\\": 55 }\", bodyPattern.getExpected(), true);\nEqualToJsonPattern equalToJsonPattern = (EqualToJsonPattern) bodyPattern;\n- assertThat(equalToJsonPattern.isIgnoreArrayOrder(), is(true));\n- assertThat(equalToJsonPattern.isIgnoreExtraElements(), is(true));\n+ assertThat(equalToJsonPattern.isIgnoreArrayOrder(), nullValue());\n+ assertThat(equalToJsonPattern.isIgnoreExtraElements(), nullValue());\n}\n@Test\n@@ -153,7 +150,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nStringValuePattern yesValuePattern = mappings.get(0).getRequest().getHeaders().get(\"Yes\").getValuePattern();\nassertThat(yesValuePattern, instanceOf(EqualToPattern.class));\n- assertThat(((EqualToPattern) yesValuePattern).getCaseInsensitive(), is(false));\n+ assertThat(((EqualToPattern) yesValuePattern).getCaseInsensitive(), nullValue());\nassertFalse(mappings.get(0).getRequest().getHeaders().containsKey(\"No\"));\nStringValuePattern alsoYesValuePattern = mappings.get(1).getRequest().getHeaders().get(\"Also-Yes\").getValuePattern();\n@@ -247,6 +244,30 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings.get(0).getResponse().getHeaders().getHeader(\"X-Key\").firstValue(), is(\"My value\"));\n}\n+ @Test\n+ public void supportsConfigurationOfJsonBodyMatching() {\n+ client.postJson(\"/some-json\", \"{}\");\n+\n+ List<StubMapping> mappings = snapshotRecord(\n+ snapshotSpec().jsonBodyMatchFlags(true, true)\n+ );\n+\n+ EqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\n+ assertThat(bodyPattern.isIgnoreArrayOrder(), is(true));\n+ assertThat(bodyPattern.isIgnoreExtraElements(), is(true));\n+ }\n+\n+ @Test\n+ public void defaultsToNoJsonBodyMatchingFlags() {\n+ client.postJson(\"/some-json\", \"{}\");\n+\n+ List<StubMapping> mappings = snapshotRecord(snapshotSpec());\n+\n+ EqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\n+ assertThat(bodyPattern.isIgnoreArrayOrder(), nullValue());\n+ assertThat(bodyPattern.isIgnoreExtraElements(), nullValue());\n+ }\n+\n@Test\npublic void staticClientIsSupportedWithDefaultSpec() {\nclient.get(\"/get-this\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/RequestPatternTransformerTest.java",
"diff": "@@ -4,8 +4,6 @@ import com.github.tomakehurst.wiremock.admin.model.CaptureHeadersSpec;\nimport com.github.tomakehurst.wiremock.admin.model.RequestPatternTransformer;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n-import com.github.tomakehurst.wiremock.matching.AnythingPattern;\n-import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport org.junit.Test;\n@@ -27,7 +25,7 @@ public class RequestPatternTransformerTest {\nRequestPatternBuilder expected = new RequestPatternBuilder(RequestMethod.GET, urlEqualTo(\"/foo\"));\n// Default is to include method and URL exactly\n- assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());\n}\n@Test\n@@ -44,7 +42,7 @@ public class RequestPatternTransformerTest {\nMap<String, CaptureHeadersSpec> headers = newLinkedHashMap();\n- assertEquals(expected.build(), new RequestPatternTransformer(headers).apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(headers, null).apply(request).build());\n}\n@Test\n@@ -57,7 +55,7 @@ public class RequestPatternTransformerTest {\n.withUrl(\"/somewhere\")\n.withRequestBody(equalToJson(\"['hello']\"));\n- assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());\n}\n@Test\n@@ -71,6 +69,6 @@ public class RequestPatternTransformerTest {\n.withUrl(\"/somewhere\")\n.withRequestBody(equalToXml(\"<foo/>\"));\n- assertEquals(expected.build(), new RequestPatternTransformer(null).apply(request).build());\n+ assertEquals(expected.build(), new RequestPatternTransformer(null, null).apply(request).build());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/admin/SnapshotStubMappingGeneratorTest.java",
"diff": "@@ -37,7 +37,7 @@ public class SnapshotStubMappingGeneratorTest {\n}\nprivate static RequestPatternTransformer requestPatternTransformer(final RequestPatternBuilder requestPatternBuilder) {\n- return new RequestPatternTransformer(null) {\n+ return new RequestPatternTransformer(null, null) {\n@Override\npublic RequestPatternBuilder apply(Request request) {\nreturn requestPatternBuilder;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added JSON matching flags to snapshot recording |
686,936 | 17.07.2017 16:26:54 | -3,600 | 74ea12d1ecf3ee22f7dad1c622d7c2a334b3eea5 | Added basics of start/stop recording | [
{
"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": "@@ -382,6 +382,16 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn wireMockApp.takeSnapshotRecording(spec.build()).getStubMappings();\n}\n+ @Override\n+ public void startRecording(String targetBaseUrl) {\n+ wireMockApp.startRecording(targetBaseUrl);\n+ }\n+\n+ @Override\n+ public SnapshotRecordResult stopRecording() {\n+ return wireMockApp.stopRecording();\n+ }\n+\n@Override\npublic SnapshotRecordResult takeSnapshotRecording() {\nreturn wireMockApp.takeSnapshotRecording();\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": "@@ -282,6 +282,16 @@ public class HttpAdminClient implements Admin {\nreturn Json.read(body, SnapshotRecordResult.class);\n}\n+ @Override\n+ public void startRecording(String targetBaseUrl) {\n+\n+ }\n+\n+ @Override\n+ public SnapshotRecordResult stopRecording() {\n+ return null;\n+ }\n+\n@Override\npublic Options getOptions() {\nreturn new WireMockConfiguration().port(port).bindAddress(host);\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": "@@ -26,6 +26,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@@ -57,6 +58,9 @@ public interface Admin {\nSnapshotRecordResult takeSnapshotRecording();\nSnapshotRecordResult takeSnapshotRecording(SnapshotSpec spec);\n+ void startRecording(String targetBaseUrl);\n+ SnapshotRecordResult stopRecording();\n+\nOptions getOptions();\nvoid shutdownServer();\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": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.core;\nimport com.github.tomakehurst.wiremock.admin.AdminRoutes;\nimport com.github.tomakehurst.wiremock.admin.LimitAndOffsetPaginator;\nimport com.github.tomakehurst.wiremock.admin.model.*;\n+import com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.extension.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\n@@ -42,6 +43,7 @@ import java.util.Map;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n+import static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\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@@ -61,6 +63,7 @@ public class WireMockApp implements StubServer, Admin {\nprivate final Container container;\nprivate final MappingsSaver mappingsSaver;\nprivate final NearMissCalculator nearMissCalculator;\n+ private final Recorder recorder;\nprivate Options options;\n@@ -79,6 +82,7 @@ public class WireMockApp implements StubServer, Admin {\noptions.extensionsOfType(ResponseDefinitionTransformer.class),\nfileSource);\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\n+ recorder = new Recorder(this);\nthis.container = container;\nloadDefaultMappings();\n}\n@@ -102,6 +106,7 @@ public class WireMockApp implements StubServer, Admin {\nstubMappings = new InMemoryStubMappings(requestMatchers, transformers, rootFileSource);\nthis.container = container;\nnearMissCalculator = new NearMissCalculator(stubMappings, requestJournal);\n+ recorder = new Recorder(this);\nloadDefaultMappings();\n}\n@@ -345,49 +350,16 @@ public class WireMockApp implements StubServer, Admin {\n}\npublic SnapshotRecordResult takeSnapshotRecording(SnapshotSpec snapshotSpec) {\n- final List<StubMapping> stubMappings = serveEventsToStubMappings(\n- Lists.reverse(getServeEvents().getServeEvents()),\n- snapshotSpec.getFilters(),\n- new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders(), snapshotSpec.getJsonMatchingFlags()),\n- getStubMappingPostProcessor(getOptions(), snapshotSpec)\n- );\n-\n- for (StubMapping stubMapping : stubMappings) {\n- if (snapshotSpec.shouldPersist()) {\n- stubMapping.setPersistent(true);\n- addStubMapping(stubMapping);\n- }\n+ return recorder.takeSnapshot(getServeEvents().getServeEvents(), snapshotSpec);\n}\n- return snapshotSpec.getOutputFormat().format(stubMappings);\n- }\n-\n- private List<StubMapping> serveEventsToStubMappings(\n- List<ServeEvent> serveEventsResult,\n- ProxiedServeEventFilters serveEventFilters,\n- SnapshotStubMappingGenerator stubMappingGenerator,\n- SnapshotStubMappingPostProcessor stubMappingPostProcessor\n- ) {\n- final Iterable<StubMapping> stubMappings = from(serveEventsResult)\n- .filter(serveEventFilters)\n- .transform(stubMappingGenerator);\n-\n- return stubMappingPostProcessor.process(stubMappings);\n+ @Override\n+ public void startRecording(String targetBaseUrl) {\n+ recorder.startRecording(targetBaseUrl);\n}\n- private SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n- final SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\n- options.extensionsOfType(StubMappingTransformer.class).values(),\n- snapshotSpec.getTransformers(),\n- snapshotSpec.getTransformerParameters(),\n- options.filesRoot()\n- );\n-\n- return new SnapshotStubMappingPostProcessor(\n- snapshotSpec.shouldRecordRepeatsAsScenarios(),\n- transformerRunner,\n- snapshotSpec.getExtractBodyCriteria(),\n- new SnapshotStubMappingBodyExtractor(options.filesRoot())\n- );\n+ @Override\n+ public SnapshotRecordResult stopRecording() {\n+ return recorder.stopRecording();\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "+package com.github.tomakehurst.wiremock.recording;\n+\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.core.Options;\n+import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.google.common.base.Predicate;\n+import com.google.common.collect.Iterables;\n+import com.google.common.collect.Lists;\n+\n+import java.util.List;\n+import java.util.Objects;\n+import java.util.UUID;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\n+import static com.google.common.collect.FluentIterable.from;\n+import static com.google.common.collect.Iterables.indexOf;\n+import static com.google.common.collect.Lists.newLinkedList;\n+\n+public class Recorder {\n+\n+ private final Admin admin;\n+ private State state;\n+\n+ public Recorder(Admin admin) {\n+ this.admin = admin;\n+ state = State.initial();\n+ }\n+\n+ public synchronized void startRecording(String targetBaseUrl) {\n+ StubMapping proxyMapping = proxyAllTo(targetBaseUrl).build();\n+ admin.addStubMapping(proxyMapping);\n+\n+ List<ServeEvent> serveEvents = admin.getServeEvents().getServeEvents();\n+ UUID initialId = serveEvents.isEmpty() ? null : serveEvents.get(0).getId();\n+ state = state.start(initialId, proxyMapping);\n+ }\n+\n+ public synchronized SnapshotRecordResult stopRecording() {\n+ List<ServeEvent> serveEvents = admin.getServeEvents().getServeEvents();\n+\n+ UUID lastId = serveEvents.isEmpty() ? null : serveEvents.get(0).getId();\n+ state = state.stop(lastId);\n+ admin.removeStubMapping(state.getProxyMapping());\n+\n+ if (serveEvents.isEmpty()) {\n+ return SnapshotRecordResult.empty();\n+ }\n+\n+ int startIndex = state.getStartingServeEventId() == null ?\n+ serveEvents.size() :\n+ indexOf(serveEvents, withId(state.getStartingServeEventId()));\n+ int endIndex = indexOf(serveEvents, withId(state.getFinishingServeEventId()));\n+ List<ServeEvent> eventsToSnapshot = serveEvents.subList(endIndex, startIndex);\n+\n+ return takeSnapshot(eventsToSnapshot, SnapshotSpec.DEFAULTS);\n+ }\n+\n+ private static Predicate<ServeEvent> withId(final UUID id) {\n+ return new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent input) {\n+ return input.getId().equals(id);\n+ }\n+ };\n+ }\n+\n+ public SnapshotRecordResult takeSnapshot(List<ServeEvent> serveEvents, SnapshotSpec snapshotSpec) {\n+ final List<StubMapping> stubMappings = serveEventsToStubMappings(\n+ Lists.reverse(serveEvents),\n+ snapshotSpec.getFilters(),\n+ new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders(), snapshotSpec.getJsonMatchingFlags()),\n+ getStubMappingPostProcessor(admin.getOptions(), snapshotSpec)\n+ );\n+\n+ for (StubMapping stubMapping : stubMappings) {\n+ if (snapshotSpec.shouldPersist()) {\n+ stubMapping.setPersistent(true);\n+ admin.addStubMapping(stubMapping);\n+ }\n+ }\n+\n+ return snapshotSpec.getOutputFormat().format(stubMappings);\n+ }\n+\n+ public List<StubMapping> serveEventsToStubMappings(\n+ List<ServeEvent> serveEventsResult,\n+ ProxiedServeEventFilters serveEventFilters,\n+ SnapshotStubMappingGenerator stubMappingGenerator,\n+ SnapshotStubMappingPostProcessor stubMappingPostProcessor\n+ ) {\n+ final Iterable<StubMapping> stubMappings = from(serveEventsResult)\n+ .filter(serveEventFilters)\n+ .transform(stubMappingGenerator);\n+\n+ return stubMappingPostProcessor.process(stubMappings);\n+ }\n+\n+ public SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n+ final SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\n+ options.extensionsOfType(StubMappingTransformer.class).values(),\n+ snapshotSpec.getTransformers(),\n+ snapshotSpec.getTransformerParameters(),\n+ options.filesRoot()\n+ );\n+\n+ return new SnapshotStubMappingPostProcessor(\n+ snapshotSpec.shouldRecordRepeatsAsScenarios(),\n+ transformerRunner,\n+ snapshotSpec.getExtractBodyCriteria(),\n+ new SnapshotStubMappingBodyExtractor(options.filesRoot())\n+ );\n+ }\n+\n+ private static class State {\n+\n+ enum Status { NeverStarted, Recording, Stopped }\n+\n+ private final Status status;\n+ private final StubMapping proxyMapping;\n+ private final UUID startingServeEventId;\n+ private final UUID finishingServeEventId;\n+\n+ public State(Status status, StubMapping proxyMapping, UUID startingServeEventId, UUID finishingServeEventId) {\n+ this.status = status;\n+ this.proxyMapping = proxyMapping;\n+ this.startingServeEventId = startingServeEventId;\n+ this.finishingServeEventId = finishingServeEventId;\n+ }\n+\n+ public static State initial() {\n+ return new State(Status.NeverStarted, null, null, null);\n+ }\n+\n+ public State start(UUID startingServeEventId, StubMapping proxyMapping) {\n+ return new State(Status.Recording, proxyMapping, startingServeEventId, null);\n+ }\n+\n+ public State stop(UUID finishingServeEventId) {\n+ return new State(Status.Stopped, proxyMapping, startingServeEventId, finishingServeEventId);\n+ }\n+\n+ public Status getStatus() {\n+ return status;\n+ }\n+\n+ public StubMapping getProxyMapping() {\n+ return proxyMapping;\n+ }\n+\n+ public UUID getStartingServeEventId() {\n+ return startingServeEventId;\n+ }\n+\n+ public UUID getFinishingServeEventId() {\n+ return finishingServeEventId;\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+ State state = (State) o;\n+ return status == state.status &&\n+ Objects.equals(proxyMapping, state.proxyMapping) &&\n+ Objects.equals(startingServeEventId, state.startingServeEventId) &&\n+ Objects.equals(finishingServeEventId, state.finishingServeEventId);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(status, proxyMapping, startingServeEventId, finishingServeEventId);\n+ }\n+ }\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestToStubGenerator.java",
"new_path": null,
"diff": "-package com.github.tomakehurst.wiremock.recording;\n-\n-import com.github.tomakehurst.wiremock.admin.model.GetServeEventsResult;\n-import com.github.tomakehurst.wiremock.core.Options;\n-import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n-import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-\n-import java.util.List;\n-\n-import static com.google.common.collect.FluentIterable.from;\n-\n-public class RequestToStubGenerator {\n-\n- public List<StubMapping> serveEventsToStubMappings(\n- GetServeEventsResult serveEventsResult,\n- ProxiedServeEventFilters serveEventFilters,\n- SnapshotStubMappingGenerator stubMappingGenerator,\n- SnapshotStubMappingPostProcessor stubMappingPostProcessor\n- ) {\n- final Iterable<StubMapping> stubMappings = from(serveEventsResult.getServeEvents())\n- .filter(serveEventFilters)\n- .transform(stubMappingGenerator);\n-\n- return stubMappingPostProcessor.process(stubMappings);\n- }\n-\n- private SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n- final SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\n- options.extensionsOfType(StubMappingTransformer.class).values(),\n- snapshotSpec.getTransformers(),\n- snapshotSpec.getTransformerParameters(),\n- options.filesRoot()\n- );\n-\n- return new SnapshotStubMappingPostProcessor(\n- snapshotSpec.shouldRecordRepeatsAsScenarios(),\n- transformerRunner,\n- snapshotSpec.getExtractBodyCriteria(),\n- new SnapshotStubMappingBodyExtractor(options.filesRoot())\n- );\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotRecordResult.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotRecordResult.java",
"diff": "@@ -41,6 +41,10 @@ public class SnapshotRecordResult {\nreturn new Ids(ids);\n}\n+ public static SnapshotRecordResult empty() {\n+ return full(Collections.<StubMapping>emptyList());\n+ }\n+\npublic static class Full extends SnapshotRecordResult {\npublic Full(List<StubMapping> mappings) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "+package com.github.tomakehurst.wiremock;\n+\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.hamcrest.Matchers;\n+import org.junit.After;\n+import org.junit.Test;\n+\n+import java.util.List;\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.WireMatchers.findMappingWithUrl;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\n+\n+ private WireMockServer targetService;\n+ private WireMockServer proxyingService;\n+ private WireMockTestClient client;\n+ private WireMock adminClient;\n+ private String targetBaseUrl;\n+\n+ public void init() {\n+ proxyingService = new WireMockServer(wireMockConfig()\n+ .dynamicPort()\n+ .withRootDirectory(setupTempFileRoot().getAbsolutePath()));\n+ proxyingService.start();\n+\n+ targetService = wireMockServer;\n+ targetBaseUrl = \"http://localhost:\" + targetService.port();\n+\n+ client = new WireMockTestClient(proxyingService.port());\n+ WireMock.configureFor(proxyingService.port());\n+ adminClient = new WireMock(proxyingService.port());\n+ }\n+\n+ @After\n+ public void proxyServerShutdown() {\n+ proxyingService.resetMappings();\n+ proxyingService.stop();\n+ }\n+\n+ @Test\n+ public void startsRecordingWithDefaultSpecFromTheSpecifiedProxyBaseUrlWhenServeEventsAlreadyExist() {\n+ targetService.stubFor(get(\"/record-this\").willReturn(okForContentType(\"text/plain\",\"Got it\")));\n+ targetService.stubFor(get(urlPathMatching(\"/do-not-record-this/.*\")).willReturn(noContent()));\n+\n+ client.get(\"/do-not-record-this/1\");\n+ client.get(\"/do-not-record-this/2\");\n+ client.get(\"/do-not-record-this/3\");\n+\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ client.get(\"/record-this\");\n+\n+ List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ client.get(\"/do-not-record-this/4\");\n+\n+\n+ assertThat(returnedMappings.size(), is(1));\n+ assertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/record-this\"));\n+\n+ StubMapping mapping = findMappingWithUrl(proxyingService.getStubMappings(), \"/record-this\");\n+ assertThat(mapping.getResponse().getBody(), is(\"Got it\"));\n+ }\n+\n+ @Test\n+ public void startsRecordingWithDefaultSpecFromTheSpecifiedProxyBaseUrlWhenNoServeEventsAlreadyExist() {\n+ targetService.stubFor(get(\"/record-this\").willReturn(okForContentType(\"text/plain\",\"Got it\")));\n+\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ client.get(\"/record-this\");\n+\n+ List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+\n+ assertThat(returnedMappings.size(), is(1));\n+ assertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/record-this\"));\n+\n+ StubMapping mapping = findMappingWithUrl(proxyingService.getStubMappings(), \"/record-this\");\n+ assertThat(mapping.getResponse().getBody(), is(\"Got it\"));\n+ }\n+\n+ @Test\n+ public void recordsNothingWhenNoServeEventsAreRecievedDuringRecording() {\n+ targetService.stubFor(get(urlPathMatching(\"/do-not-record-this/.*\")).willReturn(noContent()));\n+\n+ client.get(\"/do-not-record-this/1\");\n+ client.get(\"/do-not-record-this/2\");\n+\n+ proxyingService.startRecording(targetBaseUrl);\n+ List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ client.get(\"/do-not-record-this/3\");\n+\n+ assertThat(returnedMappings.size(), is(0));\n+ assertThat(proxyingService.getStubMappings(), Matchers.<StubMapping>empty());\n+ }\n+\n+ @Test\n+ public void recordsNothingWhenNoServeEventsAreRecievedAtAll() {\n+ proxyingService.startRecording(targetBaseUrl);\n+ List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+\n+ assertThat(returnedMappings.size(), is(0));\n+ assertThat(proxyingService.getStubMappings(), Matchers.<StubMapping>empty());\n+ }\n+\n+\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": "@@ -10,16 +10,11 @@ import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.matching.EqualToPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\n-import com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.Scenario;\n-import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n-import com.google.common.base.Predicate;\n-import com.google.common.collect.ImmutableList;\nimport com.google.common.collect.ImmutableMap;\n-import org.hamcrest.Description;\n-import org.hamcrest.TypeSafeDiagnosingMatcher;\nimport org.junit.After;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONAssert;\n@@ -116,8 +111,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n);\nassertThat(mappings.size(), is(3));\n- assertThat(mappings, everyItem(stubMappingWithUrl(urlPathMatching(\"/things.*\"))));\n- assertThat(mappings, not(hasItem(stubMappingWithUrl(urlPathMatching(\"/stuff.*\")))));\n+ assertThat(mappings, everyItem(WireMatchers.stubMappingWithUrl(urlPathMatching(\"/things.*\"))));\n+ assertThat(mappings, not(hasItem(WireMatchers.stubMappingWithUrl(urlPathMatching(\"/stuff.*\")))));\n}\n@Test\n@@ -126,7 +121,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/2\");\nclient.get(\"/3\");\n- UUID serveEventId = findServeEventWithUrl(proxyingService.getAllServeEvents(), \"/2\").getId();\n+ UUID serveEventId = WireMatchers.findServeEventWithUrl(proxyingService.getAllServeEvents(), \"/2\").getId();\nList<StubMapping> mappings = adminClient.takeSnapshotRecording(\nsnapshotSpec()\n@@ -185,10 +180,10 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n);\nassertThat(mappings.size(), is(4));\n- assertThat(findMappingWithUrl(mappings, \"/small/text\").getResponse().getBodyFileName(), nullValue());\n- assertThat(findMappingWithUrl(mappings, \"/large/text\").getResponse().getBodyFileName(), containsString(\"large-text\"));\n- assertThat(findMappingWithUrl(mappings, \"/small/binary\").getResponse().getBodyFileName(), nullValue());\n- assertThat(findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large-binary\"));\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/small/text\").getResponse().getBodyFileName(), nullValue());\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/text\").getResponse().getBodyFileName(), containsString(\"large-text\"));\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/small/binary\").getResponse().getBodyFileName(), nullValue());\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large-binary\"));\n}\n@Test\n@@ -200,7 +195,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\n.makeStubsPersistent(false)\n);\n- assertThat(findMappingWithUrl(mappings, \"/transient\").isPersistent(), nullValue());\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/transient\").isPersistent(), nullValue());\n}\n@Test\n@@ -221,7 +216,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(client.get(\"/stateful\").content(), is(\"Two\"));\nassertThat(client.get(\"/stateful\").content(), is(\"Three\"));\n- assertThat(mappings, everyItem(isInAScenario()));\n+ assertThat(mappings, everyItem(WireMatchers.isInAScenario()));\nassertThat(mappings.get(0).getRequiredScenarioState(), is(Scenario.STARTED));\nassertThat(mappings.get(1).getRequiredScenarioState(), is(\"scenario-stateful-2\"));\nassertThat(mappings.get(2).getRequiredScenarioState(), is(\"scenario-stateful-3\"));\n@@ -275,7 +270,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nsnapshotRecord();\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\n- assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this\")));\n+ assertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this\")));\n}\n@Test\n@@ -286,8 +281,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nsnapshotRecord(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\n- assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this\")));\n- assertThat(serverMappings, not(hasItem(stubMappingWithUrl(\"/but-not-this\"))));\n+ assertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this\")));\n+ assertThat(serverMappings, not(hasItem(WireMatchers.stubMappingWithUrl(\"/but-not-this\"))));\n}\n@Test\n@@ -296,7 +291,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nadminClient.takeSnapshotRecording();\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\n- assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this-too\")));\n+ assertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this-too\")));\n}\n@Test\n@@ -307,66 +302,8 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nadminClient.takeSnapshotRecording(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\n- assertThat(serverMappings, hasItem(stubMappingWithUrl(\"/get-this\")));\n- assertThat(serverMappings, not(hasItem(stubMappingWithUrl(\"/but-not-this\"))));\n- }\n-\n- private static ServeEvent findServeEventWithUrl(List<ServeEvent> serveEvents, final String url) {\n- return find(serveEvents, new Predicate<ServeEvent>() {\n- @Override\n- public boolean apply(ServeEvent input) {\n- return url.equals(input.getRequest().getUrl());\n- }\n- });\n- }\n-\n- private static StubMapping findMappingWithUrl(List<StubMapping> stubMappings, final String url) {\n- return find(stubMappings, withUrl(url));\n- }\n-\n- private static List<StubMapping> findMappingsWithUrl(List<StubMapping> stubMappings, final String url) {\n- return ImmutableList.copyOf(filter(stubMappings, withUrl(url)));\n- }\n-\n- private static Predicate<StubMapping> withUrl(final String url) {\n- return new Predicate<StubMapping>() {\n- @Override\n- public boolean apply(StubMapping input) {\n- return url.equals(input.getRequest().getUrl());\n- }\n- };\n- }\n-\n- private static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final String url) {\n- return stubMappingWithUrl(urlEqualTo(url));\n- }\n-\n- private static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final UrlPattern urlPattern) {\n- return new TypeSafeDiagnosingMatcher<StubMapping>() {\n- @Override\n- public void describeTo(Description description) {\n- description.appendText(\"a stub mapping with a request URL matching \" + urlPattern);\n- }\n-\n- @Override\n- protected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n- return urlPattern.match(item.getRequest().getUrl()).isExactMatch();\n- }\n- };\n- }\n-\n- private TypeSafeDiagnosingMatcher<StubMapping> isInAScenario() {\n- return new TypeSafeDiagnosingMatcher<StubMapping>() {\n- @Override\n- public void describeTo(Description description) {\n- description.appendText(\"a stub mapping with a scenario name\");\n- }\n-\n- @Override\n- protected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n- return item.getScenarioName() != null;\n- }\n- };\n+ assertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this\")));\n+ assertThat(serverMappings, not(hasItem(WireMatchers.stubMappingWithUrl(\"/but-not-this\"))));\n}\npublic static class TestParameterisedTransformer extends StubMappingTransformer {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMatchers.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMatchers.java",
"diff": "@@ -17,10 +17,14 @@ package com.github.tomakehurst.wiremock.testsupport;\nimport com.github.tomakehurst.wiremock.common.TextFile;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\n+import com.github.tomakehurst.wiremock.matching.UrlPattern;\n+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Charsets;\nimport com.google.common.base.Function;\nimport com.google.common.base.Joiner;\nimport com.google.common.base.Predicate;\n+import com.google.common.collect.ImmutableList;\nimport com.google.common.io.Files;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matcher;\n@@ -38,6 +42,7 @@ import java.util.Date;\nimport java.util.Iterator;\nimport java.util.List;\n+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.google.common.collect.Iterables.*;\nimport static java.util.Arrays.asList;\n@@ -278,4 +283,61 @@ public class WireMatchers {\n}\n}\n+ public static Predicate<StubMapping> withUrl(final String url) {\n+ return new Predicate<StubMapping>() {\n+ @Override\n+ public boolean apply(StubMapping input) {\n+ return url.equals(input.getRequest().getUrl());\n+ }\n+ };\n+ }\n+\n+ public static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final String url) {\n+ return stubMappingWithUrl(urlEqualTo(url));\n+ }\n+\n+ public static TypeSafeDiagnosingMatcher<StubMapping> stubMappingWithUrl(final UrlPattern urlPattern) {\n+ return new TypeSafeDiagnosingMatcher<StubMapping>() {\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"a stub mapping with a request URL matching \" + urlPattern);\n+ }\n+\n+ @Override\n+ protected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n+ return urlPattern.match(item.getRequest().getUrl()).isExactMatch();\n+ }\n+ };\n+ }\n+\n+ public static ServeEvent findServeEventWithUrl(List<ServeEvent> serveEvents, final String url) {\n+ return find(serveEvents, new Predicate<ServeEvent>() {\n+ @Override\n+ public boolean apply(ServeEvent input) {\n+ return url.equals(input.getRequest().getUrl());\n+ }\n+ });\n+ }\n+\n+ public static StubMapping findMappingWithUrl(List<StubMapping> stubMappings, final String url) {\n+ return find(stubMappings, withUrl(url));\n+ }\n+\n+ public static List<StubMapping> findMappingsWithUrl(List<StubMapping> stubMappings, final String url) {\n+ return ImmutableList.copyOf(filter(stubMappings, withUrl(url)));\n+ }\n+\n+ public static TypeSafeDiagnosingMatcher<StubMapping> isInAScenario() {\n+ return new TypeSafeDiagnosingMatcher<StubMapping>() {\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"a stub mapping with a scenario name\");\n+ }\n+\n+ @Override\n+ protected boolean matchesSafely(StubMapping item, Description mismatchDescription) {\n+ return item.getScenarioName() != null;\n+ }\n+ };\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added basics of start/stop recording |
686,936 | 17.07.2017 17:25:02 | -3,600 | 8c9271999379b7d4187d2aa253f532438a7cd377 | Added start/stop recording via the remote DSL and added spec support | [
{
"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": "@@ -387,6 +387,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nwireMockApp.startRecording(targetBaseUrl);\n}\n+ @Override\n+ public void startRecording(SnapshotSpec spec) {\n+ wireMockApp.startRecording(spec);\n+ }\n+\n@Override\npublic SnapshotRecordResult stopRecording() {\nreturn wireMockApp.stopRecording();\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": "@@ -81,6 +81,8 @@ public class AdminRoutes {\nrouter.add(GET, \"/requests/{id}\", GetServedStubTask.class);\nrouter.add(POST, \"/recordings/snapshot\", SnapshotTask.class);\n+ router.add(POST, \"/recordings/start\", StartRecordingTask.class);\n+ router.add(POST, \"/recordings/stop\", StopRecordingTask.class);\nrouter.add(POST, \"/near-misses/request\", FindNearMissesForRequestTask.class);\nrouter.add(POST, \"/near-misses/request-pattern\", FindNearMissesForRequestPatternTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StartRecordingTask.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.recording.SnapshotSpec;\n+\n+public class StartRecordingTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ SnapshotSpec snapshotSpec = Json.read(request.getBodyAsString(), SnapshotSpec.class);\n+ admin.startRecording(snapshotSpec);\n+ return ResponseDefinition.okEmptyJson();\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StopRecordingTask.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+import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n+\n+import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n+import static java.net.HttpURLConnection.HTTP_OK;\n+\n+public class StopRecordingTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ SnapshotRecordResult result = admin.stopRecording();\n+ return jsonResponse(result, HTTP_OK);\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": "*/\npackage com.github.tomakehurst.wiremock.client;\n-import com.github.tomakehurst.wiremock.admin.AdminRoutes;\n-import com.github.tomakehurst.wiremock.admin.AdminTask;\n-import com.github.tomakehurst.wiremock.admin.RequestSpec;\n+import com.github.tomakehurst.wiremock.admin.*;\nimport com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.admin.tasks.*;\nimport com.github.tomakehurst.wiremock.common.AdminException;\n@@ -284,12 +282,25 @@ public class HttpAdminClient implements Admin {\n@Override\npublic void startRecording(String targetBaseUrl) {\n+ startRecording(SnapshotSpec.forBaseUrl(targetBaseUrl));\n+ }\n+ @Override\n+ public void startRecording(SnapshotSpec recordSpec) {\n+ postJsonAssertOkAndReturnBody(\n+ urlFor(StartRecordingTask.class),\n+ Json.write(recordSpec),\n+ HTTP_OK);\n}\n@Override\npublic SnapshotRecordResult stopRecording() {\n- return null;\n+ String body = postJsonAssertOkAndReturnBody(\n+ urlFor(StopRecordingTask.class),\n+ \"\",\n+ HTTP_OK);\n+\n+ return Json.read(body, SnapshotRecordResult.class);\n}\n@Override\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.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotSpecBuilder;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.SingleRootFileSource;\n@@ -676,6 +677,30 @@ public class WireMock {\nreturn admin.takeSnapshotRecording(spec.build()).getStubMappings();\n}\n+ public static void startRecording(String targetBaseUrl) {\n+ defaultInstance.get().startStubRecording(targetBaseUrl);\n+ }\n+\n+ public static void startRecording(SnapshotSpecBuilder spec) {\n+ defaultInstance.get().startStubRecording(spec);\n+ }\n+\n+ public void startStubRecording(String targetBaseUrl) {\n+ admin.startRecording(targetBaseUrl);\n+ }\n+\n+ public void startStubRecording(SnapshotSpecBuilder spec) {\n+ admin.startRecording(spec.build());\n+ }\n+\n+ public static SnapshotRecordResult stopRecording() {\n+ return defaultInstance.get().stopStubRecording();\n+ }\n+\n+ public SnapshotRecordResult stopStubRecording() {\n+ return admin.stopRecording();\n+ }\n+\npublic static SnapshotSpecBuilder snapshotSpec() {\nreturn new SnapshotSpecBuilder();\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": "@@ -59,6 +59,7 @@ public interface Admin {\nSnapshotRecordResult takeSnapshotRecording(SnapshotSpec spec);\nvoid startRecording(String targetBaseUrl);\n+ void startRecording(SnapshotSpec snapshotSpec);\nSnapshotRecordResult stopRecording();\nOptions getOptions();\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": "@@ -355,7 +355,12 @@ public class WireMockApp implements StubServer, Admin {\n@Override\npublic void startRecording(String targetBaseUrl) {\n- recorder.startRecording(targetBaseUrl);\n+ recorder.startRecording(SnapshotSpec.forBaseUrl(targetBaseUrl));\n+ }\n+\n+ @Override\n+ public void startRecording(SnapshotSpec snapshotSpec) {\n+ recorder.startRecording(snapshotSpec);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -6,7 +6,6 @@ import com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Predicate;\n-import com.google.common.collect.Iterables;\nimport com.google.common.collect.Lists;\nimport java.util.List;\n@@ -16,7 +15,6 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\nimport static com.google.common.collect.FluentIterable.from;\nimport static com.google.common.collect.Iterables.indexOf;\n-import static com.google.common.collect.Lists.newLinkedList;\npublic class Recorder {\n@@ -28,13 +26,13 @@ public class Recorder {\nstate = State.initial();\n}\n- public synchronized void startRecording(String targetBaseUrl) {\n- StubMapping proxyMapping = proxyAllTo(targetBaseUrl).build();\n+ public synchronized void startRecording(SnapshotSpec spec) {\n+ StubMapping proxyMapping = proxyAllTo(spec.getTargetBaseUrl()).build();\nadmin.addStubMapping(proxyMapping);\nList<ServeEvent> serveEvents = admin.getServeEvents().getServeEvents();\nUUID initialId = serveEvents.isEmpty() ? null : serveEvents.get(0).getId();\n- state = state.start(initialId, proxyMapping);\n+ state = state.start(initialId, proxyMapping, spec);\n}\npublic synchronized SnapshotRecordResult stopRecording() {\n@@ -54,7 +52,7 @@ public class Recorder {\nint endIndex = indexOf(serveEvents, withId(state.getFinishingServeEventId()));\nList<ServeEvent> eventsToSnapshot = serveEvents.subList(endIndex, startIndex);\n- return takeSnapshot(eventsToSnapshot, SnapshotSpec.DEFAULTS);\n+ return takeSnapshot(eventsToSnapshot, state.getSpec());\n}\nprivate static Predicate<ServeEvent> withId(final UUID id) {\n@@ -119,26 +117,28 @@ public class Recorder {\nprivate final Status status;\nprivate final StubMapping proxyMapping;\n+ private final SnapshotSpec spec;\nprivate final UUID startingServeEventId;\nprivate final UUID finishingServeEventId;\n- public State(Status status, StubMapping proxyMapping, UUID startingServeEventId, UUID finishingServeEventId) {\n+ public State(Status status, StubMapping proxyMapping, SnapshotSpec spec, UUID startingServeEventId, UUID finishingServeEventId) {\nthis.status = status;\nthis.proxyMapping = proxyMapping;\n+ this.spec = spec;\nthis.startingServeEventId = startingServeEventId;\nthis.finishingServeEventId = finishingServeEventId;\n}\npublic static State initial() {\n- return new State(Status.NeverStarted, null, null, null);\n+ return new State(Status.NeverStarted, null, null, null, null);\n}\n- public State start(UUID startingServeEventId, StubMapping proxyMapping) {\n- return new State(Status.Recording, proxyMapping, startingServeEventId, null);\n+ public State start(UUID startingServeEventId, StubMapping proxyMapping, SnapshotSpec spec) {\n+ return new State(Status.Recording, proxyMapping, spec, startingServeEventId, null);\n}\npublic State stop(UUID finishingServeEventId) {\n- return new State(Status.Stopped, proxyMapping, startingServeEventId, finishingServeEventId);\n+ return new State(Status.Stopped, proxyMapping, spec, startingServeEventId, finishingServeEventId);\n}\npublic Status getStatus() {\n@@ -149,6 +149,10 @@ public class Recorder {\nreturn proxyMapping;\n}\n+ public SnapshotSpec getSpec() {\n+ return spec;\n+ }\n+\npublic UUID getStartingServeEventId() {\nreturn startingServeEventId;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpec.java",
"diff": "@@ -11,6 +11,9 @@ import java.util.Map;\n* Encapsulates options for generating and outputting StubMappings\n*/\npublic class SnapshotSpec {\n+\n+ private final String targetBaseUrl;\n+\n// Whitelist requests to generate StubMappings for\nprivate final ProxiedServeEventFilters filters;\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\n@@ -31,6 +34,7 @@ public class SnapshotSpec {\n@JsonCreator\npublic SnapshotSpec(\n+ @JsonProperty(\"targetBaseUrl\") String targetBaseUrl,\n@JsonProperty(\"filters\") ProxiedServeEventFilters filters,\n@JsonProperty(\"captureHeaders\") Map<String, CaptureHeadersSpec> captureHeaders,\n@JsonProperty(\"extractBodyCriteria\") ResponseDefinitionBodyMatcher extractBodyCriteria,\n@@ -40,6 +44,7 @@ public class SnapshotSpec {\n@JsonProperty(\"transformers\") List<String> transformers,\n@JsonProperty(\"transformerParameters\") Parameters transformerParameters,\n@JsonProperty(\"jsonMatchingFlags\") JsonMatchingFlags jsonMatchingFlags) {\n+ this.targetBaseUrl = targetBaseUrl;\nthis.filters = filters == null ? new ProxiedServeEventFilters() : filters;\nthis.captureHeaders = captureHeaders;\nthis.extractBodyCriteria = extractBodyCriteria;\n@@ -52,11 +57,19 @@ public class SnapshotSpec {\n}\nprivate SnapshotSpec() {\n- this(null, null, null, null, null, true, null, null, null);\n+ this(null, null, null, null, null, null, true, null, null, null);\n}\npublic static final SnapshotSpec DEFAULTS = new SnapshotSpec();\n+ public static SnapshotSpec forBaseUrl(String targetBaseUrl) {\n+ return new SnapshotSpec(targetBaseUrl, null, null, null, null, null, true, null, null, null);\n+ }\n+\n+ public String getTargetBaseUrl() {\n+ return targetBaseUrl;\n+ }\n+\npublic ProxiedServeEventFilters getFilters() { return filters; }\npublic Map<String, CaptureHeadersSpec> getCaptureHeaders() { return captureHeaders; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpecBuilder.java",
"diff": "@@ -13,6 +13,7 @@ import static java.util.Arrays.asList;\npublic class SnapshotSpecBuilder {\n+ private String targetBaseUrl;\nprivate RequestPatternBuilder filterRequestPatternBuilder;\nprivate List<UUID> filterIds;\nprivate Map<String, CaptureHeadersSpec> headers = newLinkedHashMap();\n@@ -24,6 +25,11 @@ public class SnapshotSpecBuilder {\nprivate Parameters transformerParameters;\nprivate JsonMatchingFlags jsonMatchingFlags;\n+ public SnapshotSpecBuilder forTarget(String targetBaseUrl) {\n+ this.targetBaseUrl = targetBaseUrl;\n+ return this;\n+ }\n+\npublic SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPatternBuilder = filterRequestPattern;\nreturn this;\n@@ -88,6 +94,7 @@ public class SnapshotSpecBuilder {\nResponseDefinitionBodyMatcher responseDefinitionBodyMatcher = new ResponseDefinitionBodyMatcher(maxTextBodySize, maxBinaryBodySize);\nreturn new SnapshotSpec(\n+ targetBaseUrl,\nfilters,\nheaders.isEmpty() ? null : headers,\nresponseDefinitionBodyMatcher,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport org.hamcrest.Matchers;\n@@ -11,6 +12,7 @@ import java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\n+import static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findMappingWithUrl;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -52,11 +54,11 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/do-not-record-this/2\");\nclient.get(\"/do-not-record-this/3\");\n- proxyingService.startRecording(targetBaseUrl);\n+ startRecording(targetBaseUrl);\nclient.get(\"/record-this\");\n- List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ List<StubMapping> returnedMappings = stopRecording().getStubMappings();\nclient.get(\"/do-not-record-this/4\");\n@@ -71,11 +73,11 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\npublic void startsRecordingWithDefaultSpecFromTheSpecifiedProxyBaseUrlWhenNoServeEventsAlreadyExist() {\ntargetService.stubFor(get(\"/record-this\").willReturn(okForContentType(\"text/plain\",\"Got it\")));\n- proxyingService.startRecording(targetBaseUrl);\n+ startRecording(targetBaseUrl);\nclient.get(\"/record-this\");\n- List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ List<StubMapping> returnedMappings = stopRecording().getStubMappings();\nassertThat(returnedMappings.size(), is(1));\nassertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/record-this\"));\n@@ -91,8 +93,8 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/do-not-record-this/1\");\nclient.get(\"/do-not-record-this/2\");\n- proxyingService.startRecording(targetBaseUrl);\n- List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ startRecording(targetBaseUrl);\n+ List<StubMapping> returnedMappings = stopRecording().getStubMappings();\nclient.get(\"/do-not-record-this/3\");\nassertThat(returnedMappings.size(), is(0));\n@@ -101,12 +103,63 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\n@Test\npublic void recordsNothingWhenNoServeEventsAreRecievedAtAll() {\n- proxyingService.startRecording(targetBaseUrl);\n- List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+ startRecording(targetBaseUrl);\n+ List<StubMapping> returnedMappings = stopRecording().getStubMappings();\nassertThat(returnedMappings.size(), is(0));\nassertThat(proxyingService.getStubMappings(), Matchers.<StubMapping>empty());\n}\n+ @Test\n+ public void honoursRecordSpecWhenPresent() {\n+ targetService.stubFor(get(\"/record-this-with-header\").willReturn(ok()));\n+\n+ startRecording(snapshotSpec()\n+ .forTarget(targetBaseUrl)\n+ .captureHeader(\"Accept\")\n+ );\n+\n+ client.get(\"/record-this\", withHeader(\"Accept\", \"text/plain\"));\n+\n+ List<StubMapping> returnedMappings = stopRecording().getStubMappings();\n+\n+ assertThat(returnedMappings.get(0).getRequest().getHeaders().get(\"Accept\").getExpected(), is(\"text/plain\"));\n+ }\n+\n+ @Test\n+ public void supportsInstanceClientWithDefaultSpec() {\n+ targetService.stubFor(get(\"/record-this\").willReturn(okForContentType(\"text/plain\",\"Got it\")));\n+\n+ adminClient.startStubRecording(targetBaseUrl);\n+\n+ client.get(\"/record-this\");\n+\n+ List<StubMapping> returnedMappings = adminClient.stopStubRecording().getStubMappings();\n+\n+ assertThat(returnedMappings.size(), is(1));\n+ assertThat(returnedMappings.get(0).getRequest().getUrl(), is(\"/record-this\"));\n+\n+ StubMapping mapping = findMappingWithUrl(proxyingService.getStubMappings(), \"/record-this\");\n+ assertThat(mapping.getResponse().getBody(), is(\"Got it\"));\n+ }\n+\n+ @Test\n+ public void supportsInstanceClientWithSpec() {\n+ targetService.stubFor(post(\"/record-this-with-body\").willReturn(ok()));\n+\n+ adminClient.startStubRecording(\n+ snapshotSpec()\n+ .forTarget(targetBaseUrl)\n+ .jsonBodyMatchFlags(true, true)\n+ );\n+\n+ client.postJson(\"/record-this-with-body\", \"{}\");\n+\n+ List<StubMapping> returnedMappings = adminClient.stopStubRecording().getStubMappings();\n+\n+ EqualToJsonPattern bodyPattern = (EqualToJsonPattern) returnedMappings.get(0).getRequest().getBodyPatterns().get(0);\n+ assertThat(bodyPattern.isIgnoreArrayOrder(), is(true));\n+ assertThat(bodyPattern.isIgnoreExtraElements(), is(true));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added start/stop recording via the remote DSL and added spec support |
686,936 | 17.07.2017 17:26:30 | -3,600 | a729a799dbc645d6c5cb95adcc909727f3f3301c | Renamed SnapshotSpec to RecordSpec | [
{
"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": "@@ -36,8 +36,8 @@ import com.github.tomakehurst.wiremock.junit.Stubbing;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpec;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpecBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordSpec;\n+import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.standalone.MappingsLoader;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -378,7 +378,7 @@ public class WireMockServer implements Container, Stubbing, Admin {\n}\n@Override\n- public List<StubMapping> snapshotRecord(SnapshotSpecBuilder spec) {\n+ public List<StubMapping> snapshotRecord(RecordSpecBuilder spec) {\nreturn wireMockApp.takeSnapshotRecording(spec.build()).getStubMappings();\n}\n@@ -388,7 +388,7 @@ public class WireMockServer implements Container, Stubbing, Admin {\n}\n@Override\n- public void startRecording(SnapshotSpec spec) {\n+ public void startRecording(RecordSpec spec) {\nwireMockApp.startRecording(spec);\n}\n@@ -403,7 +403,7 @@ public class WireMockServer implements Container, Stubbing, Admin {\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording(SnapshotSpec spec) {\n+ public SnapshotRecordResult takeSnapshotRecording(RecordSpec spec) {\nreturn wireMockApp.takeSnapshotRecording(spec);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StartRecordingTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StartRecordingTask.java",
"diff": "@@ -5,14 +5,14 @@ import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpec;\n+import com.github.tomakehurst.wiremock.recording.RecordSpec;\npublic class StartRecordingTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n- SnapshotSpec snapshotSpec = Json.read(request.getBodyAsString(), SnapshotSpec.class);\n- admin.startRecording(snapshotSpec);\n+ RecordSpec recordSpec = Json.read(request.getBodyAsString(), RecordSpec.class);\n+ admin.startRecording(recordSpec);\nreturn ResponseDefinition.okEmptyJson();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -3,7 +3,7 @@ package com.github.tomakehurst.wiremock.admin.tasks;\nimport com.github.tomakehurst.wiremock.admin.AdminTask;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpec;\n+import com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.http.Request;\n@@ -16,11 +16,11 @@ public class SnapshotTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n- SnapshotSpec snapshotSpec = request.getBody().length == 0\n- ? SnapshotSpec.DEFAULTS\n- : Json.read(request.getBodyAsString(), SnapshotSpec.class);\n+ RecordSpec recordSpec = request.getBody().length == 0\n+ ? RecordSpec.DEFAULTS\n+ : Json.read(request.getBodyAsString(), RecordSpec.class);\n- SnapshotRecordResult result = admin.takeSnapshotRecording(snapshotSpec);\n+ SnapshotRecordResult result = admin.takeSnapshotRecording(recordSpec);\nreturn jsonResponse(result, HTTP_OK);\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": "@@ -28,7 +28,7 @@ import com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpec;\n+import com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.verification.FindNearMissesResult;\nimport com.github.tomakehurst.wiremock.verification.FindRequestsResult;\n@@ -271,7 +271,7 @@ public class HttpAdminClient implements Admin {\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording(SnapshotSpec spec) {\n+ public SnapshotRecordResult takeSnapshotRecording(RecordSpec spec) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(SnapshotTask.class),\nJson.write(spec),\n@@ -282,11 +282,11 @@ public class HttpAdminClient implements Admin {\n@Override\npublic void startRecording(String targetBaseUrl) {\n- startRecording(SnapshotSpec.forBaseUrl(targetBaseUrl));\n+ startRecording(RecordSpec.forBaseUrl(targetBaseUrl));\n}\n@Override\n- public void startRecording(SnapshotSpec recordSpec) {\n+ public void startRecording(RecordSpec recordSpec) {\npostJsonAssertOkAndReturnBody(\nurlFor(StartRecordingTask.class),\nJson.write(recordSpec),\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": "@@ -18,7 +18,7 @@ package com.github.tomakehurst.wiremock.client;\nimport com.github.tomakehurst.wiremock.admin.model.ListStubMappingsResult;\nimport com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpecBuilder;\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@@ -665,7 +665,7 @@ public class WireMock {\nreturn defaultInstance.get().takeSnapshotRecording();\n}\n- public static List<StubMapping> snapshotRecord(SnapshotSpecBuilder spec) {\n+ public static List<StubMapping> snapshotRecord(RecordSpecBuilder spec) {\nreturn defaultInstance.get().takeSnapshotRecording(spec);\n}\n@@ -673,7 +673,7 @@ public class WireMock {\nreturn admin.takeSnapshotRecording().getStubMappings();\n}\n- public List<StubMapping> takeSnapshotRecording(SnapshotSpecBuilder spec) {\n+ public List<StubMapping> takeSnapshotRecording(RecordSpecBuilder spec) {\nreturn admin.takeSnapshotRecording(spec.build()).getStubMappings();\n}\n@@ -681,7 +681,7 @@ public class WireMock {\ndefaultInstance.get().startStubRecording(targetBaseUrl);\n}\n- public static void startRecording(SnapshotSpecBuilder spec) {\n+ public static void startRecording(RecordSpecBuilder spec) {\ndefaultInstance.get().startStubRecording(spec);\n}\n@@ -689,7 +689,7 @@ public class WireMock {\nadmin.startRecording(targetBaseUrl);\n}\n- public void startStubRecording(SnapshotSpecBuilder spec) {\n+ public void startStubRecording(RecordSpecBuilder spec) {\nadmin.startRecording(spec.build());\n}\n@@ -701,7 +701,7 @@ public class WireMock {\nreturn admin.stopRecording();\n}\n- public static SnapshotSpecBuilder snapshotSpec() {\n- return new SnapshotSpecBuilder();\n+ public static RecordSpecBuilder recordSpec() {\n+ return new RecordSpecBuilder();\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": "@@ -19,14 +19,13 @@ import com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpec;\n+import com.github.tomakehurst.wiremock.recording.RecordSpec;\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@@ -56,10 +55,10 @@ public interface Admin {\nvoid updateGlobalSettings(GlobalSettings settings);\nSnapshotRecordResult takeSnapshotRecording();\n- SnapshotRecordResult takeSnapshotRecording(SnapshotSpec spec);\n+ SnapshotRecordResult takeSnapshotRecording(RecordSpec spec);\nvoid startRecording(String targetBaseUrl);\n- void startRecording(SnapshotSpec snapshotSpec);\n+ void startRecording(RecordSpec recordSpec);\nSnapshotRecordResult stopRecording();\nOptions getOptions();\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": "@@ -18,7 +18,6 @@ package com.github.tomakehurst.wiremock.core;\nimport com.github.tomakehurst.wiremock.admin.AdminRoutes;\nimport com.github.tomakehurst.wiremock.admin.LimitAndOffsetPaginator;\nimport com.github.tomakehurst.wiremock.admin.model.*;\n-import com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.extension.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\n@@ -36,14 +35,12 @@ import com.github.tomakehurst.wiremock.verification.*;\nimport com.google.common.base.Optional;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n-import com.google.common.collect.Lists;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n-import static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\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@@ -346,21 +343,21 @@ public class WireMockApp implements StubServer, Admin {\n}\npublic SnapshotRecordResult takeSnapshotRecording() {\n- return takeSnapshotRecording(SnapshotSpec.DEFAULTS);\n+ return takeSnapshotRecording(RecordSpec.DEFAULTS);\n}\n- public SnapshotRecordResult takeSnapshotRecording(SnapshotSpec snapshotSpec) {\n- return recorder.takeSnapshot(getServeEvents().getServeEvents(), snapshotSpec);\n+ public SnapshotRecordResult takeSnapshotRecording(RecordSpec recordSpec) {\n+ return recorder.takeSnapshot(getServeEvents().getServeEvents(), recordSpec);\n}\n@Override\npublic void startRecording(String targetBaseUrl) {\n- recorder.startRecording(SnapshotSpec.forBaseUrl(targetBaseUrl));\n+ recorder.startRecording(RecordSpec.forBaseUrl(targetBaseUrl));\n}\n@Override\n- public void startRecording(SnapshotSpec snapshotSpec) {\n- recorder.startRecording(snapshotSpec);\n+ public void startRecording(RecordSpec recordSpec) {\n+ recorder.startRecording(recordSpec);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/junit/Stubbing.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/junit/Stubbing.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.junit;\n-import com.github.tomakehurst.wiremock.recording.SnapshotSpecBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.client.MappingBuilder;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n@@ -50,5 +50,5 @@ public interface Stubbing {\nList<NearMiss> findAllNearMissesFor(RequestPatternBuilder requestPatternBuilder);\nList<StubMapping> snapshotRecord();\n- List<StubMapping> snapshotRecord(SnapshotSpecBuilder spec);\n+ List<StubMapping> snapshotRecord(RecordSpecBuilder spec);\n}\n"
},
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java",
"diff": "@@ -10,7 +10,7 @@ import java.util.Map;\n/**\n* Encapsulates options for generating and outputting StubMappings\n*/\n-public class SnapshotSpec {\n+public class RecordSpec {\nprivate final String targetBaseUrl;\n@@ -33,7 +33,7 @@ public class SnapshotSpec {\nprivate final JsonMatchingFlags jsonMatchingFlags;\n@JsonCreator\n- public SnapshotSpec(\n+ public RecordSpec(\n@JsonProperty(\"targetBaseUrl\") String targetBaseUrl,\n@JsonProperty(\"filters\") ProxiedServeEventFilters filters,\n@JsonProperty(\"captureHeaders\") Map<String, CaptureHeadersSpec> captureHeaders,\n@@ -56,14 +56,14 @@ public class SnapshotSpec {\nthis.jsonMatchingFlags = jsonMatchingFlags;\n}\n- private SnapshotSpec() {\n+ private RecordSpec() {\nthis(null, null, null, null, null, null, true, null, null, null);\n}\n- public static final SnapshotSpec DEFAULTS = new SnapshotSpec();\n+ public static final RecordSpec DEFAULTS = new RecordSpec();\n- public static SnapshotSpec forBaseUrl(String targetBaseUrl) {\n- return new SnapshotSpec(targetBaseUrl, null, null, null, null, null, true, null, null, null);\n+ public static RecordSpec forBaseUrl(String targetBaseUrl) {\n+ return new RecordSpec(targetBaseUrl, null, null, null, null, null, true, null, null, null);\n}\npublic String getTargetBaseUrl() {\n"
},
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java",
"diff": "@@ -11,7 +11,7 @@ import java.util.UUID;\nimport static com.google.common.collect.Maps.newLinkedHashMap;\nimport static java.util.Arrays.asList;\n-public class SnapshotSpecBuilder {\n+public class RecordSpecBuilder {\nprivate String targetBaseUrl;\nprivate RequestPatternBuilder filterRequestPatternBuilder;\n@@ -25,65 +25,65 @@ public class SnapshotSpecBuilder {\nprivate Parameters transformerParameters;\nprivate JsonMatchingFlags jsonMatchingFlags;\n- public SnapshotSpecBuilder forTarget(String targetBaseUrl) {\n+ public RecordSpecBuilder forTarget(String targetBaseUrl) {\nthis.targetBaseUrl = targetBaseUrl;\nreturn this;\n}\n- public SnapshotSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\n+ public RecordSpecBuilder onlyRequestsMatching(RequestPatternBuilder filterRequestPattern) {\nthis.filterRequestPatternBuilder = filterRequestPattern;\nreturn this;\n}\n- public SnapshotSpecBuilder onlyRequestIds(List<UUID> filterIds) {\n+ public RecordSpecBuilder onlyRequestIds(List<UUID> filterIds) {\nthis.filterIds = filterIds;\nreturn this;\n}\n- public SnapshotSpecBuilder extractTextBodiesOver(long size) {\n+ public RecordSpecBuilder extractTextBodiesOver(long size) {\nthis.maxTextBodySize = size;\nreturn this;\n}\n- public SnapshotSpecBuilder extractBinaryBodiesOver(long size) {\n+ public RecordSpecBuilder extractBinaryBodiesOver(long size) {\nthis.maxBinaryBodySize = size;\nreturn this;\n}\n- public SnapshotSpecBuilder makeStubsPersistent(boolean persistent) {\n+ public RecordSpecBuilder makeStubsPersistent(boolean persistent) {\nthis.persistentStubs = persistent;\nreturn this;\n}\n- public SnapshotSpecBuilder ignoreRepeatRequests() {\n+ public RecordSpecBuilder ignoreRepeatRequests() {\nthis.repeatsAsScenarios = false;\nreturn this;\n}\n- public SnapshotSpecBuilder transformers(String... transformerName) {\n+ public RecordSpecBuilder transformers(String... transformerName) {\nreturn transformers(asList(transformerName));\n}\n- public SnapshotSpecBuilder transformers(List<String> transformerName) {\n+ public RecordSpecBuilder transformers(List<String> transformerName) {\nthis.transformerNames = transformerName;\nreturn this;\n}\n- public SnapshotSpecBuilder transformerParameters(Parameters parameters) {\n+ public RecordSpecBuilder transformerParameters(Parameters parameters) {\nthis.transformerParameters = parameters;\nreturn this;\n}\n- public SnapshotSpecBuilder captureHeader(String key) {\n+ public RecordSpecBuilder captureHeader(String key) {\nreturn captureHeader(key, null);\n}\n- public SnapshotSpecBuilder captureHeader(String key, Boolean caseInsensitive) {\n+ public RecordSpecBuilder captureHeader(String key, Boolean caseInsensitive) {\nheaders.put(key, new CaptureHeadersSpec(caseInsensitive));\nreturn this;\n}\n- public SnapshotSpec build() {\n+ public RecordSpec build() {\nRequestPattern filterRequestPattern = filterRequestPatternBuilder != null ?\nfilterRequestPatternBuilder.build() :\nnull;\n@@ -93,7 +93,7 @@ public class SnapshotSpecBuilder {\nResponseDefinitionBodyMatcher responseDefinitionBodyMatcher = new ResponseDefinitionBodyMatcher(maxTextBodySize, maxBinaryBodySize);\n- return new SnapshotSpec(\n+ return new RecordSpec(\ntargetBaseUrl,\nfilters,\nheaders.isEmpty() ? null : headers,\n@@ -106,7 +106,7 @@ public class SnapshotSpecBuilder {\njsonMatchingFlags);\n}\n- public SnapshotSpecBuilder jsonBodyMatchFlags(boolean ignoreArrayOrder, boolean ignoreExtraElements) {\n+ public RecordSpecBuilder jsonBodyMatchFlags(boolean ignoreArrayOrder, boolean ignoreExtraElements) {\nthis.jsonMatchingFlags = new JsonMatchingFlags(ignoreArrayOrder, ignoreExtraElements);\nreturn this;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -26,7 +26,7 @@ public class Recorder {\nstate = State.initial();\n}\n- public synchronized void startRecording(SnapshotSpec spec) {\n+ public synchronized void startRecording(RecordSpec spec) {\nStubMapping proxyMapping = proxyAllTo(spec.getTargetBaseUrl()).build();\nadmin.addStubMapping(proxyMapping);\n@@ -64,22 +64,22 @@ public class Recorder {\n};\n}\n- public SnapshotRecordResult takeSnapshot(List<ServeEvent> serveEvents, SnapshotSpec snapshotSpec) {\n+ public SnapshotRecordResult takeSnapshot(List<ServeEvent> serveEvents, RecordSpec recordSpec) {\nfinal List<StubMapping> stubMappings = serveEventsToStubMappings(\nLists.reverse(serveEvents),\n- snapshotSpec.getFilters(),\n- new SnapshotStubMappingGenerator(snapshotSpec.getCaptureHeaders(), snapshotSpec.getJsonMatchingFlags()),\n- getStubMappingPostProcessor(admin.getOptions(), snapshotSpec)\n+ recordSpec.getFilters(),\n+ new SnapshotStubMappingGenerator(recordSpec.getCaptureHeaders(), recordSpec.getJsonMatchingFlags()),\n+ getStubMappingPostProcessor(admin.getOptions(), recordSpec)\n);\nfor (StubMapping stubMapping : stubMappings) {\n- if (snapshotSpec.shouldPersist()) {\n+ if (recordSpec.shouldPersist()) {\nstubMapping.setPersistent(true);\nadmin.addStubMapping(stubMapping);\n}\n}\n- return snapshotSpec.getOutputFormat().format(stubMappings);\n+ return recordSpec.getOutputFormat().format(stubMappings);\n}\npublic List<StubMapping> serveEventsToStubMappings(\n@@ -95,18 +95,18 @@ public class Recorder {\nreturn stubMappingPostProcessor.process(stubMappings);\n}\n- public SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, SnapshotSpec snapshotSpec) {\n+ public SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, RecordSpec recordSpec) {\nfinal SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\noptions.extensionsOfType(StubMappingTransformer.class).values(),\n- snapshotSpec.getTransformers(),\n- snapshotSpec.getTransformerParameters(),\n+ recordSpec.getTransformers(),\n+ recordSpec.getTransformerParameters(),\noptions.filesRoot()\n);\nreturn new SnapshotStubMappingPostProcessor(\n- snapshotSpec.shouldRecordRepeatsAsScenarios(),\n+ recordSpec.shouldRecordRepeatsAsScenarios(),\ntransformerRunner,\n- snapshotSpec.getExtractBodyCriteria(),\n+ recordSpec.getExtractBodyCriteria(),\nnew SnapshotStubMappingBodyExtractor(options.filesRoot())\n);\n}\n@@ -117,11 +117,11 @@ public class Recorder {\nprivate final Status status;\nprivate final StubMapping proxyMapping;\n- private final SnapshotSpec spec;\n+ private final RecordSpec spec;\nprivate final UUID startingServeEventId;\nprivate final UUID finishingServeEventId;\n- public State(Status status, StubMapping proxyMapping, SnapshotSpec spec, UUID startingServeEventId, UUID finishingServeEventId) {\n+ public State(Status status, StubMapping proxyMapping, RecordSpec spec, UUID startingServeEventId, UUID finishingServeEventId) {\nthis.status = status;\nthis.proxyMapping = proxyMapping;\nthis.spec = spec;\n@@ -133,7 +133,7 @@ public class Recorder {\nreturn new State(Status.NeverStarted, null, null, null, null);\n}\n- public State start(UUID startingServeEventId, StubMapping proxyMapping, SnapshotSpec spec) {\n+ public State start(UUID startingServeEventId, StubMapping proxyMapping, RecordSpec spec) {\nreturn new State(Status.Recording, proxyMapping, spec, startingServeEventId, null);\n}\n@@ -149,7 +149,7 @@ public class Recorder {\nreturn proxyMapping;\n}\n- public SnapshotSpec getSpec() {\n+ public RecordSpec getSpec() {\nreturn spec;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -114,7 +114,7 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\npublic void honoursRecordSpecWhenPresent() {\ntargetService.stubFor(get(\"/record-this-with-header\").willReturn(ok()));\n- startRecording(snapshotSpec()\n+ startRecording(recordSpec()\n.forTarget(targetBaseUrl)\n.captureHeader(\"Accept\")\n);\n@@ -148,7 +148,7 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\ntargetService.stubFor(post(\"/record-this-with-body\").willReturn(ok()));\nadminClient.startStubRecording(\n- snapshotSpec()\n+ recordSpec()\n.forTarget(targetBaseUrl)\n.jsonBodyMatchFlags(true, true)\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": "@@ -106,7 +106,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/stuff/2\");\nList<StubMapping> mappings = proxyingService.snapshotRecord(\n- snapshotSpec()\n+ recordSpec()\n.onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/things/.*\")))\n);\n@@ -124,7 +124,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nUUID serveEventId = WireMatchers.findServeEventWithUrl(proxyingService.getAllServeEvents(), \"/2\").getId();\nList<StubMapping> mappings = adminClient.takeSnapshotRecording(\n- snapshotSpec()\n+ recordSpec()\n.onlyRequestIds(singletonList(serveEventId))\n);\n@@ -138,7 +138,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/two\", withHeader(\"Yes\", \"2\"), withHeader(\"Also-Yes\", \"BBB\"));\nList<StubMapping> mappings = snapshotRecord(\n- snapshotSpec()\n+ recordSpec()\n.captureHeader(\"Yes\")\n.captureHeader(\"Also-Yes\", true)\n);\n@@ -174,7 +174,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/large/binary\");\nList<StubMapping> mappings = snapshotRecord(\n- snapshotSpec()\n+ recordSpec()\n.extractTextBodiesOver(10)\n.extractBinaryBodiesOver(5)\n);\n@@ -191,7 +191,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/transient\");\nList<StubMapping> mappings = snapshotRecord(\n- snapshotSpec()\n+ recordSpec()\n.makeStubsPersistent(false)\n);\n@@ -227,7 +227,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/transform-this\");\nList<StubMapping> mappings = snapshotRecord(\n- snapshotSpec()\n+ recordSpec()\n.transformers(\"test-transformer\")\n.transformerParameters(Parameters.from(\nImmutableMap.<String, Object>of(\n@@ -244,7 +244,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.postJson(\"/some-json\", \"{}\");\nList<StubMapping> mappings = snapshotRecord(\n- snapshotSpec().jsonBodyMatchFlags(true, true)\n+ recordSpec().jsonBodyMatchFlags(true, true)\n);\nEqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\n@@ -256,7 +256,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void defaultsToNoJsonBodyMatchingFlags() {\nclient.postJson(\"/some-json\", \"{}\");\n- List<StubMapping> mappings = snapshotRecord(snapshotSpec());\n+ List<StubMapping> mappings = snapshotRecord(recordSpec());\nEqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\nassertThat(bodyPattern.isIgnoreArrayOrder(), nullValue());\n@@ -278,7 +278,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/get-this\");\nclient.get(\"/but-not-this\");\n- snapshotRecord(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\n+ snapshotRecord(recordSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\nassertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this\")));\n@@ -299,7 +299,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/get-this\");\nclient.get(\"/but-not-this\");\n- adminClient.takeSnapshotRecording(snapshotSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\n+ adminClient.takeSnapshotRecording(recordSpec().onlyRequestsMatching(getRequestedFor(urlEqualTo(\"/get-this\"))));\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\nassertThat(serverMappings, hasItem(WireMatchers.stubMappingWithUrl(\"/get-this\")));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Renamed SnapshotSpec to RecordSpec |
686,936 | 17.07.2017 17:47:04 | -3,600 | c35a86b6519a09e3c9d96b18bee3f3fe9cb36639 | Added direct DSL support for stop/start recording | [
{
"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": "@@ -392,6 +392,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nwireMockApp.startRecording(spec);\n}\n+ @Override\n+ public void startRecording(RecordSpecBuilder recordSpec) {\n+ wireMockApp.startRecording(recordSpec);\n+ }\n+\n@Override\npublic SnapshotRecordResult stopRecording() {\nreturn wireMockApp.stopRecording();\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": "@@ -27,6 +27,7 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -293,6 +294,11 @@ public class HttpAdminClient implements Admin {\nHTTP_OK);\n}\n+ @Override\n+ public void startRecording(RecordSpecBuilder recordSpec) {\n+ startRecording(recordSpec.build());\n+ }\n+\n@Override\npublic SnapshotRecordResult stopRecording() {\nString body = postJsonAssertOkAndReturnBody(\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": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.core;\nimport com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -58,7 +59,8 @@ public interface Admin {\nSnapshotRecordResult takeSnapshotRecording(RecordSpec spec);\nvoid startRecording(String targetBaseUrl);\n- void startRecording(RecordSpec recordSpec);\n+ void startRecording(RecordSpec spec);\n+ void startRecording(RecordSpecBuilder recordSpec);\nSnapshotRecordResult stopRecording();\nOptions getOptions();\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": "@@ -360,6 +360,11 @@ public class WireMockApp implements StubServer, Admin {\nrecorder.startRecording(recordSpec);\n}\n+ @Override\n+ public void startRecording(RecordSpecBuilder recordSpec) {\n+ recorder.startRecording(recordSpec.build());\n+ }\n+\n@Override\npublic SnapshotRecordResult stopRecording() {\nreturn recorder.stopRecording();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -162,4 +162,22 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(bodyPattern.isIgnoreExtraElements(), is(true));\n}\n+ @Test\n+ public void supportsDirectDslCallsWithSpec() {\n+ targetService.stubFor(post(\"/record-this-with-body\").willReturn(ok()));\n+\n+ proxyingService.startRecording(\n+ recordSpec()\n+ .forTarget(targetBaseUrl)\n+ .jsonBodyMatchFlags(true, true)\n+ );\n+\n+ client.postJson(\"/record-this-with-body\", \"{}\");\n+\n+ List<StubMapping> returnedMappings = proxyingService.stopRecording().getStubMappings();\n+\n+ EqualToJsonPattern bodyPattern = (EqualToJsonPattern) returnedMappings.get(0).getRequest().getBodyPatterns().get(0);\n+ assertThat(bodyPattern.isIgnoreArrayOrder(), is(true));\n+ assertThat(bodyPattern.isIgnoreExtraElements(), is(true));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added direct DSL support for stop/start recording |
686,936 | 17.07.2017 18:42:36 | -3,600 | 05ee6496fdb4b81982eb1f5a67d08794632baf3b | Added a test case for starting/stopping recording via the API. Add a no-op when trying to start recording when already started. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -27,6 +27,10 @@ public class Recorder {\n}\npublic synchronized void startRecording(RecordSpec spec) {\n+ if (state.getStatus() == State.Status.Recording) {\n+ return;\n+ }\n+\nStubMapping proxyMapping = proxyAllTo(spec.getTargetBaseUrl()).build();\nadmin.addStubMapping(proxyMapping);\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/SnapshotAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordApiAcceptanceTest.java",
"diff": "@@ -19,8 +19,12 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.testsupport.GlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransformer;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import com.google.common.base.Charsets;\nimport com.google.common.base.Predicate;\n+import org.apache.http.HttpEntity;\n+import org.apache.http.entity.StringEntity;\nimport org.junit.After;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -32,19 +36,22 @@ import 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;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n+import static com.google.common.base.Charsets.UTF_8;\nimport static com.google.common.collect.Iterables.find;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertThat;\n-public class SnapshotAcceptanceTest extends AcceptanceTestBase {\n+public class RecordApiAcceptanceTest extends AcceptanceTestBase {\nprivate WireMockServer proxyingService;\nprivate WireMockTestClient proxyingTestClient;\n+ private String proxyTargetUrl;\nprivate void proxyServerStart(WireMockConfiguration config) {\nproxyingService = new WireMockServer(config.dynamicPort());\nproxyingService.start();\n- proxyingService.stubFor(proxyAllTo(\"http://localhost:\" + wireMockServer.port()));\n+ proxyTargetUrl = \"http://localhost:\" + wireMockServer.port();\n+ proxyingService.stubFor(proxyAllTo(proxyTargetUrl));\nproxyingTestClient = new WireMockTestClient(proxyingService.port());\nwireMockServer.stubFor(any(anyUrl()).willReturn(ok()));\n@@ -431,4 +438,34 @@ public class SnapshotAcceptanceTest extends AcceptanceTestBase {\nequalToJson(NONGLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE, JSONCompareMode.STRICT_ORDER)\n);\n}\n+\n+ private static final String RECORD_WITH_CAPTURE_HEADERS_SNAPSHOT_REQUEST_TEMPLATE =\n+ \"{ \\n\" +\n+ \" \\\"targetBaseUrl\\\": \\\"%s\\\", \\n\" +\n+ \" \\\"outputFormat\\\": \\\"full\\\", \\n\" +\n+ \" \\\"persist\\\": \\\"false\\\", \\n\" +\n+ \" \\\"captureHeaders\\\": { \\n\" +\n+ \" \\\"Accept\\\": { \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"X-Another\\\": {} \\n\" +\n+ \" } \\n\" +\n+ \"} \";\n+\n+ @Test\n+ public void startsAndStopsRecording() {\n+ proxyServerStartWithEmptyFileRoot();\n+\n+ String requestJson = String.format(RECORD_WITH_CAPTURE_HEADERS_SNAPSHOT_REQUEST_TEMPLATE, proxyTargetUrl);\n+ proxyingTestClient.postJson(\"/__admin/recordings/start\", requestJson);\n+\n+ proxyingTestClient.put(\"/foo/bar\",\n+ withHeader(\"Ignored\", \"whatever\"),\n+ withHeader(\"Accept\", \"text/plain\"),\n+ withHeader(\"X-Another\", \"blah\")\n+ );\n+\n+ WireMockResponse response = proxyingTestClient.post(\"/__admin/recordings/stop\", new StringEntity(\"\", UTF_8));\n+ assertThat(response.content(), equalToJson(CAPTURE_HEADERS_SNAPSHOT_RESPONSE, JSONCompareMode.STRICT_ORDER));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a test case for starting/stopping recording via the API. Add a no-op when trying to start recording when already started. |
686,936 | 17.07.2017 19:29:24 | -3,600 | 7916bda9884f0503487ed8d92005af69120d8881 | Added recording status API/DSL call | [
{
"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": "@@ -35,6 +35,7 @@ import com.github.tomakehurst.wiremock.http.StubRequestHandler;\nimport com.github.tomakehurst.wiremock.junit.Stubbing;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\n@@ -402,6 +403,11 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn wireMockApp.stopRecording();\n}\n+ @Override\n+ public RecordingStatusResult getRecordingStatus() {\n+ return wireMockApp.getRecordingStatus();\n+ }\n+\n@Override\npublic SnapshotRecordResult takeSnapshotRecording() {\nreturn wireMockApp.takeSnapshotRecording();\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": "@@ -83,6 +83,7 @@ public class AdminRoutes {\nrouter.add(POST, \"/recordings/snapshot\", SnapshotTask.class);\nrouter.add(POST, \"/recordings/start\", StartRecordingTask.class);\nrouter.add(POST, \"/recordings/stop\", StopRecordingTask.class);\n+ router.add(GET, \"/recordings/status\", GetRecordingStatusTask.class);\nrouter.add(POST, \"/near-misses/request\", FindNearMissesForRequestTask.class);\nrouter.add(POST, \"/near-misses/request-pattern\", FindNearMissesForRequestPatternTask.class);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/GetRecordingStatusTask.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 GetRecordingStatusTask implements AdminTask {\n+\n+ @Override\n+ public ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ return ResponseDefinition.okForJson(\n+ admin.getRecordingStatus()\n+ );\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": "@@ -28,6 +28,7 @@ import com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -309,6 +310,11 @@ public class HttpAdminClient implements Admin {\nreturn Json.read(body, SnapshotRecordResult.class);\n}\n+ @Override\n+ public RecordingStatusResult getRecordingStatus() {\n+ return executeRequest(adminRoutes.requestSpecForTask(GetRecordingStatusTask.class), RecordingStatusResult.class);\n+ }\n+\n@Override\npublic Options getOptions() {\nreturn new WireMockConfiguration().port(port).bindAddress(host);\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.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.common.FileSource;\n@@ -701,6 +702,14 @@ public class WireMock {\nreturn admin.stopRecording();\n}\n+ public static RecordingStatusResult getRecordingStatus() {\n+ return defaultInstance.get().getStubRecordingStatus();\n+ }\n+\n+ public RecordingStatusResult getStubRecordingStatus() {\n+ return admin.getRecordingStatus();\n+ }\n+\npublic static RecordSpecBuilder recordSpec() {\nreturn new RecordSpecBuilder();\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": "@@ -19,6 +19,7 @@ import com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -62,6 +63,7 @@ public interface Admin {\nvoid startRecording(RecordSpec spec);\nvoid startRecording(RecordSpecBuilder recordSpec);\nSnapshotRecordResult stopRecording();\n+ RecordingStatusResult getRecordingStatus();\nOptions getOptions();\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": "@@ -369,4 +369,9 @@ public class WireMockApp implements StubServer, Admin {\npublic SnapshotRecordResult stopRecording() {\nreturn recorder.stopRecording();\n}\n+\n+ @Override\n+ public RecordingStatusResult getRecordingStatus() {\n+ return new RecordingStatusResult(recorder.getStatus().name());\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -27,7 +27,7 @@ public class Recorder {\n}\npublic synchronized void startRecording(RecordSpec spec) {\n- if (state.getStatus() == State.Status.Recording) {\n+ if (state.getStatus() == RecordingStatus.Recording) {\nreturn;\n}\n@@ -115,17 +115,19 @@ public class Recorder {\n);\n}\n- private static class State {\n+ public RecordingStatus getStatus() {\n+ return state.getStatus();\n+ }\n- enum Status { NeverStarted, Recording, Stopped }\n+ private static class State {\n- private final Status status;\n+ private final RecordingStatus status;\nprivate final StubMapping proxyMapping;\nprivate final RecordSpec spec;\nprivate final UUID startingServeEventId;\nprivate final UUID finishingServeEventId;\n- public State(Status status, StubMapping proxyMapping, RecordSpec spec, UUID startingServeEventId, UUID finishingServeEventId) {\n+ public State(RecordingStatus status, StubMapping proxyMapping, RecordSpec spec, UUID startingServeEventId, UUID finishingServeEventId) {\nthis.status = status;\nthis.proxyMapping = proxyMapping;\nthis.spec = spec;\n@@ -134,18 +136,18 @@ public class Recorder {\n}\npublic static State initial() {\n- return new State(Status.NeverStarted, null, null, null, null);\n+ return new State(RecordingStatus.NeverStarted, null, null, null, null);\n}\npublic State start(UUID startingServeEventId, StubMapping proxyMapping, RecordSpec spec) {\n- return new State(Status.Recording, proxyMapping, spec, startingServeEventId, null);\n+ return new State(RecordingStatus.Recording, proxyMapping, spec, startingServeEventId, null);\n}\npublic State stop(UUID finishingServeEventId) {\n- return new State(Status.Stopped, proxyMapping, spec, startingServeEventId, finishingServeEventId);\n+ return new State(RecordingStatus.Stopped, proxyMapping, spec, startingServeEventId, finishingServeEventId);\n}\n- public Status getStatus() {\n+ public RecordingStatus getStatus() {\nreturn status;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordingStatus.java",
"diff": "+package com.github.tomakehurst.wiremock.recording;\n+\n+public enum RecordingStatus {\n+\n+ NeverStarted, Recording, Stopped\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordingStatusResult.java",
"diff": "+package com.github.tomakehurst.wiremock.recording;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+public class RecordingStatusResult {\n+\n+ private final RecordingStatus status;\n+\n+ @JsonCreator\n+ public RecordingStatusResult(@JsonProperty(\"status\") String status) {\n+ this(RecordingStatus.valueOf(status));\n+ }\n+\n+ public RecordingStatusResult(RecordingStatus status) {\n+ this.status = status;\n+ }\n+\n+ public RecordingStatus getStatus() {\n+ return status;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -2,6 +2,9 @@ package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n+import com.github.tomakehurst.wiremock.recording.Recorder;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatus;\n+import com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport org.hamcrest.Matchers;\n@@ -180,4 +183,32 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(bodyPattern.isIgnoreArrayOrder(), is(true));\nassertThat(bodyPattern.isIgnoreExtraElements(), is(true));\n}\n+\n+ @Test\n+ public void returnsTheRecordingStatus() {\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ RecordingStatusResult result = getRecordingStatus();\n+\n+ assertThat(result.getStatus(), is(RecordingStatus.Recording));\n+ }\n+\n+ @Test\n+ public void returnsTheRecordingStatusViaInstanceClient() {\n+ proxyingService.startRecording(targetBaseUrl);\n+ proxyingService.stopRecording();\n+\n+ RecordingStatusResult result = adminClient.getStubRecordingStatus();\n+\n+ assertThat(result.getStatus(), is(RecordingStatus.Stopped));\n+ }\n+\n+ @Test\n+ public void returnsTheRecordingStatusViaDirectDsl() {\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ RecordingStatusResult result = proxyingService.getRecordingStatus();\n+\n+ assertThat(result.getStatus(), is(RecordingStatus.Recording));\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RecordingStatusResultTest.java",
"diff": "+package com.github.tomakehurst.wiremock.recording;\n+\n+import com.github.tomakehurst.wiremock.common.Json;\n+import org.junit.Test;\n+\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class RecordingStatusResultTest {\n+\n+ @Test\n+ public void deserialise() {\n+ RecordingStatusResult result = Json.read(\"{ \\\"status\\\": \\\"Recording\\\" }\", RecordingStatusResult.class);\n+\n+ assertThat(result.getStatus(), is(RecordingStatus.Recording));\n+ }\n+\n+ @Test\n+ public void serialise() {\n+ RecordingStatusResult result = new RecordingStatusResult(RecordingStatus.Recording);\n+\n+ String json = Json.write(result);\n+\n+ assertThat(json, equalToJson(\"{ \\\"status\\\": \\\"Recording\\\" }\"));\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added recording status API/DSL call |
686,936 | 18.07.2017 15:55:41 | -3,600 | 33febb15ee4ddaefd9c70cc945f50cbf00cd940c | Now sends a client error response/throws exception when attempting to stop recording when not started | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StopRecordingTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StopRecordingTask.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.common.Errors;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.recording.NotRecordingException;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n+import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;\nimport static java.net.HttpURLConnection.HTTP_OK;\npublic class StopRecordingTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\n+ try {\nSnapshotRecordResult result = admin.stopRecording();\nreturn jsonResponse(result, HTTP_OK);\n+ } catch (NotRecordingException e) {\n+ return jsonResponse(Errors.notRecording(), HTTP_BAD_REQUEST);\n+ }\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": "@@ -18,9 +18,7 @@ package com.github.tomakehurst.wiremock.client;\nimport com.github.tomakehurst.wiremock.admin.*;\nimport com.github.tomakehurst.wiremock.admin.model.*;\nimport com.github.tomakehurst.wiremock.admin.tasks.*;\n-import com.github.tomakehurst.wiremock.common.AdminException;\n-import com.github.tomakehurst.wiremock.common.Json;\n-import com.github.tomakehurst.wiremock.common.ProxySettings;\n+import com.github.tomakehurst.wiremock.common.*;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\n@@ -40,6 +38,7 @@ import org.apache.commons.lang3.StringUtils;\nimport org.apache.http.client.methods.*;\nimport org.apache.http.entity.StringEntity;\nimport org.apache.http.impl.client.CloseableHttpClient;\n+import org.eclipse.jetty.http.HttpStatus;\nimport java.util.UUID;\n@@ -114,8 +113,7 @@ public class HttpAdminClient implements Admin {\nadminRoutes.requestSpecForTask(CreateStubMappingTask.class),\nPathParams.empty(),\nstubMapping,\n- Void.class,\n- 201\n+ Void.class\n);\n}\n@@ -123,16 +121,14 @@ public class HttpAdminClient implements Admin {\npublic void editStubMapping(StubMapping stubMapping) {\npostJsonAssertOkAndReturnBody(\nurlFor(OldEditStubMappingTask.class),\n- Json.write(stubMapping),\n- HTTP_NO_CONTENT);\n+ Json.write(stubMapping));\n}\n@Override\npublic void removeStubMapping(StubMapping stubbMapping) {\npostJsonAssertOkAndReturnBody(\nurlFor(OldRemoveStubMappingTask.class),\n- Json.write(stubbMapping),\n- HTTP_OK);\n+ Json.write(stubbMapping));\n}\n@Override\n@@ -155,12 +151,12 @@ public class HttpAdminClient implements Admin {\n@Override\npublic void saveMappings() {\n- postJsonAssertOkAndReturnBody(urlFor(SaveMappingsTask.class), null, HTTP_OK);\n+ postJsonAssertOkAndReturnBody(urlFor(SaveMappingsTask.class), null);\n}\n@Override\npublic void resetAll() {\n- postJsonAssertOkAndReturnBody(urlFor(ResetTask.class), null, HTTP_OK);\n+ postJsonAssertOkAndReturnBody(urlFor(ResetTask.class), null);\n}\n@Override\n@@ -180,7 +176,7 @@ public class HttpAdminClient implements Admin {\n@Override\npublic void resetToDefaultMappings() {\n- postJsonAssertOkAndReturnBody(urlFor(ResetToDefaultMappingsTask.class), null, HTTP_OK);\n+ postJsonAssertOkAndReturnBody(urlFor(ResetToDefaultMappingsTask.class), null);\n}\n@Override\n@@ -204,8 +200,7 @@ public class HttpAdminClient implements Admin {\npublic VerificationResult countRequestsMatching(RequestPattern requestPattern) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(GetRequestCountTask.class),\n- Json.write(requestPattern),\n- HTTP_OK);\n+ Json.write(requestPattern));\nreturn VerificationResult.from(body);\n}\n@@ -213,22 +208,20 @@ public class HttpAdminClient implements Admin {\npublic FindRequestsResult findRequestsMatching(RequestPattern requestPattern) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(FindRequestsTask.class),\n- Json.write(requestPattern),\n- HTTP_OK);\n+ Json.write(requestPattern));\nreturn Json.read(body, FindRequestsResult.class);\n}\n@Override\npublic FindRequestsResult findUnmatchedRequests() {\nString body = getJsonAssertOkAndReturnBody(\n- urlFor(FindUnmatchedRequestsTask.class),\n- HTTP_OK);\n+ urlFor(FindUnmatchedRequestsTask.class));\nreturn Json.read(body, FindRequestsResult.class);\n}\n@Override\npublic FindNearMissesResult findNearMissesForUnmatchedRequests() {\n- String body = getJsonAssertOkAndReturnBody(urlFor(FindNearMissesForUnmatchedTask.class), HTTP_OK);\n+ String body = getJsonAssertOkAndReturnBody(urlFor(FindNearMissesForUnmatchedTask.class));\nreturn Json.read(body, FindNearMissesResult.class);\n}\n@@ -236,8 +229,7 @@ public class HttpAdminClient implements Admin {\npublic FindNearMissesResult findTopNearMissesFor(LoggedRequest loggedRequest) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(FindNearMissesForRequestTask.class),\n- Json.write(loggedRequest),\n- HTTP_OK\n+ Json.write(loggedRequest)\n);\nreturn Json.read(body, FindNearMissesResult.class);\n@@ -247,8 +239,7 @@ public class HttpAdminClient implements Admin {\npublic FindNearMissesResult findTopNearMissesFor(RequestPattern requestPattern) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(FindNearMissesForRequestPatternTask.class),\n- Json.write(requestPattern),\n- HTTP_OK\n+ Json.write(requestPattern)\n);\nreturn Json.read(body, FindNearMissesResult.class);\n@@ -258,16 +249,14 @@ public class HttpAdminClient implements Admin {\npublic void updateGlobalSettings(GlobalSettings settings) {\npostJsonAssertOkAndReturnBody(\nurlFor(GlobalSettingsUpdateTask.class),\n- Json.write(settings),\n- HTTP_OK);\n+ Json.write(settings));\n}\n@Override\npublic SnapshotRecordResult takeSnapshotRecording() {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(SnapshotTask.class),\n- \"\",\n- HTTP_OK);\n+ \"\");\nreturn Json.read(body, SnapshotRecordResult.class);\n}\n@@ -276,8 +265,7 @@ public class HttpAdminClient implements Admin {\npublic SnapshotRecordResult takeSnapshotRecording(RecordSpec spec) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(SnapshotTask.class),\n- Json.write(spec),\n- HTTP_OK);\n+ Json.write(spec));\nreturn Json.read(body, SnapshotRecordResult.class);\n}\n@@ -291,8 +279,7 @@ public class HttpAdminClient implements Admin {\npublic void startRecording(RecordSpec recordSpec) {\npostJsonAssertOkAndReturnBody(\nurlFor(StartRecordingTask.class),\n- Json.write(recordSpec),\n- HTTP_OK);\n+ Json.write(recordSpec));\n}\n@Override\n@@ -304,8 +291,7 @@ public class HttpAdminClient implements Admin {\npublic SnapshotRecordResult stopRecording() {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(StopRecordingTask.class),\n- \"\",\n- HTTP_OK);\n+ \"\");\nreturn Json.read(body, SnapshotRecordResult.class);\n}\n@@ -322,7 +308,7 @@ public class HttpAdminClient implements Admin {\n@Override\npublic void shutdownServer() {\n- postJsonAssertOkAndReturnBody(urlFor(ShutdownServerTask.class), null, HTTP_OK);\n+ postJsonAssertOkAndReturnBody(urlFor(ShutdownServerTask.class), null);\n}\npublic int port() {\n@@ -336,37 +322,37 @@ public class HttpAdminClient implements Admin {\nreturn ProxySettings.NO_PROXY;\n}\n- private String postJsonAssertOkAndReturnBody(String url, String json, int expectedStatus) {\n+ private String postJsonAssertOkAndReturnBody(String url, String json) {\nHttpPost post = new HttpPost(url);\nif (json != null) {\npost.setEntity(jsonStringEntity(json));\n}\n- return safelyExecuteRequest(url, expectedStatus, post);\n+ return safelyExecuteRequest(url, post);\n}\n- protected String getJsonAssertOkAndReturnBody(String url, int expectedStatus) {\n+ protected String getJsonAssertOkAndReturnBody(String url) {\nHttpGet get = new HttpGet(url);\n- return safelyExecuteRequest(url, expectedStatus, get);\n+ return safelyExecuteRequest(url, get);\n}\nprivate void executeRequest(RequestSpec requestSpec) {\n- executeRequest(requestSpec, PathParams.empty(), null, Void.class, 200);\n+ executeRequest(requestSpec, PathParams.empty(), null, Void.class);\n}\nprivate <B, R> R executeRequest(RequestSpec requestSpec, B requestBody, Class<R> responseType) {\n- return executeRequest(requestSpec, PathParams.empty(), requestBody, responseType, 200);\n+ return executeRequest(requestSpec, PathParams.empty(), requestBody, responseType);\n}\nprivate <B, R> R executeRequest(RequestSpec requestSpec, Class<R> responseType) {\n- return executeRequest(requestSpec, PathParams.empty(), null, responseType, 200);\n+ return executeRequest(requestSpec, PathParams.empty(), null, responseType);\n}\nprivate <B, R> R executeRequest(RequestSpec requestSpec, PathParams pathParams, Class<R> responseType) {\n- return executeRequest(requestSpec, pathParams, null, responseType, 200);\n+ return executeRequest(requestSpec, pathParams, null, responseType);\n}\n- private <B, R> R executeRequest(RequestSpec requestSpec, PathParams pathParams, B requestBody, Class<R> responseType, int expectedStatus) {\n+ private <B, R> R executeRequest(RequestSpec requestSpec, PathParams pathParams, B requestBody, Class<R> responseType) {\nString url = String.format(ADMIN_URL_PREFIX + requestSpec.path(pathParams), scheme, host, port, urlPathPrefix);\nRequestBuilder requestBuilder = RequestBuilder\n.create(requestSpec.method().getName())\n@@ -376,26 +362,32 @@ public class HttpAdminClient implements Admin {\nrequestBuilder.setEntity(jsonStringEntity(Json.write(requestBody)));\n}\n- String responseBodyString = safelyExecuteRequest(url, expectedStatus, requestBuilder.build());\n+ String responseBodyString = safelyExecuteRequest(url, requestBuilder.build());\nreturn responseType == Void.class ?\nnull :\nJson.read(responseBodyString, responseType);\n}\n- private String safelyExecuteRequest(String url, int expectedStatus, HttpUriRequest request) {\n+ private String safelyExecuteRequest(String url, HttpUriRequest request) {\nif (hostHeader != null) {\nrequest.addHeader(HOST, hostHeader);\n}\ntry (CloseableHttpResponse response = httpClient.execute(request)) {\nint statusCode = response.getStatusLine().getStatusCode();\n- if (statusCode != expectedStatus) {\n+ if (HttpStatus.isServerError(statusCode)) {\nthrow new VerificationException(\n- \"Expected status \" + expectedStatus + \" for \" + url + \" but was \" + statusCode);\n+ \"Expected status 2xx for \" + url + \" but was \" + statusCode);\n}\n- return getEntityAsStringAndCloseStream(response);\n+ String body = getEntityAsStringAndCloseStream(response);\n+ if (HttpStatus.isClientError(statusCode)) {\n+ Errors errors = Json.read(body, Errors.class);\n+ throw ClientError.fromErrors(errors);\n+ }\n+\n+ return body;\n} catch (Exception e) {\nreturn throwUnchecked(e, String.class);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/ClientError.java",
"diff": "+package com.github.tomakehurst.wiremock.common;\n+\n+import com.github.tomakehurst.wiremock.recording.NotRecordingException;\n+\n+public class ClientError extends RuntimeException {\n+\n+ private final Errors errors;\n+\n+ public ClientError(Errors errors) {\n+ this.errors = errors;\n+ }\n+\n+ public static ClientError fromErrors(Errors errors) {\n+ if (errors.first().getCode().equals(30)) {\n+ return new NotRecordingException();\n+ }\n+\n+ return new ClientError(errors);\n+ }\n+\n+ public Errors getErrors() {\n+ return errors;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Errors.java",
"diff": "+package com.github.tomakehurst.wiremock.common;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+import java.util.List;\n+\n+import static java.util.Collections.singletonList;\n+\n+public class Errors {\n+\n+ private final List<Error> errors;\n+\n+ public Errors(@JsonProperty(\"errors\") List<Error> errors) {\n+ this.errors = errors;\n+ }\n+\n+ public static Errors single(Integer code, String title) {\n+ return new Errors(singletonList(new Error(code, title)));\n+ }\n+\n+ public static Errors notRecording() {\n+ return single(30, \"Not currently recording.\");\n+ }\n+\n+ public Error first() {\n+ if (errors.isEmpty()) {\n+ throw new IllegalStateException(\"No errors are present\");\n+ }\n+\n+ return errors.get(0);\n+ }\n+\n+ public List<Error> getErrors() {\n+ return errors;\n+ }\n+\n+ public static class Error {\n+\n+ private final Integer code;\n+ private final String title;\n+\n+ public Error(@JsonProperty(\"code\") Integer code, @JsonProperty(\"title\") String title) {\n+ this.code = code;\n+ this.title = title;\n+ }\n+\n+ public Integer getCode() {\n+ return code;\n+ }\n+\n+ public String getTitle() {\n+ return title;\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/NotRecordingException.java",
"diff": "+package com.github.tomakehurst.wiremock.recording;\n+\n+import com.github.tomakehurst.wiremock.common.ClientError;\n+import com.github.tomakehurst.wiremock.common.Errors;\n+\n+public class NotRecordingException extends ClientError {\n+\n+ public NotRecordingException() {\n+ super(Errors.notRecording());\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -40,6 +40,10 @@ public class Recorder {\n}\npublic synchronized SnapshotRecordResult stopRecording() {\n+ if (state.getStatus() != RecordingStatus.Recording) {\n+ throw new NotRecordingException();\n+ }\n+\nList<ServeEvent> serveEvents = admin.getServeEvents().getServeEvents();\nUUID lastId = serveEvents.isEmpty() ? null : serveEvents.get(0).getId();\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": "@@ -21,9 +21,7 @@ import com.github.tomakehurst.wiremock.testsupport.GlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n-import com.google.common.base.Charsets;\nimport com.google.common.base.Predicate;\n-import org.apache.http.HttpEntity;\nimport org.apache.http.entity.StringEntity;\nimport org.junit.After;\nimport org.junit.Before;\n@@ -468,4 +466,23 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\nWireMockResponse response = proxyingTestClient.post(\"/__admin/recordings/stop\", new StringEntity(\"\", UTF_8));\nassertThat(response.content(), equalToJson(CAPTURE_HEADERS_SNAPSHOT_RESPONSE, JSONCompareMode.STRICT_ORDER));\n}\n+\n+ private static final String NOT_RECORDING_ERROR =\n+ \"{ \\n\" +\n+ \" \\\"errors\\\": [ \\n\" +\n+ \" { \\n\" +\n+ \" \\\"code\\\": 30, \\n\" +\n+ \" \\\"title\\\": \\\"Not currently recording.\\\" \\n\" +\n+ \" } \\n\" +\n+ \" ] \\n\" +\n+ \"}\";\n+\n+ @Test\n+ public void returnsErrorWhenAttemptingToStopRecordingWhenNotStarted() {\n+ proxyServerStartWithEmptyFileRoot();\n+\n+ WireMockResponse response = proxyingTestClient.postWithBody(\"/__admin/recordings/stop\", \"\", \"text/plain\", \"utf-8\");\n+\n+ assertThat(response.content(), equalToJson(NOT_RECORDING_ERROR));\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -2,7 +2,7 @@ package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n-import com.github.tomakehurst.wiremock.recording.Recorder;\n+import com.github.tomakehurst.wiremock.recording.NotRecordingException;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatus;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -211,4 +211,19 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(result.getStatus(), is(RecordingStatus.Recording));\n}\n+\n+ @Test(expected = NotRecordingException.class)\n+ public void returnsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\n+ stopRecording();\n+ }\n+\n+ @Test(expected = NotRecordingException.class)\n+ public void returnsAnErrorIfAttemptingToStopViaInstanceRemoteDslWhenNotRecording() {\n+ adminClient.stopStubRecording();\n+ }\n+\n+ @Test(expected = NotRecordingException.class)\n+ public void returnsAnErrorIfAttemptingToStopViaDirectDslWhenNotRecording() {\n+ proxyingService.stopRecording();\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Now sends a client error response/throws exception when attempting to stop recording when not started |
686,936 | 18.07.2017 21:44:06 | -3,600 | 8508d5236ab8d8bfc97f04511d6de61521c4c5d9 | Added log messages for start and stop recording | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.extension.StubMappingTransformer;\n@@ -13,6 +14,7 @@ import java.util.Objects;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\n+import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.google.common.collect.FluentIterable.from;\nimport static com.google.common.collect.Iterables.indexOf;\n@@ -37,6 +39,8 @@ public class Recorder {\nList<ServeEvent> serveEvents = admin.getServeEvents().getServeEvents();\nUUID initialId = serveEvents.isEmpty() ? null : serveEvents.get(0).getId();\nstate = state.start(initialId, proxyMapping, spec);\n+\n+ notifier().info(\"Started recording with record spec:\\n\" + Json.write(spec));\n}\npublic synchronized SnapshotRecordResult stopRecording() {\n@@ -60,7 +64,10 @@ public class Recorder {\nint endIndex = indexOf(serveEvents, withId(state.getFinishingServeEventId()));\nList<ServeEvent> eventsToSnapshot = serveEvents.subList(endIndex, startIndex);\n- return takeSnapshot(eventsToSnapshot, state.getSpec());\n+ SnapshotRecordResult result = takeSnapshot(eventsToSnapshot, state.getSpec());\n+\n+ notifier().info(\"Stopped recording. Stubs captured:\\n\" + Json.write(result.getStubMappings()));\n+ return result;\n}\nprivate static Predicate<ServeEvent> withId(final UUID id) {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added log messages for start and stop recording |
686,936 | 18.07.2017 22:19:28 | -3,600 | e35a8aed87710e3dce246bb80a412db0ba2bfbd9 | Fixed behaviour of persist flag when recording. Fixed scenario flag serialisation. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\nimport com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonIgnore;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\n@@ -50,14 +51,14 @@ public class RecordSpec {\nthis.extractBodyCriteria = extractBodyCriteria;\nthis.outputFormat = outputFormat == null ? SnapshotOutputFormatter.FULL : outputFormat;\nthis.persist = persist == null ? true : persist;\n- this.repeatsAsScenarios = repeatsAsScenarios == null ? false : repeatsAsScenarios;\n+ this.repeatsAsScenarios = repeatsAsScenarios;\nthis.transformers = transformers;\nthis.transformerParameters = transformerParameters;\nthis.jsonMatchingFlags = jsonMatchingFlags;\n}\nprivate RecordSpec() {\n- this(null, null, null, null, null, null, true, null, null, null);\n+ this(null, null, null, null, null, null, null, null, null, null);\n}\npublic static final RecordSpec DEFAULTS = new RecordSpec();\n@@ -79,8 +80,14 @@ public class RecordSpec {\n@JsonProperty(\"persist\")\npublic boolean shouldPersist() { return persist; }\n- @JsonProperty(\"repeatsAsScenarios\")\n- public boolean shouldRecordRepeatsAsScenarios() { return repeatsAsScenarios; }\n+ @JsonIgnore\n+ public boolean shouldRecordRepeatsAsScenarios() {\n+ return repeatsAsScenarios == null ? true : repeatsAsScenarios;\n+ }\n+\n+ public Boolean getRepeatsAsScenarios() {\n+ return repeatsAsScenarios;\n+ }\npublic List<String> getTransformers() { return transformers; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -90,8 +90,8 @@ public class Recorder {\nfor (StubMapping stubMapping : stubMappings) {\nif (recordSpec.shouldPersist()) {\nstubMapping.setPersistent(true);\n- admin.addStubMapping(stubMapping);\n}\n+ admin.addStubMapping(stubMapping);\n}\nreturn recordSpec.getOutputFormat().format(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": "@@ -17,6 +17,7 @@ package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.GlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.NonGlobalStubMappingTransformer;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\n@@ -34,8 +35,10 @@ import 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;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findMappingWithUrl;\nimport static com.google.common.base.Charsets.UTF_8;\nimport static com.google.common.collect.Iterables.find;\n+import static org.hamcrest.Matchers.notNullValue;\nimport static org.junit.Assert.assertEquals;\nimport static org.junit.Assert.assertThat;\n@@ -450,6 +453,48 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\n\" } \\n\" +\n\"} \";\n+ private static final String RECORD_WITH_CAPTURE_HEADERS_RECORD_RESPONSE =\n+ \"{ \\n\" +\n+ \" \\\"mappings\\\": [ \\n\" +\n+ \" { \\n\" +\n+ \" \\\"request\\\" : { \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n+ \" \\\"method\\\" : \\\"PUT\\\", \\n\" +\n+ \" \\\"headers\\\": { \\n\" +\n+ \" \\\"Accept\\\": { \\n\" +\n+ \" \\\"equalTo\\\": \\\"text/plain\\\", \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"X-Another\\\": { \\n\" +\n+ \" \\\"equalTo\\\": \\\"blah\\\" \\n\" +\n+ \" } \\n\" +\n+ \" } \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"response\\\" : { \\n\" +\n+ \" \\\"status\\\" : 200 \\n\" +\n+ \" } \\n\" +\n+ \" }, \\n\" +\n+ \" { \\n\" +\n+ \" \\\"request\\\" : { \\n\" +\n+ \" \\\"url\\\" : \\\"/foo/bar\\\", \\n\" +\n+ \" \\\"method\\\" : \\\"PUT\\\", \\n\" +\n+ \" \\\"headers\\\": { \\n\" +\n+ \" \\\"Accept\\\": { \\n\" +\n+ \" \\\"equalTo\\\": \\\"text/plain\\\", \\n\" +\n+ \" \\\"caseInsensitive\\\": true \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"X-Another\\\": { \\n\" +\n+ \" \\\"equalTo\\\": \\\"blah\\\" \\n\" +\n+ \" } \\n\" +\n+ \" } \\n\" +\n+ \" }, \\n\" +\n+ \" \\\"response\\\" : { \\n\" +\n+ \" \\\"status\\\" : 200 \\n\" +\n+ \" } \\n\" +\n+ \" } \\n\" +\n+ \" ] \\n\" +\n+ \"} \";\n+\n@Test\npublic void startsAndStopsRecording() {\nproxyServerStartWithEmptyFileRoot();\n@@ -462,9 +507,16 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\nwithHeader(\"Accept\", \"text/plain\"),\nwithHeader(\"X-Another\", \"blah\")\n);\n+ proxyingTestClient.put(\"/foo/bar\",\n+ withHeader(\"Accept\", \"text/plain\"),\n+ withHeader(\"X-Another\", \"blah\")\n+ );\nWireMockResponse response = proxyingTestClient.post(\"/__admin/recordings/stop\", new StringEntity(\"\", UTF_8));\n- assertThat(response.content(), equalToJson(CAPTURE_HEADERS_SNAPSHOT_RESPONSE, JSONCompareMode.STRICT_ORDER));\n+ assertThat(response.content(), equalToJson(RECORD_WITH_CAPTURE_HEADERS_RECORD_RESPONSE, JSONCompareMode.STRICT_ORDER));\n+\n+ StubMapping createdMapping = findMappingWithUrl(proxyingService.getStubMappings(), \"/foo/bar\");\n+ assertThat(createdMapping.getScenarioName(), notNullValue());\n}\nprivate static final String NOT_RECORDING_ERROR =\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed behaviour of persist flag when recording. Fixed scenario flag serialisation. |
686,936 | 19.07.2017 09:53:45 | -3,600 | 82aec54d8902416b97169b61eef29b76230ed7fd | Added basic validation of record spec on start recording (just checking existence of base URL) | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StartRecordingTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/StartRecordingTask.java",
"diff": "package com.github.tomakehurst.wiremock.admin;\nimport com.github.tomakehurst.wiremock.admin.model.PathParams;\n+import com.github.tomakehurst.wiremock.common.InvalidRequestException;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.recording.RecordSpec;\n+import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.jsonResponse;\n+\npublic class StartRecordingTask implements AdminTask {\n@Override\npublic ResponseDefinition execute(Admin admin, Request request, PathParams pathParams) {\nRecordSpec recordSpec = Json.read(request.getBodyAsString(), RecordSpec.class);\n+ try {\nadmin.startRecording(recordSpec);\nreturn ResponseDefinition.okEmptyJson();\n+ } catch (InvalidRequestException e) {\n+ return jsonResponse(e.getErrors(), 422);\n+ }\n}\n}\n"
},
{
"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": "@@ -11,12 +11,16 @@ public class ClientError extends RuntimeException {\n}\npublic static ClientError fromErrors(Errors errors) {\n- if (errors.first().getCode().equals(30)) {\n+ Integer errorCode = errors.first().getCode();\n+ switch (errorCode) {\n+ case 10:\n+ return new InvalidRequestException(errors);\n+ case 30:\nreturn new NotRecordingException();\n- }\n-\n+ default:\nreturn new ClientError(errors);\n}\n+ }\npublic Errors getErrors() {\nreturn errors;\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": "@@ -14,6 +14,10 @@ public class Errors {\nthis.errors = errors;\n}\n+ public static Errors single(Integer code, String sourcePointer, String title) {\n+ return new Errors(singletonList(new Error(code, new Error.Source(sourcePointer), title)));\n+ }\n+\npublic static Errors single(Integer code, String title) {\nreturn new Errors(singletonList(new Error(code, title)));\n}\n@@ -22,6 +26,10 @@ public class Errors {\nreturn single(30, \"Not currently recording.\");\n}\n+ public static Errors validation(String pointer, String message) {\n+ return single(10, pointer, message);\n+ }\n+\npublic Error first() {\nif (errors.isEmpty()) {\nthrow new IllegalStateException(\"No errors are present\");\n@@ -37,19 +45,46 @@ public class Errors {\npublic static class Error {\nprivate final Integer code;\n+ private final Source source;\nprivate final String title;\n- public Error(@JsonProperty(\"code\") Integer code, @JsonProperty(\"title\") String title) {\n+ public Error(@JsonProperty(\"code\") Integer code,\n+ @JsonProperty(\"source\") Source source,\n+ @JsonProperty(\"title\") String title) {\nthis.code = code;\n+ this.source = source;\nthis.title = title;\n}\n+ public Error(int code, String title) {\n+ this(code, null, title);\n+ }\n+\npublic Integer getCode() {\nreturn code;\n}\n+ public Source getSource() {\n+ return source;\n+ }\n+\npublic String getTitle() {\nreturn title;\n}\n+\n+ public static class Source {\n+\n+ private final String pointer;\n+\n+ public Source(@JsonProperty(\"pointer\") String pointer) {\n+ this.pointer = pointer;\n+ }\n+\n+ public String getPointer() {\n+ return pointer;\n}\n}\n+ }\n+\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/InvalidRequestException.java",
"diff": "+package com.github.tomakehurst.wiremock.common;\n+\n+public class InvalidRequestException extends ClientError {\n+\n+ public InvalidRequestException(Errors errors) {\n+ super(errors);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\n+import com.github.tomakehurst.wiremock.common.Errors;\n+import com.github.tomakehurst.wiremock.common.InvalidRequestException;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\nimport com.github.tomakehurst.wiremock.core.Options;\n@@ -33,6 +35,10 @@ public class Recorder {\nreturn;\n}\n+ if (spec.getTargetBaseUrl() == null || spec.getTargetBaseUrl().isEmpty()) {\n+ throw new InvalidRequestException(Errors.validation(\"/targetBaseUrl\", \"targetBaseUrl is required\"));\n+ }\n+\nStubMapping proxyMapping = proxyAllTo(spec.getTargetBaseUrl()).build();\nadmin.addStubMapping(proxyMapping);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.InvalidRequestException;\nimport com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\nimport com.github.tomakehurst.wiremock.recording.NotRecordingException;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatus;\n@@ -213,17 +214,27 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\n}\n@Test(expected = NotRecordingException.class)\n- public void returnsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\n+ public void throwsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\nstopRecording();\n}\n@Test(expected = NotRecordingException.class)\n- public void returnsAnErrorIfAttemptingToStopViaInstanceRemoteDslWhenNotRecording() {\n+ public void throwsAnErrorIfAttemptingToStopViaInstanceRemoteDslWhenNotRecording() {\nadminClient.stopStubRecording();\n}\n@Test(expected = NotRecordingException.class)\n- public void returnsAnErrorIfAttemptingToStopViaDirectDslWhenNotRecording() {\n+ public void throwsAnErrorIfAttemptingToStopViaDirectDslWhenNotRecording() {\nproxyingService.stopRecording();\n}\n+\n+ @Test(expected = InvalidRequestException.class)\n+ public void throwsValidationErrorWhenAttemptingToStartRecordingViaStaticDslWithNoTargetUrl() {\n+ startRecording(recordSpec());\n+ }\n+\n+ @Test(expected = InvalidRequestException.class)\n+ public void throwsValidationErrorWhenAttemptingToStartRecordingViaDirectDslWithNoTargetUrl() {\n+ proxyingService.startRecording(recordSpec());\n+ }\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": "@@ -26,8 +26,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.client.WireMock.any;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\n-import static com.google.common.collect.Iterables.filter;\n-import static com.google.common.collect.Iterables.find;\nimport static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.*;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added basic validation of record spec on start recording (just checking existence of base URL) |
686,936 | 19.07.2017 09:56:20 | -3,600 | f7ce1ca4645e25ebfc3a041534848e548487d3b1 | Removed redundant equals and hashCode from Recorder.State | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -184,20 +184,5 @@ public class Recorder {\nreturn finishingServeEventId;\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- State state = (State) o;\n- return status == state.status &&\n- Objects.equals(proxyMapping, state.proxyMapping) &&\n- Objects.equals(startingServeEventId, state.startingServeEventId) &&\n- Objects.equals(finishingServeEventId, state.finishingServeEventId);\n- }\n-\n- @Override\n- public int hashCode() {\n- return Objects.hash(status, proxyMapping, startingServeEventId, finishingServeEventId);\n- }\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Removed redundant equals and hashCode from Recorder.State |
686,936 | 19.07.2017 12:14:07 | -3,600 | e9ab585f83cf467eca850eebd90d7b1a1970f2aa | Fixed - request body not send gzipped via the proxy when original request was gzipped | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/ProxyResponseRenderer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/ProxyResponseRenderer.java",
"diff": "@@ -20,6 +20,7 @@ import com.github.tomakehurst.wiremock.common.ProxySettings;\nimport com.google.common.collect.ImmutableList;\nimport org.apache.http.*;\nimport org.apache.http.client.HttpClient;\n+import org.apache.http.client.entity.GzipCompressingEntity;\nimport org.apache.http.client.methods.*;\nimport org.apache.http.entity.ContentType;\nimport org.apache.http.entity.InputStreamEntity;\n@@ -42,6 +43,7 @@ public class ProxyResponseRenderer implements ResponseRenderer {\nprivate static final int MINUTES = 1000 * 60;\nprivate static final String TRANSFER_ENCODING = \"transfer-encoding\";\n+ private static final String CONTENT_ENCODING = \"content-encoding\";\nprivate static final String CONTENT_LENGTH = \"content-length\";\nprivate static final String HOST_HEADER = \"host\";\n@@ -143,10 +145,25 @@ public class ProxyResponseRenderer implements ResponseRenderer {\nif (originalRequest.containsHeader(TRANSFER_ENCODING) &&\noriginalRequest.header(TRANSFER_ENCODING).firstValue().equals(\"chunked\")) {\n- return new InputStreamEntity(new ByteArrayInputStream(originalRequest.getBody()), -1, contentType);\n+ return applyGzipWrapperIfRequired(\n+ originalRequest,\n+ new InputStreamEntity(new ByteArrayInputStream(originalRequest.getBody()), -1, contentType)\n+ );\n}\n- return new ByteArrayEntity(originalRequest.getBody());\n+ return applyGzipWrapperIfRequired(\n+ originalRequest,\n+ new ByteArrayEntity(originalRequest.getBody())\n+ );\n+ }\n+\n+ private static HttpEntity applyGzipWrapperIfRequired(Request originalRequest, HttpEntity content) {\n+ if (originalRequest.containsHeader(CONTENT_ENCODING) &&\n+ originalRequest.header(CONTENT_ENCODING).firstValue().contains(\"gzip\")) {\n+ return new GzipCompressingEntity(content);\n+ }\n+\n+ return content;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ProxyAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ProxyAcceptanceTest.java",
"diff": "@@ -28,11 +28,15 @@ import com.github.tomakehurst.wiremock.testsupport.TestHttpHeader;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\nimport com.github.tomakehurst.wiremock.verification.LoggedRequest;\n+import com.google.common.net.HttpHeaders;\nimport com.sun.net.httpserver.HttpExchange;\nimport com.sun.net.httpserver.HttpHandler;\nimport com.sun.net.httpserver.HttpServer;\n+import org.apache.http.HttpEntity;\n+import org.apache.http.client.entity.GzipCompressingEntity;\nimport org.apache.http.entity.ByteArrayEntity;\n+import org.apache.http.entity.StringEntity;\nimport org.hamcrest.Matchers;\nimport org.junit.After;\nimport org.junit.Test;\n@@ -41,6 +45,8 @@ import 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;\nimport static com.google.common.collect.Iterables.getLast;\n+import static com.google.common.net.HttpHeaders.CONTENT_ENCODING;\n+import static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.hasItems;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertFalse;\n@@ -368,6 +374,21 @@ public class ProxyAcceptanceTest {\nassertThat(lastRequest.header(\"Accept\").values(), hasItems(\"accept1\", \"accept2\"));\n}\n+ @Test\n+ public void maintainsGZippedRequest() {\n+ initWithDefaultConfig();\n+\n+ targetServiceAdmin.register(post(\"/gzipped\").willReturn(aResponse().withStatus(201)));\n+ proxyingServiceAdmin.register(post(\"/gzipped\").willReturn(aResponse().proxiedFrom(targetServiceBaseUrl)));\n+\n+ HttpEntity gzippedBody = new GzipCompressingEntity(new StringEntity(\"gzipped body\", TEXT_PLAIN));\n+ testClient.post(\"/gzipped\", gzippedBody);\n+\n+ targetServiceAdmin.verifyThat(postRequestedFor(urlEqualTo(\"/gzipped\"))\n+ .withHeader(CONTENT_ENCODING, containing(\"gzip\"))\n+ .withRequestBody(equalTo(\"gzipped body\")));\n+ }\n+\nprivate void register200StubOnProxyAndTarget(String url) {\ntargetServiceAdmin.register(get(urlEqualTo(url)).willReturn(aResponse().withStatus(200)));\nproxyingServiceAdmin.register(get(urlEqualTo(url)).willReturn(aResponse().proxiedFrom(targetServiceBaseUrl)));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -8,6 +8,9 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatus;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.apache.http.HttpEntity;\n+import org.apache.http.client.entity.GzipCompressingEntity;\n+import org.apache.http.entity.StringEntity;\nimport org.hamcrest.Matchers;\nimport org.junit.After;\nimport org.junit.Test;\n@@ -18,6 +21,7 @@ import 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;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findMappingWithUrl;\n+import static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -213,6 +217,18 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(result.getStatus(), is(RecordingStatus.Recording));\n}\n+ @Test\n+ public void recordsIntoPlainTextWhenRequestIsGZipped() {\n+ proxyingService.startRecording(targetBaseUrl);\n+ targetService.stubFor(post(\"/gzipped\").willReturn(ok(\"Zippy\")));\n+\n+ HttpEntity compressedBody = new GzipCompressingEntity(new StringEntity(\"expected body\", TEXT_PLAIN));\n+ client.post(\"/gzipped\", compressedBody);\n+\n+ StubMapping mapping = proxyingService.stopRecording().getStubMappings().get(0);\n+ assertThat(mapping.getRequest().getBodyPatterns().get(0).getExpected(), is(\"expected body\"));\n+ }\n+\n@Test(expected = NotRecordingException.class)\npublic void throwsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\nstopRecording();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed #542 - request body not send gzipped via the proxy when original request was gzipped |
686,936 | 19.07.2017 15:38:33 | -3,600 | 9fa0cba0b9a135257c9f3a4e07e36aa7d4aee3f7 | Split out bump patch and minor version build tasks | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -387,34 +387,76 @@ task 'set-release-dir' << {\n}\n}\n-task 'bump-version' << {\n- def baseVersion = '2.6'\n+task 'bump-patch-version' << {\ndef filesWithVersion = [\n- 'build.gradle' : { \"version = '${baseVersion}.${it}\" },\n- 'docs-v2/_config.yml' : { \"wiremock_version: ${baseVersion}.${it}\" },\n- 'src/main/resources/raml/wiremock-admin-api.raml': { \"version: ${baseVersion}.${it}\" }\n+ 'build.gradle' : { \"version = '${it}\" },\n+ 'docs-v2/_config.yml' : { \"wiremock_version: ${it}\" },\n+ 'src/main/resources/raml/wiremock-admin-api.raml': { \"version: ${it}\" }\n]\n- def gradleBuildFile = new File('build.gradle')\n- int currentMinorVersion\n- gradleBuildFile.text.find ~/version = '${baseVersion}.([0-9]+)/, { match, minorVersion ->\n- currentMinorVersion = Integer.valueOf(minorVersion)\n- int nextMinorVersion = currentMinorVersion + 1\n+ def currentVersion = project.version\n+ def nextVersion = \"${majorVersion}.${minorVersion}.${patchVersion + 1}\"\nfilesWithVersion.each { fileName, lineWithVersionTemplates ->\ndef file = new File(fileName)\ndef lineWithVersionTemplateList = lineWithVersionTemplates instanceof List ?\nlineWithVersionTemplates :\n- [lineWithVersionTemplates];\n+ [lineWithVersionTemplates]\nlineWithVersionTemplateList.each { lineWithVersionTemplate ->\n- def oldLine = lineWithVersionTemplate.call(currentMinorVersion)\n- def newLine = lineWithVersionTemplate.call(nextMinorVersion)\n+ def oldLine = lineWithVersionTemplate.call(currentVersion)\n+ def newLine = lineWithVersionTemplate.call(nextVersion)\nprintln \"Replacing '${oldLine}' with '${newLine}' in ${fileName}\"\n- file.text = file.text.replace(oldLine, newLine);\n+ file.text = file.text.replace(oldLine, newLine)\n}\n}\n}\n+\n+task 'bump-minor-version' << {\n+ def filesWithVersion = [\n+ 'build.gradle' : { \"version = '${it}\" },\n+ 'docs-v2/_config.yml' : { \"wiremock_version: ${it}\" },\n+ 'src/main/resources/raml/wiremock-admin-api.raml': { \"version: ${it}\" }\n+ ]\n+\n+ def currentVersion = project.version\n+ def nextVersion = \"${majorVersion}.${minorVersion + 1}.0\"\n+\n+ filesWithVersion.each { fileName, lineWithVersionTemplates ->\n+ def file = new File(fileName)\n+ def lineWithVersionTemplateList = lineWithVersionTemplates instanceof List ?\n+ lineWithVersionTemplates :\n+ [lineWithVersionTemplates]\n+\n+ lineWithVersionTemplateList.each { lineWithVersionTemplate ->\n+ def oldLine = lineWithVersionTemplate.call(currentVersion)\n+ def newLine = lineWithVersionTemplate.call(nextVersion)\n+ println \"Replacing '${oldLine}' with '${newLine}' in ${fileName}\"\n+ file.text = file.text.replace(oldLine, newLine)\n+ }\n+ }\n+}\n+\n+int getMajorVersion() {\n+ Integer.valueOf(project.version.substring(0, project.version.indexOf('.')))\n+}\n+\n+int getMinorVersion() {\n+ Integer.valueOf(project.version.substring(project.version.indexOf('.') + 1, project.version.lastIndexOf('.')))\n+}\n+\n+int getPatchVersion() {\n+ Integer.valueOf(project.version.substring(project.version.lastIndexOf('.') + 1))\n+}\n+\n+String getBaseVersion() {\n+ project.version.substring(0, project.version.lastIndexOf('.'))\n+}\n+\n+task 'tmp' << {\n+ println majorVersion\n+ println minorVersion\n+ println patchVersion\n}\ntask wrapper(type: Wrapper) {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Split out bump patch and minor version build tasks |
686,936 | 19.07.2017 15:47:54 | -3,600 | 874c4edf8e12cbb2f0694d5fa432d1bc4f4046cf | Removed some redundant code from the build file | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -449,16 +449,6 @@ int getPatchVersion() {\nInteger.valueOf(project.version.substring(project.version.lastIndexOf('.') + 1))\n}\n-String getBaseVersion() {\n- project.version.substring(0, project.version.lastIndexOf('.'))\n-}\n-\n-task 'tmp' << {\n- println majorVersion\n- println minorVersion\n- println patchVersion\n-}\n-\ntask wrapper(type: Wrapper) {\ngradleVersion = '3.1'\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Removed some redundant code from the build file |
686,936 | 19.07.2017 17:18:05 | -3,600 | 16081001faa336365200ee335b7055013e6fc95c | Recorder now sets the stub name to one made safe from the URL path | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/SafeNames.java",
"diff": "+package com.github.tomakehurst.wiremock.common;\n+\n+import org.apache.commons.lang3.StringUtils;\n+\n+import java.text.Normalizer;\n+import java.util.Locale;\n+import java.util.regex.Pattern;\n+\n+public class SafeNames {\n+\n+ private static final Pattern NONLATIN = Pattern.compile(\"[^\\\\w-]\");\n+ private static final Pattern WHITESPACE = Pattern.compile(\"[\\\\s]\");\n+\n+ public static String makeSafeNameFromUrl(String urlPath) {\n+ String startingPath = urlPath.replace(\"/\", \"_\");\n+ return makeSafeName(startingPath);\n+ }\n+\n+ public static String makeSafeName(String name) {\n+ String nowhitespace = WHITESPACE.matcher(name).replaceAll(\"-\");\n+ String normalized = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD);\n+ String slug = NONLATIN.matcher(normalized).replaceAll(\"\");\n+\n+ slug = slug.replaceAll(\"^[_]*\", \"\");\n+ slug = slug.replaceAll(\"[_]*$\", \"\");\n+\n+ slug = StringUtils.truncate(slug, 200);\n+\n+ return slug.toLowerCase(Locale.ENGLISH);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.recording;\n+import com.github.tomakehurst.wiremock.common.SafeNames;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.google.common.base.Function;\n+import java.net.URI;\nimport java.util.Map;\n/**\n@@ -49,7 +51,11 @@ public class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMa\npublic StubMapping apply(ServeEvent event) {\nfinal RequestPattern requestPattern = requestTransformer.apply(event.getRequest()).build();\nfinal ResponseDefinition responseDefinition = responseTransformer.apply(event.getResponse());\n+ StubMapping stubMapping = new StubMapping(requestPattern, responseDefinition);\n- return new StubMapping(requestPattern, responseDefinition);\n+ URI uri = URI.create(event.getRequest().getUrl());\n+ stubMapping.setName(SafeNames.makeSafeNameFromUrl(uri.getPath()));\n+\n+ return stubMapping;\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Recorder now sets the stub name to one made safe from the URL path |
686,936 | 19.07.2017 17:46:15 | -3,600 | cb5fd165e6d5b188614e0955839a8276e83f8074 | Mappings source now generates filenames based on stub name and ID, or URL and ID if no name present | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/SafeNames.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/SafeNames.java",
"diff": "package com.github.tomakehurst.wiremock.common;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport org.apache.commons.lang3.StringUtils;\n+import java.net.URI;\nimport java.text.Normalizer;\nimport java.util.Locale;\nimport java.util.regex.Pattern;\n+import static org.apache.commons.lang3.StringUtils.isNotEmpty;\n+\npublic class SafeNames {\n- private static final Pattern NONLATIN = Pattern.compile(\"[^\\\\w-]\");\n+ private static final Pattern NON_ALPHANUMERIC = Pattern.compile(\"[^\\\\w-]\");\nprivate static final Pattern WHITESPACE = Pattern.compile(\"[\\\\s]\");\n+ public static String makeSafeFileName(StubMapping mapping) {\n+ return makeSafeFileName(mapping, \"json\");\n+ }\n+\n+ public static String makeSafeFileName(StubMapping mapping, String extension) {\n+ String suffix = \"-\" + mapping.getId() + \".\" + extension;\n+ if (isNotEmpty(mapping.getName())) {\n+ return makeSafeName(mapping.getName()) + suffix;\n+ }\n+\n+ String expectedUrl = mapping.getRequest().getUrlMatcher().getExpected();\n+ URI uri = URI.create(sanitise(expectedUrl));\n+ return makeSafeNameFromUrl(uri.getPath()) + suffix;\n+ }\n+\npublic static String makeSafeNameFromUrl(String urlPath) {\nString startingPath = urlPath.replace(\"/\", \"_\");\nreturn makeSafeName(startingPath);\n@@ -19,7 +38,7 @@ public class SafeNames {\npublic static String makeSafeName(String name) {\nString nowhitespace = WHITESPACE.matcher(name).replaceAll(\"-\");\nString normalized = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD);\n- String slug = NONLATIN.matcher(normalized).replaceAll(\"\");\n+ String slug = sanitise(normalized);\nslug = slug.replaceAll(\"^[_]*\", \"\");\nslug = slug.replaceAll(\"[_]*$\", \"\");\n@@ -28,4 +47,8 @@ public class SafeNames {\nreturn slug.toLowerCase(Locale.ENGLISH);\n}\n+\n+ private static String sanitise(String s) {\n+ return NON_ALPHANUMERIC.matcher(s).replaceAll(\"\");\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java",
"diff": "@@ -52,7 +52,7 @@ public class JsonFileMappingsSource implements MappingsSource {\npublic void save(StubMapping stubMapping) {\nString mappingFileName = fileNameMap.get(stubMapping.getId());\nif (mappingFileName == null) {\n- mappingFileName = \"saved-mapping-\" + idGenerator.generate() + \".json\";\n+ mappingFileName = SafeNames.makeSafeFileName(stubMapping);\n}\nmappingsFileSource.writeTextFile(mappingFileName, write(stubMapping));\nfileNameMap.put(stubMapping.getId(), mappingFileName);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Mappings source now generates filenames based on stub name and ID, or URL and ID if no name present |
686,936 | 19.07.2017 17:51:05 | -3,600 | 3598c1cb65b796014bd2c735bcf6fcf7d562b5a5 | Added safe filename generation for the case where a stub mapping matches any URL | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/SafeNames.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/SafeNames.java",
"diff": "package com.github.tomakehurst.wiremock.common;\n+import com.github.tomakehurst.wiremock.matching.AnythingPattern;\n+import com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport org.apache.commons.lang3.StringUtils;\n@@ -25,7 +27,13 @@ public class SafeNames {\nreturn makeSafeName(mapping.getName()) + suffix;\n}\n- String expectedUrl = mapping.getRequest().getUrlMatcher().getExpected();\n+ UrlPattern urlMatcher = mapping.getRequest().getUrlMatcher();\n+\n+ if (urlMatcher.getPattern() instanceof AnythingPattern) {\n+ return suffix.substring(1);\n+ }\n+\n+ String expectedUrl = urlMatcher.getExpected();\nURI uri = URI.create(sanitise(expectedUrl));\nreturn makeSafeNameFromUrl(uri.getPath()) + suffix;\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added safe filename generation for the case where a stub mapping matches any URL |
686,936 | 19.07.2017 19:43:22 | -3,600 | 0f0a59f9bfbefc9312789b315ca06d9138972ae3 | Recorded body files are now given the same name as the stub mapping (with the appropriate extension) | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.common.Errors;\n+import com.github.tomakehurst.wiremock.common.FileSource;\nimport com.github.tomakehurst.wiremock.common.InvalidRequestException;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.Admin;\n@@ -32,6 +33,7 @@ import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n+import static com.github.tomakehurst.wiremock.core.WireMockApp.FILES_ROOT;\nimport static com.google.common.collect.FluentIterable.from;\nimport static com.google.common.collect.Iterables.indexOf;\n@@ -132,18 +134,19 @@ public class Recorder {\n}\npublic SnapshotStubMappingPostProcessor getStubMappingPostProcessor(Options options, RecordSpec recordSpec) {\n+ FileSource filesRoot = options.filesRoot().child(FILES_ROOT);\nfinal SnapshotStubMappingTransformerRunner transformerRunner = new SnapshotStubMappingTransformerRunner(\noptions.extensionsOfType(StubMappingTransformer.class).values(),\nrecordSpec.getTransformers(),\nrecordSpec.getTransformerParameters(),\n- options.filesRoot()\n+ filesRoot\n);\nreturn new SnapshotStubMappingPostProcessor(\nrecordSpec.shouldRecordRepeatsAsScenarios(),\ntransformerRunner,\nrecordSpec.getExtractBodyCriteria(),\n- new SnapshotStubMappingBodyExtractor(options.filesRoot())\n+ new SnapshotStubMappingBodyExtractor(filesRoot)\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"diff": "@@ -22,15 +22,9 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\npublic class SnapshotStubMappingBodyExtractor {\nprivate final FileSource fileSource;\n- private final IdGenerator idGenerator;\npublic SnapshotStubMappingBodyExtractor(FileSource fileSource) {\n- this(fileSource, new VeryShortIdGenerator());\n- }\n-\n- public SnapshotStubMappingBodyExtractor(FileSource fileSource, IdGenerator idGenerator) {\nthis.fileSource = fileSource;\n- this.idGenerator = idGenerator;\n}\n/**\n@@ -41,18 +35,13 @@ public class SnapshotStubMappingBodyExtractor {\n* @param stubMapping Stub mapping to extract\n*/\npublic void extractInPlace(StubMapping stubMapping) {\n- String fileId = idGenerator.generate();\nbyte[] body = stubMapping.getResponse().getByteBody();\nString extension = ContentTypes.determineFileExtension(\nstubMapping.getRequest().getUrl(),\nstubMapping.getResponse().getHeaders().getContentTypeHeader(),\nbody);\n- String bodyFileName = UniqueFilenameGenerator.generate(\n- stubMapping.getRequest().getUrl(),\n- WireMockApp.FILES_ROOT + \"/body\",\n- fileId,\n- extension\n- );\n+\n+ String bodyFileName = SafeNames.makeSafeFileName(stubMapping, extension);\n// used to prevent ambiguous method call error for withBody()\nString noStringBody = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingTransformerRunner.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingTransformerRunner.java",
"diff": "@@ -28,7 +28,7 @@ import java.util.List;\n* passing them any supplied Parameters.\n*/\npublic class SnapshotStubMappingTransformerRunner implements Function<StubMapping, StubMapping> {\n- private final FileSource fileSource;\n+ private final FileSource filesRoot;\nprivate final Parameters parameters;\nprivate final Iterable<StubMappingTransformer> registeredTransformers;\nprivate final List<String> requestedTransformers;\n@@ -41,12 +41,12 @@ public class SnapshotStubMappingTransformerRunner implements Function<StubMappin\nIterable<StubMappingTransformer> registeredTransformers,\nList<String> requestedTransformers,\nParameters parameters,\n- FileSource fileSource\n+ FileSource filesRoot\n) {\nthis.requestedTransformers = requestedTransformers;\nthis.registeredTransformers = registeredTransformers;\nthis.parameters = parameters;\n- this.fileSource = fileSource;\n+ this.filesRoot = filesRoot;\n}\n@Override\n@@ -56,7 +56,7 @@ public class SnapshotStubMappingTransformerRunner implements Function<StubMappin\ntransformer.applyGlobally()\n|| (requestedTransformers != null && requestedTransformers.contains(transformer.getName()))\n) {\n- stubMapping = transformer.transform(stubMapping, fileSource, parameters);\n+ stubMapping = transformer.transform(stubMapping, filesRoot, parameters);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -30,6 +30,7 @@ import org.hamcrest.Matchers;\nimport org.junit.After;\nimport org.junit.Test;\n+import java.io.File;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n@@ -47,11 +48,13 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nprivate WireMockTestClient client;\nprivate WireMock adminClient;\nprivate String targetBaseUrl;\n+ private File fileRoot;\npublic void init() {\n+ fileRoot = setupTempFileRoot();\nproxyingService = new WireMockServer(wireMockConfig()\n.dynamicPort()\n- .withRootDirectory(setupTempFileRoot().getAbsolutePath()));\n+ .withRootDirectory(fileRoot.getAbsolutePath()));\nproxyingService.start();\ntargetService = wireMockServer;\n@@ -260,6 +263,31 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mapping.getRequest().getBodyPatterns().get(0).getExpected(), is(\"expected body\"));\n}\n+ static final String IMAGE_CONTENT_BASE64 = \"iVBORw0KGgoAAAANSUhEUgAAACAAAAAPCAYAAACFgM0XAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH4AYeEQ8RFdqRVAAAA/VJREFUOMvFk9+LVHUYxj/v9/yYmbVVN1NKDVvDH6yBiuiWrG6LelG33lQQ1EVIUNA/YBARRNHVFgRWF93URV4VJGQm/l5KFNfaQNnN1a3NH+vOzM6cOed8v9+3i5mdGcLb6IUDhwfe532+D88D//PIpi8n3pIwDFAENPNp42huzMy0tdHauPBCjPYDihgkin/wNr8wdfxrYfvIcy6It7zoT8moOxLHWBfi0AVz+ePDh75/86NPwWgf8BLQiyBY+cPPmm8w5A99MAVAKGH4ikSFrQCoqnhfy4Pwc5fMrUniwjs9xSX9SFvv+sFt/WOTMzuXShQfliB6esD9Sa8keAx48HU5+/prn51DKUvIIPAhUALwVZnSRC4QMLXIaNTZb0G1yS8iQbD31t4nEZFttTxd61BAWh87r0zMPkJc2qAm2NTHAsP+alufWgHLFrPcD2hFAPYtHkdBG/K4FHVQIqUjIEuP4f29DhLs3Pjd2KMiMpQ5F6XWdgyAfuvsFoJwl5egb0Bvsllv4pGmvgwIWC5FHTar3TJguL1pASWUkh4INzhTe/eJ5jlXnRtX78bbJhuzLotLe4BBr0rd5nT00uOc3U8QDAPs9eMso9aKD2guSKxIUYfJZDewaXFRc0EChRK7fVUek0KT1fQOjlTU2p+6ctljlVdFdbMCSZ7htSMhz/ODxoRDS0kY1vGOO761XVAosR3hELC0veiAAkhR+yXWHVJQ5kfXYJJrE2iensT7KqqQ5eRODyCyQoDUWTJnmwqsJUuzzc6EqzfoDE/5G037AXV4CRSKIKGuAp6nW5w0xUmkBQz7I2OICTCuMoevV66qsxPkFl9PaDgXait1XrVsbX4e69B6gyTLUGDI/8oKKk37QRHOUaAqkYIgQNRV92lC7km8yMqeHL9SAJP9NUXfrqH7Wq+f1FqdvJaQtt8FCr8Fzo9qPam5WkKijh5SRvQKwaLvUJeAIxLrZHdiO8HmqMQ6hmkjG4GtAGb6vZeZPzuGmy+f8OWFJM0yrHRYBM6UGva4VmrXs6RBQwz9Oss2nWx2f/GFwo8IFx9wvgEcw3CqC+sBRgSaDHb2Fu7u7Ut+vnwtwaOd+wlw4lpl7q6Wq6cbLscZwzP6O6v0fpdP/CLCDHCmE8f23ACuAOeBhS78WYWHDYC7M8vk+wdv59WF043I0GXjdeDSykqKrSwcr4cmLZCxz18mwrUbBpxqFeVn4M6/BFxUuA1MAJNd+ACwIwSY/uIN+t4+Rlgpf2VFi2S5iGLUmPPau+ROKkpeii404uCTFfl83zr/t9aJfSwub1l8okU6CYwC6zvZ56iAV7gn8DGwo1VKAHlQZP7zSUbXtf//AaFX9LL7Nh3cAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA2LTMwVDE3OjE1OjE3KzAxOjAwsKT/BwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNi0zMFQxNzoxNToxNyswMTowMMH5R7sAAAAASUVORK5CYII=\";\n+\n+ @Test\n+ public void writesBodyFileToTheAppropriatePlaceWhenResponseIsOverTheSpecifiedSize() {\n+ targetService.stubFor(get(\"/myimage.png\").willReturn(\n+ aResponse()\n+ .withBase64Body(IMAGE_CONTENT_BASE64))\n+ );\n+\n+ proxyingService.startRecording(recordSpec()\n+ .forTarget(targetBaseUrl)\n+ .extractBinaryBodiesOver(100)\n+ );\n+\n+ client.get(\"/myimage.png\");\n+\n+ List<StubMapping> mappings = proxyingService.stopRecording().getStubMappings();\n+ StubMapping mapping = mappings.get(0);\n+ String bodyFileName = mapping.getResponse().getBodyFileName();\n+\n+ assertThat(bodyFileName, is(\"myimagepng-\" + mapping.getId() + \".png\"));\n+ File bodyFile = new File(fileRoot, \"__files/\" + bodyFileName);\n+ assertThat(bodyFile.exists(), is(true));\n+ }\n+\n@Test(expected = NotRecordingException.class)\npublic void throwsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\nstopRecording();\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": "@@ -194,9 +194,9 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mappings.size(), is(4));\nassertThat(WireMatchers.findMappingWithUrl(mappings, \"/small/text\").getResponse().getBodyFileName(), nullValue());\n- assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/text\").getResponse().getBodyFileName(), containsString(\"large-text\"));\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/text\").getResponse().getBodyFileName(), containsString(\"large_text\"));\nassertThat(WireMatchers.findMappingWithUrl(mappings, \"/small/binary\").getResponse().getBodyFileName(), nullValue());\n- assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large-binary\"));\n+ assertThat(WireMatchers.findMappingWithUrl(mappings, \"/large/binary\").getResponse().getBodyFileName(), containsString(\"large_binary\"));\n}\n@Test\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Recorded body files are now given the same name as the stub mapping (with the appropriate extension) |
686,936 | 20.07.2017 16:56:02 | -3,600 | d373555a471c148c611ceab97191a656242c7790 | Added documentation for the new recorder | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs-v2/_docs/record-playback-legacy.md",
"diff": "+---\n+layout: docs\n+title: Record and Playback (Legacy)\n+toc_rank: 71\n+description: Recording HTTP exchanges with other APIs and playing them back as stubs - the old way.\n+---\n+\n+**WireMock has the ability to create stub mappings by recording them\n+while you send requests. This can be used to quickly capture a\n+collection of responses from a real service then use them offline in\n+your tests.**\n+\n+## Recording\n+\n+Recording is done by starting the standalone runner like this:\n+\n+```bash\n+$ java -jar wiremock-standalone-{{ site.wiremock_version }}.jar --proxy-all=\"http://search.twitter.com\" --record-mappings --verbose\n+```\n+\n+Once it's started you send requests to it as if it was the remote\n+service:\n+\n+```bash\n+$ curl \"http://localhost:8080/search.json?q=from:sirbonar&result_type=recent&rpp=1\"\n+```\n+\n+Now if you look under `mappings` and `__files` (under the current\n+directory you're running WireMock in) you'll see that a new file has\n+been one created under each, the former for the stub mapping and the\n+latter for the body content.\n+\n+### Capturing request headers\n+\n+\n+Optionally, you can record request headers so that your stub mappings\n+will match on those in addition to URL, method and body (if a POST or\n+PUT). This is done by adding an extra parameter to the command line e.g.\n+`--match-headers=\"Accept,Content-Type\"`\n+\n+> **note**\n+>\n+> The recorder will ignore any request matching one it has already\n+> captured.\n+\n+## Playback\n+\n+\n+If you start the standalone runner again without the extra commandline\n+options it will automatically load the newly created stub mappings and\n+start serving them.\n+\n+Alternatively you can copy the files created under\n+`src/test/resources/mappings` and `src/test/resources/__files` in your\n+Java project, or the equivalents under `WEB-INF/wiremock` in your WAR\n+project.\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/record-playback.md",
"new_path": "docs-v2/_docs/record-playback.md",
"diff": "---\nlayout: docs\n-title: Record and Playback\n+title: Record and Playback (New)\ntoc_rank: 70\nredirect_from: \"/record-playback.html\"\n-description: Recording HTTP exchanges with other APIs and playing them back as stubs.\n+description: Recording HTTP exchanges with other APIs and playing them back as stubs - the new way.\n---\n-**WireMock has the ability to create stub mappings by recording them\n-while you send requests. This can be used to quickly capture a\n-collection of responses from a real service then use them offline in\n-your tests.**\n+WireMock can create stub mappings from requests it has received. Combined with its proxying feature this allows you to \"record\"\n+stub mappings from interaction with existing APIs.\n-## Recording\n+Two approaches are available: Recording or snapshotting. The same results can be achieved with either, so which you choose should depend on whatever\n+fits best with your workflow. If you're new to WireMock, recording is probably the simplest option for getting started.\n+\n+Both approaches are described in more detail below.\n+\n+## Quick start\n+\n+The fastest way to get started with WireMock's recorder is to use the simple web UI provided.\n-Recording is done by starting the standalone runner like this:\n+First, start an instance of [WireMock running standalone](/docs/running-standalone).\n+Once that's running visit the recorder UI page at [http://localhost:8080/__admin/recorder](http://localhost:8080/__admin/recorder)\n+(assuming you started WireMock on the default port of 8080).\n+\n+\n+\n+Enter the URL you wish to record from in the target URL field and click the Record button. You can use `http://example.mocklab.io` to try it out.\n+\n+Now you need to make a request through WireMock to the target API so that it can be recorded. If you're using the example URL, you can generate a request using curl:\n```bash\n-$ java -jar wiremock-standalone-{{ site.wiremock_version }}.jar --proxy-all=\"http://search.twitter.com\" --record-mappings --verbose\n+$ curl http://localhost:8080/recordables/123\n```\n-Once it's started you send requests to it as if it was the remote\n-service:\n+Now click stop. You should see a message indicating that one stub was captured.\n+\n+You should also see that a file has been created called something like `recordables_123-40a93c4a-d378-4e07-8321-6158d5dbcb29.json`\n+under the `mappings` directory created when WireMock started up, and that a new mapping has appeared at [http://localhost:8080/__admin/mappings](http://localhost:8080/__admin/mappings).\n+\n+Requesting the same URL again (possibly disabling your wifi first if you want firm proof) will now serve the recorded result:\n-```bash\n-$ curl \"http://localhost:8080/search.json?q=from:sirbonar&result_type=recent&rpp=1\"\n```\n+$ curl http://localhost:8080/recordables/123\n-Now if you look under `mappings` and `__files` (under the current\n-directory you're running WireMock in) you'll see that a new file has\n-been one created under each, the former for the stub mapping and the\n-latter for the body content.\n+{\n+ \"message\": \"Congratulations on your first recording!\"\n+}\n+```\n-### Capturing request headers\n+> **note**\n+>\n+> Stub mappings will only be created at the point that the recording is stopped.\n+> **note**\n+>\n+> \"Playback\" doesn't require any explicit action. Recorded stubs will start being served immediately after recording is stopped.\n+\n+\n+## Recording\n+\n+Recording can also be started and stopped via WireMock's JSON API and Java DSL.\n+\n+Java:\n+\n+```java\n+// Static DSL\n+WireMock.startRecording(\"http://example.mocklab.io\");\n+List<StubMapping> recordedMappings = WireMock.stopRecording();\n-Optionally, you can record request headers so that your stub mappings\n-will match on those in addition to URL, method and body (if a POST or\n-PUT). This is done by adding an extra parameter to the command line e.g.\n-`--match-headers=\"Accept,Content-Type\"`\n+// Client instance\n+WireMock wireMockClient = new WireMock(8080);\n+wireMockClient.startStubRecording(\"http://example.mocklab.io\");\n+List<StubMapping> recordedMappings = wireMockClient.stopStubRecording();\n+\n+// Directly\n+WireMockServer wireMockServer = new WireMockServer();\n+wireMockServer.start();\n+wireMockServer.startRecording(\"http://example.mocklab.io\");\n+List<StubMapping> recordedMappings = wireMockServer.stopRecording();\n+```\n+\n+API:\n+\n+```json\n+POST /__admin/recordings/start\n+{\n+ \"targetBaseUrl\": \"http://example.mocklab.io\"\n+}\n+```\n+\n+```\n+POST /__admin/recordings/stop\n+```\n+\n+\n+## Snapshotting\n+\n+Snapshotting is effectively \"recording after the fact\". Rather than starting recording at a specific point, snapshotting allows you to convert requests already received by WireMock\n+into stub mappings.\n+\n+An implication of this order of events is that if you want to record an external API, you'll need to have configured proxying before you start generating traffic.\n+See [Proxying](/docs/proxying) for details on proxy configuration, but in summary this can be achieved by creating a proxy mapping via the API or Java DSL:\n+\n+Java:\n+\n+```java\n+stubFor(proxyAllTo(\"http://example.mocklab.io\").atPriority(1));\n+```\n+\n+API:\n+\n+```json\n+POST /__admin/mappings\n+{\n+ \"priority\": 1,\n+ \"request\": {\n+ \"method\": \"ANY\"\n+ },\n+ \"response\": {\n+ \"proxyBaseUrl\" : \"http://example.mocklab.io\"\n+ }\n+}\n+```\n> **note**\n>\n-> The recorder will ignore any request matching one it has already\n-> captured.\n+> You can still take snapshots without a proxy stub configured.\n+> You might want to do this e.g. if you want to capture requests made by your application under test that you can then modify by hand to provide the appropriate responses.\n+\n+Once you have made some requests through WireMock (which you can view under http://localhost:8080/__admin/requests) you can trigger a snapshot to generate stub mappings:\n+\n+Java:\n+\n+```java\n+// Static DSL\n+List<StubMapping> recordedMappings = WireMock.snapshotRecord();\n+\n+// Client instance\n+WireMock wireMockClient = new WireMock(8080);\n+List<StubMapping> recordedMappings = wireMockClient.takeSnapshotRecording();\n+\n+// Directly\n+WireMockServer wireMockServer = new WireMockServer();\n+wireMockServer.start();\n+List<StubMapping> recordedMappings = wireMockServer.snapshotRecord();\n+```\n+\n+API:\n+\n+```\n+POST /__admin/recordings/snapshot\n+{}\n+```\n+\n+## Customising your recordings\n+\n+The default recording behaviour can be tweaked in a number of ways by passing a \"record spec\" to the record or snapshot actions.\n+\n+In Java this achieved using the DSL:\n+\n+```java\n+startRecording(\n+ recordSpec()\n+ .forTarget(\"http://example.mocklab.io\")\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ );\n+```\n+\n+And via the API:\n+\n+```json\n+POST /__admin/recordings/start\n+{\n+ \"targetBaseUrl\" : \"http://example.mocklab.io\",\n+ \"filters\" : {\n+ \"urlPathPattern\" : \"/api/.*\",\n+ \"method\" : \"GET\"\n+ },\n+ \"captureHeaders\" : {\n+ \"Accept\" : { },\n+ \"Content-Type\" : {\n+ \"caseInsensitive\" : true\n+ }\n+ },\n+ \"extractBodyCriteria\" : {\n+ \"textSizeThreshold\" : \"2048\",\n+ \"binarySizeThreshold\" : \"10240\"\n+ },\n+ \"persist\" : false,\n+ \"repeatsAsScenarios\" : false,\n+ \"transformers\" : [ \"modify-response-header\" ],\n+ \"transformerParameters\" : {\n+ \"headerValue\" : \"123\"\n+ },\n+ \"jsonMatchingFlags\" : {\n+ \"ignoreArrayOrder\" : false,\n+ \"ignoreExtraElements\" : true\n+ }\n+}\n+```\n+\n+The same specification can also be passed when snapshotting:\n+\n+Java:\n+\n+```java\n+snapshotRecord(\n+ recordSpec()\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .onlyRequestIds(singletonList(UUID.fromString(\"40a93c4a-d378-4e07-8321-6158d5dbcb29\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ );\n+```\n+\n+API:\n+\n+```json\n+POST /__admin/recordings/snapshot\n+{\n+ \"filters\" : {\n+ \"urlPathPattern\" : \"/api/.*\",\n+ \"method\" : \"GET\",\n+ \"ids\" : [ \"40a93c4a-d378-4e07-8321-6158d5dbcb29\" ]\n+ },\n+ \"captureHeaders\" : {\n+ \"Accept\" : { },\n+ \"Content-Type\" : {\n+ \"caseInsensitive\" : true\n+ }\n+ },\n+ \"extractBodyCriteria\" : {\n+ \"textSizeThreshold\" : \"2 kb\",\n+ \"binarySizeThreshold\" : \"1 Mb\"\n+ },\n+ \"outputFormat\" : \"FULL\",\n+ \"persist\" : false,\n+ \"repeatsAsScenarios\" : false,\n+ \"transformers\" : [ \"modify-response-header\" ],\n+ \"transformerParameters\" : {\n+ \"headerValue\" : \"123\"\n+ },\n+ \"jsonMatchingFlags\" : {\n+ \"ignoreArrayOrder\" : false,\n+ \"ignoreExtraElements\" : true\n+ }\n+}\n+```\n+\n+The following sections will detail each parameter in turn:\n+\n+### Filtering\n+\n+`filters` supports selection of requests to be recorded according to the same [request matcher](/docs/request-matching) format used elsewhere in WireMock.\n+\n+Additionally, when snapshotting the `ids` parameter allows specific serve events to be selected by ID.\n+\n+\n+### Capturing request headers\n-## Playback\n+You may want your recorded stub mappings to match on one or more specific request headers.\n+For instance if you're intending to record from an API that supports both XML and JSON responses via content negotiation,\n+then you will need to capture the value of the `Accept` header sent in each request.\n+The `captureHeaders` attribute allows you to specify a map of header names to match parameter objects. Currently the only parameter\n+available is `caseInsensitive`, which defaults to false if absent.\n+\n+\n+### Body files extraction size criteria\n+\n+By default, recorded response bodies will be included directly in the stub mapping response part, via the `body` attribute for text or `base64Body` for binary content.\n+\n+However, this can be overridden by setting the `textSizeThreshold` and `binarySizeThreshold` values under `extractBodyCriteria`.\n+The size values are of type string, and support friendly syntax for specifying the order of magnitude e.g.\n+\n+```\n+\"56 kb\"\n+\"10 Mb\"\n+\"18.2 GB\"\n+\"255\" // bytes when no magnitude specified\n+```\n+\n+In the Java DSL these values are specified as a `long` number of bytes:\n+\n+```java\n+recordSpec().extractBinaryBodiesOver(204800)\n+```\n+\n+### Output format\n+\n+By default the stop recording and snapshot API calls will return the full JSON of all mappings captured.\n+If you only require the IDs of captured stubs you can specify:\n+\n+```json\n+{\n+ \"outputFormat\": \"IDS\"\n+}\n+```\n+\n+### Persist stubs\n+\n+By default generated stubs will be set to persistent, meaning that they will be saved to the file system\n+(or other back-end if you've implemented your own `MappingsSource`) and will survive calls to reset mappings to default.\n+\n+Setting `persistent` to `false` means that stubs will not be saved and will be deleted on the next reset.\n+\n+\n+### Repeats as scenarios\n+\n+What happens when the recorder sees two identical requests that produce different results?\n+\n+There are two ways to handle this. Setting `repeatsAsScenarios` to `false` means that after the first request, subsequent identical ones will be ignored.\n+\n+However, when set to `true` (which is the default if omitted), multiple identical requests will be added to a [Scenario](/docs/stateful-behaviour), meaning that when\n+playing back, a series of requests matching this stub will yield the same series of responses captured during recording. If more requests are made after the end of the series\n+is reached, the last response will continue to be returned.\n+\n+\n+### Transforming generated stubs\n+\n+If need even more control over how your recorded stubs are generated, you can write one or more custom transformers that will be applied to stubs as they are captured.\n+\n+A transformer is an implementations of `StubMappingTransformer` and needs to be registered when starting WireMock as described in [Extending WireMock](/docs/extending-wiremock).\n+\n+Transformer implementations supply a name, and this is used to identify them in the `transformers` parameter e.g.\n+\n+```json\n+\"transformers\": [\"transformer-one\", \"transformer-two\"]\n+```\n+\n+As with other types of WireMock extension, parameters can be supplied. The exact parameters required depend on the specifics of the transformer (or it may not require any).\n+\n+```json\n+\"transformerParameters\": {\n+ \"simpleParam1\": \"One\",\n+ \"arrayParam2\": [1, 2, 3],\n+ ...\n+}\n+```\n+\n+\n+### JSON matching flags\n+\n+When a stub is recorded from a request with a JSON body, its body match operator will be set to `equalToJson` (rather than `equalTo`, the default).\n+This operator has two optional parameters, indicating whether array order should be ignored, and whether extra elements should be ignored.\n+\n+```json\n+\"jsonMatchingFlags\" : {\n+ \"ignoreArrayOrder\" : false,\n+ \"ignoreExtraElements\" : true\n+ }\n+```\n+\n+If not specified, both of these will default to `false`.\n+\n+\n+> **note**\n+>\n+> The `targetBaseUrl` parameter will be ignored when snapshotting and the `filters/ids` parameter will be ignored when recording.\n-If you start the standalone runner again without the extra commandline\n-options it will automatically load the newly created stub mappings and\n-start serving them.\n-Alternatively you can copy the files created under\n-`src/test/resources/mappings` and `src/test/resources/__files` in your\n-Java project, or the equivalents under `WEB-INF/wiremock` in your WAR\n-project.\n"
},
{
"change_type": "ADD",
"old_path": "docs-v2/images/recorder-screenshot.png",
"new_path": "docs-v2/images/recorder-screenshot.png",
"diff": "Binary files /dev/null and b/docs-v2/images/recorder-screenshot.png differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs-v2/serve.sh",
"diff": "+#!/usr/bin/env bash\n+\n+set -euo pipefail\n+\n+npm run watch:all &\n+bundle exec jekyll serve\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": "@@ -33,10 +33,13 @@ import com.google.common.base.Optional;\nimport com.google.common.collect.ImmutableMap;\nimport org.junit.Test;\n+import java.util.Collections;\nimport java.util.List;\n+import java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;\n+import static java.util.Collections.singletonList;\nimport static org.hamcrest.Matchers.containsString;\nimport static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.not;\n@@ -399,4 +402,68 @@ public class Examples extends AcceptanceTestBase {\nstubFor(proxyAllTo(\"http://my.example.com\"));\n}\n+\n+ @Test\n+ public void recordingDsl() {\n+ startRecording(\n+ recordSpec()\n+ .forTarget(\"http://example.mocklab.io\")\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ );\n+\n+ System.out.println(Json.write(recordSpec()\n+ .forTarget(\"http://example.mocklab.io\")\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ .build()));\n+ }\n+\n+ @Test\n+ public void snapshotDsl() {\n+ snapshotRecord(\n+ recordSpec()\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .onlyRequestIds(singletonList(UUID.fromString(\"40a93c4a-d378-4e07-8321-6158d5dbcb29\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ );\n+\n+ System.out.println(Json.write(recordSpec()\n+ .onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/api/.*\")))\n+ .onlyRequestIds(singletonList(UUID.fromString(\"40a93c4a-d378-4e07-8321-6158d5dbcb29\")))\n+ .captureHeader(\"Accept\")\n+ .captureHeader(\"Content-Type\", true)\n+ .extractBinaryBodiesOver(10240)\n+ .extractTextBodiesOver(2048)\n+ .makeStubsPersistent(false)\n+ .ignoreRepeatRequests()\n+ .transformers(\"modify-response-header\")\n+ .transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n+ .jsonBodyMatchFlags(false, true)\n+ .build()));\n+ }\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added documentation for the new recorder |
686,936 | 20.07.2017 17:15:40 | -3,600 | 4dc9c8ff62233e601d8a29ccca716f5bed41418b | Excluded transfer-encoding response header during recording (as this is calculated) | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"diff": "@@ -18,15 +18,30 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\nimport com.github.tomakehurst.wiremock.common.ContentTypes;\nimport com.github.tomakehurst.wiremock.http.*;\n+import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\n+import com.google.common.collect.ImmutableList;\n+import com.google.common.net.*;\n+\n+import java.util.List;\nimport static com.google.common.collect.Iterables.filter;\n+import static com.google.common.net.HttpHeaders.CONTENT_ENCODING;\n+import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;\n+import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING;\n/**\n* Transforms a LoggedResponse into a ResponseDefinition, which will be used to construct a StubMapping\n*/\npublic class LoggedResponseDefinitionTransformer implements Function<LoggedResponse, ResponseDefinition> {\n+\n+ private static final List<CaseInsensitiveKey> EXCLUDED_HEADERS = ImmutableList.of(\n+ CaseInsensitiveKey.from(CONTENT_ENCODING),\n+ CaseInsensitiveKey.from(CONTENT_LENGTH),\n+ CaseInsensitiveKey.from(TRANSFER_ENCODING)\n+ );\n+\n@Override\npublic ResponseDefinition apply(LoggedResponse response) {\nfinal ResponseDefinitionBuilder responseDefinitionBuilder = new ResponseDefinitionBuilder()\n@@ -53,7 +68,7 @@ public class LoggedResponseDefinitionTransformer implements Function<LoggedRespo\nprivate HttpHeaders withoutContentEncodingAndContentLength(LoggedResponse response) {\nreturn new HttpHeaders(filter(response.getHeaders().all(), new Predicate<HttpHeader>() {\npublic boolean apply(HttpHeader header) {\n- return !header.keyEquals(\"Content-Encoding\") && !header.keyEquals(\"Content-Length\");\n+ return !EXCLUDED_HEADERS.contains(CaseInsensitiveKey.from(header.key()));\n}\n}));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformerTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.recording;\n-import com.github.tomakehurst.wiremock.recording.LoggedResponseDefinitionTransformer;\nimport com.github.tomakehurst.wiremock.http.*;\nimport org.junit.Test;\nimport static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;\n+import static com.github.tomakehurst.wiremock.http.HttpHeader.httpHeader;\nimport static org.junit.Assert.assertEquals;\npublic class LoggedResponseDefinitionTransformerTest {\n@@ -65,14 +65,15 @@ public class LoggedResponseDefinitionTransformerTest {\n}\n@Test\n- public void applyWithExtraHeaders() {\n+ public void preservesHeadersExceptThoseSpecificallyExcluded() {\nfinal LoggedResponse response = LoggedResponse.from(Response\n.response()\n.headers(new HttpHeaders(\n- HttpHeader.httpHeader(\"Content-Encoding\", \"gzip\"),\n- HttpHeader.httpHeader(\"Content-Length\", \"10\"),\n- HttpHeader.httpHeader(\"Accept\", \"application/json\"),\n- HttpHeader.httpHeader(\"X-foo\", \"Bar\")\n+ httpHeader(\"Content-Encoding\", \"gzip\"), // Excluded\n+ httpHeader(\"content-LENGTH\", \"10\"), // Excluded\n+ httpHeader(\"transfer-encoding\", \"chunked\"), // Excluded\n+ httpHeader(\"Accept\", \"application/json\"),\n+ httpHeader(\"X-foo\", \"Bar\")\n))\n.build()\n);\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Excluded transfer-encoding response header during recording (as this is calculated) |
686,936 | 20.07.2017 18:08:04 | -3,600 | 24610f2c7e066b552d657cf31f0868eba8e9b711 | Fixed handling of gzipped responses in the new recorder | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/common/Gzip.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/common/Gzip.java",
"diff": "@@ -20,10 +20,13 @@ import com.google.common.io.ByteStreams;\nimport java.io.ByteArrayInputStream;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\n+import java.nio.charset.Charset;\nimport java.util.zip.GZIPInputStream;\nimport java.util.zip.GZIPOutputStream;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static com.github.tomakehurst.wiremock.common.Strings.DEFAULT_CHARSET;\n+import static com.github.tomakehurst.wiremock.common.Strings.bytesFromString;\nimport static com.google.common.base.Charsets.UTF_8;\npublic class Gzip {\n@@ -42,10 +45,18 @@ public class Gzip {\n}\npublic static byte[] gzip(String plainContent) {\n+ return gzip(plainContent, DEFAULT_CHARSET);\n+ }\n+\n+ public static byte[] gzip(String plainContent, Charset charset) {\n+ return gzip(bytesFromString(plainContent, charset));\n+ }\n+\n+ public static byte[] gzip(byte[] plainContent) {\ntry {\nByteArrayOutputStream bytes = new ByteArrayOutputStream();\nGZIPOutputStream gzipOutputStream = new GZIPOutputStream(bytes);\n- gzipOutputStream.write(plainContent.getBytes(UTF_8));\n+ gzipOutputStream.write(plainContent);\ngzipOutputStream.close();\nreturn bytes.toByteArray();\n} catch (IOException e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/LoggedResponse.java",
"diff": "@@ -19,9 +19,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;\nimport com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.common.Encoding;\nimport com.github.tomakehurst.wiremock.common.Strings;\n+import com.google.common.net.MediaType;\nimport java.nio.charset.Charset;\n+import static com.google.common.net.MediaType.OCTET_STREAM;\n+\npublic class LoggedResponse {\nprivate final int status;\n@@ -70,8 +73,19 @@ public class LoggedResponse {\nreturn \"\";\n}\n- Charset charset = headers == null ? Strings.DEFAULT_CHARSET : headers.getContentTypeHeader().charset();\n- return Strings.stringFromBytes(body, charset);\n+ return Strings.stringFromBytes(body, getCharset());\n+ }\n+\n+ @JsonIgnore\n+ public String getMimeType() {\n+ return headers == null || headers.getContentTypeHeader() == null ?\n+ OCTET_STREAM.toString() :\n+ headers.getContentTypeHeader().mimeTypePart();\n+ }\n+\n+ @JsonIgnore\n+ public Charset getCharset() {\n+ return headers == null ? Strings.DEFAULT_CHARSET : headers.getContentTypeHeader().charset();\n}\n@JsonIgnore\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\n-import com.github.tomakehurst.wiremock.common.ContentTypes;\n+import com.github.tomakehurst.wiremock.common.Gzip;\n+import com.github.tomakehurst.wiremock.common.Strings;\nimport com.github.tomakehurst.wiremock.http.*;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\n+import com.google.common.base.Charsets;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n-import com.google.common.net.*;\n+import java.nio.charset.Charset;\nimport java.util.List;\n+import static com.github.tomakehurst.wiremock.common.ContentTypes.determineIsTextFromMimeType;\nimport static com.google.common.collect.Iterables.filter;\n-import static com.google.common.net.HttpHeaders.CONTENT_ENCODING;\n-import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;\n-import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING;\n+import static com.google.common.net.HttpHeaders.*;\n/**\n* Transforms a LoggedResponse into a ResponseDefinition, which will be used to construct a StubMapping\n@@ -48,13 +49,14 @@ public class LoggedResponseDefinitionTransformer implements Function<LoggedRespo\n.withStatus(response.getStatus());\nif (response.getBody() != null && response.getBody().length > 0) {\n- if (\n- response.getHeaders() != null\n- && ContentTypes.determineIsTextFromMimeType(response.getHeaders().getContentTypeHeader().mimeTypePart())\n- ) {\n- responseDefinitionBuilder.withBody(response.getBodyAsString());\n+\n+ byte[] body = bodyDecompressedIfRequired(response);\n+ String mimeType = response.getMimeType();\n+ Charset charset = response.getCharset();\n+ if (determineIsTextFromMimeType(mimeType)) {\n+ responseDefinitionBuilder.withBody(Strings.stringFromBytes(body, charset));\n} else {\n- responseDefinitionBuilder.withBody(response.getBody());\n+ responseDefinitionBuilder.withBody(body);\n}\n}\n@@ -65,10 +67,18 @@ public class LoggedResponseDefinitionTransformer implements Function<LoggedRespo\nreturn responseDefinitionBuilder.build();\n}\n+ private byte[] bodyDecompressedIfRequired(LoggedResponse response) {\n+ if (response.getHeaders().getHeader(CONTENT_ENCODING).containsValue(\"gzip\")) {\n+ return Gzip.unGzip(response.getBody());\n+ }\n+\n+ return response.getBody();\n+ }\n+\nprivate HttpHeaders withoutContentEncodingAndContentLength(LoggedResponse response) {\nreturn new HttpHeaders(filter(response.getHeaders().all(), new Predicate<HttpHeader>() {\npublic boolean apply(HttpHeader header) {\n- return !EXCLUDED_HEADERS.contains(CaseInsensitiveKey.from(header.key()));\n+ return !EXCLUDED_HEADERS.contains(header.caseInsensitiveKey());\n}\n}));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -34,9 +34,12 @@ import java.io.File;\nimport java.util.List;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.common.Gzip.gzip;\n+import static com.github.tomakehurst.wiremock.common.Strings.DEFAULT_CHARSET;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findMappingWithUrl;\n+import static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM;\nimport static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -263,6 +266,43 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(mapping.getRequest().getBodyPatterns().get(0).getExpected(), is(\"expected body\"));\n}\n+ @Test\n+ public void recordsIntoPlainTextWhenResponseIsGZipped() {\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ byte[] gzippedBody = gzip(\"Zippy\");\n+ targetService.stubFor(get(\"/gzipped-response\")\n+ .willReturn(aResponse()\n+ .withHeader(\"Content-Encoding\", \"gzip\")\n+ .withHeader(\"Content-Type\", \"text/plain\")\n+ .withBody(gzippedBody))\n+ );\n+\n+ client.get(\"/gzipped-response\");\n+\n+ StubMapping mapping = proxyingService.stopRecording().getStubMappings().get(0);\n+ assertThat(mapping.getResponse().getBody(), is(\"Zippy\"));\n+ }\n+\n+ @Test\n+ public void recordsIntoPlainBinaryWhenResponseIsGZipped() {\n+ proxyingService.startRecording(targetBaseUrl);\n+\n+ byte[] originalBody = \"sdkfnslkdjfsjdf\".getBytes(DEFAULT_CHARSET);\n+ byte[] gzippedBody = gzip(originalBody);\n+ targetService.stubFor(get(\"/gzipped-response\")\n+ .willReturn(aResponse()\n+ .withHeader(\"Content-Encoding\", \"gzip\")\n+ .withHeader(\"Content-Type\", APPLICATION_OCTET_STREAM.getMimeType())\n+ .withBody(gzippedBody))\n+ );\n+\n+ client.get(\"/gzipped-response\");\n+\n+ StubMapping mapping = proxyingService.stopRecording().getStubMappings().get(0);\n+ assertThat(mapping.getResponse().getByteBody(), is(originalBody));\n+ }\n+\nstatic final String IMAGE_CONTENT_BASE64 = \"iVBORw0KGgoAAAANSUhEUgAAACAAAAAPCAYAAACFgM0XAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH4AYeEQ8RFdqRVAAAA/VJREFUOMvFk9+LVHUYxj/v9/yYmbVVN1NKDVvDH6yBiuiWrG6LelG33lQQ1EVIUNA/YBARRNHVFgRWF93URV4VJGQm/l5KFNfaQNnN1a3NH+vOzM6cOed8v9+3i5mdGcLb6IUDhwfe532+D88D//PIpi8n3pIwDFAENPNp42huzMy0tdHauPBCjPYDihgkin/wNr8wdfxrYfvIcy6It7zoT8moOxLHWBfi0AVz+ePDh75/86NPwWgf8BLQiyBY+cPPmm8w5A99MAVAKGH4ikSFrQCoqnhfy4Pwc5fMrUniwjs9xSX9SFvv+sFt/WOTMzuXShQfliB6esD9Sa8keAx48HU5+/prn51DKUvIIPAhUALwVZnSRC4QMLXIaNTZb0G1yS8iQbD31t4nEZFttTxd61BAWh87r0zMPkJc2qAm2NTHAsP+alufWgHLFrPcD2hFAPYtHkdBG/K4FHVQIqUjIEuP4f29DhLs3Pjd2KMiMpQ5F6XWdgyAfuvsFoJwl5egb0Bvsllv4pGmvgwIWC5FHTar3TJguL1pASWUkh4INzhTe/eJ5jlXnRtX78bbJhuzLotLe4BBr0rd5nT00uOc3U8QDAPs9eMso9aKD2guSKxIUYfJZDewaXFRc0EChRK7fVUek0KT1fQOjlTU2p+6ctljlVdFdbMCSZ7htSMhz/ODxoRDS0kY1vGOO761XVAosR3hELC0veiAAkhR+yXWHVJQ5kfXYJJrE2iensT7KqqQ5eRODyCyQoDUWTJnmwqsJUuzzc6EqzfoDE/5G037AXV4CRSKIKGuAp6nW5w0xUmkBQz7I2OICTCuMoevV66qsxPkFl9PaDgXait1XrVsbX4e69B6gyTLUGDI/8oKKk37QRHOUaAqkYIgQNRV92lC7km8yMqeHL9SAJP9NUXfrqH7Wq+f1FqdvJaQtt8FCr8Fzo9qPam5WkKijh5SRvQKwaLvUJeAIxLrZHdiO8HmqMQ6hmkjG4GtAGb6vZeZPzuGmy+f8OWFJM0yrHRYBM6UGva4VmrXs6RBQwz9Oss2nWx2f/GFwo8IFx9wvgEcw3CqC+sBRgSaDHb2Fu7u7Ut+vnwtwaOd+wlw4lpl7q6Wq6cbLscZwzP6O6v0fpdP/CLCDHCmE8f23ACuAOeBhS78WYWHDYC7M8vk+wdv59WF043I0GXjdeDSykqKrSwcr4cmLZCxz18mwrUbBpxqFeVn4M6/BFxUuA1MAJNd+ACwIwSY/uIN+t4+Rlgpf2VFi2S5iGLUmPPau+ROKkpeii404uCTFfl83zr/t9aJfSwub1l8okU6CYwC6zvZ56iAV7gn8DGwo1VKAHlQZP7zSUbXtf//AaFX9LL7Nh3cAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA2LTMwVDE3OjE1OjE3KzAxOjAwsKT/BwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNi0zMFQxNzoxNToxNyswMTowMMH5R7sAAAAASUVORK5CYII=\";\n@Test\n@@ -288,6 +328,8 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(bodyFile.exists(), is(true));\n}\n+\n+\n@Test(expected = NotRecordingException.class)\npublic void throwsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\nstopRecording();\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed handling of gzipped responses in the new recorder |
686,936 | 20.07.2017 18:31:34 | -3,600 | e59fa382e6254178bbea35ba3a87cb094397a07b | Now defaults to always writing binary response body files when recording (regardless of size) and writing text files over 10kb | [
{
"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": "@@ -28,8 +28,8 @@ import java.util.Objects;\n@JsonDeserialize(using = ResponseDefinitionBodyMatcherDeserializer.class)\npublic class ResponseDefinitionBodyMatcher implements ValueMatcher<ResponseDefinition> {\n- public static final long DEFAULT_MAX_TEXT_SIZE = 100 * 1024 * 1024;\n- public static final long DEFAULT_MAX_BINARY_SIZE = 100 * 1024 * 1024;\n+ public static final long DEFAULT_MAX_TEXT_SIZE = 10240;\n+ public static final long DEFAULT_MAX_BINARY_SIZE = 0;\nprivate final long textSizeThreshold;\nprivate final long binarySizeThreshold;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -23,6 +23,8 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatus;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import com.google.common.net.HttpHeaders;\n+import org.apache.commons.lang3.StringUtils;\nimport org.apache.http.HttpEntity;\nimport org.apache.http.client.entity.GzipCompressingEntity;\nimport org.apache.http.entity.StringEntity;\n@@ -39,9 +41,11 @@ import static com.github.tomakehurst.wiremock.common.Strings.DEFAULT_CHARSET;\nimport static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.findMappingWithUrl;\n+import static com.google.common.net.HttpHeaders.CONTENT_TYPE;\nimport static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM;\nimport static org.apache.http.entity.ContentType.TEXT_PLAIN;\nimport static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.nullValue;\nimport static org.junit.Assert.assertThat;\npublic class RecordingDslAcceptanceTest extends AcceptanceTestBase {\n@@ -306,7 +310,7 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nstatic final String IMAGE_CONTENT_BASE64 = \"iVBORw0KGgoAAAANSUhEUgAAACAAAAAPCAYAAACFgM0XAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH4AYeEQ8RFdqRVAAAA/VJREFUOMvFk9+LVHUYxj/v9/yYmbVVN1NKDVvDH6yBiuiWrG6LelG33lQQ1EVIUNA/YBARRNHVFgRWF93URV4VJGQm/l5KFNfaQNnN1a3NH+vOzM6cOed8v9+3i5mdGcLb6IUDhwfe532+D88D//PIpi8n3pIwDFAENPNp42huzMy0tdHauPBCjPYDihgkin/wNr8wdfxrYfvIcy6It7zoT8moOxLHWBfi0AVz+ePDh75/86NPwWgf8BLQiyBY+cPPmm8w5A99MAVAKGH4ikSFrQCoqnhfy4Pwc5fMrUniwjs9xSX9SFvv+sFt/WOTMzuXShQfliB6esD9Sa8keAx48HU5+/prn51DKUvIIPAhUALwVZnSRC4QMLXIaNTZb0G1yS8iQbD31t4nEZFttTxd61BAWh87r0zMPkJc2qAm2NTHAsP+alufWgHLFrPcD2hFAPYtHkdBG/K4FHVQIqUjIEuP4f29DhLs3Pjd2KMiMpQ5F6XWdgyAfuvsFoJwl5egb0Bvsllv4pGmvgwIWC5FHTar3TJguL1pASWUkh4INzhTe/eJ5jlXnRtX78bbJhuzLotLe4BBr0rd5nT00uOc3U8QDAPs9eMso9aKD2guSKxIUYfJZDewaXFRc0EChRK7fVUek0KT1fQOjlTU2p+6ctljlVdFdbMCSZ7htSMhz/ODxoRDS0kY1vGOO761XVAosR3hELC0veiAAkhR+yXWHVJQ5kfXYJJrE2iensT7KqqQ5eRODyCyQoDUWTJnmwqsJUuzzc6EqzfoDE/5G037AXV4CRSKIKGuAp6nW5w0xUmkBQz7I2OICTCuMoevV66qsxPkFl9PaDgXait1XrVsbX4e69B6gyTLUGDI/8oKKk37QRHOUaAqkYIgQNRV92lC7km8yMqeHL9SAJP9NUXfrqH7Wq+f1FqdvJaQtt8FCr8Fzo9qPam5WkKijh5SRvQKwaLvUJeAIxLrZHdiO8HmqMQ6hmkjG4GtAGb6vZeZPzuGmy+f8OWFJM0yrHRYBM6UGva4VmrXs6RBQwz9Oss2nWx2f/GFwo8IFx9wvgEcw3CqC+sBRgSaDHb2Fu7u7Ut+vnwtwaOd+wlw4lpl7q6Wq6cbLscZwzP6O6v0fpdP/CLCDHCmE8f23ACuAOeBhS78WYWHDYC7M8vk+wdv59WF043I0GXjdeDSykqKrSwcr4cmLZCxz18mwrUbBpxqFeVn4M6/BFxUuA1MAJNd+ACwIwSY/uIN+t4+Rlgpf2VFi2S5iGLUmPPau+ROKkpeii404uCTFfl83zr/t9aJfSwub1l8okU6CYwC6zvZ56iAV7gn8DGwo1VKAHlQZP7zSUbXtf//AaFX9LL7Nh3cAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA2LTMwVDE3OjE1OjE3KzAxOjAwsKT/BwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNi0zMFQxNzoxNToxNyswMTowMMH5R7sAAAAASUVORK5CYII=\";\n@Test\n- public void writesBodyFileToTheAppropriatePlaceWhenResponseIsOverTheSpecifiedSize() {\n+ public void defaultsToWritingBinaryResponseFilesOfAnySize() {\ntargetService.stubFor(get(\"/myimage.png\").willReturn(\naResponse()\n.withBase64Body(IMAGE_CONTENT_BASE64))\n@@ -314,7 +318,6 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nproxyingService.startRecording(recordSpec()\n.forTarget(targetBaseUrl)\n- .extractBinaryBodiesOver(100)\n);\nclient.get(\"/myimage.png\");\n@@ -328,7 +331,48 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(bodyFile.exists(), is(true));\n}\n+ @Test\n+ public void defaultsToWritingTextResponseFilesOver1Kb() {\n+ targetService.stubFor(get(\"/large.txt\").willReturn(\n+ aResponse()\n+ .withHeader(CONTENT_TYPE, \"text/plain\")\n+ .withBody(StringUtils.rightPad(\"\", 10241, 'a')))\n+ );\n+\n+ proxyingService.startRecording(recordSpec()\n+ .forTarget(targetBaseUrl)\n+ );\n+\n+ client.get(\"/large.txt\");\n+\n+ List<StubMapping> mappings = proxyingService.stopRecording().getStubMappings();\n+ StubMapping mapping = mappings.get(0);\n+ String bodyFileName = mapping.getResponse().getBodyFileName();\n+\n+ assertThat(bodyFileName, is(\"largetxt-\" + mapping.getId() + \".txt\"));\n+ File bodyFile = new File(fileRoot, \"__files/\" + bodyFileName);\n+ assertThat(bodyFile.exists(), is(true));\n+ }\n+\n+ @Test\n+ public void doesNotWriteTextResponseFilesUnder1KbByDefault() {\n+ targetService.stubFor(get(\"/small.txt\").willReturn(\n+ aResponse()\n+ .withHeader(CONTENT_TYPE, \"text/plain\")\n+ .withBody(StringUtils.rightPad(\"\", 10239, 'a')))\n+ );\n+\n+ proxyingService.startRecording(recordSpec()\n+ .forTarget(targetBaseUrl)\n+ );\n+\n+ client.get(\"/small.txt\");\n+ List<StubMapping> mappings = proxyingService.stopRecording().getStubMappings();\n+ String bodyFileName = mappings.get(0).getResponse().getBodyFileName();\n+\n+ assertThat(bodyFileName, nullValue());\n+ }\n@Test(expected = NotRecordingException.class)\npublic void throwsAnErrorIfAttemptingToStopViaStaticRemoteDslWhenNotRecording() {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Now defaults to always writing binary response body files when recording (regardless of size) and writing text files over 10kb |
686,936 | 20.07.2017 18:39:13 | -3,600 | c642dfb0c470fb203427a7d9bb7e1771bf067287 | Removed record snapshot methods from the Stubbing interface for consistency (now they're just present on Admin) | [
{
"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": "@@ -372,17 +372,6 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn wireMockApp.findTopNearMissesFor(requestPattern);\n}\n- @Override\n- public List<StubMapping> snapshotRecord() {\n-\n- return wireMockApp.takeSnapshotRecording().getStubMappings();\n- }\n-\n- @Override\n- public List<StubMapping> snapshotRecord(RecordSpecBuilder spec) {\n- return wireMockApp.takeSnapshotRecording(spec.build()).getStubMappings();\n- }\n-\n@Override\npublic void startRecording(String targetBaseUrl) {\nwireMockApp.startRecording(targetBaseUrl);\n@@ -409,13 +398,18 @@ public class WireMockServer implements Container, Stubbing, Admin {\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording() {\n- return wireMockApp.takeSnapshotRecording();\n+ public SnapshotRecordResult snapshotRecord() {\n+ return wireMockApp.snapshotRecord();\n+ }\n+\n+ @Override\n+ public SnapshotRecordResult snapshotRecord(RecordSpecBuilder spec) {\n+ return wireMockApp.snapshotRecord(spec);\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording(RecordSpec spec) {\n- return wireMockApp.takeSnapshotRecording(spec);\n+ public SnapshotRecordResult snapshotRecord(RecordSpec spec) {\n+ return wireMockApp.snapshotRecord(spec);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/admin/tasks/SnapshotTask.java",
"diff": "@@ -35,7 +35,7 @@ public class SnapshotTask implements AdminTask {\n? RecordSpec.DEFAULTS\n: Json.read(request.getBodyAsString(), RecordSpec.class);\n- SnapshotRecordResult result = admin.takeSnapshotRecording(recordSpec);\n+ SnapshotRecordResult result = admin.snapshotRecord(recordSpec);\nreturn jsonResponse(result, HTTP_OK);\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": "@@ -253,7 +253,7 @@ public class HttpAdminClient implements Admin {\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording() {\n+ public SnapshotRecordResult snapshotRecord() {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(SnapshotTask.class),\n\"\");\n@@ -262,7 +262,12 @@ public class HttpAdminClient implements Admin {\n}\n@Override\n- public SnapshotRecordResult takeSnapshotRecording(RecordSpec spec) {\n+ public SnapshotRecordResult snapshotRecord(RecordSpecBuilder spec) {\n+ return snapshotRecord(spec.build());\n+ }\n+\n+ @Override\n+ public SnapshotRecordResult snapshotRecord(RecordSpec spec) {\nString body = postJsonAssertOkAndReturnBody(\nurlFor(SnapshotTask.class),\nJson.write(spec));\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": "@@ -671,11 +671,11 @@ public class WireMock {\n}\npublic List<StubMapping> takeSnapshotRecording() {\n- return admin.takeSnapshotRecording().getStubMappings();\n+ return admin.snapshotRecord().getStubMappings();\n}\npublic List<StubMapping> takeSnapshotRecording(RecordSpecBuilder spec) {\n- return admin.takeSnapshotRecording(spec.build()).getStubMappings();\n+ return admin.snapshotRecord(spec.build()).getStubMappings();\n}\npublic static void startRecording(String targetBaseUrl) {\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": "@@ -56,8 +56,9 @@ public interface Admin {\nvoid updateGlobalSettings(GlobalSettings settings);\n- SnapshotRecordResult takeSnapshotRecording();\n- SnapshotRecordResult takeSnapshotRecording(RecordSpec spec);\n+ SnapshotRecordResult snapshotRecord();\n+ SnapshotRecordResult snapshotRecord(RecordSpec spec);\n+ SnapshotRecordResult snapshotRecord(RecordSpecBuilder spec);\nvoid startRecording(String targetBaseUrl);\nvoid startRecording(RecordSpec spec);\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": "@@ -342,11 +342,16 @@ public class WireMockApp implements StubServer, Admin {\ncontainer.shutdown();\n}\n- public SnapshotRecordResult takeSnapshotRecording() {\n- return takeSnapshotRecording(RecordSpec.DEFAULTS);\n+ public SnapshotRecordResult snapshotRecord() {\n+ return snapshotRecord(RecordSpec.DEFAULTS);\n}\n- public SnapshotRecordResult takeSnapshotRecording(RecordSpec recordSpec) {\n+ @Override\n+ public SnapshotRecordResult snapshotRecord(RecordSpecBuilder spec) {\n+ return snapshotRecord(spec.build());\n+ }\n+\n+ public SnapshotRecordResult snapshotRecord(RecordSpec recordSpec) {\nreturn recorder.takeSnapshot(getServeEvents().getServeEvents(), recordSpec);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/junit/Stubbing.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/junit/Stubbing.java",
"diff": "@@ -48,7 +48,4 @@ public interface Stubbing {\nList<NearMiss> findNearMissesForAllUnmatchedRequests();\nList<NearMiss> findNearMissesFor(LoggedRequest loggedRequest);\nList<NearMiss> findAllNearMissesFor(RequestPatternBuilder requestPatternBuilder);\n-\n- List<StubMapping> snapshotRecord();\n- List<StubMapping> snapshotRecord(RecordSpecBuilder spec);\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": "@@ -85,7 +85,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.get(\"/two\");\nclient.postJson(\"/three\", \"{ \\\"counter\\\": 55 }\");\n- List<StubMapping> returnedMappings = proxyingService.snapshotRecord();\n+ List<StubMapping> returnedMappings = proxyingService.snapshotRecord().getStubMappings();\nList<StubMapping> serverMappings = proxyingService.getStubMappings();\nassertTrue(\"All of the returned mappings should be present in the server\", serverMappings.containsAll(returnedMappings));\n@@ -121,7 +121,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nList<StubMapping> mappings = proxyingService.snapshotRecord(\nrecordSpec()\n.onlyRequestsMatching(getRequestedFor(urlPathMatching(\"/things/.*\")))\n- );\n+ ).getStubMappings();\nassertThat(mappings.size(), is(3));\nassertThat(mappings, everyItem(WireMatchers.stubMappingWithUrl(urlPathMatching(\"/things.*\"))));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Removed record snapshot methods from the Stubbing interface for consistency (now they're just present on Admin) |
686,936 | 20.07.2017 19:06:54 | -3,600 | 7d14269e8b2eb4148ba1e2032f0a7842e395bee4 | Updated the RAML spec with new recording APIs | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/resources/raml/examples/record-spec.example.json",
"diff": "+{\n+ \"targetBaseUrl\" : \"http://example.mocklab.io\",\n+ \"filters\" : {\n+ \"urlPathPattern\" : \"/api/.*\",\n+ \"method\" : \"GET\"\n+ },\n+ \"captureHeaders\" : {\n+ \"Accept\" : { },\n+ \"Content-Type\" : {\n+ \"caseInsensitive\" : true\n+ }\n+ },\n+ \"extractBodyCriteria\" : {\n+ \"textSizeThreshold\" : \"2048\",\n+ \"binarySizeThreshold\" : \"10240\"\n+ },\n+ \"persist\" : false,\n+ \"repeatsAsScenarios\" : false,\n+ \"transformers\" : [ \"modify-response-header\" ],\n+ \"transformerParameters\" : {\n+ \"headerValue\" : \"123\"\n+ },\n+ \"jsonMatchingFlags\" : {\n+ \"ignoreArrayOrder\" : false,\n+ \"ignoreExtraElements\" : true\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/resources/raml/examples/recorded-stub-mappings.example.json",
"diff": "+{\n+ \"mappings\" : [ {\n+ \"id\" : \"093f1027-e5e0-4921-9e6d-e619dfd5d2c7\",\n+ \"name\" : \"recordables_123\",\n+ \"request\" : {\n+ \"url\" : \"/recordables/123\",\n+ \"method\" : \"GET\"\n+ },\n+ \"response\" : {\n+ \"status\" : 200,\n+ \"body\" : \"{\\n \\\"message\\\": \\\"Congratulations on your first recording!\\\"\\n}\",\n+ \"headers\" : {\n+ \"Content-Type\" : \"application/json\"\n+ }\n+ },\n+ \"uuid\" : \"093f1027-e5e0-4921-9e6d-e619dfd5d2c7\",\n+ \"persistent\" : true\n+ } ]\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/resources/raml/examples/snapshot-spec.example.json",
"diff": "+{\n+ \"filters\" : {\n+ \"urlPathPattern\" : \"/api/.*\",\n+ \"method\" : \"GET\",\n+ \"ids\" : [ \"40a93c4a-d378-4e07-8321-6158d5dbcb29\" ]\n+ },\n+ \"captureHeaders\" : {\n+ \"Accept\" : { },\n+ \"Content-Type\" : {\n+ \"caseInsensitive\" : true\n+ }\n+ },\n+ \"extractBodyCriteria\" : {\n+ \"textSizeThreshold\" : \"2 kb\",\n+ \"binarySizeThreshold\" : \"1 Mb\"\n+ },\n+ \"outputFormat\" : \"FULL\",\n+ \"persist\" : false,\n+ \"repeatsAsScenarios\" : false,\n+ \"transformers\" : [ \"modify-response-header\" ],\n+ \"transformerParameters\" : {\n+ \"headerValue\" : \"123\"\n+ },\n+ \"jsonMatchingFlags\" : {\n+ \"ignoreArrayOrder\" : false,\n+ \"ignoreExtraElements\" : true\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/resources/raml/schemas/record-spec.schema.json",
"diff": "+{\n+ \"type\": \"object\",\n+ \"properties\": {\n+ \"targetBaseUrl\": {\n+ \"type\": \"string\"\n+ },\n+ \"captureHeaders\": {\n+ \"type\": \"object\"\n+ },\n+ \"extractBodyCriteria\": {\n+ \"type\": \"object\",\n+ \"properties\": {\n+ \"binarySizeThreshold\": {\n+ \"type\": \"string\"\n+ },\n+ \"textSizeThreshold\": {\n+ \"type\": \"string\"\n+ }\n+ }\n+ },\n+ \"filters\": {\n+ \"type\": \"object\",\n+ \"properties\": {\n+ \"ids\": {\n+ \"type\": \"array\",\n+ \"items\": {\n+ \"type\": \"string\"\n+ }\n+ },\n+ \"method\": {\n+ \"type\": \"string\"\n+ },\n+ \"urlPathPattern\": {\n+ \"type\": \"string\"\n+ }\n+ }\n+ },\n+ \"jsonMatchingFlags\": {\n+ \"type\": \"object\",\n+ \"properties\": {\n+ \"ignoreArrayOrder\": {\n+ \"type\": \"boolean\"\n+ },\n+ \"ignoreExtraElements\": {\n+ \"type\": \"boolean\"\n+ }\n+ }\n+ },\n+ \"persist\": {\n+ \"type\": \"boolean\"\n+ },\n+ \"repeatsAsScenarios\": {\n+ \"type\": \"boolean\"\n+ },\n+ \"transformerParameters\": {\n+ \"type\": \"object\",\n+ \"properties\": {\n+ \"headerValue\": {\n+ \"type\": \"string\"\n+ }\n+ }\n+ },\n+ \"transformers\": {\n+ \"type\": \"array\",\n+ \"items\": {\n+ \"type\": \"string\"\n+ }\n+ }\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/resources/raml/wiremock-admin-api.raml",
"new_path": "src/main/resources/raml/wiremock-admin-api.raml",
"diff": "@@ -14,6 +14,7 @@ schemas:\n- stubMapping: !include schemas/stub-mapping.schema.json\n- stubMappings: !include schemas/stub-mappings.schema.json\n- requestPattern: !include schemas/request-pattern.schema.json\n+ - recordSpec: !include schemas/record-spec.schema.json\n/__admin/mappings:\ndescription: Stub mappings\n@@ -127,21 +128,6 @@ schemas:\ndescription: Successfully removed\n-/__admin/scenarios:\n- description: Scenarios support modelling of stateful behaviour\n-\n- /reset:\n- description: Scenarios\n- post:\n- description: Reset the state of all scenarios\n- responses:\n- 200:\n- description: Successfully reset\n- body:\n- application/json:\n- example: !include examples/empty.example.json\n-\n-\n/__admin/requests:\ndescription: Logged requests and responses received by the mock service\n@@ -254,6 +240,80 @@ schemas:\napplication/json:\nexample: !include examples/near-misses.example.json\n+/__admin/recordings:\n+ description: Stub mapping record and snapshot functions\n+\n+ /start:\n+ description: Start recording stub mappings\n+ post:\n+ description: Start recording stub mappings\n+ body:\n+ application/json:\n+ schema: recordSpec\n+ example: !include examples/record-spec.example.json\n+\n+ responses:\n+ 200:\n+ description: Successfully started recording\n+\n+ /stop:\n+ description: Stop recording stub mappings\n+ post:\n+ description: Stop recording stub mappings\n+ responses:\n+ 200:\n+ description: Successfully started recording\n+ body:\n+ application/json:\n+ schema: stubMappings\n+ example: !include examples/recorded-stub-mappings.example.json\n+\n+ /status:\n+ description: Recording status\n+ get:\n+ description: Get the recording status (started or stopped)\n+\n+ responses:\n+ 200:\n+ description: Successfully got the record status\n+ body:\n+ application/json:\n+ example: |\n+ {\n+ \"status\" : \"Stopped\"\n+ }\n+\n+ /snapshot:\n+ description: Snapshot recording\n+ post:\n+ description: Take a snapshot recording\n+ body:\n+ application/json:\n+ schema: recordSpec\n+ example: !include examples/snapshot-spec.example.json\n+\n+ responses:\n+ 200:\n+ description: Successfully took a snapshot recording\n+ body:\n+ application/json:\n+ schema: stubMappings\n+ example: !include examples/recorded-stub-mappings.example.json\n+\n+/__admin/scenarios:\n+ description: Scenarios support modelling of stateful behaviour\n+\n+ /reset:\n+ description: Scenarios\n+ post:\n+ description: Reset the state of all scenarios\n+ responses:\n+ 200:\n+ description: Successfully reset\n+ body:\n+ application/json:\n+ example: !include examples/empty.example.json\n+\n/__admin/near-misses:\ndescription: Near misses allow querying of received requests or request patterns according to similarity\n@@ -310,3 +370,5 @@ schemas:\nresponses:\n200:\ndescription: Server will be shut down\n+\n+\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Updated the RAML spec with new recording APIs |
686,936 | 20.07.2017 19:36:17 | -3,600 | 6826ae39bc7f49e3c6b9c6baa930eb6bdc69ca46 | Documented case-insensitive equality matching. Added links to some new external resources. | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -193,6 +193,34 @@ JSON:\n}\n```\n+### Case-insensitive equality\n+\n+Deems a match if the entire attribute value equals the expected value, ignoring case.\n+\n+Java:\n+\n+```java\n+.withHeader(\"Content-Type\", equalToIgnoreCase(\"application/json\"))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"headers\": {\n+ \"Content-Type\": {\n+ \"equalTo\": \"application/json\",\n+ \"caseInsensitive\": true\n+ }\n+ }\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n### Substring (contains)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs-v2/external-resources/index.md",
"new_path": "docs-v2/external-resources/index.md",
"diff": "@@ -9,6 +9,8 @@ description: Extensions, integrations, blog posts and videos about WireMock.\nCode, articles and videos related to WireMock from around the web.\n## Integrations\n+Mark Winteringham wrote a very handy Chrome extension to provide a UI over WireMock:<br>\n+[http://www.mwtestconsultancy.co.uk/wiremock-chrome-extension/](http://www.mwtestconsultancy.co.uk/wiremock-chrome-extension/)\nSpring Contract Verifier (previously called Accurest) is a consumer driven contracts tool that generates WireMock stub mappings as\nexamples for client testing.\n@@ -19,6 +21,8 @@ A Spring REST Docs integration for WireMock that generates WireMock stub mapping\n## Extensions\n+Simulate webhooks with this extension:<br>\n+[https://github.com/wiremock/wiremock-webhooks-extension](https://github.com/wiremock/wiremock-webhooks-extension)\nSome folks at Open Table have written a response transformer for injecting data from the\nrequest body into the response:<br>\n@@ -58,6 +62,12 @@ Bas Dijkstra kindly open sourced the content for the workshop he ran on WireMock\n## Videos\n+Fluent and thorough live-coding demonstration of WireMock delivered by Sam Edwards at DevFest DC:<br>\n+[https://youtu.be/x3MvZ8DFrpE](https://youtu.be/x3MvZ8DFrpE)\n+\n+Sebastian Daschner presents a step-by-step guide to running your acceptance tests in Kubernetes using WireMock:<br>\n+[https://blog.sebastian-daschner.com/entries/acceptance_tests_wiremock_kubernetes](https://blog.sebastian-daschner.com/entries/acceptance_tests_wiremock_kubernetes)\n+\nInteresting and detailed presentation by Lotte Johansen on testing microservices with WireMock at Norway's top online marketplace:<br>\n[https://www.youtube.com/watch?v=cmJfMnGK-r0](https://www.youtube.com/watch?v=cmJfMnGK-r0)\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Documented case-insensitive equality matching. Added links to some new external resources. |
686,965 | 23.07.2017 22:24:35 | 25,200 | 15cb88d70309ede723f3ce7364a855a058bb6868 | Add some tests for SnapshotStubMappingBodyExtractor | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"diff": "@@ -17,7 +17,8 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\nimport com.github.tomakehurst.wiremock.common.*;\n-import com.github.tomakehurst.wiremock.core.WireMockApp;\n+import com.github.tomakehurst.wiremock.http.ContentTypeHeader;\n+import com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\npublic class SnapshotStubMappingBodyExtractor {\n@@ -36,9 +37,10 @@ public class SnapshotStubMappingBodyExtractor {\n*/\npublic void extractInPlace(StubMapping stubMapping) {\nbyte[] body = stubMapping.getResponse().getByteBody();\n+ HttpHeaders responseHeaders = stubMapping.getResponse().getHeaders();\nString extension = ContentTypes.determineFileExtension(\nstubMapping.getRequest().getUrl(),\n- stubMapping.getResponse().getHeaders().getContentTypeHeader(),\n+ responseHeaders != null ? responseHeaders.getContentTypeHeader() : ContentTypeHeader.absent(),\nbody);\nString bodyFileName = SafeNames.makeSafeFileName(stubMapping, extension);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractorTest.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.recording;\n+\n+import com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.FileSource;\n+import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n+import org.jmock.Expectations;\n+import org.jmock.Mockery;\n+import org.jmock.integration.junit4.JMock;\n+import org.junit.Before;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+\n+import static com.github.tomakehurst.wiremock.client.WireMock.ok;\n+import static com.github.tomakehurst.wiremock.client.WireMock.okJson;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+@RunWith(JMock.class)\n+public class SnapshotStubMappingBodyExtractorTest {\n+ private FileSource filesSource;\n+ private SnapshotStubMappingBodyExtractor bodyExtractor;\n+ private Mockery context;\n+\n+ @Before\n+ public void init() {\n+ context = new Mockery();\n+ filesSource = context.mock(FileSource.class, \"filesFileSource\");\n+ bodyExtractor = new SnapshotStubMappingBodyExtractor(filesSource);\n+ }\n+\n+ @Test\n+ public void updatesStubMapping() {\n+ StubMapping stubMapping = WireMock.get(\"/foo\")\n+ .willReturn(ok(\"\"))\n+ .build();\n+ context.checking(new Expectations() {{\n+ // ignore arguments because this test is only for checking stub mapping changes\n+ one(filesSource).writeBinaryFile(with(any(String.class)), with(any(byte[].class)));\n+ }});\n+ bodyExtractor.extractInPlace(stubMapping);\n+ assertThat(stubMapping.getResponse().getBodyFileName(), is(\"foo-\" + stubMapping.getId() + \".txt\"));\n+ assertThat(stubMapping.getResponse().specifiesBodyFile(), is(true));\n+ assertThat(stubMapping.getResponse().specifiesBodyContent(), is(false));\n+ }\n+\n+ @Test\n+ public void determinesFileNameProperlyFromUrlWithJson() {\n+ StubMapping stubMapping = WireMock.get(\"/foo/bar.json\")\n+ .willReturn(ok(\"{}\"))\n+ .build();\n+ setFileExpectations(\"foobarjson-\" + stubMapping.getId() + \".json\", \"{}\");\n+ bodyExtractor.extractInPlace(stubMapping);\n+ }\n+\n+ @Test\n+ public void determinesFileNameProperlyFromUrlWithText() {\n+ StubMapping stubMapping = WireMock.get(\"/foo/bar.txt\")\n+ .willReturn(ok(\"\"))\n+ .build();\n+ setFileExpectations(\"foobartxt-\" + stubMapping.getId() + \".txt\", \"\");\n+ bodyExtractor.extractInPlace(stubMapping);\n+ }\n+\n+ @Test\n+ public void determinesFileNameProperlyFromMimeTypeWithJson() {\n+ StubMapping stubMapping = WireMock.get(\"/foo/bar.txt\")\n+ .willReturn(okJson(\"{}\"))\n+ .build();\n+ setFileExpectations( \"foobartxt-\" + stubMapping.getId() + \".json\", \"{}\");\n+ bodyExtractor.extractInPlace(stubMapping);\n+ }\n+\n+ @Test\n+ public void determinesFileNameProperlyWithNamedStubMapping() {\n+ StubMapping stubMapping = WireMock.get(\"/foo\")\n+ .willReturn(okJson(\"{}\"))\n+ .build();\n+ stubMapping.setName(\"TEST NAME!\");\n+ setFileExpectations( \"test-name-\" + stubMapping.getId() + \".json\", \"{}\");\n+ bodyExtractor.extractInPlace(stubMapping);\n+ }\n+\n+ private void setFileExpectations(final String filename, final String body) {\n+ context.checking(new Expectations() {{\n+ one(filesSource).writeBinaryFile(\n+ with(equal(filename)),\n+ with(equal(body.getBytes()))\n+ );\n+ }});\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add some tests for SnapshotStubMappingBodyExtractor |
686,965 | 24.07.2017 19:00:43 | 25,200 | b52a0800d9e4cfd70fa5b00e191a0f692cbbe7cd | Move ScenarioProcessorTest.java and SnapshotRecordResultDeserialiserTest.java to the right package | [
{
"change_type": "RENAME",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/model/ScenarioProcessorTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ScenarioProcessorTest.java",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package com.github.tomakehurst.wiremock.admin.model;\n+package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport com.github.tomakehurst.wiremock.recording.ScenarioProcessor;\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/admin/model/SnapshotRecordResultDeserialiserTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/SnapshotRecordResultDeserialiserTest.java",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package com.github.tomakehurst.wiremock.admin.model;\n+package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Move ScenarioProcessorTest.java and SnapshotRecordResultDeserialiserTest.java to the right package |
686,965 | 25.07.2017 21:35:14 | 25,200 | bb4c907414fe50a28bab1952478016d24ad15345 | Remove now-unused idGenerator from JsonFileMappingsSource | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java",
"diff": "@@ -30,12 +30,10 @@ import static com.google.common.collect.Iterables.filter;\npublic class JsonFileMappingsSource implements MappingsSource {\nprivate final FileSource mappingsFileSource;\n- private final VeryShortIdGenerator idGenerator;\nprivate final Map<UUID, String> fileNameMap;\npublic JsonFileMappingsSource(FileSource mappingsFileSource) {\nthis.mappingsFileSource = mappingsFileSource;\n- idGenerator = new VeryShortIdGenerator();\nfileNameMap = new HashMap<>();\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Remove now-unused idGenerator from JsonFileMappingsSource |
686,965 | 25.07.2017 21:54:30 | 25,200 | 5b1e23a65430f40d1257a1e449bf2301c0c4786a | Couple minor corrections to record-playback.md | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/record-playback.md",
"new_path": "docs-v2/_docs/record-playback.md",
"diff": "@@ -336,7 +336,7 @@ is reached, the last response will continue to be returned.\n### Transforming generated stubs\n-If need even more control over how your recorded stubs are generated, you can write one or more custom transformers that will be applied to stubs as they are captured.\n+If you need even more control over how your recorded stubs are generated, you can write one or more custom transformers that will be applied to stubs as they are captured.\nA transformer is an implementations of `StubMappingTransformer` and needs to be registered when starting WireMock as described in [Extending WireMock](/docs/extending-wiremock).\n@@ -359,7 +359,7 @@ As with other types of WireMock extension, parameters can be supplied. The exact\n### Request body matching\n-By default, the body match operator for a recorded stub is based on the `Content-Type` header of the request. For `*/json` MIME types, the operator will be `equalToJson` with both the `ignoreArrayOrder` and `ignoreExtraElements` options set to `true`. For `*/xml` MIME types, it will use `equalToXml`. Otherwise, it will use `equalTo` with the `caseInsensitive` option set to `false`.\n+By default, the body match operator for a recorded stub is based on the `Content-Type` header of the request. For MIME types containing the string \"json\", the operator will be `equalToJson` with both the `ignoreArrayOrder` and `ignoreExtraElements` options set to `true`. For MIME types containing `xml`, it will use `equalToXml`. Otherwise, it will use `equalTo` with the `caseInsensitive` option set to `false`.\nThis behavior can be customized via the `requestBodyPattern` parameter, which accepts a `matcher` (either `equalTo`, `equalToJson`, `equalToXml`, or `auto`) and any relevant matcher options (`ignoreArrayOrder`, `ignoreExtraElements`, or `caseInsensitive`). For example, here's how to preserve the default behavior, but set `ignoreArrayOrder` to `false` when `equalToJson` is used:\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Couple minor corrections to record-playback.md |
686,965 | 25.07.2017 22:31:11 | 25,200 | 079a13ca496a7944c70681f9cf4bdd86468fa1d1 | Minor code cleanup (mostly comments) | [
{
"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": "@@ -46,8 +46,6 @@ import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.github.tomakehurst.wiremock.common.HttpClientUtils.getEntityAsStringAndCloseStream;\nimport static com.google.common.base.Charsets.UTF_8;\nimport static com.google.common.base.Preconditions.checkNotNull;\n-import static java.net.HttpURLConnection.HTTP_NO_CONTENT;\n-import static java.net.HttpURLConnection.HTTP_OK;\nimport static org.apache.http.HttpHeaders.HOST;\npublic class HttpAdminClient implements Admin {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/StubMappingTransformer.java",
"diff": "@@ -20,9 +20,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;\n/**\n* Base class for stub mapping transformer extensions. This allows transforming stub mappings recorded via the\n- * snapshot API endpoint.\n- *\n- * @see com.github.tomakehurst.wiremock.admin.tasks.SnapshotTask\n+ * snapshot and recording API endpoints.\n*/\npublic abstract class StubMappingTransformer implements Extension {\npublic abstract StubMapping transform(StubMapping stubMapping, FileSource files, Parameters parameters);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/LoggedResponseDefinitionTransformer.java",
"diff": "@@ -19,8 +19,6 @@ import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;\nimport com.github.tomakehurst.wiremock.common.Gzip;\nimport com.github.tomakehurst.wiremock.common.Strings;\nimport com.github.tomakehurst.wiremock.http.*;\n-import com.github.tomakehurst.wiremock.http.HttpHeaders;\n-import com.google.common.base.Charsets;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\nimport com.google.common.collect.ImmutableList;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpec.java",
"diff": "@@ -28,24 +28,33 @@ import java.util.Map;\n*/\npublic class RecordSpec {\n+ // Target URL when using the recording API. Not applicable to snapshotting\nprivate final String targetBaseUrl;\n// Whitelist requests to generate StubMappings for\nprivate final ProxiedServeEventFilters filters;\n+\n// Headers from the request to include in the stub mapping, if they match the corresponding matcher\nprivate final Map<String, CaptureHeadersSpec> captureHeaders;\n+\n// Factory for the StringValuePattern that will be used to match request bodies\nprivate final RequestBodyPatternFactory requestBodyPatternFactory;\n+\n// Criteria for extracting body from responses\nprivate final ResponseDefinitionBodyMatcher extractBodyCriteria;\n+\n// How to format StubMappings in the response body\nprivate final SnapshotOutputFormatter outputFormat;\n+\n// Whether to persist stub mappings\nprivate final Boolean persist;\n+\n// Whether duplicate requests should be recorded as scenarios or just discarded\nprivate final Boolean repeatsAsScenarios;\n+\n// Stub mapping transformers\nprivate final List<String> transformers;\n+\n// Parameters for stub mapping transformers\nprivate final Parameters transformerParameters;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\n-import com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.matching.RequestPattern;\n+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport java.util.List;\nimport java.util.Map;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java",
"diff": "@@ -28,7 +28,6 @@ import com.google.common.base.Predicate;\nimport com.google.common.collect.Lists;\nimport java.util.List;\n-import java.util.Objects;\nimport java.util.UUID;\nimport static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformer.java",
"diff": "@@ -21,12 +21,10 @@ import com.google.common.base.Function;\nimport java.util.Map;\n-import static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\n/**\n- * Creates a RequestPatternBuilder from a Request's URL and method, and optionally headers from a whitelist.\n- * If headers patterns are supplied, the header will be only included in the RequestPatternBuilder if the predicate\n- * matches the request\n+ * Creates a RequestPatternBuilder from a Request's URL, method, body (if present), and optionally headers from a whitelist.\n*/\npublic class RequestPatternTransformer implements Function<Request, RequestPatternBuilder> {\nprivate final Map<String, CaptureHeadersSpec> headers;\n@@ -40,8 +38,7 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\n}\n/**\n- * Returns a RequestPatternBuilder matching the URL and method of the Request. If header patterns are supplied,\n- * this will match them against the request and include them in the RequestPatternBuilder if there's a match.\n+ * Returns a RequestPatternBuilder matching a given Request\n*/\n@Override\npublic RequestPatternBuilder apply(Request request) {\n@@ -58,8 +55,8 @@ public class RequestPatternTransformer implements Function<Request, RequestPatte\n}\n}\n- String body = request.getBodyAsString();\n- if (bodyPatternFactory != null && body != null && !body.isEmpty()) {\n+ byte[] body = request.getBody();\n+ if (bodyPatternFactory != null && body != null && body.length > 0) {\nbuilder.withRequestBody(bodyPatternFactory.forRequest(request));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotOutputFormatter.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotOutputFormatter.java",
"diff": "@@ -18,10 +18,10 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.fasterxml.jackson.annotation.JsonCreator;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n-import java.util.*;\n+import java.util.List;\n/**\n- * Generates response for calls to snapshot API endpoint using the recorded stub mappings\n+ * Wraps a list of generated StubMappings into a SnapshotRecordResult object\n*/\npublic enum SnapshotOutputFormatter {\nFULL {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingBodyExtractor.java",
"diff": "@@ -29,10 +29,9 @@ public class SnapshotStubMappingBodyExtractor {\n}\n/**\n- * Extracts body of the ResponseDefinition to a file written to the FILES_ROOT.\n- * Modifies the ResponseDefinition to point to the file in-place\n+ * Extracts body of the ResponseDefinition to a file written to the files source.\n+ * Modifies the ResponseDefinition to point to the file in-place.\n*\n- * @fixme Generates multiple files for stub mappings with identical responses\n* @param stubMapping Stub mapping to extract\n*/\npublic void extractInPlace(StubMapping stubMapping) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/SnapshotStubMappingGenerator.java",
"diff": "@@ -26,7 +26,7 @@ import java.net.URI;\nimport java.util.Map;\n/**\n- * Transforms ServeEvents to StubMappings using SnapshotRequestPatternTransformer and SnapshotResponseDefinitionTransformer\n+ * Transforms ServeEvents to StubMappings using RequestPatternTransformer and LoggedResponseDefinitionTransformer\n*/\npublic class SnapshotStubMappingGenerator implements Function<ServeEvent, StubMapping> {\nprivate final RequestPatternTransformer requestTransformer;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/resources/assets/recorder/index.html",
"new_path": "src/main/resources/assets/recorder/index.html",
"diff": "<title>WireMock Recorder</title>\n<script src='/__admin/recorder/lib/jquery-3.2.1.min.js' type='text/javascript'></script>\n- <!--<script src='assets/lib/jquery-3.2.1.min.js' type='text/javascript'></script>-->\n<style type=\"text/css\">\nbody {\n<div class=\"content\">\n<h1>\n- <!--<img src=\"assets/images/wiremock-concept-icon-01.png\" id=\"logo\"/>-->\n<img src=\"/__admin/recorder/images/wiremock-concept-icon-01.png\" id=\"logo\"/>\nWireMock Recorder\n</h1>\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": "@@ -406,7 +406,6 @@ public class RecordApiAcceptanceTest extends AcceptanceTestBase {\nprivate static final String NONGLOBAL_TRANSFORMED_STUB_MAPPING_RESPONSE =\n\"{ \\n\" +\n\" \\\"mappings\\\": [ \\n\" +\n-\n\" { \\n\" +\n\" \\\"request\\\" : { \\n\" +\n\" \\\"url\\\" : \\\"/?transformed=nonglobal\\\", \\n\" +\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ProxiedServeEventFiltersTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ProxiedServeEventFiltersTest.java",
"diff": "@@ -32,7 +32,8 @@ 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.MockRequest.mockRequest;\nimport static com.github.tomakehurst.wiremock.matching.RequestPatternBuilder.newRequestPattern;\n-import static org.junit.Assert.*;\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\npublic class ProxiedServeEventFiltersTest {\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactoryJsonDeserializerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactoryJsonDeserializerTest.java",
"diff": "package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.common.Json;\n-import com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n+import com.github.tomakehurst.wiremock.matching.EqualToPattern;\nimport org.junit.Test;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestPatternTransformerTest.java",
"diff": "@@ -17,7 +17,7 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n-import com.github.tomakehurst.wiremock.matching.*;\n+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;\nimport com.google.common.collect.ImmutableMap;\nimport org.junit.Test;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ResponseDefinitionBodyMatcherDeserializerTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/ResponseDefinitionBodyMatcherDeserializerTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.recording;\n-import com.github.tomakehurst.wiremock.recording.ResponseDefinitionBodyMatcher;\n-import com.github.tomakehurst.wiremock.recording.ResponseDefinitionBodyMatcherDeserializer;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.google.common.collect.ImmutableMap;\nimport org.junit.Test;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Minor code cleanup (mostly comments) |
686,965 | 26.07.2017 00:54:19 | 25,200 | 095d38d6b8879d1ba72513b75d2baa7277f90d45 | Add hack to use AnythingPattern in RequestBodyAutomaticPatternFactory for multipart/form | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"diff": "@@ -17,12 +17,8 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.fasterxml.jackson.annotation.JsonCreator;\nimport com.fasterxml.jackson.annotation.JsonProperty;\n-import com.github.tomakehurst.wiremock.http.ContentTypeHeader;\nimport com.github.tomakehurst.wiremock.http.Request;\n-import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n-import com.github.tomakehurst.wiremock.matching.EqualToPattern;\n-import com.github.tomakehurst.wiremock.matching.EqualToXmlPattern;\n-import com.github.tomakehurst.wiremock.matching.StringValuePattern;\n+import com.github.tomakehurst.wiremock.matching.*;\npublic class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFactory {\n@@ -64,12 +60,15 @@ public class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFac\n*/\n@Override\npublic StringValuePattern forRequest(Request request) {\n- final ContentTypeHeader contentType = request.getHeaders().getContentTypeHeader();\n- if (contentType.mimeTypePart() != null) {\n- if (contentType.mimeTypePart().contains(\"json\")) {\n+ final String mimeType = request.getHeaders().getContentTypeHeader().mimeTypePart();\n+ if (mimeType != null) {\n+ if (mimeType.contains(\"json\")) {\nreturn new EqualToJsonPattern(request.getBodyAsString(), ignoreArrayOrder, ignoreExtraElements);\n- } else if (contentType.mimeTypePart().contains(\"xml\")) {\n+ } else if (mimeType.contains(\"xml\")) {\nreturn new EqualToXmlPattern(request.getBodyAsString());\n+ } else if (mimeType.equals(\"multipart/form-data\")) {\n+ // TODO: Need to add a matcher that can handle multipart data properly. For now, just always match\n+ return new AnythingPattern();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"diff": "@@ -26,6 +26,13 @@ import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\npublic class RequestBodyAutomaticPatternFactoryTest {\nprivate final static String JSON_TEST_STRING = \"{ \\\"foo\\\": 1 }\";\nprivate final static String XML_TEST_STRING = \"<foo/>\";\n+ private final static String MULTIPART_TEST_STRING = \"--abc\\n\" +\n+ \"Content-Disposition: form-data; name=\\\"test1\\\"\\n\\n\" +\n+ \"test one\\n\" +\n+ \"--abc\\n\" +\n+ \"Content-Disposition: form-data; name=\\\"texs2\\\"\\n\\n\" +\n+ \"test two\\n\" +\n+ \"--abc\";\n@Test\npublic void forRequestWithTextBodyIsCaseSensitiveByDefault() {\n@@ -81,6 +88,17 @@ public class RequestBodyAutomaticPatternFactoryTest {\nassertThat(pattern.getEqualToXml(), is(XML_TEST_STRING));\n}\n+ @Test\n+ public void forRequestWithMultipartBody() {\n+ Request request = mockRequest()\n+ .header(\"Content-Type\", \"multipart/form-data\")\n+ .body(MULTIPART_TEST_STRING);\n+ // TODO: Update this when we add a matcher for multipart bodies\n+ AnythingPattern pattern = (AnythingPattern) patternForRequest(request);\n+\n+ assertThat(pattern.toString(), is(\"anything\"));\n+ }\n+\nprivate static StringValuePattern patternForRequest(Request request) {\nreturn RequestBodyAutomaticPatternFactory.DEFAULTS.forRequest(request);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add hack to use AnythingPattern in RequestBodyAutomaticPatternFactory for multipart/form |
686,965 | 26.07.2017 01:05:16 | 25,200 | 43e84c5f7a87989424da0e49192ae728a5a69bb2 | Add another hack to use AnythingPattern for binary bodies | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"diff": "@@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.matching.*;\n+import static com.github.tomakehurst.wiremock.common.ContentTypes.determineIsTextFromMimeType;\n+\npublic class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFactory {\nprivate final Boolean caseInsensitive;\n@@ -69,6 +71,9 @@ public class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFac\n} else if (mimeType.equals(\"multipart/form-data\")) {\n// TODO: Need to add a matcher that can handle multipart data properly. For now, just always match\nreturn new AnythingPattern();\n+ } else if (!determineIsTextFromMimeType(mimeType)) {\n+ // TODO: Need a way of matching binary body content (\"equalToBase64\"?)\n+ return new AnythingPattern();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MockRequest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MockRequest.java",
"diff": "@@ -73,6 +73,11 @@ public class MockRequest implements Request {\nreturn this;\n}\n+ public MockRequest body(byte[] body) {\n+ this.body = body;\n+ return this;\n+ }\n+\npublic MockRequest clientIp(String clientIp) {\nthis.clientIp = clientIp;\nreturn this;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"diff": "@@ -99,6 +99,17 @@ public class RequestBodyAutomaticPatternFactoryTest {\nassertThat(pattern.toString(), is(\"anything\"));\n}\n+ @Test\n+ public void forRequestWithBinaryBody() {\n+ Request request = mockRequest()\n+ .header(\"Content-Type\", \"application/octet-stream\")\n+ .body(new byte[] { 1, 2, 3});\n+ // TODO: Update this when we add a matcher for binary bodies\n+ AnythingPattern pattern = (AnythingPattern) patternForRequest(request);\n+\n+ assertThat(pattern.toString(), is(\"anything\"));\n+ }\n+\nprivate static StringValuePattern patternForRequest(Request request) {\nreturn RequestBodyAutomaticPatternFactory.DEFAULTS.forRequest(request);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add another hack to use AnythingPattern for binary bodies |
686,936 | 26.07.2017 12:18:59 | -3,600 | 33024344f292e3a5867368a3392205709bd62681 | Tweaked record spec DSL | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/record-playback.md",
"new_path": "docs-v2/_docs/record-playback.md",
"diff": "@@ -171,7 +171,7 @@ startRecording(\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .jsonBodyMatchFlags(false, true)\n+ .matchRequestBodyWithEqualToJson(false, true)\n);\n```\n@@ -226,7 +226,7 @@ snapshotRecord(\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .jsonBodyMatchFlags(false, true)\n+ .chooseBodyMatchTypeAutomatically()\n);\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RecordSpecBuilder.java",
"diff": "@@ -98,22 +98,34 @@ public class RecordSpecBuilder {\nreturn this;\n}\n- public RecordSpecBuilder requestBodyAutoPattern(boolean ignoreArrayOrder, boolean ignoreExtraElements, boolean caseInsensitive) {\n+ public RecordSpecBuilder chooseBodyMatchTypeAutomatically() {\n+ return chooseBodyMatchTypeAutomatically(null, null, null);\n+ }\n+\n+ public RecordSpecBuilder chooseBodyMatchTypeAutomatically(Boolean ignoreArrayOrder, Boolean ignoreExtraElements, Boolean caseInsensitive) {\nthis.requestBodyPatternFactory = new RequestBodyAutomaticPatternFactory(ignoreArrayOrder, ignoreExtraElements, caseInsensitive);\nreturn this;\n}\n- public RecordSpecBuilder requestBodyEqualToJsonPattern(boolean ignoreArrayOrder, boolean ignoreExtraElements) {\n+ public RecordSpecBuilder matchRequestBodyWithEqualToJson() {\n+ return matchRequestBodyWithEqualToJson(null, null);\n+ }\n+\n+ public RecordSpecBuilder matchRequestBodyWithEqualToJson(Boolean ignoreArrayOrder, Boolean ignoreExtraElements) {\nthis.requestBodyPatternFactory = new RequestBodyEqualToJsonPatternFactory(ignoreArrayOrder, ignoreExtraElements);\nreturn this;\n}\n- public RecordSpecBuilder requestBodyEqualToXmlPattern() {\n+ public RecordSpecBuilder matchRequestBodyWithEqualToXml() {\nthis.requestBodyPatternFactory = new RequestBodyEqualToXmlPatternFactory();\nreturn this;\n}\n- public RecordSpecBuilder requestBodyEqualToPattern(boolean caseInsensitive) {\n+ public RecordSpecBuilder matchRequestBodyWithEqualTo() {\n+ return matchRequestBodyWithEqualTo(null);\n+ }\n+\n+ public RecordSpecBuilder matchRequestBodyWithEqualTo(Boolean caseInsensitive) {\nthis.requestBodyPatternFactory = new RequestBodyEqualToPatternFactory(caseInsensitive);\nreturn this;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/RecordingDslAcceptanceTest.java",
"diff": "@@ -23,7 +23,6 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatus;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n-import com.google.common.net.HttpHeaders;\nimport org.apache.commons.lang3.StringUtils;\nimport org.apache.http.HttpEntity;\nimport org.apache.http.client.entity.GzipCompressingEntity;\n@@ -199,7 +198,7 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nadminClient.startStubRecording(\nrecordSpec()\n.forTarget(targetBaseUrl)\n- .requestBodyEqualToJsonPattern(true, true)\n+ .matchRequestBodyWithEqualToJson(true, true)\n);\nclient.postJson(\"/record-this-with-body\", \"{}\");\n@@ -218,7 +217,7 @@ public class RecordingDslAcceptanceTest extends AcceptanceTestBase {\nproxyingService.startRecording(\nrecordSpec()\n.forTarget(targetBaseUrl)\n- .requestBodyEqualToJsonPattern(true, true)\n+ .matchRequestBodyWithEqualToJson(true, true)\n);\nclient.postJson(\"/record-this-with-body\", \"{}\");\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": "@@ -256,7 +256,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nclient.postWithBody(\"/some-json\", \"<foo/>\", \"application/xml\", \"utf-8\");\nclient.postWithBody(\"/some-json\", \"foo\", \"application/text\", \"utf-8\");\n- List<StubMapping> mappings = snapshotRecord(recordSpec().requestBodyAutoPattern(false, false, true));\n+ List<StubMapping> mappings = snapshotRecord(recordSpec().chooseBodyMatchTypeAutomatically(false, false, true));\nEqualToJsonPattern jsonBodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\nassertThat(jsonBodyPattern.getEqualToJson(), is(\"{}\"));\n@@ -275,7 +275,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToJsonPattern() {\nclient.postJson(\"/some-json\", \"{}\");\n- List<StubMapping> mappings = snapshotRecord(recordSpec().requestBodyEqualToJsonPattern(false, true));\n+ List<StubMapping> mappings = snapshotRecord(recordSpec().matchRequestBodyWithEqualToJson(false, true));\nEqualToJsonPattern bodyPattern = (EqualToJsonPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\nassertThat(bodyPattern.isIgnoreArrayOrder(), is(false));\n@@ -286,7 +286,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToXmlPattern() {\nclient.postWithBody(\"/some-json\", \"<foo/>\", \"application/xml\", \"utf-8\");\n- List<StubMapping> mappings = snapshotRecord(recordSpec().requestBodyEqualToXmlPattern());\n+ List<StubMapping> mappings = snapshotRecord(recordSpec().matchRequestBodyWithEqualToXml());\nassertThat(mappings.get(0).getRequest().getBodyPatterns().get(0), instanceOf(EqualToXmlPattern.class));\n}\n@@ -295,7 +295,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\npublic void supportsConfigurationOfRequestBodyPatternFactoryWithEqualToPattern() {\nclient.postWithBody(\"/some-json\", \"foo\", \"application/text\", \"utf-8\");\n- List<StubMapping> mappings = snapshotRecord(recordSpec().requestBodyEqualToPattern(true));\n+ List<StubMapping> mappings = snapshotRecord(recordSpec().matchRequestBodyWithEqualTo(true));\nEqualToPattern bodyPattern = (EqualToPattern) mappings.get(0).getRequest().getBodyPatterns().get(0);\nassertThat(bodyPattern.getCaseInsensitive(), is(true));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/ignored/Examples.java",
"new_path": "src/test/java/ignored/Examples.java",
"diff": "@@ -33,7 +33,6 @@ import com.google.common.base.Optional;\nimport com.google.common.collect.ImmutableMap;\nimport org.junit.Test;\n-import java.util.Collections;\nimport java.util.List;\nimport java.util.UUID;\n@@ -417,7 +416,7 @@ public class Examples extends AcceptanceTestBase {\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .requestBodyEqualToJsonPattern(false, true)\n+ .matchRequestBodyWithEqualToJson(false, true)\n);\nSystem.out.println(Json.write(recordSpec()\n@@ -431,7 +430,7 @@ public class Examples extends AcceptanceTestBase {\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .requestBodyEqualToJsonPattern(false, true)\n+ .matchRequestBodyWithEqualToJson(false, true)\n.build()));\n}\n@@ -449,7 +448,7 @@ public class Examples extends AcceptanceTestBase {\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .requestBodyEqualToJsonPattern(false, true)\n+ .chooseBodyMatchTypeAutomatically()\n);\nSystem.out.println(Json.write(recordSpec()\n@@ -463,7 +462,7 @@ public class Examples extends AcceptanceTestBase {\n.ignoreRepeatRequests()\n.transformers(\"modify-response-header\")\n.transformerParameters(Parameters.one(\"headerValue\", \"123\"))\n- .requestBodyEqualToJsonPattern(false, true)\n+ .chooseBodyMatchTypeAutomatically()\n.build()));\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked record spec DSL |
686,936 | 27.07.2017 12:28:24 | -3,600 | b4fd12e46a9650b865ba5a044e89ce3ddebd500d | Added binary request body equality matching | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/BasicMappingBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/BasicMappingBuilder.java",
"diff": "@@ -86,7 +86,7 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {\n}\n@Override\n- public BasicMappingBuilder withRequestBody(StringValuePattern bodyPattern) {\n+ public BasicMappingBuilder withRequestBody(ContentPattern<?> bodyPattern) {\nrequestPatternBuilder.withRequestBody(bodyPattern);\nreturn this;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/MappingBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/MappingBuilder.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.client;\n+import com.github.tomakehurst.wiremock.matching.ContentPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -25,7 +26,7 @@ public interface MappingBuilder {\nMappingBuilder atPriority(Integer priority);\nMappingBuilder withHeader(String key, StringValuePattern headerPattern);\nMappingBuilder withQueryParam(String key, StringValuePattern queryParamPattern);\n- MappingBuilder withRequestBody(StringValuePattern bodyPattern);\n+ MappingBuilder withRequestBody(ContentPattern<?> bodyPattern);\nScenarioMappingBuilder inScenario(String scenarioName);\nMappingBuilder withId(UUID id);\nMappingBuilder withName(String name);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/ScenarioMappingBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/ScenarioMappingBuilder.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.client;\n+import com.github.tomakehurst.wiremock.matching.ContentPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\nimport java.util.UUID;\n@@ -27,7 +28,7 @@ public interface ScenarioMappingBuilder extends MappingBuilder {\nScenarioMappingBuilder atPriority(Integer priority);\nScenarioMappingBuilder withHeader(String key, StringValuePattern headerPattern);\nScenarioMappingBuilder withQueryParam(String key, StringValuePattern queryParamPattern);\n- ScenarioMappingBuilder withRequestBody(StringValuePattern bodyPattern);\n+ ScenarioMappingBuilder withRequestBody(ContentPattern<?> bodyPattern);\nScenarioMappingBuilder inScenario(String scenarioName);\nScenarioMappingBuilder withId(UUID id);\nScenarioMappingBuilder persistent();\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": "@@ -155,6 +155,10 @@ public class WireMock {\nreturn new EqualToPattern(value);\n}\n+ public static BinaryEqualToPattern binaryEqualTo(byte[] content) {\n+ return new BinaryEqualToPattern(content);\n+ }\n+\npublic static StringValuePattern equalToIgnoreCase(String value) {\nreturn new EqualToPattern(value, true);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/BinaryEqualToPattern.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonIgnore;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+import com.google.common.io.BaseEncoding;\n+\n+import java.util.Arrays;\n+\n+public class BinaryEqualToPattern extends ContentPattern<byte[]> {\n+\n+ public BinaryEqualToPattern(byte[] expected) {\n+ super(expected);\n+ }\n+\n+ @JsonCreator\n+ public BinaryEqualToPattern(@JsonProperty(\"binaryEqualTo\") String expected) {\n+ this(BaseEncoding.base64().decode(expected));\n+ }\n+\n+ @Override\n+ public MatchResult match(byte[] actual) {\n+ return MatchResult.of(\n+ Arrays.equals(actual, expectedValue)\n+ );\n+ }\n+\n+ @Override\n+ @JsonIgnore\n+ public String getName() {\n+ return \"binaryEqualTo\";\n+ }\n+\n+ @Override\n+ @JsonIgnore\n+ public String getExpected() {\n+ return BaseEncoding.base64().encode(expectedValue);\n+ }\n+\n+ public String getBinaryEqualTo() {\n+ return getExpected();\n+ }\n+\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/ContentPattern.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.annotation.JsonIgnore;\n+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;\n+\n+@JsonDeserialize(using = ContentPatternDeserialiser.class)\n+public abstract class ContentPattern<T> implements NamedValueMatcher<T> {\n+\n+ protected final T expectedValue;\n+\n+ public ContentPattern(T expectedValue) {\n+ this.expectedValue = expectedValue;\n+ }\n+\n+ @JsonIgnore\n+ public T getValue() {\n+ return expectedValue;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/ContentPatternDeserialiser.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.core.JsonParser;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.DeserializationContext;\n+import com.fasterxml.jackson.databind.JsonDeserializer;\n+import com.fasterxml.jackson.databind.JsonMappingException;\n+import com.fasterxml.jackson.databind.JsonNode;\n+import com.google.common.collect.ImmutableList;\n+\n+import java.io.IOException;\n+import java.util.Map;\n+\n+public class ContentPatternDeserialiser extends JsonDeserializer<ContentPattern<?>> {\n+\n+ @Override\n+ public ContentPattern<?> deserialize(JsonParser parser, DeserializationContext context) throws IOException, JsonProcessingException {\n+ JsonNode rootNode = parser.readValueAsTree();\n+\n+ if (isAbsent(rootNode)) {\n+ return StringValuePattern.ABSENT;\n+ }\n+\n+ if (!rootNode.has(\"binaryEqualTo\")) {\n+ return new StringValuePatternJsonDeserializer().buildStringValuePattern(rootNode);\n+ }\n+\n+ return deserializeBinaryEqualTo(rootNode);\n+ }\n+\n+ private BinaryEqualToPattern deserializeBinaryEqualTo(JsonNode rootNode) throws JsonMappingException {\n+ String operand = rootNode.findValue(\"binaryEqualTo\").textValue();\n+\n+ return new BinaryEqualToPattern(operand);\n+ }\n+\n+ private static boolean isAbsent(JsonNode rootNode) {\n+ for (Map.Entry<String, JsonNode> node: ImmutableList.copyOf(rootNode.fields())) {\n+ if (node.getKey().equals(\"absent\")) {\n+ return true;\n+ }\n+ }\n+\n+ return false;\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": "@@ -48,7 +48,7 @@ public class RequestPattern implements NamedValueMatcher<Request> {\nprivate final Map<String, MultiValuePattern> queryParams;\nprivate final Map<String, StringValuePattern> cookies;\nprivate final BasicCredentials basicAuthCredentials;\n- private final List<StringValuePattern> bodyPatterns;\n+ private final List<ContentPattern<?>> bodyPatterns;\nprivate CustomMatcherDefinition customMatcherDefinition;\nprivate ValueMatcher<Request> matcher;\n@@ -79,7 +79,7 @@ public class RequestPattern implements NamedValueMatcher<Request> {\nMap<String, MultiValuePattern> queryParams,\nMap<String, StringValuePattern> cookies,\nBasicCredentials basicAuthCredentials,\n- List<StringValuePattern> bodyPatterns,\n+ List<ContentPattern<?>> bodyPatterns,\nCustomMatcherDefinition customMatcherDefinition) {\nthis.url = url;\nthis.method = firstNonNull(method, RequestMethod.ANY);\n@@ -102,7 +102,7 @@ public class RequestPattern implements NamedValueMatcher<Request> {\n@JsonProperty(\"queryParameters\") Map<String, MultiValuePattern> queryParams,\n@JsonProperty(\"cookies\") Map<String, StringValuePattern> cookies,\n@JsonProperty(\"basicAuth\") BasicCredentials basicAuthCredentials,\n- @JsonProperty(\"bodyPatterns\") List<StringValuePattern> bodyPatterns,\n+ @JsonProperty(\"bodyPatterns\") List<ContentPattern<?>> bodyPatterns,\n@JsonProperty(\"customMatcher\") CustomMatcherDefinition customMatcherDefinition) {\nthis(\n@@ -220,14 +220,21 @@ public class RequestPattern implements NamedValueMatcher<Request> {\nreturn MatchResult.exactMatch();\n}\n+ @SuppressWarnings(\"unchecked\")\nprivate MatchResult allBodyPatternsMatch(final Request request) {\nif (bodyPatterns != null && !bodyPatterns.isEmpty() && request.getBody() != null) {\nreturn MatchResult.aggregate(\n- from(bodyPatterns).transform(new Function<StringValuePattern, MatchResult>() {\n+ from(bodyPatterns).transform(new Function<ContentPattern, MatchResult>() {\n@Override\n- public MatchResult apply(StringValuePattern pattern) {\n+ public MatchResult apply(ContentPattern pattern) {\n+ if (StringValuePattern.class.isAssignableFrom(pattern.getClass())) {\nreturn pattern.match(request.getBodyAsString());\n}\n+\n+ return ((BinaryEqualToPattern) pattern).match(request.getBody());\n+ }\n+\n+\n}).toList()\n);\n}\n@@ -284,7 +291,7 @@ public class RequestPattern implements NamedValueMatcher<Request> {\nreturn cookies;\n}\n- public List<StringValuePattern> getBodyPatterns() {\n+ public List<ContentPattern<?>> getBodyPatterns() {\nreturn bodyPatterns;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPatternBuilder.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/RequestPatternBuilder.java",
"diff": "@@ -33,7 +33,7 @@ public class RequestPatternBuilder {\nprivate RequestMethod method;\nprivate Map<String, MultiValuePattern> headers = newLinkedHashMap();\nprivate Map<String, MultiValuePattern> queryParams = newLinkedHashMap();\n- private List<StringValuePattern> bodyPatterns = newArrayList();\n+ private List<ContentPattern<?>> bodyPatterns = newArrayList();\nprivate Map<String, StringValuePattern> cookies = newLinkedHashMap();\nprivate BasicCredentials basicCredentials;\n@@ -107,7 +107,7 @@ public class RequestPatternBuilder {\nreturn this;\n}\n- public RequestPatternBuilder withRequestBody(StringValuePattern valuePattern) {\n+ public RequestPatternBuilder withRequestBody(ContentPattern valuePattern) {\nthis.bodyPatterns.add(valuePattern);\nreturn this;\n}\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": "@@ -25,14 +25,12 @@ import com.google.common.collect.FluentIterable;\nimport java.lang.reflect.Constructor;\n@JsonDeserialize(using = StringValuePatternJsonDeserializer.class)\n-public abstract class StringValuePattern implements NamedValueMatcher<String> {\n+public abstract class StringValuePattern extends ContentPattern<String> {\npublic static final AbsentPattern ABSENT = new AbsentPattern(null);\n- protected final String expectedValue;\n-\npublic StringValuePattern(String expectedValue) {\n- this.expectedValue = expectedValue;\n+ super(expectedValue);\n}\n@JsonIgnore\n@@ -49,11 +47,6 @@ public abstract class StringValuePattern implements NamedValueMatcher<String> {\nreturn this == ABSENT;\n}\n- @JsonIgnore\n- public String getValue() {\n- return expectedValue;\n- }\n-\n@Override\npublic String toString() {\nreturn getName() + \" \" + getValue();\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": "@@ -59,6 +59,10 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nreturn StringValuePattern.ABSENT;\n}\n+ return buildStringValuePattern(rootNode);\n+ }\n+\n+ public StringValuePattern buildStringValuePattern(JsonNode rootNode) throws JsonMappingException {\nClass<? extends StringValuePattern> patternClass = findPatternClass(rootNode);\nif (patternClass.equals(EqualToJsonPattern.class)) {\nreturn deserializeEqualToJson(rootNode);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/verification/Diff.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/verification/Diff.java",
"diff": "@@ -22,16 +22,11 @@ import com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.MultiValue;\nimport com.github.tomakehurst.wiremock.http.Request;\nimport com.github.tomakehurst.wiremock.http.RequestMethod;\n-import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;\n-import com.github.tomakehurst.wiremock.matching.EqualToPattern;\n-import com.github.tomakehurst.wiremock.matching.EqualToXmlPattern;\n-import com.github.tomakehurst.wiremock.matching.MultiValuePattern;\n-import com.github.tomakehurst.wiremock.matching.RequestPattern;\n-import com.github.tomakehurst.wiremock.matching.StringValuePattern;\n-import com.github.tomakehurst.wiremock.matching.NamedValueMatcher;\n+import com.github.tomakehurst.wiremock.matching.*;\nimport com.google.common.base.Function;\nimport com.google.common.base.Joiner;\nimport com.google.common.collect.ImmutableList;\n+import com.google.common.io.BaseEncoding;\nimport java.util.Collections;\nimport java.util.List;\n@@ -110,11 +105,18 @@ public class Diff {\nbuilder.add(SPACER);\n}\n- List<StringValuePattern> bodyPatterns = requestPattern.getBodyPatterns();\n+ List<ContentPattern<?>> bodyPatterns = requestPattern.getBodyPatterns();\nif (bodyPatterns != null && !bodyPatterns.isEmpty()) {\n- for (StringValuePattern pattern: bodyPatterns) {\n+ for (ContentPattern<?> pattern: bodyPatterns) {\nString body = formatIfJsonOrXml(pattern);\n- builder.add(new Section<>(pattern, body, pattern.getExpected()));\n+ if (StringValuePattern.class.isAssignableFrom(pattern.getClass())) {\n+ StringValuePattern stringValuePattern = (StringValuePattern) pattern;\n+ builder.add(new Section<>(stringValuePattern, body, pattern.getExpected()));\n+ } else {\n+ BinaryEqualToPattern nonStringPattern = (BinaryEqualToPattern) pattern;\n+ builder.add(new Section<>(nonStringPattern, body.getBytes(), pattern.getExpected()));\n+ }\n+\n}\n}\n@@ -128,12 +130,14 @@ public class Diff {\nreturn sections.isEmpty() ? \"\" : junitStyleDiffMessage(expected, actual);\n}\n- private String formatIfJsonOrXml(StringValuePattern pattern) {\n+ private String formatIfJsonOrXml(ContentPattern<?> pattern) {\ntry {\nreturn pattern.getClass().equals(EqualToJsonPattern.class) ?\nJson.prettyPrint(request.getBodyAsString()) :\npattern.getClass().equals(EqualToXmlPattern.class) ?\nXml.prettyPrint(request.getBodyAsString()) :\n+ pattern.getClass().equals(BinaryEqualToPattern.class) ?\n+ BaseEncoding.base64().encode(request.getBody()):\nrequest.getBodyAsString();\n} catch (Exception e) {\nreturn request.getBodyAsString();\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": "@@ -99,7 +99,7 @@ public class SnapshotDslAcceptanceTest extends AcceptanceTestBase {\nassertThat(returnedMappings.get(2).getRequest().getUrl(), is(\"/three\"));\n- StringValuePattern bodyPattern = returnedMappings.get(2).getRequest().getBodyPatterns().get(0);\n+ ContentPattern bodyPattern = returnedMappings.get(2).getRequest().getBodyPatterns().get(0);\nassertThat(bodyPattern, instanceOf(EqualToJsonPattern.class));\nJSONAssert.assertEquals(\"{ \\\"counter\\\": 55 }\", bodyPattern.getExpected(), true);\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": "@@ -23,6 +23,8 @@ import com.github.tomakehurst.wiremock.testsupport.WireMockResponse;\nimport org.apache.http.MalformedChunkCodingException;\nimport org.apache.http.NoHttpResponseException;\nimport org.apache.http.client.ClientProtocolException;\n+import org.apache.http.entity.ByteArrayEntity;\n+import org.apache.http.entity.ContentType;\nimport org.hamcrest.Description;\nimport org.hamcrest.Matcher;\nimport org.hamcrest.TypeSafeMatcher;\n@@ -39,6 +41,7 @@ import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;\nimport static com.github.tomakehurst.wiremock.testsupport.TestHttpHeader.withHeader;\nimport static java.net.HttpURLConnection.HTTP_NOT_FOUND;\nimport static java.net.HttpURLConnection.HTTP_OK;\n+import static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -268,6 +271,23 @@ public class StubbingAcceptanceTest extends AcceptanceTestBase {\nassertThat(response.statusCode(), is(HTTP_OK));\n}\n+ @Test\n+ public void matchingOnRequestBodyWithBinaryEqualTo() {\n+ byte[] requestBody = new byte[] { 1, 2, 3 };\n+\n+ stubFor(post(\"/match/binary\")\n+ .withRequestBody(binaryEqualTo(requestBody))\n+ .willReturn(ok(\"Matched binary\"))\n+ );\n+\n+ WireMockResponse response = testClient.post(\"/match/binary\", new ByteArrayEntity(new byte[] { 9 }, APPLICATION_OCTET_STREAM));\n+ assertThat(response.statusCode(), is(HTTP_NOT_FOUND));\n+\n+ response = testClient.post(\"/match/binary\", new ByteArrayEntity(requestBody, APPLICATION_OCTET_STREAM));\n+ assertThat(response.statusCode(), is(HTTP_OK));\n+\n+ }\n+\n@Test\npublic void responseWithFixedDelay() {\nstubFor(get(urlEqualTo(\"/delayed/resource\")).willReturn(\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/BinaryEqualToPatternPatternTest.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.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.Json;\n+import com.google.common.io.BaseEncoding;\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+import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;\n+\n+public class BinaryEqualToPatternPatternTest {\n+\n+ @Test\n+ public void returns1ForNonMatch() {\n+ ValueMatcher<byte[]> pattern = WireMock.binaryEqualTo(new byte[] { 1, 2, 3 });\n+ byte[] actual = {4, 5, 6};\n+\n+ MatchResult match = pattern.match(actual);\n+\n+ assertThat(match.getDistance(), is(1.0));\n+ assertThat(match.isExactMatch(), is(false));\n+ }\n+\n+ @Test\n+ public void returns0WhenExactlyEqual() {\n+ ValueMatcher<byte[]> pattern = WireMock.binaryEqualTo(new byte[] { 1, 2, 3 });\n+ byte[] actual = { 1, 2, 3};\n+\n+ MatchResult match = pattern.match(actual);\n+\n+ assertThat(match.getDistance(), is(0.0));\n+ assertThat(match.isExactMatch(), is(true));\n+ }\n+\n+ @Test\n+ public void returnsNonMatchWheActualIsNull() {\n+ ValueMatcher<byte[]> pattern = WireMock.binaryEqualTo(new byte[] { 1, 2, 3 });\n+ byte[] actual = null;\n+\n+ MatchResult match = pattern.match(actual);\n+\n+ assertThat(match.getDistance(), is(1.0));\n+ assertThat(match.isExactMatch(), is(false));\n+ }\n+\n+ @Test\n+ public void serialisesCorrectly() throws Exception {\n+ byte[] expected = { 5, 5, 5, 5 };\n+ String base64Expected = BaseEncoding.base64().encode(expected);\n+ String expectedJson =\n+ \"{ \\n\" +\n+ \" \\\"binaryEqualTo\\\": \\\"\" + base64Expected + \"\\\" \\n\" +\n+ \"}\";\n+ assertEquals(\n+ expectedJson,\n+ Json.write(new BinaryEqualToPattern(expected)),\n+ true\n+ );\n+ }\n+\n+ @Test\n+ @SuppressWarnings(\"unchecked\")\n+ public void deserialisesCorrectly() {\n+ String base64Expected = BaseEncoding.base64().encode(new byte[] { 1, 2, 3 });\n+\n+ ContentPattern<byte[]> pattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"binaryEqualTo\\\": \\\"\" + base64Expected + \"\\\" \\n\" +\n+ \"}\",\n+ ContentPattern.class);\n+\n+ assertThat(pattern, instanceOf(BinaryEqualToPattern.class));\n+ assertThat(pattern.getExpected(), is(base64Expected));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/RequestPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/RequestPatternTest.java",
"diff": "@@ -409,10 +409,10 @@ public class RequestPatternTest {\nJSONAssert.assertEquals(ALL_BODY_PATTERNS_EXAMPLE, json, true);\n}\n- static Matcher<StringValuePattern> valuePattern(final Class<? extends StringValuePattern> patternClass, final String expectedValue) {\n- return new TypeSafeDiagnosingMatcher<StringValuePattern>() {\n+ static Matcher<ContentPattern<?>> valuePattern(final Class<? extends StringValuePattern> patternClass, final String expectedValue) {\n+ return new TypeSafeDiagnosingMatcher<ContentPattern<?>>() {\n@Override\n- protected boolean matchesSafely(StringValuePattern item, Description mismatchDescription) {\n+ protected boolean matchesSafely(ContentPattern<?> item, Description mismatchDescription) {\nreturn item.getClass().equals(patternClass) && item.getValue().equals(expectedValue);\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added binary request body equality matching |
686,936 | 27.07.2017 14:44:39 | -3,600 | edbe9fcec03bbc763cc2321c921e7c915e27321d | Recorder now uses the new binary equality operator when binary request bodies are captured | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/matching/BinaryEqualToPattern.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/BinaryEqualToPattern.java",
"diff": "@@ -41,5 +41,8 @@ public class BinaryEqualToPattern extends ContentPattern<byte[]> {\nreturn getExpected();\n}\n-\n+ @Override\n+ public String toString() {\n+ return getName() + \" \" + getExpected();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactory.java",
"diff": "@@ -61,7 +61,7 @@ public class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFac\n* easier to read. Otherwise, just use \"equalTo\"\n*/\n@Override\n- public StringValuePattern forRequest(Request request) {\n+ public ContentPattern<?> forRequest(Request request) {\nfinal String mimeType = request.getHeaders().getContentTypeHeader().mimeTypePart();\nif (mimeType != null) {\nif (mimeType.contains(\"json\")) {\n@@ -72,8 +72,7 @@ public class RequestBodyAutomaticPatternFactory implements RequestBodyPatternFac\n// TODO: Need to add a matcher that can handle multipart data properly. For now, just always match\nreturn new AnythingPattern();\n} else if (!determineIsTextFromMimeType(mimeType)) {\n- // TODO: Need a way of matching binary body content (\"equalToBase64\"?)\n- return new AnythingPattern();\n+ return new BinaryEqualToPattern(request.getBody());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactory.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/recording/RequestBodyPatternFactory.java",
"diff": "@@ -18,6 +18,7 @@ package com.github.tomakehurst.wiremock.recording;\nimport com.fasterxml.jackson.annotation.JsonSubTypes;\nimport com.fasterxml.jackson.annotation.JsonTypeInfo;\nimport com.github.tomakehurst.wiremock.http.Request;\n+import com.github.tomakehurst.wiremock.matching.ContentPattern;\nimport com.github.tomakehurst.wiremock.matching.StringValuePattern;\n/**\n@@ -36,5 +37,5 @@ import com.github.tomakehurst.wiremock.matching.StringValuePattern;\n@JsonSubTypes.Type(value = RequestBodyEqualToXmlPatternFactory.class, name = \"equalToXml\")\n})\npublic interface RequestBodyPatternFactory {\n- StringValuePattern forRequest(Request request);\n+ ContentPattern<?> forRequest(Request request);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/recording/RequestBodyAutomaticPatternFactoryTest.java",
"diff": "@@ -104,13 +104,13 @@ public class RequestBodyAutomaticPatternFactoryTest {\nRequest request = mockRequest()\n.header(\"Content-Type\", \"application/octet-stream\")\n.body(new byte[] { 1, 2, 3 });\n- // TODO: Update this when we add a matcher for binary bodies\n- AnythingPattern pattern = (AnythingPattern) patternForRequest(request);\n- assertThat(pattern.toString(), is(\"anything\"));\n+ BinaryEqualToPattern pattern = (BinaryEqualToPattern) patternForRequest(request);\n+\n+ assertThat(pattern.toString(), is(\"binaryEqualTo AQID\"));\n}\n- private static StringValuePattern patternForRequest(Request request) {\n+ private static ContentPattern<?> patternForRequest(Request request) {\nreturn RequestBodyAutomaticPatternFactory.DEFAULTS.forRequest(request);\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Recorder now uses the new binary equality operator when binary request bodies are captured |
686,936 | 27.07.2017 15:07:33 | -3,600 | 7610d003720e1b39c994f95dcd36b3e3e48b9b9b | Updated the docs with details of the new binary equality matcher | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -221,6 +221,34 @@ JSON:\n}\n```\n+### Binary Equality\n+\n+Deems a match if the entire binary attribute value equals the expected value. Unlike the above equalTo operator, this compares byte arrays (or their equivalent base64 representation).\n+\n+Java:\n+\n+```java\n+// Specifying the expected value as a byte array\n+.withRequestBody(binaryEqualTo(new byte[] { 1, 2, 3 }))\n+\n+// Specifying the expected value as a base64 String\n+.withRequestBody(binaryEqualTo(\"AQID\"))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [{\n+ \"binaryEqualTo\" : \"AQID\" // Base 64\n+ }]\n+ ...\n+ },\n+ ...\n+}\n+```\n### Substring (contains)\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": "@@ -159,6 +159,10 @@ public class WireMock {\nreturn new BinaryEqualToPattern(content);\n}\n+ public static BinaryEqualToPattern binaryEqualTo(String content) {\n+ return new BinaryEqualToPattern(content);\n+ }\n+\npublic static StringValuePattern equalToIgnoreCase(String value) {\nreturn new EqualToPattern(value, true);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/ignored/Examples.java",
"new_path": "src/test/java/ignored/Examples.java",
"diff": "@@ -81,6 +81,20 @@ public class Examples extends AcceptanceTestBase {\n.willReturn(aResponse().withStatus(200)));\n}\n+ @Test\n+ public void binaryBodyMatchingByteArray() {\n+ stubFor(post(urlEqualTo(\"/with/body\"))\n+ .withRequestBody(binaryEqualTo(new byte[] { 1, 2, 3 }))\n+ .willReturn(ok()));\n+ }\n+\n+ @Test\n+ public void binaryBodyMatchingBase64() {\n+ stubFor(post(urlEqualTo(\"/with/body\"))\n+ .withRequestBody(binaryEqualTo(\"AQID\"))\n+ .willReturn(ok()));\n+ }\n+\n@Test\npublic void priorities() {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Updated the docs with details of the new binary equality matcher |
686,936 | 31.07.2017 13:48:09 | -3,600 | 4e7d5256437d9e546ca66d136f36813078e2eae3 | Removed dependency on Jetty's HttpStatus class due to reports that this breaks when used with Spring Boot | [
{
"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": "@@ -24,6 +24,7 @@ import com.github.tomakehurst.wiremock.core.Options;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\nimport com.github.tomakehurst.wiremock.global.GlobalSettings;\nimport com.github.tomakehurst.wiremock.http.HttpClientFactory;\n+import com.github.tomakehurst.wiremock.http.HttpStatus;\nimport com.github.tomakehurst.wiremock.matching.RequestPattern;\nimport com.github.tomakehurst.wiremock.recording.RecordSpecBuilder;\nimport com.github.tomakehurst.wiremock.recording.RecordingStatusResult;\n@@ -38,7 +39,6 @@ import org.apache.commons.lang3.StringUtils;\nimport org.apache.http.client.methods.*;\nimport org.apache.http.entity.StringEntity;\nimport org.apache.http.impl.client.CloseableHttpClient;\n-import org.eclipse.jetty.http.HttpStatus;\nimport java.util.UUID;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/http/HttpStatus.java",
"diff": "+package com.github.tomakehurst.wiremock.http;\n+\n+public class HttpStatus {\n+\n+ public static boolean isSuccess(int code) {\n+ return ((200 <= code) && (code <= 299));\n+ }\n+\n+ public static boolean isRedirection(int code) {\n+ return ((300 <= code) && (code <= 399));\n+ }\n+\n+ public static boolean isClientError(int code) {\n+ return ((400 <= code) && (code <= 499));\n+ }\n+\n+ public static boolean isServerError(int code) {\n+ return ((500 <= code) && (code <= 599));\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Removed dependency on Jetty's HttpStatus class due to reports that this breaks when used with Spring Boot |
686,948 | 07.08.2017 21:27:41 | -7,200 | ccef888b120013d88980d0038d061a64dcaac35d | added wiremock exclusive handlebars helpers:
wmXml: allows to search body content via xPath
wmSoap: is the same as wmXml but just with prefix /Envelope/Body
wmJson: allows to search body content via JsonPath
added com.jayway.jsonpath:json-path:2.2.0 to dependencies which allows the JsonPath implementation | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -66,6 +66,7 @@ dependencies {\ncompile 'com.github.jknack:handlebars:4.0.6', {\nexclude group: 'org.mozilla', module: 'rhino'\n}\n+ compile 'com.jayway.jsonpath:json-path:2.2.0'\ntestCompile \"org.hamcrest:hamcrest-all:1.3\"\ntestCompile(\"org.jmock:jmock:2.5.1\") {\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": "@@ -24,6 +24,7 @@ import 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.responsetemplating.helpers.WiremockHelpers;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\nimport com.github.tomakehurst.wiremock.http.HttpHeaders;\nimport com.github.tomakehurst.wiremock.http.Request;\n@@ -62,6 +63,11 @@ public class ResponseTemplateTransformer extends ResponseDefinitionTransformer {\nhandlebars.registerHelper(helper.name(), helper);\n}\n+ //Add all available wiremock helpers\n+ for(WiremockHelpers helper: WiremockHelpers.values()){\n+ handlebars.registerHelper(helper.name(), helper);\n+ }\n+\nfor (Map.Entry<String, Helper> entry: helpers.entrySet()) {\nhandlebars.registerHelper(entry.getKey(), entry.getValue());\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Helper;\n+\n+import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n+\n+/**\n+ * This abstract class is the base for all defined Handlebars helper in wiremock. It basically allows simpler error\n+ * handling.\n+ *\n+ * @param <T> Type used as context for the Handlebars helper.\n+ * @author Christopher Holomek\n+ */\n+public abstract class HandlebarsHelper<T> implements Helper<T> {\n+ public static final String ERROR_PREFIX = \"Handlebars Helper Error: \";\n+\n+\n+ /**\n+ * Handle invalid helper data without exception details or because none was thrown.\n+ *\n+ * @param message message to log and return\n+ * @return a message which will be used as content\n+ */\n+ protected String handleError(final String message) {\n+ notifier().error(ERROR_PREFIX + message);\n+ return ERROR_PREFIX + message;\n+ }\n+\n+ /**\n+ * Handle invalid helper data with exception details in the log message.\n+ *\n+ * @param message message to log and return\n+ * @param cause which occurred during application of the helper\n+ * @return a message which will be used as content\n+ */\n+ protected String handleError(final String message, final Throwable cause) {\n+ notifier().error(ERROR_PREFIX + message, cause);\n+ return ERROR_PREFIX + message;\n+ }\n+\n+ /**\n+ * Handle invalid helper data with exception details in the log message. Also additional information regarding the\n+ * issue is written in the logs.\n+ *\n+ * @param message message to log and return\n+ * @param logExclusive additional information just for the log\n+ * @param cause which occured during application of the helper\n+ * @return a message which will be used as content\n+ */\n+ protected String handleError(final String message, final String logExclusive, final Throwable cause) {\n+ notifier().error(ERROR_PREFIX + message + \" - \" + logExclusive, cause);\n+ return ERROR_PREFIX + message;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import com.jayway.jsonpath.InvalidJsonException;\n+import com.jayway.jsonpath.JsonPath;\n+\n+import java.io.IOException;\n+\n+\n+/**\n+ * This class uses JsonPath from jayway for reading a json via jsonPath so that the result can be used for response\n+ * templating.\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsJsonHelper extends HandlebarsHelper<String> {\n+\n+ @Override\n+ public Object apply(final String context, final Options options) throws IOException {\n+ if (context == null || options == null || options.param(0, null) == null) {\n+ return this.handleError(\"HandlebarsJsonHelper: No parameters defined. Helper not applied\");\n+ }\n+\n+ final String jsonPath = options.param(0);\n+ try {\n+ return String.valueOf(JsonPath.read(context, jsonPath));\n+ } catch (final InvalidJsonException e) {\n+ return this.handleError(\n+ \"HandlebarsJsonHelper: An error occurred. Helper not applied. See cause for more details.\",\n+ e.getJson(), e);\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+/**\n+ * This class uses HandlebarsXmlHelper as a base an just set a prefix which reduce the written handlebars helper to the\n+ * relevant part\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsSoapHelper extends HandlebarsXmlHelper {\n+\n+ @Override\n+ protected String getXPathPrefix() {\n+ return \"/Envelope/Body/\";\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelper.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import com.github.jknack.handlebars.Options;\n+import org.w3c.dom.Document;\n+import org.xml.sax.InputSource;\n+import org.xml.sax.SAXException;\n+\n+import javax.xml.parsers.DocumentBuilder;\n+import javax.xml.parsers.DocumentBuilderFactory;\n+import javax.xml.parsers.ParserConfigurationException;\n+import javax.xml.xpath.XPath;\n+import javax.xml.xpath.XPathExpressionException;\n+import javax.xml.xpath.XPathFactory;\n+import java.io.IOException;\n+import java.io.StringReader;\n+\n+/**\n+ * This class uses javax.xml.xpath.* for reading a xml via xPath so that the result can be used for response\n+ * templating.\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsXmlHelper extends HandlebarsHelper<String> {\n+\n+ @Override\n+ public Object apply(final String context, final Options options) throws IOException {\n+ if (context == null || options == null || options.param(0, null) == null) {\n+ return this.handleError(this.getClass().getSimpleName() + \": No parameters defined. Helper not applied\");\n+ }\n+\n+ final String xPathInput = options.param(0);\n+\n+ try (final StringReader reader = new StringReader(context)) {\n+ final InputSource source = new InputSource(reader);\n+\n+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\n+ final DocumentBuilder builder = factory.newDocumentBuilder();\n+ final Document doc = builder.parse(source);\n+\n+ final XPathFactory xPathfactory = XPathFactory.newInstance();\n+ final XPath xpath = xPathfactory.newXPath();\n+\n+ return xpath.evaluate(getXPathPrefix() + xPathInput, doc);\n+\n+ } catch (SAXException | XPathExpressionException | ParserConfigurationException e) {\n+ return this.handleError(this.getClass().getSimpleName() + \": An error occurred. Helper not applied.\", e);\n+ }\n+ }\n+\n+\n+ /**\n+ * No prefix by default. It allows to extend this class with a specified prefix. Just overwrite this method to do\n+ * so.\n+ *\n+ * @return a prefix which will be applied before the specified xpath.\n+ */\n+ protected String getXPathPrefix() {\n+ return \"\";\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/WiremockHelpers.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+\n+/**\n+ * This enum is implemented similar to the StringHelpers of handlebars.\n+ * It is basically a library of all available wiremock helpers\n+ *\n+ * @author Christopher Holomek\n+ */\n+public enum WiremockHelpers implements Helper<Object> {\n+ wmXml {\n+ private HandlebarsXmlHelper helper = new HandlebarsXmlHelper();\n+\n+ @Override\n+ public Object apply(final Object context, final Options options) throws IOException {\n+ return this.helper.apply(String.valueOf(context), options);\n+ }\n+ },\n+ wmSoap {\n+ private HandlebarsSoapHelper helper = new HandlebarsSoapHelper();\n+\n+ @Override\n+ public Object apply(final Object context, final Options options) throws IOException {\n+ return this.helper.apply(String.valueOf(context), options);\n+ }\n+ },\n+ wmJson {\n+ private HandlebarsJsonHelper helper = new HandlebarsJsonHelper();\n+\n+ @Override\n+ public Object apply(final Object context, final Options options) throws IOException {\n+ return this.helper.apply(String.valueOf(context), options);\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.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 org.junit.Assert;\n+\n+import java.io.IOException;\n+import java.util.ArrayList;\n+\n+import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.startsWith;\n+import static org.junit.Assert.assertThat;\n+\n+/**\n+ * This class is the test base for all handlebars helper\n+ *\n+ * @author Christopher Holomek\n+ */\n+public abstract class HandlebarsHelperTestBase {\n+\n+ protected static final String FAIL_GRACEFULLY_MSG = \"Handlebars helper should fail gracefully and show the issue directly in the response.\";\n+\n+ protected static <T> void testHelperError(final Helper<T> helper,\n+ final T content, final String xPath) {\n+ try {\n+ assertThat((String) helper.apply(content, createOptions(xPath)), startsWith(HandlebarsHelper.ERROR_PREFIX));\n+ } catch (final IOException e) {\n+ Assert.fail(FAIL_GRACEFULLY_MSG);\n+ }\n+ }\n+\n+ protected static <T> void testHelper(final Helper<T> helper,\n+ final T content, final String optionParam, final String expected) throws\n+ IOException {\n+ assertThat((String) helper.apply(content, createOptions(optionParam)), is(expected));\n+ }\n+\n+ protected static Options createOptions(final String optionParam) {\n+ return new Options(null, null, null, null, null, null,\n+ new Object[]{optionParam}, null, new ArrayList<String>(0));\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+\n+/**\n+ * This class tests the HandlebarsJsonHelper\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\n+\n+ private HandlebarsJsonHelper helper;\n+\n+ @Before\n+ public void init() {\n+ this.helper = new HandlebarsJsonHelper();\n+ }\n+\n+ @Test\n+ public void positiveTestSimpleJson() throws IOException {\n+ testHelper(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.test\", \"success\");\n+ }\n+\n+ @Test\n+ public void negativeTestInvalidJson() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.test\");\n+ }\n+\n+ @Test\n+ public void negativeTestInvalidJsonPath() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.\\\\test\");\n+ }\n+\n+ @Test\n+ public void negativeTestJsonNull() {\n+ testHelperError(this.helper, null, \"$.test\");\n+ }\n+\n+ @Test\n+ public void negativeTestJsonPathNull() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", null);\n+ }\n+\n+ @Test\n+ public void negativeTestAllNull() {\n+ testHelperError(this.helper, null, null);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+\n+/**\n+ * This class tests the HandlebarsSoapHelper\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\n+\n+ private HandlebarsSoapHelper helper;\n+\n+ @Before\n+ public void init() {\n+ this.helper = new HandlebarsSoapHelper();\n+ }\n+\n+ @Test\n+ public void positiveTestSimpleSoap() throws IOException {\n+ testHelper(this.helper, \"<Envelope><Body><test>success</test></Body></Envelope>\", \"/test\", \"success\");\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"diff": "+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+\n+import org.junit.Before;\n+import org.junit.Test;\n+\n+import java.io.IOException;\n+\n+/**\n+ * This class tests the HandlebarsXmlHelper\n+ *\n+ * @author Christopher Holomek\n+ */\n+public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n+\n+ private HandlebarsXmlHelper helper;\n+\n+ @Before\n+ public void init() {\n+ this.helper = new HandlebarsXmlHelper();\n+ }\n+\n+ @Test\n+ public void positiveTestSimpleXml() throws IOException {\n+ testHelper(this.helper, \"<test>success</test>\", \"/test\", \"success\");\n+ }\n+\n+ @Test\n+ public void negativeTestInvalidXml() {\n+ testHelperError(this.helper, \"<testsuccess</test>\", \"/test\");\n+ }\n+\n+ @Test\n+ public void negativeTestInvalidXPath() {\n+ testHelperError(this.helper, \"<test>success</test>\", \"/\\\\test\");\n+ }\n+\n+ @Test\n+ public void negativeTestXmlNull() {\n+ testHelperError(this.helper, null, \"/test\");\n+ }\n+\n+ @Test\n+ public void negativeTestXPathNull() {\n+ testHelperError(this.helper, \"<test>success</test>\", null);\n+ }\n+\n+ @Test\n+ public void negativeTestAllNull() {\n+ testHelperError(this.helper, null, null);\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | added wiremock exclusive handlebars helpers:
-wmXml: allows to search body content via xPath
-wmSoap: is the same as wmXml but just with prefix /Envelope/Body
-wmJson: allows to search body content via JsonPath
-added com.jayway.jsonpath:json-path:2.2.0 to dependencies which allows the JsonPath implementation |
686,948 | 08.08.2017 21:23:06 | -7,200 | 99ae293b349aff933fc7b08508c6460e00231550 | added more tests
catch JsonPathException to handle all possible exceptions from JsonPath. | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"diff": "@@ -3,6 +3,7 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\nimport com.jayway.jsonpath.InvalidJsonException;\nimport com.jayway.jsonpath.JsonPath;\n+import com.jayway.jsonpath.JsonPathException;\nimport java.io.IOException;\n@@ -28,6 +29,9 @@ public class HandlebarsJsonHelper extends HandlebarsHelper<String> {\nreturn this.handleError(\n\"HandlebarsJsonHelper: An error occurred. Helper not applied. See cause for more details.\",\ne.getJson(), e);\n+ }catch(final JsonPathException e){\n+ return this.handleError(\n+ \"HandlebarsJsonHelper: An error occurred. Helper not applied. See cause for more details.\", e);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Before;\nimport org.junit.Test;\nimport java.io.IOException;\n+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.startsWith;\n+import static org.junit.Assert.assertThat;\n+\n/**\n* This class tests the HandlebarsJsonHelper\n*\n@@ -13,10 +23,12 @@ import java.io.IOException;\npublic class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsJsonHelper helper;\n+ private ResponseTemplateTransformer transformer;\n@Before\npublic void init() {\nthis.helper = new HandlebarsJsonHelper();\n+ this.transformer = new ResponseTemplateTransformer(true);\n}\n@Test\n@@ -24,6 +36,30 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\ntestHelper(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.test\", \"success\");\n}\n+ @Test\n+ public void positiveTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/json\").body(\n+ \"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n+ aResponse().withBody(\"{\\\"test\\\": \\\"{{wmJson request.body '$.a.test'}}\\\"}\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), is(\"{\\\"test\\\": \\\"success\\\"}\"));\n+ }\n+\n+ @Test\n+ public void negativeTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/json\").body(\n+ \"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n+ aResponse().withBody(\"{\\\"test\\\": \\\"{{wmJson request.body '$.b.test'}}\\\"}\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), startsWith(\"{\\\"test\\\": \\\"\" + HandlebarsHelper.ERROR_PREFIX));\n+ }\n+\n@Test\npublic void negativeTestInvalidJson() {\ntestHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.test\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Before;\nimport org.junit.Test;\nimport java.io.IOException;\n+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n/**\n* This class tests the HandlebarsSoapHelper\n*\n@@ -13,14 +22,40 @@ import java.io.IOException;\npublic class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsSoapHelper helper;\n+ private ResponseTemplateTransformer transformer;\n@Before\npublic void init() {\nthis.helper = new HandlebarsSoapHelper();\n+ this.transformer = new ResponseTemplateTransformer(true);\n}\n@Test\npublic void positiveTestSimpleSoap() throws IOException {\ntestHelper(this.helper, \"<Envelope><Body><test>success</test></Body></Envelope>\", \"/test\", \"success\");\n}\n+\n+ @Test\n+ public void positiveTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/soap\").body(\n+ \"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n+ aResponse().withBody(\"<test>{{wmSoap request.body '/a/test'}}</test>\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), is(\"<test>success</test>\"));\n+ }\n+\n+ @Test\n+ public void negativeTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/soap\").body(\n+ \"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n+ aResponse().withBody(\"<test>{{wmSoap request.body '/b/test'}}</test>\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), is(\"<test></test>\"));\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+import com.github.tomakehurst.wiremock.extension.Parameters;\n+import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\n+import com.github.tomakehurst.wiremock.http.ResponseDefinition;\nimport org.junit.Before;\nimport org.junit.Test;\nimport java.io.IOException;\n+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\n+import static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\n+import static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static org.hamcrest.Matchers.is;\n+import static org.hamcrest.Matchers.startsWith;\n+import static org.junit.Assert.assertThat;\n+\n/**\n* This class tests the HandlebarsXmlHelper\n*\n@@ -13,10 +23,12 @@ import java.io.IOException;\npublic class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsXmlHelper helper;\n+ private ResponseTemplateTransformer transformer;\n@Before\npublic void init() {\nthis.helper = new HandlebarsXmlHelper();\n+ this.transformer = new ResponseTemplateTransformer(true);\n}\n@Test\n@@ -24,6 +36,28 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\ntestHelper(this.helper, \"<test>success</test>\", \"/test\", \"success\");\n}\n+ @Test\n+ public void positiveTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/xml\").body(\"<a><test>success</test></a>\"),\n+ aResponse().withBody(\"<test>{{wmXml request.body '/a/test'}}</test>\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), is(\"<test>success</test>\"));\n+ }\n+\n+ @Test\n+ public void negativeTestResponseTemplate(){\n+ final ResponseDefinition responseDefinition = this.transformer.transform(\n+ mockRequest().url(\"/xml\").body(\"<a><test>success</test></a>\"),\n+ aResponse().withBody(\"<test>{{wmXml request.body '/b/test'}}</test>\").build(),\n+ noFileSource(),\n+ Parameters.empty());\n+\n+ assertThat(responseDefinition.getBody(), startsWith(\"<test></test>\"));\n+ }\n+\n@Test\npublic void negativeTestInvalidXml() {\ntestHelperError(this.helper, \"<testsuccess</test>\", \"/test\");\n@@ -48,4 +82,6 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\npublic void negativeTestAllNull() {\ntestHelperError(this.helper, null, null);\n}\n+\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | -added more tests
-catch JsonPathException to handle all possible exceptions from JsonPath. |
686,936 | 11.08.2017 13:30:20 | -3,600 | 212d5880a087bc901974317eb58b90207a46c580 | Tweaked error messaging and tests for xpath and jsonpath handlebars helpers | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -66,7 +66,6 @@ dependencies {\ncompile 'com.github.jknack:handlebars:4.0.6', {\nexclude group: 'org.mozilla', module: 'rhino'\n}\n- compile 'com.jayway.jsonpath:json-path:2.2.0'\ntestCompile \"org.hamcrest:hamcrest-all:1.3\"\ntestCompile(\"org.jmock:jmock:2.5.1\") {\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": "@@ -9,11 +9,11 @@ import static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n* handling.\n*\n* @param <T> Type used as context for the Handlebars helper.\n- * @author Christopher Holomek\n*/\npublic abstract class HandlebarsHelper<T> implements Helper<T> {\n- public static final String ERROR_PREFIX = \"Handlebars Helper Error: \";\n+ public static final String ERROR_PREFIX = \"[ERROR: \";\n+ public static final String ERROR_SUFFIX = \"]\";\n/**\n* Handle invalid helper data without exception details or because none was thrown.\n@@ -22,8 +22,8 @@ public abstract class HandlebarsHelper<T> implements Helper<T> {\n* @return a message which will be used as content\n*/\nprotected String handleError(final String message) {\n- notifier().error(ERROR_PREFIX + message);\n- return ERROR_PREFIX + message;\n+ notifier().error(formatMessage(message));\n+ return formatMessage(message);\n}\n/**\n@@ -34,8 +34,8 @@ public abstract class HandlebarsHelper<T> implements Helper<T> {\n* @return a message which will be used as content\n*/\nprotected String handleError(final String message, final Throwable cause) {\n- notifier().error(ERROR_PREFIX + message, cause);\n- return ERROR_PREFIX + message;\n+ notifier().error(formatMessage(message), cause);\n+ return formatMessage(message);\n}\n/**\n@@ -49,6 +49,10 @@ public abstract class HandlebarsHelper<T> implements Helper<T> {\n*/\nprotected String handleError(final String message, final String logExclusive, final Throwable cause) {\nnotifier().error(ERROR_PREFIX + message + \" - \" + logExclusive, cause);\n- return ERROR_PREFIX + message;\n+ return formatMessage(message);\n+ }\n+\n+ private String formatMessage(String message) {\n+ return ERROR_PREFIX + message + ERROR_SUFFIX;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"diff": "@@ -7,31 +7,27 @@ import com.jayway.jsonpath.JsonPathException;\nimport java.io.IOException;\n-\n-/**\n- * This class uses JsonPath from jayway for reading a json via jsonPath so that the result can be used for response\n- * templating.\n- *\n- * @author Christopher Holomek\n- */\npublic class HandlebarsJsonHelper extends HandlebarsHelper<String> {\n@Override\n- public Object apply(final String context, final Options options) throws IOException {\n- if (context == null || options == null || options.param(0, null) == null) {\n- return this.handleError(\"HandlebarsJsonHelper: No parameters defined. Helper not applied\");\n+ public Object apply(final String inputJson, final Options options) throws IOException {\n+ if (inputJson == null) {\n+ return \"\";\n+ }\n+\n+ if (options == null || options.param(0, null) == null) {\n+ return this.handleError(\"The JSONPath cannot be empty\");\n}\nfinal String jsonPath = options.param(0);\ntry {\n- return String.valueOf(JsonPath.read(context, jsonPath));\n- } catch (final InvalidJsonException e) {\n+ return String.valueOf(JsonPath.read(inputJson, jsonPath));\n+ } catch (InvalidJsonException e) {\nreturn this.handleError(\n- \"HandlebarsJsonHelper: An error occurred. Helper not applied. See cause for more details.\",\n+ inputJson + \" is not valid JSON\",\ne.getJson(), e);\n- }catch(final JsonPathException e){\n- return this.handleError(\n- \"HandlebarsJsonHelper: An error occurred. Helper not applied. See cause for more details.\", e);\n+ } catch (JsonPathException e) {\n+ return this.handleError(jsonPath + \" is not a valid JSONPath expression\", e);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelper.java",
"diff": "@@ -3,8 +3,6 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n/**\n* This class uses HandlebarsXmlHelper as a base an just set a prefix which reduce the written handlebars helper to the\n* relevant part\n- *\n- * @author Christopher Holomek\n*/\npublic class HandlebarsSoapHelper extends HandlebarsXmlHelper {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelper.java",
"diff": "@@ -14,36 +14,46 @@ import javax.xml.xpath.XPathFactory;\nimport java.io.IOException;\nimport java.io.StringReader;\n+import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+\n/**\n* This class uses javax.xml.xpath.* for reading a xml via xPath so that the result can be used for response\n* templating.\n- *\n- * @author Christopher Holomek\n*/\npublic class HandlebarsXmlHelper extends HandlebarsHelper<String> {\n@Override\n- public Object apply(final String context, final Options options) throws IOException {\n- if (context == null || options == null || options.param(0, null) == null) {\n- return this.handleError(this.getClass().getSimpleName() + \": No parameters defined. Helper not applied\");\n+ public Object apply(final String inputXml, final Options options) throws IOException {\n+ if (inputXml == null ) {\n+ return \"\";\n}\n- final String xPathInput = options.param(0);\n+ if (options.param(0, null) == null) {\n+ return handleError(\"The XPath expression cannot be empty\");\n+ }\n- try (final StringReader reader = new StringReader(context)) {\n- final InputSource source = new InputSource(reader);\n+ final String xPathInput = options.param(0);\n+ Document doc;\n+ try (final StringReader reader = new StringReader(inputXml)) {\n+ InputSource source = new InputSource(reader);\nfinal DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\nfinal DocumentBuilder builder = factory.newDocumentBuilder();\n- final Document doc = builder.parse(source);\n+ doc = builder.parse(source);\n+ } catch (SAXException se) {\n+ return handleError(inputXml + \" is not valid XML\");\n+ } catch (ParserConfigurationException e) {\n+ return throwUnchecked(e, Object.class);\n+ }\n+ try {\nfinal XPathFactory xPathfactory = XPathFactory.newInstance();\nfinal XPath xpath = xPathfactory.newXPath();\nreturn xpath.evaluate(getXPathPrefix() + xPathInput, doc);\n- } catch (SAXException | XPathExpressionException | ParserConfigurationException e) {\n- return this.handleError(this.getClass().getSimpleName() + \": An error occurred. Helper not applied.\", e);\n+ } catch (XPathExpressionException e) {\n+ return handleError(xPathInput + \" is not a valid XPath expression\", e);\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": "@@ -8,11 +8,9 @@ import java.io.IOException;\n/**\n* This enum is implemented similar to the StringHelpers of handlebars.\n* It is basically a library of all available wiremock helpers\n- *\n- * @author Christopher Holomek\n*/\npublic enum WiremockHelpers implements Helper<Object> {\n- wmXml {\n+ xPath {\nprivate HandlebarsXmlHelper helper = new HandlebarsXmlHelper();\n@Override\n@@ -20,7 +18,7 @@ public enum WiremockHelpers implements Helper<Object> {\nreturn this.helper.apply(String.valueOf(context), options);\n}\n},\n- wmSoap {\n+ soapXPath {\nprivate HandlebarsSoapHelper helper = new HandlebarsSoapHelper();\n@Override\n@@ -28,7 +26,7 @@ public enum WiremockHelpers implements Helper<Object> {\nreturn this.helper.apply(String.valueOf(context), options);\n}\n},\n- wmJson {\n+ jsonPath {\nprivate HandlebarsJsonHelper helper = new HandlebarsJsonHelper();\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/client/WireMockClientWithProxyAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/client/WireMockClientWithProxyAcceptanceTest.java",
"diff": "@@ -24,6 +24,7 @@ import org.junit.Test;\nimport org.littleshoot.proxy.HttpProxyServer;\nimport org.littleshoot.proxy.impl.DefaultHttpProxyServer;\n+import java.net.InetAddress;\nimport java.net.InetSocketAddress;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n@@ -38,12 +39,11 @@ public class WireMockClientWithProxyAcceptanceTest {\nprivate HttpProxyServer proxyServer;\n@Before\n- public void init() {\n+ public void init() throws Exception {\nwireMockServer = new WireMockServer(Options.DYNAMIC_PORT);\nwireMockServer.start();\n- InetSocketAddress proxyAddress = new InetSocketAddress(Options.DYNAMIC_PORT);\n- proxyServer = DefaultHttpProxyServer.bootstrap().withAddress(proxyAddress).start();\n+ proxyServer = DefaultHttpProxyServer.bootstrap().withPort(0).start();\nWireMock.configureFor(\"http\", \"localhost\", wireMockServer.port(), proxyServer.getListenAddress().getHostString(), proxyServer.getListenAddress().getPort());\ntestClient = new WireMockTestClient(wireMockServer.port());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"diff": "@@ -2,6 +2,7 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Helper;\nimport com.github.jknack.handlebars.Options;\n+import org.hamcrest.Matcher;\nimport org.junit.Assert;\nimport java.io.IOException;\n@@ -11,31 +12,35 @@ import static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n-/**\n- * This class is the test base for all handlebars helper\n- *\n- * @author Christopher Holomek\n- */\npublic abstract class HandlebarsHelperTestBase {\nprotected static final String FAIL_GRACEFULLY_MSG = \"Handlebars helper should fail gracefully and show the issue directly in the response.\";\n- protected static <T> void testHelperError(final Helper<T> helper,\n- final T content, final String xPath) {\n+ protected static <T> void testHelperError(Helper<T> helper,\n+ T content,\n+ String pathExpression) {\n+ testHelperError(helper, content, pathExpression, startsWith(HandlebarsHelper.ERROR_PREFIX));\n+ }\n+\n+ protected static <T> void testHelperError(Helper<T> helper,\n+ T content,\n+ String pathExpression,\n+ Matcher<String> expectation) {\ntry {\n- assertThat((String) helper.apply(content, createOptions(xPath)), startsWith(HandlebarsHelper.ERROR_PREFIX));\n+ assertThat((String) helper.apply(content, createOptions(pathExpression)), expectation);\n} catch (final IOException e) {\nAssert.fail(FAIL_GRACEFULLY_MSG);\n}\n}\n- protected static <T> void testHelper(final Helper<T> helper,\n- final T content, final String optionParam, final String expected) throws\n- IOException {\n+ protected static <T> void testHelper(Helper<T> helper,\n+ T content,\n+ String optionParam,\n+ String expected) throws IOException {\nassertThat((String) helper.apply(content, createOptions(optionParam)), is(expected));\n}\n- protected static Options createOptions(final String optionParam) {\n+ protected static Options createOptions(String optionParam) {\nreturn new Options(null, null, null, null, null, null,\nnew Object[]{optionParam}, null, new ArrayList<String>(0));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n+import com.github.tomakehurst.wiremock.common.ConsoleNotifier;\n+import com.github.tomakehurst.wiremock.common.LocalNotifier;\n+import com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n@@ -15,11 +18,6 @@ import static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n-/**\n- * This class tests the HandlebarsJsonHelper\n- *\n- * @author Christopher Holomek\n- */\npublic class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsJsonHelper helper;\n@@ -29,19 +27,23 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\npublic void init() {\nthis.helper = new HandlebarsJsonHelper();\nthis.transformer = new ResponseTemplateTransformer(true);\n+\n+ LocalNotifier.set(new ConsoleNotifier(true));\n}\n@Test\n- public void positiveTestSimpleJson() throws IOException {\n+ public void extractsASimpleValueFromTheInputJson() throws IOException {\ntestHelper(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.test\", \"success\");\n}\n@Test\n- public void positiveTestResponseTemplate(){\n+ public void mergesASimpleValueFromRequestIntoResponseBody() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/json\").body(\n- \"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n- aResponse().withBody(\"{\\\"test\\\": \\\"{{wmJson request.body '$.a.test'}}\\\"}\").build(),\n+ mockRequest()\n+ .url(\"/json\").\n+ body(\"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n+ aResponse()\n+ .withBody(\"{\\\"test\\\": \\\"{{jsonPath request.body '$.a.test'}}\\\"}\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -49,11 +51,13 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\n}\n@Test\n- public void negativeTestResponseTemplate(){\n+ public void incluesAnErrorInTheResponseBodyWhenTheJsonPathExpressionReturnsNothing() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/json\").body(\n- \"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n- aResponse().withBody(\"{\\\"test\\\": \\\"{{wmJson request.body '$.b.test'}}\\\"}\").build(),\n+ mockRequest()\n+ .url(\"/json\")\n+ .body(\"{\\\"a\\\": {\\\"test\\\": \\\"success\\\"}}\"),\n+ aResponse()\n+ .withBody(\"{\\\"test\\\": \\\"{{jsonPath request.body '$.b.test'}}\\\"}\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -61,27 +65,22 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\n}\n@Test\n- public void negativeTestInvalidJson() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.test\");\n- }\n-\n- @Test\n- public void negativeTestInvalidJsonPath() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.\\\\test\");\n+ public void rendersAMeaningfulErrorWhenInputJsonIsInvalid() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.test\", is(\"[ERROR: {\\\"test\\\":\\\"success} is not valid JSON]\"));\n}\n@Test\n- public void negativeTestJsonNull() {\n- testHelperError(this.helper, null, \"$.test\");\n+ public void rendersAMeaningfulErrorWhenJsonPathIsInvalid() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.\\\\test\", is(\"[ERROR: $.\\\\test is not a valid JSONPath expression]\"));\n}\n@Test\n- public void negativeTestJsonPathNull() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", null);\n+ public void rendersAnEmptyStringWhenJsonIsNull() {\n+ testHelperError(this.helper, null, \"$.test\", is(\"\"));\n}\n@Test\n- public void negativeTestAllNull() {\n- testHelperError(this.helper, null, null);\n+ public void rendersAMeaningfulErrorWhenJsonPathIsNull() {\n+ testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", null, is(\"[ERROR: The JSONPath cannot be empty]\"));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"diff": "@@ -14,11 +14,6 @@ import static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSou\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n-/**\n- * This class tests the HandlebarsSoapHelper\n- *\n- * @author Christopher Holomek\n- */\npublic class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsSoapHelper helper;\n@@ -38,9 +33,11 @@ public class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\n@Test\npublic void positiveTestResponseTemplate(){\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/soap\").body(\n- \"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n- aResponse().withBody(\"<test>{{wmSoap request.body '/a/test'}}</test>\").build(),\n+ mockRequest()\n+ .url(\"/soap\")\n+ .body(\"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n+ aResponse()\n+ .withBody(\"<test>{{soapXPath request.body '/a/test'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -50,9 +47,11 @@ public class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\n@Test\npublic void negativeTestResponseTemplate(){\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/soap\").body(\n- \"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n- aResponse().withBody(\"<test>{{wmSoap request.body '/b/test'}}</test>\").build(),\n+ mockRequest()\n+ .url(\"/soap\")\n+ .body(\"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\n+ aResponse()\n+ .withBody(\"<test>{{soapXPath request.body '/b/test'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"diff": "@@ -15,11 +15,6 @@ import static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n-/**\n- * This class tests the HandlebarsXmlHelper\n- *\n- * @author Christopher Holomek\n- */\npublic class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\nprivate HandlebarsXmlHelper helper;\n@@ -31,16 +26,13 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\nthis.transformer = new ResponseTemplateTransformer(true);\n}\n- @Test\n- public void positiveTestSimpleXml() throws IOException {\n- testHelper(this.helper, \"<test>success</test>\", \"/test\", \"success\");\n- }\n-\n@Test\npublic void positiveTestResponseTemplate(){\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/xml\").body(\"<a><test>success</test></a>\"),\n- aResponse().withBody(\"<test>{{wmXml request.body '/a/test'}}</test>\").build(),\n+ mockRequest().url(\"/xml\")\n+ .body(\"<a><test>success</test></a>\"),\n+ aResponse()\n+ .withBody(\"<test>{{xPath request.body '/a/test'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -50,8 +42,10 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n@Test\npublic void negativeTestResponseTemplate(){\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n- mockRequest().url(\"/xml\").body(\"<a><test>success</test></a>\"),\n- aResponse().withBody(\"<test>{{wmXml request.body '/b/test'}}</test>\").build(),\n+ mockRequest().url(\"/xml\")\n+ .body(\"<a><test>success</test></a>\"),\n+ aResponse()\n+ .withBody(\"<test>{{xPath request.body '/b/test'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -59,29 +53,30 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n}\n@Test\n- public void negativeTestInvalidXml() {\n- testHelperError(this.helper, \"<testsuccess</test>\", \"/test\");\n+ public void extractsASimpleValue() throws IOException {\n+ testHelper(this.helper, \"<test>success</test>\", \"/test\", \"success\");\n}\n@Test\n- public void negativeTestInvalidXPath() {\n- testHelperError(this.helper, \"<test>success</test>\", \"/\\\\test\");\n+ public void rendersAMeaningfulErrorWhenTheInputXmlIsInvalid() {\n+ testHelperError(this.helper, \"<testsuccess</test>\", \"/test\", is(\"[ERROR: <testsuccess</test> is not valid XML]\"));\n}\n@Test\n- public void negativeTestXmlNull() {\n- testHelperError(this.helper, null, \"/test\");\n+ public void rendersAMeaningfulErrorWhenTheXPathExpressionIsInvalid() {\n+ testHelperError(this.helper, \"<test>success</test>\", \"/\\\\test\", is(\"[ERROR: /\\\\test is not a valid XPath expression]\"));\n}\n@Test\n- public void negativeTestXPathNull() {\n- testHelperError(this.helper, \"<test>success</test>\", null);\n+ public void rendersAMeaningfulErrorWhenTheXPathExpressionIsAbsent() {\n+ testHelperError(this.helper, \"<test>success</test>\", null, is(\"[ERROR: The XPath expression cannot be empty]\"));\n}\n@Test\n- public void negativeTestAllNull() {\n- testHelperError(this.helper, null, null);\n+ public void rendersABlankWhenTheInputXmlIsAbsent() {\n+ testHelperError(this.helper, null, \"/test\", is(\"\"));\n}\n+\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked error messaging and tests for xpath and jsonpath handlebars helpers |
686,936 | 11.08.2017 13:39:15 | -3,600 | 0d2b2af60784c1264584942736b65c791c103fc3 | Added support for extracting JSON objects and arrays from request bodies via helpers | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.jayway.jsonpath.InvalidJsonException;\nimport com.jayway.jsonpath.JsonPath;\nimport com.jayway.jsonpath.JsonPathException;\nimport java.io.IOException;\n+import java.util.Map;\npublic class HandlebarsJsonHelper extends HandlebarsHelper<String> {\n@@ -21,7 +23,11 @@ public class HandlebarsJsonHelper extends HandlebarsHelper<String> {\nfinal String jsonPath = options.param(0);\ntry {\n- return String.valueOf(JsonPath.read(inputJson, jsonPath));\n+ Object result = JsonPath.read(inputJson, jsonPath);\n+ if (result instanceof Map) {\n+ return Json.write(result);\n+ }\n+ return String.valueOf(result);\n} catch (InvalidJsonException e) {\nreturn this.handleError(\ninputJson + \" is not valid JSON\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"diff": "@@ -16,12 +16,6 @@ public abstract class HandlebarsHelperTestBase {\nprotected static final String FAIL_GRACEFULLY_MSG = \"Handlebars helper should fail gracefully and show the issue directly in the response.\";\n- protected static <T> void testHelperError(Helper<T> helper,\n- T content,\n- String pathExpression) {\n- testHelperError(helper, content, pathExpression, startsWith(HandlebarsHelper.ERROR_PREFIX));\n- }\n-\nprotected static <T> void testHelperError(Helper<T> helper,\nT content,\nString pathExpression,\n@@ -37,7 +31,14 @@ public abstract class HandlebarsHelperTestBase {\nT content,\nString optionParam,\nString expected) throws IOException {\n- assertThat((String) helper.apply(content, createOptions(optionParam)), is(expected));\n+ testHelper(helper, content, optionParam, is(expected));\n+ }\n+\n+ protected static <T> void testHelper(Helper<T> helper,\n+ T content,\n+ String optionParam,\n+ Matcher<String> expected) throws IOException {\n+ assertThat((String) helper.apply(content, createOptions(optionParam)), expected);\n}\nprotected static Options createOptions(String optionParam) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"diff": "@@ -6,6 +6,7 @@ import com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -14,6 +15,7 @@ import java.io.IOException;\nimport static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\nimport static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\nimport static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n@@ -25,17 +27,12 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\n@Before\npublic void init() {\n- this.helper = new HandlebarsJsonHelper();\n- this.transformer = new ResponseTemplateTransformer(true);\n+ helper = new HandlebarsJsonHelper();\n+ transformer = new ResponseTemplateTransformer(true);\nLocalNotifier.set(new ConsoleNotifier(true));\n}\n- @Test\n- public void extractsASimpleValueFromTheInputJson() throws IOException {\n- testHelper(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.test\", \"success\");\n- }\n-\n@Test\npublic void mergesASimpleValueFromRequestIntoResponseBody() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\n@@ -64,23 +61,52 @@ public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\nassertThat(responseDefinition.getBody(), startsWith(\"{\\\"test\\\": \\\"\" + HandlebarsHelper.ERROR_PREFIX));\n}\n+ @Test\n+ public void extractsASimpleValueFromTheInputJson() throws IOException {\n+ testHelper(helper,\"{\\\"test\\\":\\\"success\\\"}\", \"$.test\", \"success\");\n+ }\n+\n+ @Test\n+ public void extractsAJsonObjectFromTheInputJson() throws IOException {\n+ testHelper(helper,\n+ \"{ \\n\" +\n+ \" \\\"outer\\\": { \\n\" +\n+ \" \\\"inner\\\": \\\"Sanctum\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\",\n+ \"$.outer\",\n+ equalToJson(\"{ \\n\" +\n+ \" \\\"inner\\\": \\\"Sanctum\\\" \\n\" +\n+ \" }\"));\n+ }\n+\n+ @Test\n+ public void extractsAJsonArrayFromTheInputJson() throws IOException {\n+ testHelper(helper,\n+ \"{\\n\" +\n+ \" \\\"things\\\": [1, 2, 3]\\n\" +\n+ \"}\",\n+ \"$.things\",\n+ equalToJson(\"[1, 2, 3]\"));\n+ }\n+\n@Test\npublic void rendersAMeaningfulErrorWhenInputJsonIsInvalid() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", \"$.test\", is(\"[ERROR: {\\\"test\\\":\\\"success} is not valid JSON]\"));\n+ testHelperError(helper, \"{\\\"test\\\":\\\"success}\", \"$.test\", is(\"[ERROR: {\\\"test\\\":\\\"success} is not valid JSON]\"));\n}\n@Test\npublic void rendersAMeaningfulErrorWhenJsonPathIsInvalid() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.\\\\test\", is(\"[ERROR: $.\\\\test is not a valid JSONPath expression]\"));\n+ testHelperError(helper, \"{\\\"test\\\":\\\"success\\\"}\", \"$.\\\\test\", is(\"[ERROR: $.\\\\test is not a valid JSONPath expression]\"));\n}\n@Test\npublic void rendersAnEmptyStringWhenJsonIsNull() {\n- testHelperError(this.helper, null, \"$.test\", is(\"\"));\n+ testHelperError(helper, null, \"$.test\", is(\"\"));\n}\n@Test\npublic void rendersAMeaningfulErrorWhenJsonPathIsNull() {\n- testHelperError(this.helper, \"{\\\"test\\\":\\\"success}\", null, is(\"[ERROR: The JSONPath cannot be empty]\"));\n+ testHelperError(helper, \"{\\\"test\\\":\\\"success}\", null, is(\"[ERROR: The JSONPath cannot be empty]\"));\n}\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for extracting JSON objects and arrays from request bodies via helpers |
686,936 | 21.08.2017 23:33:06 | -7,200 | b810a24b363da144147278fba4814b9bfb3ff3ca | Upgraded Gradle. Added openjdk8 to travis config. Added --stacktrace to travis command. | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -3,9 +3,10 @@ jdk:\n- oraclejdk8\n- oraclejdk7\n- openjdk7\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-script: ./gradlew test\n+script: ./gradlew test --stacktrace\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle/wrapper/gradle-wrapper.properties",
"new_path": "gradle/wrapper/gradle-wrapper.properties",
"diff": "@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME\ndistributionPath=wrapper/dists\nzipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-3.1-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-4.1-bin.zip\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Upgraded Gradle. Added openjdk8 to travis config. Added --stacktrace to travis command. |
686,936 | 21.08.2017 23:40:31 | -7,200 | 8896029264f9d0bdb056af8a44d7e47232b8a769 | Fixed a copyright header. Added --no-daemon to Travis build command. | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -8,5 +8,5 @@ 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 6.3.0\n-script: ./gradlew test --stacktrace\n+script: ./gradlew test --stacktrace --no-daemon\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": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-/*\n- * Copyright (C) 2017 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;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Fixed a copyright header. Added --no-daemon to Travis build command. |
686,936 | 22.08.2017 08:34:38 | -7,200 | 27171feb2e750991dffec6e5f39c4ef82f141ff2 | Re-removed openjdk8 from the Travis build as this seems not to work with the precise build | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -5,7 +5,6 @@ jdk:\n- oraclejdk8\n- oraclejdk7\n- openjdk7\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 | Apache License 2.0 | tomakehurst/wiremock | Re-removed openjdk8 from the Travis build as this seems not to work with the precise build |
686,936 | 24.08.2017 11:31:33 | -7,200 | 3850c26fdba2560e7faf714078fa497d24de451a | Added support for rendering XML fragments in response templates via the xpath Handlebars helper | [
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelper.java",
"diff": "@@ -9,7 +9,7 @@ import com.jayway.jsonpath.JsonPathException;\nimport java.io.IOException;\nimport java.util.Map;\n-public class HandlebarsJsonHelper extends HandlebarsHelper<String> {\n+public class HandlebarsJsonPathHelper extends HandlebarsHelper<String> {\n@Override\npublic Object apply(final String inputJson, final Options options) throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelper.java",
"diff": "@@ -4,7 +4,7 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\n* This class uses HandlebarsXmlHelper as a base an just set a prefix which reduce the written handlebars helper to the\n* relevant part\n*/\n-public class HandlebarsSoapHelper extends HandlebarsXmlHelper {\n+public class HandlebarsSoapHelper extends HandlebarsXPathHelper {\n@Override\nprotected String getXPathPrefix() {\n"
},
{
"change_type": "RENAME",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXPathHelper.java",
"diff": "@@ -2,25 +2,37 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\nimport org.w3c.dom.Document;\n+import org.w3c.dom.Node;\nimport org.xml.sax.InputSource;\nimport org.xml.sax.SAXException;\nimport javax.xml.parsers.DocumentBuilder;\nimport javax.xml.parsers.DocumentBuilderFactory;\nimport javax.xml.parsers.ParserConfigurationException;\n+import javax.xml.transform.OutputKeys;\n+import javax.xml.transform.Transformer;\n+import javax.xml.transform.TransformerException;\n+import javax.xml.transform.TransformerFactory;\n+import javax.xml.transform.dom.DOMSource;\n+import javax.xml.transform.stream.StreamResult;\nimport javax.xml.xpath.XPath;\n+import javax.xml.xpath.XPathConstants;\nimport javax.xml.xpath.XPathExpressionException;\nimport javax.xml.xpath.XPathFactory;\nimport java.io.IOException;\nimport java.io.StringReader;\n+import java.io.StringWriter;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n+import static javax.xml.transform.OutputKeys.INDENT;\n+import static javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION;\n+import static javax.xml.xpath.XPathConstants.NODE;\n/**\n* This class uses javax.xml.xpath.* for reading a xml via xPath so that the result can be used for response\n* templating.\n*/\n-public class HandlebarsXmlHelper extends HandlebarsHelper<String> {\n+public class HandlebarsXPathHelper extends HandlebarsHelper<String> {\n@Override\npublic Object apply(final String inputXml, final Options options) throws IOException {\n@@ -50,13 +62,39 @@ public class HandlebarsXmlHelper extends HandlebarsHelper<String> {\nfinal XPathFactory xPathfactory = XPathFactory.newInstance();\nfinal XPath xpath = xPathfactory.newXPath();\n- return xpath.evaluate(getXPathPrefix() + xPathInput, doc);\n+ Node node = (Node) xpath.evaluate(getXPathPrefix() + xPathInput, doc, NODE);\n+ if (node == null) {\n+ return \"\";\n+ }\n+\n+ switch(node.getNodeType()) {\n+ case Node.TEXT_NODE:\n+ case Node.ATTRIBUTE_NODE:\n+ return node.getTextContent();\n+ case Node.ELEMENT_NODE:\n+ return render(node);\n+ default:\n+ return node.toString();\n+ }\n} catch (XPathExpressionException e) {\nreturn handleError(xPathInput + \" is not a valid XPath expression\", e);\n}\n}\n+ private String render(Node node) {\n+ try {\n+ StringWriter sw = new StringWriter();\n+ Transformer transformer = TransformerFactory.newInstance().newTransformer();\n+ transformer.setOutputProperty(OMIT_XML_DECLARATION, \"yes\");\n+ transformer.setOutputProperty(INDENT, \"yes\");\n+ transformer.transform(new DOMSource(node), new StreamResult(sw));\n+ return sw.toString();\n+ } catch (TransformerException e) {\n+ return throwUnchecked(e, String.class);\n+ }\n+ }\n+\n/**\n* No prefix by default. It allows to extend this class with a specified prefix. Just overwrite this method to do\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": "@@ -11,7 +11,7 @@ import java.io.IOException;\n*/\npublic enum WiremockHelpers implements Helper<Object> {\nxPath {\n- private HandlebarsXmlHelper helper = new HandlebarsXmlHelper();\n+ private HandlebarsXPathHelper helper = new HandlebarsXPathHelper();\n@Override\npublic Object apply(final Object context, final Options options) throws IOException {\n@@ -27,7 +27,7 @@ public enum WiremockHelpers implements Helper<Object> {\n}\n},\njsonPath {\n- private HandlebarsJsonHelper helper = new HandlebarsJsonHelper();\n+ private HandlebarsJsonPathHelper helper = new HandlebarsJsonPathHelper();\n@Override\npublic Object apply(final Object context, final Options options) throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsHelperTestBase.java",
"diff": "@@ -38,7 +38,7 @@ public abstract class HandlebarsHelperTestBase {\nT content,\nString optionParam,\nMatcher<String> expected) throws IOException {\n- assertThat((String) helper.apply(content, createOptions(optionParam)), expected);\n+ assertThat(helper.apply(content, createOptions(optionParam)).toString(), expected);\n}\nprotected static Options createOptions(String optionParam) {\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsJsonPathHelperTest.java",
"diff": "@@ -2,11 +2,9 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\n-import com.github.tomakehurst.wiremock.common.Notifier;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n-import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -20,14 +18,14 @@ import static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n-public class HandlebarsJsonHelperTest extends HandlebarsHelperTestBase {\n+public class HandlebarsJsonPathHelperTest extends HandlebarsHelperTestBase {\n- private HandlebarsJsonHelper helper;\n+ private HandlebarsJsonPathHelper helper;\nprivate ResponseTemplateTransformer transformer;\n@Before\npublic void init() {\n- helper = new HandlebarsJsonHelper();\n+ helper = new HandlebarsJsonPathHelper();\ntransformer = new ResponseTemplateTransformer(true);\nLocalNotifier.set(new ConsoleNotifier(true));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsSoapHelperTest.java",
"diff": "@@ -26,18 +26,18 @@ public class HandlebarsSoapHelperTest extends HandlebarsHelperTestBase {\n}\n@Test\n- public void positiveTestSimpleSoap() throws IOException {\n- testHelper(this.helper, \"<Envelope><Body><test>success</test></Body></Envelope>\", \"/test\", \"success\");\n+ public void extractsASimpleBodyValue() throws IOException {\n+ testHelper(this.helper, \"<Envelope><Body><test>success</test></Body></Envelope>\", \"/test/text()\", \"success\");\n}\n@Test\n- public void positiveTestResponseTemplate(){\n+ public void rendersASimpleValue() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\nmockRequest()\n.url(\"/soap\")\n.body(\"<soap:Envelope xmlns:soap=\\\"http://www.w3.org/2003/05/soap-envelope/\\\"><soap:Body><m:a><m:test>success</m:test></m:a></soap:Body></soap:Envelope>\"),\naResponse()\n- .withBody(\"<test>{{soapXPath request.body '/a/test'}}</test>\").build(),\n+ .withBody(\"<test>{{soapXPath request.body '/a/test/text()'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n"
},
{
"change_type": "RENAME",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXmlHelperTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXPathHelperTest.java",
"diff": "@@ -3,6 +3,7 @@ package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.tomakehurst.wiremock.extension.Parameters;\nimport com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;\nimport com.github.tomakehurst.wiremock.http.ResponseDefinition;\n+import com.github.tomakehurst.wiremock.testsupport.WireMatchers;\nimport org.junit.Before;\nimport org.junit.Test;\n@@ -11,28 +12,29 @@ import java.io.IOException;\nimport static com.github.tomakehurst.wiremock.client.WireMock.aResponse;\nimport static com.github.tomakehurst.wiremock.matching.MockRequest.mockRequest;\nimport static com.github.tomakehurst.wiremock.testsupport.NoFileSource.noFileSource;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToXml;\nimport static org.hamcrest.Matchers.is;\nimport static org.hamcrest.Matchers.startsWith;\nimport static org.junit.Assert.assertThat;\n-public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n+public class HandlebarsXPathHelperTest extends HandlebarsHelperTestBase {\n- private HandlebarsXmlHelper helper;\n+ private HandlebarsXPathHelper helper;\nprivate ResponseTemplateTransformer transformer;\n@Before\npublic void init() {\n- this.helper = new HandlebarsXmlHelper();\n+ helper = new HandlebarsXPathHelper();\nthis.transformer = new ResponseTemplateTransformer(true);\n}\n@Test\n- public void positiveTestResponseTemplate(){\n+ public void rendersASimpleValue() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\nmockRequest().url(\"/xml\")\n.body(\"<a><test>success</test></a>\"),\naResponse()\n- .withBody(\"<test>{{xPath request.body '/a/test'}}</test>\").build(),\n+ .withBody(\"<test>{{xPath request.body '/a/test/text()'}}</test>\").build(),\nnoFileSource(),\nParameters.empty());\n@@ -40,7 +42,7 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n}\n@Test\n- public void negativeTestResponseTemplate(){\n+ public void rendersNothingWhenTheXPathExpressionResolvesNoContent() {\nfinal ResponseDefinition responseDefinition = this.transformer.transform(\nmockRequest().url(\"/xml\")\n.body(\"<a><test>success</test></a>\"),\n@@ -54,27 +56,41 @@ public class HandlebarsXmlHelperTest extends HandlebarsHelperTestBase {\n@Test\npublic void extractsASimpleValue() throws IOException {\n- testHelper(this.helper, \"<test>success</test>\", \"/test\", \"success\");\n+ testHelper(helper, \"<test>success</test>\", \"/test/text()\", \"success\");\n+ }\n+\n+ @Test\n+ public void extractsAnAttribute() throws IOException {\n+ testHelper(helper, \"<test outcome=\\\"success\\\"/>\", \"/test/@outcome\", \"success\");\n+ }\n+\n+ @Test\n+ public void extractsASubElement() throws IOException {\n+ testHelper(helper, \"<outer>\\n\" +\n+ \" <inner>stuff</inner>\\n\" +\n+ \"</outer>\",\n+ \"/outer/inner\",\n+ equalToXml(\"<inner>stuff</inner>\"));\n}\n@Test\npublic void rendersAMeaningfulErrorWhenTheInputXmlIsInvalid() {\n- testHelperError(this.helper, \"<testsuccess</test>\", \"/test\", is(\"[ERROR: <testsuccess</test> is not valid XML]\"));\n+ testHelperError(helper, \"<testsuccess</test>\", \"/test\", is(\"[ERROR: <testsuccess</test> is not valid XML]\"));\n}\n@Test\npublic void rendersAMeaningfulErrorWhenTheXPathExpressionIsInvalid() {\n- testHelperError(this.helper, \"<test>success</test>\", \"/\\\\test\", is(\"[ERROR: /\\\\test is not a valid XPath expression]\"));\n+ testHelperError(helper, \"<test>success</test>\", \"/\\\\test\", is(\"[ERROR: /\\\\test is not a valid XPath expression]\"));\n}\n@Test\npublic void rendersAMeaningfulErrorWhenTheXPathExpressionIsAbsent() {\n- testHelperError(this.helper, \"<test>success</test>\", null, is(\"[ERROR: The XPath expression cannot be empty]\"));\n+ testHelperError(helper, \"<test>success</test>\", null, is(\"[ERROR: The XPath expression cannot be empty]\"));\n}\n@Test\npublic void rendersABlankWhenTheInputXmlIsAbsent() {\n- testHelperError(this.helper, null, \"/test\", is(\"\"));\n+ testHelperError(helper, null, \"/test\", is(\"\"));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMatchers.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMatchers.java",
"diff": "@@ -17,6 +17,7 @@ package com.github.tomakehurst.wiremock.testsupport;\nimport com.github.tomakehurst.wiremock.common.TextFile;\nimport com.github.tomakehurst.wiremock.http.HttpHeader;\n+import com.github.tomakehurst.wiremock.matching.EqualToXmlPattern;\nimport com.github.tomakehurst.wiremock.matching.UrlPattern;\nimport com.github.tomakehurst.wiremock.stubbing.ServeEvent;\nimport com.github.tomakehurst.wiremock.stubbing.StubMapping;\n@@ -32,6 +33,10 @@ import org.hamcrest.TypeSafeDiagnosingMatcher;\nimport org.hamcrest.TypeSafeMatcher;\nimport org.skyscreamer.jsonassert.JSONAssert;\nimport org.skyscreamer.jsonassert.JSONCompareMode;\n+import org.xmlunit.builder.DiffBuilder;\n+import org.xmlunit.builder.Input;\n+import org.xmlunit.diff.ComparisonControllers;\n+import org.xmlunit.diff.Diff;\nimport java.io.File;\nimport java.io.IOException;\n@@ -91,6 +96,27 @@ public class WireMatchers {\n};\n}\n+ public static Matcher<String> equalToXml(final String expected) {\n+ return new TypeSafeMatcher<String>() {\n+ @Override\n+ protected boolean matchesSafely(String value) {\n+ Diff diff = DiffBuilder.compare(Input.from(expected))\n+ .withTest(value)\n+ .withComparisonController(ComparisonControllers.StopWhenDifferent)\n+ .ignoreWhitespace()\n+ .ignoreComments()\n+ .build();\n+\n+ return !diff.hasDifferences();\n+ }\n+\n+ @Override\n+ public void describeTo(Description description) {\n+ description.appendText(\"Expected:\\n\" + expected);\n+ }\n+ };\n+ }\n+\npublic static Matcher<String> matches(final String regex) {\nreturn new TypeSafeMatcher<String>() {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added support for rendering XML fragments in response templates via the xpath Handlebars helper |
686,936 | 26.08.2017 10:50:52 | -3,600 | b50eafc8376d5091672f4bc40b69cf9d3b953628 | Added docs for xpath and jsonpath handlebars helpers | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/response-templating.md",
"new_path": "docs-v2/_docs/response-templating.md",
"diff": "@@ -25,8 +25,6 @@ to being served.\nOtherwise the transformer will need to be specified on each stub mapping by its name `response-template`:\n-Command line parameters can be used to enable templating when running WireMock [standalone](/docs/running-standalone/#command-line-options).\n-\n### Java\n{% raw %}\n@@ -54,6 +52,8 @@ wm.stubFor(get(urlPathEqualTo(\"/templated\"))\n```\n{% endraw %}\n+Command line parameters can be used to enable templating when running WireMock [standalone](/docs/running-standalone/#command-line-options).\n+\n## Proxying\nTemplating also works when defining proxy URLs, e.g.\n@@ -121,6 +121,84 @@ are available e.g.\n{% endraw %}\n+## XPath helpers\n+Addiionally some helpers are available for working with JSON and XML.\n+\n+When the incoming request contains XML, the `xPath` helper can be used to extract values or sub documents via an XPath 1.0 expression. For instance, given the XML\n+\n+```xml\n+<outer>\n+ <inner>Stuff</inner>\n+</outer>\n+```\n+\n+The following will render \"Stuff\" into the output:\n+\n+{% raw %}\n+```\n+{{xPath request.body '/outer/inner/text()'}}\n+```\n+{% endraw %}\n+\n+And given the same XML the following will render `<inner>Stuff</inner>`:\n+\n+{% raw %}\n+```\n+{{xPath request.body '/outer/inner'}}\n+```\n+{% endraw %}\n+\n+\n+As a convenience the `soapXPath` helper also exists for extracting values from SOAP bodies e.g. for the SOAP document:\n+\n+```xml\n+<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope/\">\n+ <soap:Body>\n+ <m:a>\n+ <m:test>success</m:test>\n+ </m:a>\n+ </soap:Body>\n+</soap:Envelope>\n+```\n+\n+The following will render \"success\" in the output:\n+\n+{% raw %}\n+```\n+{{soapXPath request.body '/a/test/text()'}}\n+```\n+{% endraw %}\n+\n+\n+## JSONPath helper\n+\n+It is similarly possible to extract JSON values or sub documents via JSONPath using the `jsonPath` helper. Given the JSON\n+\n+```json\n+{\n+ \"outer\": {\n+ \"inner\": \"Stuff\"\n+ }\n+}\n+```\n+\n+The following will render \"Stuff\" into the output:\n+\n+{% raw %}\n+```\n+{{jsonPath request.body '$.outer.inner'}}\n+```\n+{% endraw %}\n+\n+And for the same JSON the following will render `{ \"inner\": \"Stuff\" }`:\n+\n+{% raw %}\n+```\n+{{jsonPath request.body '$.outer'}}\n+```\n+{% endraw %}\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 docs for xpath and jsonpath handlebars helpers |
686,936 | 28.08.2017 22:11:00 | -3,600 | 1e8521a105208c1fd6bee16641c03cfbbfcd94ef | Added Spring Boot doc page | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs-v2/_docs/spring-boot.md",
"diff": "+---\n+layout: docs\n+title: 'Spring Boot'\n+toc_rank: 116\n+description: Running WireMock with Spring Boot.\n+---\n+\n+The team behind Spring Cloud Contract have created a library to support running WireMock using the \"ambient\" HTTP server.\n+It also simplifies some aspects of configuration and eliminates some common issues that occur when running Spring Boot and WireMock together.\n+\n+\n+See [Spring Cloud Contract WireMock](http://cloud.spring.io/spring-cloud-static/spring-cloud-contract/1.1.2.RELEASE/#_spring_cloud_contract_wiremock) for details.\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added Spring Boot doc page |
686,936 | 29.08.2017 09:42:56 | -3,600 | a9c20e5cfb1f513d4c841dc5ab07bb9691072609 | Added an acceptance test for proxy trailing slash stripping | [
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/ProxyAcceptanceTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/ProxyAcceptanceTest.java",
"diff": "@@ -389,6 +389,19 @@ public class ProxyAcceptanceTest {\n.withRequestBody(equalTo(\"gzipped body\")));\n}\n+ @Test\n+ public void removesTrailingSlashFromUrlBeforeForwarding() {\n+ initWithDefaultConfig();\n+\n+ targetServiceAdmin.register(get(\"/slashes\").willReturn(ok()));\n+ proxyingServiceAdmin.register(any(anyUrl()).willReturn(aResponse().proxiedFrom(targetServiceBaseUrl)));\n+\n+ WireMockResponse response = testClient.get(\"/slashes/\");\n+ assertThat(response.statusCode(), is(200));\n+\n+ targetServiceAdmin.verifyThat(getRequestedFor(urlEqualTo(\"/slashes\")));\n+ }\n+\nprivate void register200StubOnProxyAndTarget(String url) {\ntargetServiceAdmin.register(get(urlEqualTo(url)).willReturn(aResponse().withStatus(200)));\nproxyingServiceAdmin.register(get(urlEqualTo(url)).willReturn(aResponse().proxiedFrom(targetServiceBaseUrl)));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added an acceptance test for proxy trailing slash stripping |
686,936 | 30.08.2017 12:42:10 | -3,600 | 87957dae97f0940324b083472b7cfd4c110e8205 | Added a test for find requests with multi-valued headers | [
{
"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": "@@ -17,12 +17,14 @@ package com.github.tomakehurst.wiremock;\nimport com.github.tomakehurst.wiremock.client.VerificationException;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+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.MatchResult;\nimport com.github.tomakehurst.wiremock.matching.RequestMatcher;\nimport com.github.tomakehurst.wiremock.matching.ValueMatcher;\nimport com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.RequestJournalDisabledException;\nimport com.google.common.base.Optional;\nimport org.apache.http.entity.StringEntity;\n@@ -31,6 +33,8 @@ import org.junit.Test;\nimport org.junit.experimental.runners.Enclosed;\nimport org.junit.runner.RunWith;\n+import java.util.List;\n+\nimport static com.github.tomakehurst.wiremock.client.WireMock.containing;\nimport static com.github.tomakehurst.wiremock.client.WireMock.equalTo;\nimport static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;\n@@ -66,6 +70,7 @@ import static org.hamcrest.Matchers.allOf;\nimport static org.hamcrest.Matchers.containsString;\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n+import static org.junit.Assert.assertTrue;\nimport static org.junit.Assert.fail;\n@RunWith(Enclosed.class)\n@@ -168,6 +173,21 @@ public class VerificationAcceptanceTest {\n.withHeader(\"X-Thing\", equalTo(\"Three\")));\n}\n+ @Test\n+ public void findsRequestsWithMultiValueHeaders() {\n+ testClient.get(\"/multi/value/header\",\n+ withHeader(\"X-Thing\", \"One\"),\n+ withHeader(\"X-Thing\", \"Two\"),\n+ withHeader(\"X-Thing\", \"Three\"));\n+\n+\n+ List<LoggedRequest> requests = findAll(getRequestedFor(urlEqualTo(\"/multi/value/header\")));\n+\n+ HttpHeaders headers = requests.get(0).getHeaders();\n+ assertThat(headers.getHeader(\"X-Thing\").values().size(), is(3));\n+ assertThat(headers.getHeader(\"X-Thing\").values().get(1), is(\"TWo\"));\n+ }\n+\n@Test(expected=VerificationException.class)\npublic void throwsVerificationExceptionWhenHeadersDoNotMatch() {\ntestClient.put(\"/to/modify\", withHeader(\"Content-Type\", \"application/json\"), withHeader(\"Encoding\", \"LATIN-1\"));\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added a test for find requests with multi-valued headers |
686,936 | 01.09.2017 12:41:24 | -3,600 | 31fd990bd989b88c2b09e08f0bcf32b94806e3f6 | Added advanced JSONPath and XPath matching | [
{
"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": "@@ -179,6 +179,10 @@ public class WireMock {\nreturn new MatchesJsonPathPattern(value);\n}\n+ public static StringValuePattern matchingJsonPath(String value, StringValuePattern valuePattern) {\n+ return new MatchesJsonPathPattern(value, valuePattern);\n+ }\n+\npublic static StringValuePattern equalToXml(String value) {\nreturn new EqualToXmlPattern(value);\n}\n@@ -191,6 +195,10 @@ public class WireMock {\nreturn new MatchesXPathPattern(value, namespaces);\n}\n+ public static StringValuePattern matchingXPath(String value, StringValuePattern valuePattern) {\n+ return new MatchesXPathPattern(value, valuePattern);\n+ }\n+\npublic static StringValuePattern containing(String value) {\nreturn new ContainsPattern(value);\n}\n"
},
{
"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": "package com.github.tomakehurst.wiremock.common;\nimport org.w3c.dom.Document;\n+import org.w3c.dom.Node;\nimport org.xml.sax.InputSource;\nimport org.xml.sax.SAXException;\n@@ -23,6 +24,7 @@ import javax.xml.parsers.DocumentBuilder;\nimport javax.xml.parsers.DocumentBuilderFactory;\nimport javax.xml.parsers.ParserConfigurationException;\nimport javax.xml.transform.Transformer;\n+import javax.xml.transform.TransformerException;\nimport javax.xml.transform.TransformerFactory;\nimport javax.xml.transform.dom.DOMSource;\nimport javax.xml.transform.stream.StreamResult;\n@@ -59,4 +61,29 @@ public class Xml {\nInputSource is = new InputSource(new StringReader(xml));\nreturn db.parse(is);\n}\n+\n+ public static String render(Node node) {\n+ try {\n+ StringWriter sw = new StringWriter();\n+ Transformer transformer = TransformerFactory.newInstance().newTransformer();\n+ transformer.setOutputProperty(OMIT_XML_DECLARATION, \"yes\");\n+ transformer.setOutputProperty(INDENT, \"yes\");\n+ transformer.transform(new DOMSource(node), new StreamResult(sw));\n+ return sw.toString();\n+ } catch (TransformerException e) {\n+ return throwUnchecked(e, String.class);\n+ }\n+ }\n+\n+ public static String toStringValue(Node node) {\n+ switch(node.getNodeType()) {\n+ case Node.TEXT_NODE:\n+ case Node.ATTRIBUTE_NODE:\n+ return node.getTextContent();\n+ case Node.ELEMENT_NODE:\n+ return render(node);\n+ default:\n+ return node.toString();\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXPathHelper.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HandlebarsXPathHelper.java",
"diff": "package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;\nimport com.github.jknack.handlebars.Options;\n+import com.github.tomakehurst.wiremock.common.Xml;\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.xml.sax.InputSource;\n@@ -9,23 +10,13 @@ import org.xml.sax.SAXException;\nimport javax.xml.parsers.DocumentBuilder;\nimport javax.xml.parsers.DocumentBuilderFactory;\nimport javax.xml.parsers.ParserConfigurationException;\n-import javax.xml.transform.OutputKeys;\n-import javax.xml.transform.Transformer;\n-import javax.xml.transform.TransformerException;\n-import javax.xml.transform.TransformerFactory;\n-import javax.xml.transform.dom.DOMSource;\n-import javax.xml.transform.stream.StreamResult;\nimport javax.xml.xpath.XPath;\n-import javax.xml.xpath.XPathConstants;\nimport javax.xml.xpath.XPathExpressionException;\nimport javax.xml.xpath.XPathFactory;\nimport java.io.IOException;\nimport java.io.StringReader;\n-import java.io.StringWriter;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\n-import static javax.xml.transform.OutputKeys.INDENT;\n-import static javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION;\nimport static javax.xml.xpath.XPathConstants.NODE;\n/**\n@@ -68,33 +59,12 @@ public class HandlebarsXPathHelper extends HandlebarsHelper<String> {\nreturn \"\";\n}\n- switch(node.getNodeType()) {\n- case Node.TEXT_NODE:\n- case Node.ATTRIBUTE_NODE:\n- return node.getTextContent();\n- case Node.ELEMENT_NODE:\n- return render(node);\n- default:\n- return node.toString();\n- }\n+ return Xml.toStringValue(node);\n} catch (XPathExpressionException e) {\nreturn handleError(xPathInput + \" is not a valid XPath expression\", e);\n}\n}\n- private String render(Node node) {\n- try {\n- StringWriter sw = new StringWriter();\n- Transformer transformer = TransformerFactory.newInstance().newTransformer();\n- transformer.setOutputProperty(OMIT_XML_DECLARATION, \"yes\");\n- transformer.setOutputProperty(INDENT, \"yes\");\n- transformer.transform(new DOMSource(node), new StreamResult(sw));\n- return sw.toString();\n- } catch (TransformerException e) {\n- return throwUnchecked(e, String.class);\n- }\n- }\n-\n/**\n* No prefix by default. It allows to extend this class with a specified prefix. Just overwrite this method to do\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/JsonPathPatternJsonSerializer.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.core.JsonGenerator;\n+import com.fasterxml.jackson.databind.SerializerProvider;\n+\n+import java.io.IOException;\n+\n+public class JsonPathPatternJsonSerializer extends PathPatternJsonSerializer<MatchesJsonPathPattern> {\n+ @Override\n+ protected void serializeAdditionalFields(MatchesJsonPathPattern value, JsonGenerator gen, SerializerProvider serializers) throws IOException {\n+ }\n+}\n"
},
{
"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": "package com.github.tomakehurst.wiremock.matching;\nimport com.fasterxml.jackson.annotation.JsonProperty;\n+import com.fasterxml.jackson.databind.annotation.JsonSerialize;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.jayway.jsonpath.JsonPath;\n+import com.jayway.jsonpath.PathNotFoundException;\nimport java.util.Collection;\nimport java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\n-public class MatchesJsonPathPattern extends StringValuePattern {\n+@JsonSerialize(using = JsonPathPatternJsonSerializer.class)\n+public class MatchesJsonPathPattern extends PathPattern {\n- public MatchesJsonPathPattern(@JsonProperty(\"matchesJsonPath\") String value) {\n- super(value);\n+ public MatchesJsonPathPattern(@JsonProperty(\"matchesJsonPath\") String expectedJsonPath,\n+ StringValuePattern valuePattern) {\n+ super(expectedJsonPath, valuePattern);\n}\n- public String getMatchesJsonPath() {\n- return expectedValue;\n+ public MatchesJsonPathPattern(String value) {\n+ this(value, null);\n}\n- @Override\n- public MatchResult match(String value) {\n- return MatchResult.of(isJsonPathMatch(value));\n+ public String getMatchesJsonPath() {\n+ return expectedValue;\n}\n- private boolean isJsonPathMatch(String value) {\n+ protected MatchResult isSimpleJsonPathMatch(String value) {\ntry {\nObject obj = JsonPath.read(value, expectedValue);\n- if (obj instanceof Collection) {\n- return !((Collection) obj).isEmpty();\n- }\n- if (obj instanceof Map) {\n- return !((Map) obj).isEmpty();\n+ boolean result;\n+ if (obj instanceof Collection) {\n+ result = !((Collection) obj).isEmpty();\n+ } else if (obj instanceof Map) {\n+ result = !((Map) obj).isEmpty();\n+ } else {\n+ result = obj != null;\n}\n- return obj != null;\n+ return MatchResult.of(result);\n} catch (Exception e) {\nString error;\nif (e.getMessage().equalsIgnoreCase(\"invalid path\")) {\nerror = \"the JSON path didn't match the document structure\";\n+ } else if (e.getMessage().equalsIgnoreCase(\"invalid container object\")) {\n+ error = \"the JSON document couldn't be parsed\";\n+ } else {\n+ error = \"of error '\" + e.getMessage() + \"'\";\n}\n- else if (e.getMessage().equalsIgnoreCase(\"invalid container object\")) {\n+\n+ String message = String.format(\n+ \"Warning: JSON path expression '%s' failed to match document '%s' because %s\",\n+ expectedValue, value, error);\n+ notifier().info(message);\n+\n+ return MatchResult.noMatch();\n+ }\n+\n+ }\n+\n+ protected MatchResult isAdvancedJsonPathMatch(String value) {\n+ Object obj = null;\n+ try {\n+ obj = JsonPath.read(value, expectedValue);\n+ } catch (PathNotFoundException pnfe) {\n+ } catch (Exception e) {\n+ String error;\n+ if (e.getMessage().equalsIgnoreCase(\"invalid container object\")) {\nerror = \"the JSON document couldn't be parsed\";\n} else {\nerror = \"of error '\" + e.getMessage() + \"'\";\n@@ -65,7 +93,18 @@ public class MatchesJsonPathPattern extends StringValuePattern {\n\"Warning: JSON path expression '%s' failed to match document '%s' because %s\",\nexpectedValue, value, error);\nnotifier().info(message);\n- return false;\n+\n+ return MatchResult.noMatch();\n}\n+\n+ if (obj instanceof Number || obj instanceof String || obj instanceof Boolean) {\n+ value = String.valueOf(obj);\n+ } else if (obj instanceof Map || obj instanceof Collection) {\n+ value = Json.write(obj);\n+ } else {\n+ value = null;\n+ }\n+\n+ return valuePattern.match(value);\n}\n}\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": "@@ -17,14 +17,18 @@ package com.github.tomakehurst.wiremock.matching;\nimport com.fasterxml.jackson.annotation.JsonGetter;\nimport com.fasterxml.jackson.annotation.JsonProperty;\n+import com.fasterxml.jackson.databind.annotation.JsonSerialize;\nimport com.github.tomakehurst.wiremock.common.SilentErrorHandler;\n+import 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;\nimport org.custommonkey.xmlunit.XpathEngine;\nimport org.custommonkey.xmlunit.exceptions.XpathException;\nimport org.w3c.dom.Document;\n+import org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\n@@ -33,17 +37,33 @@ import java.io.IOException;\nimport java.io.StringReader;\nimport java.util.Collections;\nimport java.util.Map;\n+import java.util.SortedSet;\nimport static com.github.tomakehurst.wiremock.common.LocalNotifier.notifier;\nimport static com.google.common.base.MoreObjects.firstNonNull;\n+import static com.google.common.collect.Sets.newTreeSet;\n-public class MatchesXPathPattern extends StringValuePattern {\n+@JsonSerialize(using = XPathPatternJsonSerializer.class)\n+public class MatchesXPathPattern extends PathPattern {\nprivate final Map<String, String> xpathNamespaces;\n- public MatchesXPathPattern(@JsonProperty(\"matchesXPath\") String expectedValue,\n- @JsonProperty(\"namespaces\") Map<String, String> namespaces) {\n- super(expectedValue);\n+ public MatchesXPathPattern(String xpath) {\n+ this(xpath, null, null);\n+ }\n+\n+ public MatchesXPathPattern(String xpath, StringValuePattern valuePattern) {\n+ this(xpath, null, valuePattern);\n+ }\n+\n+ public MatchesXPathPattern(String xpath, Map<String, String> namespaces) {\n+ this(xpath, namespaces, null);\n+ }\n+\n+ public MatchesXPathPattern(@JsonProperty(\"matchesXPath\") String xpath,\n+ @JsonProperty(\"namespaces\") Map<String, String> namespaces,\n+ @JsonProperty(\"valuePattern\") StringValuePattern valuePattern) {\n+ super(xpath, valuePattern);\nxpathNamespaces = namespaces == null || namespaces.isEmpty() ? null : namespaces;\n}\n@@ -65,15 +85,38 @@ public class MatchesXPathPattern extends StringValuePattern {\n}\n@Override\n- public MatchResult match(String value) {\n- return MatchResult.of(isXPathMatch(value));\n+ protected MatchResult isSimpleJsonPathMatch(String value) {\n+ if (value == null) {\n+ return MatchResult.noMatch();\n}\n- private boolean isXPathMatch(String value) {\n+ NodeList nodeList = findXmlNodesMatching(value);\n+\n+ return MatchResult.of(nodeList != null && nodeList.getLength() > 0);\n+ }\n+\n+ @Override\n+ protected MatchResult isAdvancedJsonPathMatch(String value) {\nif (value == null) {\n- return false;\n+ return MatchResult.noMatch();\n+ }\n+\n+ NodeList nodeList = findXmlNodesMatching(value);\n+ if (nodeList == null || nodeList.getLength() == 0) {\n+ return MatchResult.noMatch();\n+ }\n+\n+ SortedSet<MatchResult> results = newTreeSet();\n+ for (int i = 0; i < nodeList.getLength(); i++) {\n+ Node node = nodeList.item(i);\n+ String nodeValue = Xml.toStringValue(node);\n+ results.add(valuePattern.match(nodeValue));\n+ }\n+\n+ return results.last();\n}\n+ private NodeList findXmlNodesMatching(String value) {\ntry {\nDocumentBuilder documentBuilder = XMLUnit.newControlParser();\ndocumentBuilder.setErrorHandler(new SilentErrorHandler());\n@@ -83,18 +126,17 @@ public class MatchesXPathPattern extends StringValuePattern {\nNamespaceContext namespaceContext = new SimpleNamespaceContext(xpathNamespaces);\nsimpleXpathEngine.setNamespaceContext(namespaceContext);\n}\n- NodeList nodeList = simpleXpathEngine.getMatchingNodes(expectedValue, inDocument);\n- return nodeList.getLength() > 0;\n+ return simpleXpathEngine.getMatchingNodes(expectedValue, inDocument);\n} catch (SAXException e) {\nnotifier().info(String.format(\n\"Warning: failed to parse the XML document. Reason: %s\\nXML: %s\", e.getMessage(), value));\n- return false;\n+ return null;\n} catch (IOException e) {\nnotifier().info(e.getMessage());\n- return false;\n+ return null;\n} catch (XpathException e) {\nnotifier().info(\"Warning: failed to evaluate the XPath expression \" + expectedValue);\n- return false;\n+ return null;\n}\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPattern.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.annotation.JsonIgnore;\n+\n+public abstract class PathPattern extends StringValuePattern {\n+\n+ protected final StringValuePattern valuePattern;\n+\n+ protected PathPattern(String expectedValue, StringValuePattern valuePattern) {\n+ super(expectedValue);\n+ this.valuePattern = valuePattern;\n+ }\n+\n+ public StringValuePattern getValuePattern() {\n+ return valuePattern;\n+ }\n+\n+ @JsonIgnore\n+ public boolean isSimple() {\n+ return valuePattern == null;\n+ }\n+\n+ @Override\n+ public MatchResult match(String value) {\n+ if (isSimple()) {\n+ return isSimpleJsonPathMatch(value);\n+ }\n+\n+ return isAdvancedJsonPathMatch(value);\n+ }\n+\n+ protected abstract MatchResult isSimpleJsonPathMatch(String value);\n+ protected abstract MatchResult isAdvancedJsonPathMatch(String value);\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/PathPatternJsonSerializer.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.core.JsonGenerator;\n+import com.fasterxml.jackson.databind.JsonSerializer;\n+import com.fasterxml.jackson.databind.SerializerProvider;\n+\n+import java.io.IOException;\n+\n+public abstract class PathPatternJsonSerializer<T extends PathPattern> extends JsonSerializer<T> {\n+\n+ @Override\n+ public void serialize(T value, JsonGenerator gen, SerializerProvider serializers) throws IOException {\n+ gen.writeStartObject();\n+\n+ if (value.isSimple()) {\n+ gen.writeStringField(value.getName(), value.getExpected());\n+ } else {\n+ gen.writeObjectFieldStart(value.getName());\n+ gen.writeStringField(\"expression\", value.getExpected());\n+ gen.writeStringField(value.getValuePattern().getName(), value.getValuePattern().getExpected());\n+ gen.writeEndObject();\n+ }\n+\n+ serializeAdditionalFields(value, gen, serializers);\n+\n+ gen.writeEndObject();\n+ }\n+\n+ protected abstract void serializeAdditionalFields(T value, JsonGenerator gen, SerializerProvider serializers) throws IOException;\n+\n+}\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,6 +25,8 @@ 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@@ -34,6 +36,7 @@ import java.util.Map;\nimport static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;\nimport static com.google.common.collect.Iterables.tryFind;\n+import static com.google.common.collect.Iterators.find;\nimport static java.util.Arrays.asList;\npublic class StringValuePatternJsonDeserializer extends JsonDeserializer<StringValuePattern> {\n@@ -66,6 +69,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(MatchesJsonPathPattern.class)) {\n+ return deserialiseMatchesJsonPathPattern(rootNode);\n} else if (patternClass.equals(MatchesXPathPattern.class)) {\nreturn deserialiseMatchesXPathPattern(rootNode);\n} else if (patternClass.equals(EqualToPattern.class)) {\n@@ -74,7 +79,13 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nConstructor<? extends StringValuePattern> constructor = findConstructor(patternClass);\n- Map.Entry<String, JsonNode> entry = rootNode.fields().next();\n+ Map.Entry<String, JsonNode> entry = find(rootNode.fields(), new Predicate<Map.Entry<String, JsonNode>>() {\n+ @Override\n+ public boolean apply(Map.Entry<String, JsonNode> input) {\n+ return PATTERNS.keySet().contains(input.getKey());\n+ }\n+ });\n+\nString operand = entry.getValue().textValue();\ntry {\nreturn constructor.newInstance(operand);\n@@ -107,19 +118,50 @@ public class StringValuePatternJsonDeserializer extends JsonDeserializer<StringV\nreturn new EqualToJsonPattern(operand, ignoreArrayOrder, ignoreExtraElements);\n}\n+ private MatchesJsonPathPattern deserialiseMatchesJsonPathPattern(JsonNode rootNode) throws JsonMappingException {\n+ if (!rootNode.has(\"matchesJsonPath\")) {\n+ throw new JsonMappingException(rootNode.toString() + \" is not a valid comparison\");\n+ }\n+\n+ JsonNode outerPatternNode = rootNode.findValue(\"matchesJsonPath\");\n+ if (outerPatternNode.isTextual()) {\n+ return new MatchesJsonPathPattern(outerPatternNode.textValue());\n+ }\n+\n+ if (!outerPatternNode.has(\"expression\")) {\n+ throw new JsonMappingException(\"expression is required in the advanced matchesJsonPath form\");\n+ }\n+\n+ String expression = outerPatternNode.findValue(\"expression\").textValue();\n+ StringValuePattern valuePattern = buildStringValuePattern(outerPatternNode);\n+\n+ return new MatchesJsonPathPattern(expression, valuePattern);\n+ }\n+\nprivate MatchesXPathPattern deserialiseMatchesXPathPattern(JsonNode rootNode) throws JsonMappingException {\nif (!rootNode.has(\"matchesXPath\")) {\nthrow new JsonMappingException(rootNode.toString() + \" is not a valid comparison\");\n}\n- String operand = rootNode.findValue(\"matchesXPath\").textValue();\nJsonNode namespacesNode = rootNode.findValue(\"xPathNamespaces\");\nMap<String, String> namespaces = namespacesNode != null ?\ntoNamespaceMap(namespacesNode) :\nCollections.<String, String>emptyMap() ;\n- return new MatchesXPathPattern(operand, namespaces);\n+ JsonNode outerPatternNode = rootNode.findValue(\"matchesXPath\");\n+ if (outerPatternNode.isTextual()) {\n+ return new MatchesXPathPattern(outerPatternNode.textValue(), namespaces);\n+ }\n+\n+ if (!outerPatternNode.has(\"expression\")) {\n+ throw new JsonMappingException(\"expression is required in the advanced matchesXPath form\");\n+ }\n+\n+ String expression = outerPatternNode.findValue(\"expression\").textValue();\n+ StringValuePattern valuePattern = buildStringValuePattern(outerPatternNode);\n+\n+ return new MatchesXPathPattern(expression, namespaces, valuePattern);\n}\nprivate static Map<String, String> toNamespaceMap(JsonNode namespacesNode) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/main/java/com/github/tomakehurst/wiremock/matching/XPathPatternJsonSerializer.java",
"diff": "+package com.github.tomakehurst.wiremock.matching;\n+\n+import com.fasterxml.jackson.core.JsonGenerator;\n+import com.fasterxml.jackson.databind.SerializerProvider;\n+\n+import java.io.IOException;\n+import java.util.Map;\n+\n+public class XPathPatternJsonSerializer extends PathPatternJsonSerializer<MatchesXPathPattern> {\n+\n+ @Override\n+ protected void serializeAdditionalFields(MatchesXPathPattern value, JsonGenerator gen, SerializerProvider serializers) throws IOException {\n+ if (value.getXPathNamespaces() != null && !value.getXPathNamespaces().isEmpty()) {\n+ gen.writeObjectFieldStart(\"xPathNamespaces\");\n+ for (Map.Entry<String, String> namespace: value.getXPathNamespaces().entrySet()) {\n+ gen.writeStringField(namespace.getKey(), namespace.getValue());\n+ }\n+ gen.writeEndObject();\n+ }\n+ }\n+}\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": "@@ -289,7 +289,34 @@ public class StubbingAcceptanceTest extends AcceptanceTestBase {\nresponse = testClient.post(\"/match/binary\", new ByteArrayEntity(requestBody, APPLICATION_OCTET_STREAM));\nassertThat(response.statusCode(), is(HTTP_OK));\n+ }\n+\n+ @Test\n+ public void matchingOnRequestBodyWithAdvancedJsonPath() {\n+ stubFor(post(\"/jsonpath/advanced\")\n+ .withRequestBody(matchingJsonPath(\"$.counter\", equalTo(\"123\")))\n+ .willReturn(ok())\n+ );\n+ WireMockResponse response = testClient.postJson(\"/jsonpath/advanced\", \"{ \\\"counter\\\": 234 }\");\n+ assertThat(response.statusCode(), is(HTTP_NOT_FOUND));\n+\n+ response = testClient.postJson(\"/jsonpath/advanced\", \"{ \\\"counter\\\": 123 }\");\n+ assertThat(response.statusCode(), is(HTTP_OK));\n+ }\n+\n+ @Test\n+ public void matchingOnRequestBodyWithAdvancedXPath() {\n+ stubFor(post(\"/xpath/advanced\")\n+ .withRequestBody(matchingXPath(\"//counter/text()\", equalTo(\"123\")))\n+ .willReturn(ok())\n+ );\n+\n+ WireMockResponse response = testClient.postXml(\"/xpath/advanced\", \"<counter>6666</counter>\");\n+ assertThat(response.statusCode(), is(HTTP_NOT_FOUND));\n+\n+ response = testClient.postXml(\"/xpath/advanced\", \"<counter>123</counter>\");\n+ assertThat(response.statusCode(), is(HTTP_OK));\n}\n@Test\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": "*/\npackage com.github.tomakehurst.wiremock.matching;\n+import com.fasterxml.jackson.databind.JsonMappingException;\nimport com.github.tomakehurst.wiremock.client.WireMock;\n+import com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.common.LocalNotifier;\nimport com.github.tomakehurst.wiremock.common.Notifier;\nimport org.jmock.Expectations;\n@@ -24,10 +26,11 @@ import org.junit.After;\nimport org.junit.Before;\nimport org.junit.Test;\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n+import static org.hamcrest.Matchers.instanceOf;\nimport 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.junit.Assert.*;\npublic class MatchesJsonPathPatternTest {\n@@ -130,6 +133,190 @@ public class MatchesJsonPathPatternTest {\nassertThat(WireMock.matchingJsonPath(\"$..*\").match(null).isExactMatch(), is(false));\n}\n+ @Test\n+ public void matchesNumericExpressionResultAgainstValuePatternWhenSpecified() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": 11\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", equalTo(\"11\"));\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesStringExpressionResultAgainstValuePatternWhenSpecified() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": \\\"eleven\\\"\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", equalTo(\"eleven\"));\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesBooleanExpressionResultAgainstValuePatternWhenSpecified() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": true\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", equalTo(\"true\"));\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesObjectExpressionResultAgainstValuePatternWhenSpecified() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": 11\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl\", WireMock.equalToJson(\n+ \"{\\n\" +\n+ \" \\\"max\\\": 11\\n\" +\n+ \"}\"));\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesArrayExpressionResultAgainstValuePatternWhenSpecified() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": [1, 2, 3, 11]\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", WireMock.equalToJson(\"[1,2,3,11]\"));\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesNotPresentExpressionResultAgainstAbsentValuePattern() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": true\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.min\", absent());\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void matchesNullExpressionResultAgainstAbsentValuePattern() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": null\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", absent());\n+ MatchResult match = pattern.match(json);\n+ assertTrue(match.isExactMatch());\n+ }\n+\n+ @Test\n+ public void returnsTheDistanceFromTheValueMatcherWhenNotAMatch() {\n+ String json = \"{\\n\" +\n+ \" \\\"volumeControl\\\": {\\n\" +\n+ \" \\\"max\\\": \\\"eleven\\\"\\n\" +\n+ \" }\\n\" +\n+ \"}\";\n+\n+ StringValuePattern pattern = WireMock.matchingJsonPath(\"$.volumeControl.max\", equalTo(\"ele\"));\n+ MatchResult match = pattern.match(json);\n+ assertFalse(match.isExactMatch());\n+ assertThat(match.getDistance(), is(0.5));\n+ }\n+\n+ @Test\n+ public void correctlySerialises() {\n+ assertThat(Json.write(WireMock.matchingJsonPath(\"$..thing\")), equalToJson(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": \\\"$..thing\\\" \\n\" +\n+ \"}\"\n+ ));\n+ }\n+\n+ @Test\n+ public void correctlySerialisesWithValuePattern() {\n+ assertThat(Json.write(WireMock.matchingJsonPath(\"$..thing\", containing(\"123\"))), equalToJson(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"$..thing\\\", \\n\" +\n+ \" \\\"contains\\\": \\\"123\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\"\n+ ));\n+ }\n+\n+ @Test\n+ public void correctlyDeserialises() {\n+ StringValuePattern stringValuePattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": \\\"$..thing\\\" \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+\n+ assertThat(stringValuePattern, instanceOf(MatchesJsonPathPattern.class));\n+ assertThat(stringValuePattern.getExpected(), is(\"$..thing\"));\n+ }\n+\n+ @Test\n+ public void correctlyDeserialisesWithValuePattern() {\n+ StringValuePattern stringValuePattern = Json.read(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"$..thing\\\", \\n\" +\n+ \" \\\"equalTo\\\": \\\"the value\\\" \\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(EqualToPattern.class));\n+ assertThat(subMatcher.getExpected(), is(\"the value\"));\n+ }\n+\n+ @Test(expected = JsonMappingException.class)\n+ public void throwsSensibleErrorOnDeserialisationWhenPatternIsBadlyFormedWithMissingExpression() {\n+ Json.read(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": { \\n\" +\n+ \" \\\"express\\\": \\\"$..thing\\\", \\n\" +\n+ \" \\\"equalTo\\\": \\\"the value\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+ }\n+\n+ @Test(expected = JsonMappingException.class)\n+ public void throwsSensibleErrorOnDeserialisationWhenPatternIsBadlyFormedWithBadValuePatternName() {\n+ Json.read(\n+ \"{ \\n\" +\n+ \" \\\"matchesJsonPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"$..thing\\\", \\n\" +\n+ \" \\\"badOperator\\\": \\\"the value\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\",\n+ StringValuePattern.class);\n+ }\n+\nprivate void expectInfoNotification(final String message) {\nfinal Notifier notifier = context.mock(Notifier.class);\ncontext.checking(new Expectations() {{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPatternTest.java",
"diff": "@@ -18,15 +18,18 @@ package com.github.tomakehurst.wiremock.matching;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.google.common.collect.ImmutableMap;\n+import org.hamcrest.Matchers;\nimport org.json.JSONException;\nimport org.junit.Test;\nimport org.skyscreamer.jsonassert.JSONAssert;\nimport java.util.Collections;\n-import static org.hamcrest.Matchers.hasEntry;\n-import static org.hamcrest.Matchers.is;\n-import static org.hamcrest.Matchers.nullValue;\n+import static com.github.tomakehurst.wiremock.client.WireMock.containing;\n+import static com.github.tomakehurst.wiremock.client.WireMock.equalToIgnoreCase;\n+import static com.github.tomakehurst.wiremock.client.WireMock.matching;\n+import static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\n+import static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertFalse;\nimport static org.junit.Assert.assertThat;\nimport static org.junit.Assert.assertTrue;\n@@ -98,6 +101,67 @@ public class MatchesXPathPatternTest {\nassertTrue(match.isExactMatch());\n}\n+ @Test\n+ public void matchesAgainstValuePatternWhenSingleElementReturnedFromXPath() {\n+ String xml =\n+ \"<outer>\\n\" +\n+ \" <inner>stuff</inner>\\n\" +\n+ \"</outer>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"//inner/text()\", matching(\"[a-z]*\"));\n+\n+ assertThat(pattern.match(xml).isExactMatch(), is(true));\n+ }\n+\n+ @Test\n+ public void matchesAgainstValuePatternWhenMultipleElementsReturnedFromXPath() {\n+ String xml =\n+ \"<outer>\\n\" +\n+ \" <inner>stuffing</inner>\\n\" +\n+ \" <inner>stuffed</inner>\\n\" +\n+ \" <inner>stuff</inner>\\n\" +\n+ \" <inner>stuffable</inner>\\n\" +\n+ \"</outer>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"//inner/text()\", WireMock.equalTo(\"stuff\"));\n+\n+ assertThat(pattern.match(xml).isExactMatch(), is(true));\n+ }\n+\n+ @Test\n+ public void returnsTheMatchFromTheClosestElementWhenNoneMatchExactly() {\n+ String xml =\n+ \"<outer>\\n\" +\n+ \" <inner>stuffing</inner>\\n\" +\n+ \" <inner>stuffed</inner>\\n\" +\n+ \" <inner>stuffy</inner>\\n\" +\n+ \" <inner>stuffable</inner>\\n\" +\n+ \"</outer>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"//inner/text()\", WireMock.equalTo(\"stuff\"));\n+\n+ assertThat(pattern.match(xml).getDistance(), closeTo(0.16, 0.01));\n+ }\n+\n+ @Test\n+ public void matchesAttributeAgainstValuePattern() {\n+ String xml = \"<outer inner=\\\"stuff\\\"/>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"/outer/@inner\", equalToIgnoreCase(\"Stuff\"));\n+\n+ assertThat(pattern.match(xml).isExactMatch(), is(true));\n+ }\n+\n+ @Test\n+ public void returnsAMaxDistanceNoMatchWhenNoNodesReturnedAndValuePatternIsPresent() {\n+ String xml = \"<outer inner=\\\"stuff\\\"/>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"/outer/@nothing\", equalToIgnoreCase(\"Stuff\"));\n+\n+ assertThat(pattern.match(xml).isExactMatch(), is(false));\n+ assertThat(pattern.match(xml).getDistance(), is(1.0));\n+ }\n+\n@Test\npublic void deserialisesCorrectlyWithoutNamespaces() {\nString json = \"{ \\\"matchesXPath\\\" : \\\"/stuff:outer/stuff:inner[.=111]\\\" }\";\n@@ -124,6 +188,23 @@ public class MatchesXPathPatternTest {\nassertThat(pattern.getXPathNamespaces(), hasEntry(\"two\", \"http://two.com/\"));\n}\n+ @Test\n+ public void deserialisesCorrectlyWithValuePattern() {\n+ String json =\n+ \"{ \\n\" +\n+ \" \\\"matchesXPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"/thing\\\", \\n\" +\n+ \" \\\"matches\\\": \\\"[0-9]*\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\";\n+\n+ MatchesXPathPattern pattern = Json.read(json, MatchesXPathPattern.class);\n+\n+ assertThat(pattern.getValuePattern(), instanceOf(RegexPattern.class));\n+ assertThat(pattern.getExpected(), is(\"/thing\"));\n+ assertThat(pattern.getValuePattern().getExpected(), is(\"[0-9]*\"));\n+ }\n+\n@Test\npublic void serialisesCorrectlyWithNamspaces() throws JSONException {\nMatchesXPathPattern pattern = new MatchesXPathPattern(\"//*\", ImmutableMap.of(\n@@ -154,6 +235,18 @@ public class MatchesXPathPatternTest {\njson, false);\n}\n+ @Test\n+ public void serialisesCorrectlyWithValuePattern() {\n+ assertThat(Json.write(WireMock.matchingXPath(\"/thing\", containing(\"123\"))), equalToJson(\n+ \"{ \\n\" +\n+ \" \\\"matchesXPath\\\": { \\n\" +\n+ \" \\\"expression\\\": \\\"/thing\\\", \\n\" +\n+ \" \\\"contains\\\": \\\"123\\\" \\n\" +\n+ \" } \\n\" +\n+ \"}\"\n+ ));\n+ }\n+\n@Test\npublic void noMatchOnNullValue() {\nassertThat(WireMock.matchingXPath(\"//*\").match(null).isExactMatch(), is(false));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/StringValuePatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/StringValuePatternTest.java",
"diff": "*/\npackage com.github.tomakehurst.wiremock.matching;\n+import com.fasterxml.jackson.annotation.JsonProperty;\nimport com.google.common.base.Function;\nimport com.google.common.base.Predicate;\nimport com.google.common.base.Predicates;\n@@ -69,13 +70,7 @@ public class StringValuePatternTest {\nfor (Class<?> clazz: classes) {\n- Constructor<?> constructor = findConstructorWithStringParamInFirstPosition(clazz);\n- Stopwatch stopwatch = Stopwatch.createStarted();\n- assertThat(constructor\n- .getParameterAnnotations()[0][0]\n- .annotationType()\n- .getSimpleName(), is(\"JsonProperty\"));\n- stopwatch.stop();\n+ findConstructorWithStringParamInFirstPosition(clazz);\n}\n}\n@@ -84,7 +79,11 @@ public class StringValuePatternTest {\nreturn Iterables.find(asList(clazz.getConstructors()), new Predicate<Constructor<?>>() {\n@Override\npublic boolean apply(Constructor<?> input) {\n- return input.getParameterTypes().length > 0 && input.getParameterTypes()[0].equals(String.class);\n+ return input.getParameterTypes().length > 0 &&\n+ input.getParameterTypes()[0].equals(String.class) &&\n+ input.getParameterAnnotations().length > 0 &&\n+ input.getParameterAnnotations()[0].length > 0 &&\n+ input.getParameterAnnotations()[0][0].annotationType().equals(JsonProperty.class) ;\n}\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMockTestClient.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/testsupport/WireMockTestClient.java",
"diff": "@@ -46,6 +46,7 @@ import static java.net.HttpURLConnection.HTTP_CREATED;\nimport static java.net.HttpURLConnection.HTTP_NO_CONTENT;\nimport static java.net.HttpURLConnection.HTTP_OK;\nimport static org.apache.http.entity.ContentType.APPLICATION_JSON;\n+import static org.apache.http.entity.ContentType.APPLICATION_XML;\npublic class WireMockTestClient {\n@@ -165,6 +166,12 @@ public class WireMockTestClient {\nreturn executeMethodAndConvertExceptions(httpPost, headers);\n}\n+ public WireMockResponse postXml(String url, String body, TestHttpHeader... headers) {\n+ HttpPost httpPost = new HttpPost(mockServiceUrlFor(url));\n+ httpPost.setEntity(new StringEntity(body, APPLICATION_XML));\n+ return executeMethodAndConvertExceptions(httpPost, headers);\n+ }\n+\npublic WireMockResponse patchWithBody(String url, String body, String bodyMimeType, String bodyEncoding) {\nreturn patch(url, new StringEntity(body, ContentType.create(bodyMimeType, bodyEncoding)));\n}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added advanced JSONPath and XPath matching |
686,936 | 01.09.2017 13:32:37 | -3,600 | 3d4e34d549c28aa2c012423c9e552304019f340f | Added docs for advanced JSONPath and XPath matching | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -527,6 +527,72 @@ Request body example:\n{ \"things\": [ { \"name\": \"RequiredThing\" } ] }\n```\n+#### Nested value matching\n+\n+The JSONPath matcher can be combined with another matcher, such that the value returned from the JSONPath query is evaluated against it:\n+\n+Java:\n+\n+```java\n+.withRequestBody(matchingJsonPath(\"$..todoItem\", containing(\"wash\")))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"matchesJsonPath\" : {\n+ \"expression\": \"$..todoItem\",\n+ \"contains\": \"wash\"\n+ }\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n+Since WireMock's matching operators all work on strings, the value selected by the JSONPath expression will be coerced to a string before the match is evaluated. This true even if the returned value\n+is an object or array. A benefit of this is that this allows a sub-document to be selected using JSONPath, then matched using the `equalToJson` operator. E.g. for the following request body:\n+\n+```json\n+{\n+ \"outer\": {\n+ \"inner\": 42\n+ }\n+}\n+```\n+\n+The following will match:\n+\n+```java\n+.withRequestBody(matchingJsonPath(\"$.outer\", equalToJson(\"{ \\n\" +\n+ \" \\\"inner\\\": 42 \\n\" +\n+ \"}\")))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"matchesJsonPath\" : {\n+ \"expression\": \"$.outer\",\n+ \"equalToJson\": \"{ \\\"inner\\\": 42 }\"\n+ }\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n+\n### XML equality\nDeems a match if the attribute value is valid XML and is semantically equal to the expected XML document. The underlying engine for determining XML equality is [XMLUnit](http://www.xmlunit.org/).\n@@ -606,6 +672,34 @@ JSON:\n}\n```\n+#### Nested value matching\n+\n+The XPath matcher described above can be combined with another matcher, such that the value returned from the XPath query is evaluated against it:\n+\n+Java:\n+\n+```java\n+.withRequestBody(matchingXPath(\"//todo-item/text()\", containing(\"wash\")))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"matchesXPath\" : {\n+ \"expression\": \"//todo-item/text()\",\n+ \"contains\": \"wash\"\n+ }\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n### Absence\nDeems a match if the attribute specified is absent from the request.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/ignored/Examples.java",
"new_path": "src/test/java/ignored/Examples.java",
"diff": "@@ -17,6 +17,7 @@ package ignored;\nimport com.github.tomakehurst.wiremock.AcceptanceTestBase;\nimport com.github.tomakehurst.wiremock.client.VerificationException;\n+import com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.common.ConsoleNotifier;\nimport com.github.tomakehurst.wiremock.common.Json;\nimport com.github.tomakehurst.wiremock.core.WireMockConfiguration;\n@@ -233,6 +234,35 @@ public class Examples extends AcceptanceTestBase {\n.willReturn(aResponse().withStatus(200)));\n}\n+ @Test\n+ public void advancedXPathMatching() {\n+ stubFor(put(urlEqualTo(\"/xpath\"))\n+ .withRequestBody(matchingXPath(\"//todo-item/text()\", containing(\"wash\")))\n+ .willReturn(aResponse().withStatus(200)));\n+ }\n+\n+ @Test\n+ public void advancedJSONPathMatching() {\n+ stubFor(put(urlEqualTo(\"/jsonpath\"))\n+ .withRequestBody(matchingJsonPath(\"$..todoItem\", containing(\"wash\")))\n+ .willReturn(aResponse().withStatus(200)));\n+ }\n+\n+ @Test\n+ public void advancedJSONPathMatchingWithObject() {\n+ System.out.println(matchingJsonPath(\"$.outer\",\n+ equalToJson(\n+ \"{\\n\" +\n+ \" \\\"inner\\\": 42\\n\" +\n+ \" }\"))\n+ .match(\n+ \"{\\n\" +\n+ \" \\\"outer\\\": {\\n\" +\n+ \" \\\"inner\\\": 42\\n\" +\n+ \" }\\n\" +\n+ \"}\").isExactMatch());\n+ }\n+\n@Test\npublic void transformerParameters() {\nstubFor(get(urlEqualTo(\"/transform\")).willReturn(\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added docs for advanced JSONPath and XPath matching |
686,936 | 01.09.2017 13:43:36 | -3,600 | c79398418caa425d3569c45a6cababa828760e87 | Added test and docs for advanced XPath matching against complex elements | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_docs/request-matching.md",
"new_path": "docs-v2/_docs/request-matching.md",
"diff": "@@ -700,6 +700,35 @@ JSON:\n}\n```\n+If multiple nodes are returned from the XPath query, all will be evaluated and the returned match will be the one with the shortest distance.\n+\n+If the XPath expression returns an XML element rather than a value, this will be rendered as an XML string before it is passed to the value matcher.\n+This can be usefully combined with the `equalToXml` matcher e.g.\n+\n+Java:\n+\n+```java\n+.withRequestBody(matchingXPath(\"//todo-item\", equalToXml(\"<todo-item>Do the washing</todo-item>\")))\n+```\n+\n+JSON:\n+\n+```json\n+{\n+ \"request\": {\n+ ...\n+ \"bodyPatterns\" : [ {\n+ \"matchesXPath\" : {\n+ \"expression\": \"//todo-item\",\n+ \"equalToXml\": \"<todo-item>Do the washing</todo-item>\"\n+ }\n+ } ]\n+ ...\n+ },\n+ ...\n+}\n+```\n+\n### Absence\nDeems a match if the attribute specified is absent from the request.\n"
},
{
"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": "@@ -62,6 +62,18 @@ public class Xml {\nreturn db.parse(is);\n}\n+ public static String toStringValue(Node node) {\n+ switch(node.getNodeType()) {\n+ case Node.TEXT_NODE:\n+ case Node.ATTRIBUTE_NODE:\n+ return node.getTextContent();\n+ case Node.ELEMENT_NODE:\n+ return render(node);\n+ default:\n+ return node.toString();\n+ }\n+ }\n+\npublic static String render(Node node) {\ntry {\nStringWriter sw = new StringWriter();\n@@ -74,16 +86,4 @@ public class Xml {\nreturn throwUnchecked(e, String.class);\n}\n}\n-\n- public static String toStringValue(Node node) {\n- switch(node.getNodeType()) {\n- case Node.TEXT_NODE:\n- case Node.ATTRIBUTE_NODE:\n- return node.getTextContent();\n- case Node.ELEMENT_NODE:\n- return render(node);\n- default:\n- return node.toString();\n- }\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPatternTest.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/matching/MatchesXPathPatternTest.java",
"diff": "@@ -25,9 +25,7 @@ import org.skyscreamer.jsonassert.JSONAssert;\nimport java.util.Collections;\n-import static com.github.tomakehurst.wiremock.client.WireMock.containing;\n-import static com.github.tomakehurst.wiremock.client.WireMock.equalToIgnoreCase;\n-import static com.github.tomakehurst.wiremock.client.WireMock.matching;\n+import static com.github.tomakehurst.wiremock.client.WireMock.*;\nimport static com.github.tomakehurst.wiremock.testsupport.WireMatchers.equalToJson;\nimport static org.hamcrest.Matchers.*;\nimport static org.junit.Assert.assertFalse;\n@@ -162,6 +160,18 @@ public class MatchesXPathPatternTest {\nassertThat(pattern.match(xml).getDistance(), is(1.0));\n}\n+ @Test\n+ public void matchesComplexElementAgainstValuePattern() {\n+ String xml =\n+ \"<outer>\\n\" +\n+ \" <inner>stuff</inner>\\n\" +\n+ \"</outer>\";\n+\n+ StringValuePattern pattern = WireMock.matchingXPath(\"/outer/inner\", equalToXml(\"<inner>stuff</inner>\"));\n+\n+ assertThat(pattern.match(xml).isExactMatch(), is(true));\n+ }\n+\n@Test\npublic void deserialisesCorrectlyWithoutNamespaces() {\nString json = \"{ \\\"matchesXPath\\\" : \\\"/stuff:outer/stuff:inner[.=111]\\\" }\";\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added test and docs for advanced XPath matching against complex elements |
687,061 | 03.09.2017 23:51:17 | 14,400 | 95489ff4ac57a0958db6acc5b45012333063c8de | Added overload which calls main constructor | [
{
"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": "@@ -74,6 +74,10 @@ public class HttpAdminClient implements Admin {\nthis(scheme, host, port, urlPathPrefix, null, null, 0);\n}\n+ public HttpAdminClient(String scheme, String host, int port, String urlPathPrefix, String hostHeader) {\n+ this(scheme, host, port, urlPathPrefix, hostHeader, null, 0);\n+ }\n+\npublic HttpAdminClient(String scheme,\nString host,\nint port,\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added overload which calls main constructor |
686,966 | 07.09.2017 21:48:16 | -3,600 | 3ead9eb702ea081eff31f4ef8c31b99c82a548aa | Add convenience WireMockServer.url builder method | [
{
"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": "@@ -188,6 +188,18 @@ public class WireMockServer implements Container, Stubbing, Admin {\nreturn httpServer.httpsPort();\n}\n+ public String url(String path) {\n+ boolean https = options.httpsSettings().enabled();\n+ String protocol = https ? \"https\" : \"http\";\n+ int port = https ? httpsPort() : port();\n+\n+ if (!path.startsWith(\"/\")) {\n+ path = \"/\" + path;\n+ }\n+\n+ return String.format(\"%s://localhost:%d%s\", protocol, port, path);\n+ }\n+\npublic boolean isRunning() {\nreturn httpServer.isRunning();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/test/java/com/github/tomakehurst/wiremock/WireMockServerTests.java",
"new_path": "src/test/java/com/github/tomakehurst/wiremock/WireMockServerTests.java",
"diff": "@@ -27,6 +27,8 @@ import org.junit.rules.TemporaryFolder;\nimport java.io.IOException;\nimport static com.github.tomakehurst.wiremock.client.WireMock.*;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\n+\nimport static org.hamcrest.Matchers.is;\nimport static org.junit.Assert.assertThat;\n@@ -57,6 +59,26 @@ public class WireMockServerTests {\nassertThat(wireMockServer.getOptions(), is(options));\n}\n+ @Test\n+ public void buildsQualifiedHttpUrlFromPath() {\n+ WireMockServer wireMockServer = new WireMockServer(options().dynamicPort());\n+ wireMockServer.start();\n+ int port = wireMockServer.port();\n+\n+ assertThat(wireMockServer.url(\"/something\"), is(String.format(\"http://localhost:%d/something\", port)));\n+ assertThat(wireMockServer.url(\"something\"), is(String.format(\"http://localhost:%d/something\", port)));\n+ }\n+\n+ @Test\n+ public void buildsQualifiedHttpsUrlFromPath() {\n+ WireMockServer wireMockServer = new WireMockServer(options().dynamicHttpsPort());\n+ wireMockServer.start();\n+ int port = wireMockServer.httpsPort();\n+\n+ assertThat(wireMockServer.url(\"/something\"), is(String.format(\"https://localhost:%d/something\", port)));\n+ assertThat(wireMockServer.url(\"something\"), is(String.format(\"https://localhost:%d/something\", port)));\n+ }\n+\n// https://github.com/tomakehurst/wiremock/issues/193\n@Test\npublic void supportsRecordingProgrammaticallyWithoutHeaderMatching() {\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Add convenience WireMockServer.url builder method |
687,030 | 11.09.2017 11:01:01 | -36,000 | 90252893378459a0f7dd0b104b50c2e01b361dcd | Wire up stop timeout for embedded Jetty server | [
{
"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": "@@ -72,6 +72,7 @@ public class WireMockConfiguration implements Options {\nprivate Integer jettyAcceptors;\nprivate Integer jettyAcceptQueueSize;\nprivate Integer jettyHeaderBufferSize;\n+ private Long jettyStopTimeout;\nprivate Map<String, Extension> extensions = newLinkedHashMap();\nprivate WiremockNetworkTrafficListener networkTrafficListener = new DoNothingWiremockNetworkTrafficListener();\n@@ -132,6 +133,11 @@ public class WireMockConfiguration implements Options {\nreturn this;\n}\n+ public WireMockConfiguration jettyStopTimeout(Long jettyStopTimeout) {\n+ this.jettyStopTimeout = jettyStopTimeout;\n+ return this;\n+ }\n+\npublic WireMockConfiguration keystorePath(String path) {\nthis.keyStorePath = path;\nreturn this;\n@@ -305,6 +311,7 @@ public class WireMockConfiguration implements Options {\n.withAcceptors(jettyAcceptors)\n.withAcceptQueueSize(jettyAcceptQueueSize)\n.withRequestHeaderSize(jettyHeaderBufferSize)\n+ .withStopTimeout(jettyStopTimeout)\n.build();\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": "@@ -90,7 +90,7 @@ public class JettyHttpServer implements HttpServer {\njettyServer.setHandler(createHandler(options, adminRequestHandler, stubRequestHandler));\n- finalizeSetup();\n+ finalizeSetup(options);\n}\nprotected HandlerCollection createHandler(Options options, AdminRequestHandler adminRequestHandler, StubRequestHandler stubRequestHandler) {\n@@ -110,9 +110,11 @@ public class JettyHttpServer implements HttpServer {\nreturn handlers;\n}\n- protected void finalizeSetup() {\n+ protected void finalizeSetup(Options options) {\n+ if(!options.jettySettings().getStopTimeout().isPresent()) {\njettyServer.setStopTimeout(0);\n}\n+ }\nprotected Server createServer(Options options) {\nfinal Server server = new Server(new QueuedThreadPool(options.containerThreads()));\n@@ -176,6 +178,10 @@ public class JettyHttpServer implements HttpServer {\nreturn httpsConnector.getLocalPort();\n}\n+ protected long stopTimeout() {\n+ return jettyServer.getStopTimeout();\n+ }\n+\nprotected ServerConnector createHttpConnector(\nString bindAddress,\nint port,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/core/WireMockConfigurationTest.java",
"diff": "+package com.github.tomakehurst.wiremock.core;\n+\n+import com.google.common.base.Optional;\n+import org.junit.Test;\n+\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+public class WireMockConfigurationTest {\n+\n+ @Test\n+ public void testJettyStopTimeout() {\n+ Long expectedStopTimeout = 500L;\n+ WireMockConfiguration wireMockConfiguration = WireMockConfiguration.wireMockConfig().jettyStopTimeout(expectedStopTimeout);\n+ Optional<Long> jettyStopTimeout = wireMockConfiguration.jettySettings().getStopTimeout();\n+\n+ assertThat(jettyStopTimeout.isPresent(), is(true));\n+ assertThat(jettyStopTimeout.get(), is(expectedStopTimeout));\n+ }\n+\n+ @Test\n+ public void testJettyStopTimeoutNotSet() {\n+ WireMockConfiguration wireMockConfiguration = WireMockConfiguration.wireMockConfig();\n+ Optional<Long> jettyStopTimeout = wireMockConfiguration.jettySettings().getStopTimeout();\n+ assertThat(jettyStopTimeout.isPresent(), is(false));\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/jetty9/JettyHttpServerTest.java",
"diff": "+package com.github.tomakehurst.wiremock.jetty9;\n+\n+import com.github.tomakehurst.wiremock.admin.AdminRoutes;\n+import com.github.tomakehurst.wiremock.core.Admin;\n+import com.github.tomakehurst.wiremock.core.StubServer;\n+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;\n+import com.github.tomakehurst.wiremock.extension.PostServeAction;\n+import com.github.tomakehurst.wiremock.http.AdminRequestHandler;\n+import com.github.tomakehurst.wiremock.http.BasicResponseRenderer;\n+import com.github.tomakehurst.wiremock.http.ResponseRenderer;\n+import com.github.tomakehurst.wiremock.http.StubRequestHandler;\n+import com.github.tomakehurst.wiremock.verification.RequestJournal;\n+import org.jmock.Mockery;\n+import org.jmock.integration.junit4.JMock;\n+import org.junit.Before;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+\n+import java.util.Collections;\n+\n+import static org.hamcrest.Matchers.is;\n+import static org.junit.Assert.assertThat;\n+\n+@RunWith(JMock.class)\n+public class JettyHttpServerTest {\n+\n+ private Mockery context;\n+ private AdminRequestHandler adminRequestHandler;\n+ private StubRequestHandler stubRequestHandler;\n+\n+ @Before\n+ public void init() {\n+ context = new Mockery();\n+ Admin admin = context.mock(Admin.class);\n+\n+ adminRequestHandler = new AdminRequestHandler(AdminRoutes.defaults(), admin, new BasicResponseRenderer());\n+ stubRequestHandler = new StubRequestHandler(context.mock(StubServer.class),\n+ context.mock(ResponseRenderer.class),\n+ admin,\n+ Collections.<String, PostServeAction>emptyMap(),\n+ context.mock(RequestJournal.class));\n+ }\n+\n+ @Test\n+ public void testStopTimeout() {\n+ long expectedStopTimeout = 500L;\n+ WireMockConfiguration config = WireMockConfiguration\n+ .wireMockConfig()\n+ .jettyStopTimeout(expectedStopTimeout);\n+\n+ JettyHttpServer jettyHttpServer = new JettyHttpServer(config, adminRequestHandler, stubRequestHandler);\n+\n+ assertThat(jettyHttpServer.stopTimeout(), is(expectedStopTimeout));\n+ }\n+\n+ @Test\n+ public void testStopTimeoutNotSet() {\n+ long expectedStopTimeout = 0L;\n+ WireMockConfiguration config = WireMockConfiguration.wireMockConfig();\n+\n+ JettyHttpServer jettyHttpServer = new JettyHttpServer(config, adminRequestHandler, stubRequestHandler);\n+\n+ assertThat(jettyHttpServer.stopTimeout(), is(expectedStopTimeout));\n+ }\n+}\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": "@@ -372,6 +372,9 @@ public class Examples extends AcceptanceTestBase {\n// Set the size of Jetty's header buffer (to avoid exceptions when very large request headers are sent). Defaults to 8192.\n.jettyHeaderBufferSize(16834)\n+ // Set the timeout to wait for Jetty to stop in milliseconds. Defaults to 0 (no wait)\n+ .jettyStopTimeout(5000L)\n+\n// Set the keystore containing the HTTPS certificate\n.keystorePath(\"/path/to/https-certs-keystore.jks\")\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Wire up stop timeout for embedded Jetty server |
686,936 | 25.09.2017 11:56:50 | -3,600 | 228da0a74c19453ee17206dd0f6efdd0b9f52775 | Added consulting link to top nav on the website | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_data/navigation.yml",
"new_path": "docs-v2/_data/navigation.yml",
"diff": "@@ -23,6 +23,9 @@ main:\n- title: \"External Resources\"\nurl: /external-resources/\n+ - title: \"Consulting Services\"\n+ url: http://consulting.wiremock.org\n+\n- title: \"MockLab\"\nurl: http://get.mocklab.io\nnew_window: true\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added consulting link to top nav on the website |
686,936 | 26.09.2017 12:11:36 | -3,600 | f95e9cdb534238be3c0e097628bf3f43f4019e53 | Added some additional external resources to the docs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/external-resources/index.md",
"new_path": "docs-v2/external-resources/index.md",
"diff": "@@ -31,18 +31,28 @@ request body into the response:<br>\nIn a similar vein, Adam York has written a response transformer utilising Velocity templates:<br>\n[https://github.com/adamyork/wiremock-velocity-transformer](https://github.com/adamyork/wiremock-velocity-transformer)\n+Mason Malone has built an extension for matching requests based on the contents of JSON web tokens:<br>\n+[https://github.com/MasonM/wiremock-jwt-extension](https://github.com/MasonM/wiremock-jwt-extension)\n+\n+Also from Mason, an extension for finding and removing unused stub mappings:<br>\n+[https://github.com/MasonM/wiremock-unused-stubs-extension](https://github.com/MasonM/wiremock-unused-stubs-extension)\n+\n## Other languages\n-Rowan Hill has written a PHP binding:<br>\n+PHP client by Rowan Hill:<br>\n[https://github.com/rowanhill/wiremock-php](https://github.com/rowanhill/wiremock-php)\n-Jeffres S. Morgan has written a Ruby wrapper:<br>\n+Ruby wrapper by Jeffres S. Morgan:<br>\n[https://rubygems.org/gems/service_mock](https://rubygems.org/gems/service_mock)\n-Tom Jankes has written a Groovy binding:<br>\n+Groovy binding by Tom Jankes:<br>\n[https://github.com/tomjankes/wiremock-groovy](https://github.com/tomjankes/wiremock-groovy)\n+Python 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+\n+\n## Articles\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added some additional external resources to the docs |
686,936 | 26.09.2017 12:14:56 | -3,600 | 1735e8603efbdc34e10efe51541571ad3de0db51 | Added GA event to Consulting Services link in docs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_includes/footer.html",
"new_path": "docs-v2/_includes/footer.html",
"diff": "_gaq.push(['_trackEvent', 'primary_nav', 'mocklab_clicked', 'MockLab clicked', 1]);\n});\n+ $(\"a[title='Consulting Services']\").click(function() {\n+ _gaq.push(['_trackEvent', 'primary_nav', 'consulting_services_clicked', 'Consulting Services clicked', 1]);\n+ });\n+\nif (!document.cookie.includes('mocklab_notification_seen')) {\nwindow.setTimeout(function () {\n$(\"#dialog\").dialog({\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Added GA event to Consulting Services link in docs |
686,936 | 27.09.2017 11:57:31 | -3,600 | 0ef7acfb1e47144ce513bdb8a28a422071706516 | Tweaked Consulting link text in docs | [
{
"change_type": "MODIFY",
"old_path": "docs-v2/_data/navigation.yml",
"new_path": "docs-v2/_data/navigation.yml",
"diff": "@@ -23,7 +23,7 @@ main:\n- title: \"External Resources\"\nurl: /external-resources/\n- - title: \"Consulting Services\"\n+ - title: \"Support & Consulting\"\nurl: http://consulting.wiremock.org\n- title: \"MockLab\"\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Tweaked Consulting link text in docs |
686,951 | 02.10.2017 21:21:17 | -10,800 | 351c7b24486acf606fb2a35da8648d9d1218da10 | changes 'failOnUnmatchedStubs' to 'failOnUnmatchedRequests' like intended. Fixes | [
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/client/VerificationException.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/client/VerificationException.java",
"diff": "@@ -43,20 +43,20 @@ public class VerificationException extends AssertionError {\nreturn new VerificationException(\"A request was unmatched by any stub mapping. Closest stub mapping was:\", diff);\n}\n- public static VerificationException forUnmatchedRequests(List<NearMiss> nearMisses) {\n+ public static VerificationException forUnmatchedNearMisses(List<NearMiss> nearMisses) {\nif (nearMisses.size() == 1) {\nreturn forSingleUnmatchedRequest(nearMisses.get(0).getDiff());\n}\nreturn new VerificationException(nearMisses.size() +\n\" requests were unmatched by any stub mapping. Shown with closest stub mappings:\\n\" +\n- renderNearMisses(nearMisses));\n+ renderList(nearMisses));\n}\n- private static String renderNearMisses(List<NearMiss> nearMisses) {\n+ private static String renderList(List list) {\nreturn Joiner.on(\"\\n\\n\").join(\n- from(nearMisses).transform(toStringFunction())\n+ from(list).transform(toStringFunction())\n);\n}\n@@ -86,4 +86,15 @@ public class VerificationException extends AssertionError {\nactualCount,\nexpected.toString()));\n}\n+\n+ public static VerificationException forUnmatchedRequests(List<LoggedRequest> unmatchedRequests) {\n+ if (unmatchedRequests.size() == 1) {\n+ return new VerificationException(String.format(\"A request was unmatched by any stub mapping. Request was: \",\n+ unmatchedRequests.get(0)));\n+ }\n+\n+ return new VerificationException(unmatchedRequests.size() +\n+ \" requests were unmatched by any stub mapping. Requests are:\\n\" +\n+ renderList(unmatchedRequests));\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main/java/com/github/tomakehurst/wiremock/junit/WireMockRule.java",
"new_path": "src/main/java/com/github/tomakehurst/wiremock/junit/WireMockRule.java",
"diff": "@@ -19,6 +19,7 @@ import com.github.tomakehurst.wiremock.WireMockServer;\nimport com.github.tomakehurst.wiremock.client.VerificationException;\nimport com.github.tomakehurst.wiremock.client.WireMock;\nimport com.github.tomakehurst.wiremock.core.Options;\n+import com.github.tomakehurst.wiremock.verification.LoggedRequest;\nimport com.github.tomakehurst.wiremock.verification.NearMiss;\nimport org.junit.rules.MethodRule;\nimport org.junit.rules.TestRule;\n@@ -32,15 +33,15 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMoc\npublic class WireMockRule extends WireMockServer implements MethodRule, TestRule {\n- private final boolean failOnUnmatchedStubs;\n+ private final boolean failOnUnmatchedRequests;\npublic WireMockRule(Options options) {\nthis(options, true);\n}\n- public WireMockRule(Options options, boolean failOnUnmatchedStubs) {\n+ public WireMockRule(Options options, boolean failOnUnmatchedRequests) {\nsuper(options);\n- this.failOnUnmatchedStubs = failOnUnmatchedStubs;\n+ this.failOnUnmatchedRequests = failOnUnmatchedRequests;\n}\npublic WireMockRule(int port) {\n@@ -81,10 +82,15 @@ public class WireMockRule extends WireMockServer implements MethodRule, TestRule\n}\nprivate void checkForUnmatchedRequests() {\n- if (failOnUnmatchedStubs) {\n+ if (failOnUnmatchedRequests) {\n+ List<LoggedRequest> unmatchedRequests = findAllUnmatchedRequests();\n+ if (!unmatchedRequests.isEmpty()) {\nList<NearMiss> nearMisses = findNearMissesForAllUnmatchedRequests();\n- if (!nearMisses.isEmpty()) {\n- throw VerificationException.forUnmatchedRequests(nearMisses);\n+ if (nearMisses.isEmpty()) {\n+ throw VerificationException.forUnmatchedRequests(unmatchedRequests);\n+ } else {\n+ throw VerificationException.forUnmatchedNearMisses(nearMisses);\n+ }\n}\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/test/java/com/github/tomakehurst/wiremock/junit/WireMockRuleFailOnUnmatchedRequestsTest.java",
"diff": "+/*\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.junit;\n+\n+import com.github.tomakehurst.wiremock.client.VerificationException;\n+import com.github.tomakehurst.wiremock.testsupport.WireMockTestClient;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.ExpectedException;\n+import org.junit.rules.RuleChain;\n+import org.junit.rules.TestRule;\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.urlEqualTo;\n+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;\n+import static org.hamcrest.Matchers.containsString;\n+\n+public class WireMockRuleFailOnUnmatchedRequestsTest {\n+\n+\n+ public ExpectedException expectedException = ExpectedException.none();\n+\n+ public WireMockRule wm = new WireMockRule(options()\n+ .dynamicPort()\n+ .withRootDirectory(\"src/main/resources/empty\"),\n+ true);\n+\n+ @Rule\n+ public TestRule chain = RuleChain\n+ .outerRule(expectedException)\n+ .around(wm);\n+\n+ WireMockTestClient client;\n+\n+ @Before\n+ public void init() {\n+ client = new WireMockTestClient(wm.port());\n+ }\n+\n+\n+ @Test\n+ public void singleUnmatchedRequestShouldThrowVerificationException() {\n+ expectedException.expect(VerificationException.class);\n+ expectedException.expectMessage(containsString(\"A request was unmatched by any stub mapping\"));\n+ wm.stubFor(get(urlEqualTo(\"/hit\")).willReturn(aResponse().withStatus(200)));\n+ client.get(\"/near-misssss\");\n+ }\n+\n+ @Test\n+ public void manyUnmatchedRequestsShouldThrowVerificationException() {\n+ expectedException.expect(VerificationException.class);\n+ expectedException.expectMessage(containsString(\"3 requests were unmatched by any stub mapping\"));\n+ wm.stubFor(get(urlEqualTo(\"/hit\")).willReturn(aResponse().withStatus(200)));\n+ client.get(\"/near-misssss\");\n+ client.get(\"/hat\");\n+ client.get(\"/whatevs\");\n+ }\n+\n+ @Test\n+ public void unmatchedRequestButMatchedStubShouldThrowVerificationException() {\n+ expectedException.expect(VerificationException.class);\n+ expectedException.expectMessage(containsString(\"A request was unmatched by any stub mapping\"));\n+ wm.stubFor(get(urlEqualTo(\"/hit\")).willReturn(aResponse().withStatus(200)));\n+ client.get(\"/near-misssss\");\n+ client.get(\"/hit\");\n+ }\n+ @Test\n+ public void matchedRequestButUnmatchedStubShouldNotThrowVerificationException() {\n+ expectedException = ExpectedException.none();\n+ wm.stubFor(get(urlEqualTo(\"/hit\")).willReturn(aResponse().withStatus(200)));\n+ wm.stubFor(get(urlEqualTo(\"/miss\")).willReturn(aResponse().withStatus(404)));\n+ client.get(\"/hit\");\n+ }\n+ @Test\n+ public void unmatchedRequestWithoutStubShouldThrowVerificationException() {\n+ expectedException.expect(VerificationException.class);\n+ expectedException.expectMessage(containsString(\"A request was unmatched by any stub mapping.\"));\n+ client.get(\"/miss\");\n+ }\n+ @Test\n+ public void unmatchedStubWithoutRequestShouldNotThrowVerificationException() {\n+ expectedException = ExpectedException.none();\n+ wm.stubFor(get(urlEqualTo(\"/miss\")).willReturn(aResponse().withStatus(404)));\n+ }\n+}\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | changes 'failOnUnmatchedStubs' to 'failOnUnmatchedRequests' like intended. Fixes #676. |
686,936 | 04.10.2017 09:34:06 | -3,600 | 5d29c98a3a68dab875d4142c582afe8ddcbc7ac1 | Another attempt at getting the new Travis machine image and openjdk8 to work | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "language: java\n-dist: precise\njdk:\n- oraclejdk8\n- oraclejdk7\n- openjdk7\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 | Apache License 2.0 | tomakehurst/wiremock | Another attempt at getting the new Travis machine image and openjdk8 to work |
686,936 | 04.10.2017 09:49:27 | -3,600 | a8b4e1f04c07fc7125c6dd8fd13f41e2c4943f4f | Remove Oracle JDK7 from Travis build as no longer supported. Add workaround for Gradle wrapper download problem. | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -2,12 +2,12 @@ language: java\njdk:\n- oraclejdk8\n- - oraclejdk7\n- openjdk7\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\nscript: ./gradlew test --stacktrace --no-daemon\n"
}
]
| Java | Apache License 2.0 | tomakehurst/wiremock | Remove Oracle JDK7 from Travis build as no longer supported. Add workaround for Gradle wrapper download problem. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.