Browse Source

Merge pull request #583 from Alanscut/npe

Fix for issue #582 -- NullPointerException of JsonProvider.length()
pull/624/head
kallestenflo 4 years ago committed by GitHub
parent
commit
45cde7b4b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      json-path/src/main/java/com/jayway/jsonpath/spi/json/AbstractJsonProvider.java
  2. 5
      json-path/src/main/java/com/jayway/jsonpath/spi/json/GsonJsonProvider.java
  3. 3
      json-path/src/main/java/com/jayway/jsonpath/spi/json/JacksonJsonNodeJsonProvider.java
  4. 3
      json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonOrgJsonProvider.java

3
json-path/src/main/java/com/jayway/jsonpath/spi/json/AbstractJsonProvider.java

@ -153,7 +153,8 @@ public abstract class AbstractJsonProvider implements JsonProvider {
} else if(obj instanceof String){
return ((String)obj).length();
}
throw new JsonPathException("length operation cannot be applied to " + obj!=null?obj.getClass().getName():"null");
throw new JsonPathException("length operation cannot be applied to " + (obj != null ? obj.getClass().getName()
: "null"));
}
/**

5
json-path/src/main/java/com/jayway/jsonpath/spi/json/GsonJsonProvider.java

@ -246,9 +246,8 @@ public class GsonJsonProvider extends AbstractJsonProvider {
}
}
}
throw new JsonPathException("length operation can not applied to " + obj != null ? obj.getClass().getName()
: "null");
throw new JsonPathException("length operation can not applied to " + (obj != null ? obj.getClass().getName()
: "null"));
}
@Override

3
json-path/src/main/java/com/jayway/jsonpath/spi/json/JacksonJsonNodeJsonProvider.java

@ -211,7 +211,8 @@ public class JacksonJsonNodeJsonProvider extends AbstractJsonProvider {
return element.size();
}
}
throw new JsonPathException("length operation can not applied to " + obj != null ? obj.getClass().getName() : "null");
throw new JsonPathException("length operation can not applied to " + (obj != null ? obj.getClass().getName()
: "null"));
}
@Override

3
json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonOrgJsonProvider.java

@ -170,7 +170,8 @@ public class JsonOrgJsonProvider extends AbstractJsonProvider {
return ((String) obj).length();
}
}
throw new JsonPathException("length operation can not applied to " + obj != null ? obj.getClass().getName() : "null");
throw new JsonPathException("length operation can not applied to " + (obj != null ? obj.getClass().getName()
: "null"));
}
@Override

Loading…
Cancel
Save