Merge pull request wiremock#2390 from wiremock/fix-simple-json-schema-matching

Fix json string schema rejecting numbers

Author: Mahoney

src/main/java/com/github/tomakehurst/wiremock/matching/MatchesJsonSchemaPattern.java

@@ -80,7 +80,7 @@ public MatchResult match(String json) {
  jsonNode = new TextNode(json);
  }
 
- final Set<ValidationMessage> validationMessages = schema.validate(jsonNode);
+ final Set<ValidationMessage> validationMessages = validate(jsonNode, json);
  if (validationMessages.isEmpty()) {
  return MatchResult.exactMatch();
  }
@@ -101,4 +101,13 @@ public double getDistance() {
  }
  };
  }
+
+ private Set<ValidationMessage> validate(JsonNode jsonNode, String originalJson) {
+ final Set<ValidationMessage> validationMessages = schema.validate(jsonNode);
+ if (validationMessages.isEmpty() || jsonNode.isTextual() || jsonNode.isContainerNode()) {
+ return validationMessages;
+ } else {
+ return schema.validate(new TextNode(originalJson));
+ }
+ }
 }

src/test/java/com/github/tomakehurst/wiremock/matching/MatchesJsonSchemaPatternTest.java

@@ -155,7 +155,13 @@ void matchesAString(String toMatch) {
  }
 
  private static Stream<Arguments> validStrings() {
- return Stream.of(Arguments.of("\"12\""), Arguments.of("\"123\""), Arguments.of("\"1234\""));
+ return Stream.of(
+ Arguments.of("\"12\""),
+ Arguments.of("\"123\""),
+ Arguments.of("\"1234\""),
+ Arguments.of("12"),
+ Arguments.of("123"),
+ Arguments.of("1234"));
  }
 
  @ParameterizedTest
@@ -173,9 +179,8 @@ private static Stream<Arguments> invalidStrings() {
  Arguments.of("\"\""),
  Arguments.of("\"1\""),
  Arguments.of("\"12345\""),
- Arguments.of("12"),
- Arguments.of("123"),
- Arguments.of("1234"));
+ Arguments.of("1"),
+ Arguments.of("12345"));
  }
 
  @ParameterizedTest
@@ -272,7 +277,7 @@ void corercesNumericActualValueToJsonNumber() {
  }
 
  @Test
- void corercesNumericActualValueToJsonString() {
+ void coercesNumericActualValueToJsonString() {
  String schema = file("schema-validation/stringy.schema.json");
 
  MatchesJsonSchemaPattern pattern =
@@ -281,7 +286,9 @@ void corercesNumericActualValueToJsonString() {
  assertThat(pattern.match("abcd").isExactMatch(), is(true));
  assertThat(pattern.match("abcde").isExactMatch(), is(true));
  assertThat(pattern.match("abcdef").isExactMatch(), is(false));
- assertThat(pattern.match("0").isExactMatch(), is(false));
+ assertThat(pattern.match("1").isExactMatch(), is(true));
+ assertThat(pattern.match("12345").isExactMatch(), is(true));
+ assertThat(pattern.match("123456").isExactMatch(), is(false));
  }
 
  private static Stream<Arguments> recursiveSchemaNonMatchingExamples() {

src/test/java/com/github/tomakehurst/wiremock/matching/RequestPatternTest.java

@@ -579,7 +579,15 @@ void matchesAPathParamAgainstAStringSchema(String toMatch) {
  }
 
  private static Stream<Arguments> validStrings() {
- return Stream.of(Arguments.of("\"12\""), Arguments.of("\"123\""), Arguments.of("\"1234\""));
+ return Stream.of(
+ Arguments.of("ab"),
+ Arguments.of("\"ab\""),
+ Arguments.of("\"12\""),
+ Arguments.of("\"123\""),
+ Arguments.of("\"1234\""),
+ Arguments.of("12"),
+ Arguments.of("123"),
+ Arguments.of("1234"));
  }
 
  @ParameterizedTest
@@ -604,9 +612,8 @@ private static Stream<Arguments> invalidStrings() {
  Arguments.of("\"\""),
  Arguments.of("\"1\""),
  Arguments.of("\"12345\""),
- Arguments.of("12"),
- Arguments.of("123"),
- Arguments.of("1234"));
+ Arguments.of("1"),
+ Arguments.of("12345"));
  }
 
  static final String ALL_BODY_PATTERNS_EXAMPLE =