Browse Source

Updated readSafely() to use available Configuration instance instead of the default Configuration.

pull/38/head
Greg Hasseler 11 years ago
parent
commit
f59634ae49
  1. 8
      json-path/src/main/java/com/jayway/jsonpath/Criteria.java

8
json-path/src/main/java/com/jayway/jsonpath/Criteria.java

@ -97,9 +97,9 @@ public class Criteria {
} }
} }
private static Object readSafely(JsonPath path, Map<String, Object> map) { private static Object readSafely(JsonPath path, Map<String, Object> map, Configuration configuration) {
try { try {
return path.read(map); return path.read(map, configuration);
} catch (InvalidPathException e) { } catch (InvalidPathException e) {
return null; return null;
} }
@ -123,7 +123,7 @@ public class Criteria {
for (CriteriaType key : this.criteria.keySet()) { for (CriteriaType key : this.criteria.keySet()) {
final Object actualVal = readSafely(this.key, map); final Object actualVal = readSafely(this.key, map, configuration);
final Object expectedVal = this.criteria.get(key); final Object expectedVal = this.criteria.get(key);
if (CriteriaType.GT.equals(key)) { if (CriteriaType.GT.equals(key)) {
@ -312,7 +312,7 @@ public class Criteria {
} }
return true; return true;
} else { } else {
Object actualVal = readSafely(this.key, map); Object actualVal = readSafely(this.key, map, configuration);
return objectOrAnyCollectionItemMatches(actualVal, new Predicate<Object>() { return objectOrAnyCollectionItemMatches(actualVal, new Predicate<Object>() {
@Override @Override
public boolean accept(Object value) { public boolean accept(Object value) {

Loading…
Cancel
Save