Start databind-side work on #2177 changes

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/JsonNode.java

@@ -454,7 +454,7 @@ public boolean canConvertToExactIntegral() {
      * @return Binary data this node contains, iff it is a binary
      *   node; null otherwise
      */
-    public byte[] binaryValue() throws IOException {
+    public byte[] binaryValue() {
         return null;
     }
 

src/main/java/com/fasterxml/jackson/databind/node/BaseJsonNode.java

@@ -141,21 +141,13 @@ public abstract void serializeWithType(JsonGenerator jgen, SerializerProvider pr
 
    @Override
    public String toString() {
-       try {
-           return JsonMapper.shared().writeValueAsString(this);
-       } catch (IOException e) { // should never occur
-           throw new RuntimeException(e);
-       }
+       return JsonMapper.shared().writeValueAsString(this);
    }
 
    @Override
    public String toPrettyString() {
-       try {
-           return JsonMapper.shared()
-                   .writerWithDefaultPrettyPrinter()
-                   .writeValueAsString(this);
-       } catch (IOException e) { // should never occur
-           throw new RuntimeException(e);
-       }
+       return JsonMapper.shared()
+               .writerWithDefaultPrettyPrinter()
+               .writeValueAsString(this);
    }
 }

src/main/java/com/fasterxml/jackson/databind/node/TextNode.java

@@ -59,9 +59,11 @@ public String textValue() {
      * Method for accessing textual contents assuming they were
      * base64 encoded; if so, they are decoded and resulting binary
      * data is returned.
+     *
+     * @throws JacksonException if textual contents are not valid Base64 content
      */
     @SuppressWarnings("resource")
-    public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
+    public byte[] getBinaryValue(Base64Variant b64variant) throws JacksonException
     {
         final String str = _value.trim();
         // 04-Sep-2020, tatu: Let's limit the size of the initial block to 64k,
@@ -74,7 +76,8 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
         try {
             b64variant.decode(str, builder);
         } catch (IllegalArgumentException e) {
-            throw InvalidFormatException.from(null,
+            throw InvalidFormatException.from(
+                    null, /* Alas, no processor to pass */
                     String.format(
 "Cannot access contents of TextNode as binary due to broken Base64 encoding: %s",
 e.getMessage()),
@@ -84,14 +87,14 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
     }
 
     @Override
-    public byte[] binaryValue() throws IOException {
+    public byte[] binaryValue() throws JacksonException {
         return getBinaryValue(Base64Variants.getDefaultVariant());
     }
 
     /* 
-    /**********************************************************
+    /**********************************************************************
     /* General type coercions
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -135,10 +138,10 @@ public double asDouble(double defaultValue) {
         return NumberInput.parseAsDouble(_value, defaultValue);
     }
 
-    /* 
-    /**********************************************************
+    /*
+    /**********************************************************************
     /* Serialization
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -152,9 +155,9 @@ public final void serialize(JsonGenerator g, SerializerProvider provider) throws
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Overridden standard methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override

src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.base.ParserMinimalBase;
+import com.fasterxml.jackson.core.exc.InputCoercionException;
 import com.fasterxml.jackson.core.util.JacksonFeatureSet;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -16,7 +17,8 @@
  * Useful when a streaming source is expected by code, such as data binding
  * functionality.
  */
-public class TreeTraversingParser extends ParserMinimalBase
+public class TreeTraversingParser
+    extends ParserMinimalBase
 {
     /*
     /**********************************************************************
@@ -85,7 +87,7 @@ public JsonNode getInputSource() {
      */
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         if (!_closed) {
             _closed = true;
@@ -101,7 +103,7 @@ public void close() throws IOException
      */
 
     @Override
-    public JsonToken nextToken() throws IOException, JsonParseException
+    public JsonToken nextToken()
     {
         _currToken = _nodeCursor.nextToken();
         if (_currToken == null) {
@@ -124,10 +126,10 @@ public JsonToken nextToken() throws IOException, JsonParseException
     }
 
     // default works well here:
-    //public JsonToken nextValue() throws IOException
+    //public JsonToken nextValue()
 
     @Override
-    public JsonParser skipChildren() throws IOException
+    public JsonParser skipChildren()
     {
         if (_currToken == JsonToken.START_OBJECT) {
             _nodeCursor = _nodeCursor.getParent();
@@ -209,17 +211,17 @@ public String getText()
     }
 
     @Override
-    public char[] getTextCharacters() throws IOException, JsonParseException {
+    public char[] getTextCharacters() {
         return getText().toCharArray();
     }
 
     @Override
-    public int getTextLength() throws IOException, JsonParseException {
+    public int getTextLength() {
         return getText().length();
     }
 
     @Override
-    public int getTextOffset() throws IOException, JsonParseException {
+    public int getTextOffset() {
         return 0;
     }
 
@@ -238,53 +240,57 @@ public boolean hasTextCharacters() {
     //public byte getByteValue() throws IOException
 
     @Override
-    public NumberType getNumberType() throws IOException {
-        JsonNode n = currentNumericNode();
-        return (n == null) ? null : n.numberType();
+    public NumberType getNumberType() {
+        // NOTE: do not call "currentNumericNode()" as that would throw exception
+        // on non-numeric node
+        JsonNode n = currentNode();
+        if (n instanceof NumericNode) {
+            return n.numberType();
+        }
+        return null;
     }
 
     @Override
-    public BigInteger getBigIntegerValue() throws IOException
-    {
-        return currentNumericNode().bigIntegerValue();
+    public BigInteger getBigIntegerValue() throws InputCoercionException {
+        return currentNumericNode(NR_BIGINT).bigIntegerValue();
     }
 
     @Override
-    public BigDecimal getDecimalValue() throws IOException {
-        return currentNumericNode().decimalValue();
+    public BigDecimal getDecimalValue() throws InputCoercionException {
+        return currentNumericNode(NR_BIGDECIMAL).decimalValue();
     }
 
     @Override
-    public double getDoubleValue() throws IOException {
-        return currentNumericNode().doubleValue();
+    public double getDoubleValue() throws InputCoercionException {
+        return currentNumericNode(NR_DOUBLE).doubleValue();
     }
 
     @Override
-    public float getFloatValue() throws IOException {
-        return (float) currentNumericNode().doubleValue();
+    public float getFloatValue() throws InputCoercionException {
+        return (float) currentNumericNode(NR_FLOAT).doubleValue();
     }
 
     @Override
-    public int getIntValue() throws IOException {
-        final NumericNode node = (NumericNode) currentNumericNode();
+    public int getIntValue() throws InputCoercionException {
+        final NumericNode node = (NumericNode) currentNumericNode(NR_INT);
         if (!node.canConvertToInt()) {
-            reportOverflowInt();
+            _reportOverflowInt();
         }
         return node.intValue();
     }
 
     @Override
-    public long getLongValue() throws IOException {
-        final NumericNode node = (NumericNode) currentNumericNode();
+    public long getLongValue() throws InputCoercionException {
+        final NumericNode node = (NumericNode) currentNumericNode(NR_LONG);
         if (!node.canConvertToLong()) {
-            reportOverflowLong();
+            _reportOverflowLong();
         }
         return node.longValue();
     }
 
     @Override
-    public Number getNumberValue() throws IOException {
-        return currentNumericNode().numberValue();
+    public Number getNumberValue() throws InputCoercionException {
+        return currentNumericNode(-1).numberValue();
     }
 
     @Override
@@ -323,7 +329,7 @@ public boolean isNaN() {
 
     @Override
     public byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException, JsonParseException
+        throws JacksonException
     {
         // Multiple possibilities...
         JsonNode n = currentNode();
@@ -342,11 +348,15 @@ public byte[] getBinaryValue(Base64Variant b64variant)
 
     @Override
     public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-            throws IOException, JsonParseException
+        throws JacksonException
     {
         byte[] data = getBinaryValue(b64variant);
         if (data != null) {
-            out.write(data, 0, data.length);
+            try {
+                out.write(data, 0, data.length);
+            } catch (IOException e) {
+                throw _wrapIOFailure(e);
+            }
             return data.length;
         }
         return 0;
@@ -365,13 +375,13 @@ protected JsonNode currentNode() {
         return _nodeCursor.currentNode();
     }
 
-    protected JsonNode currentNumericNode()
+    protected JsonNode currentNumericNode(int targetNumType)
         throws JsonParseException
     {
         JsonNode n = currentNode();
         if (n == null || !n.isNumber()) {
             JsonToken t = (n == null) ? null : n.asToken();
-            throw _constructError("Current token ("+t+") not numeric, cannot use numeric value accessors");
+            throw _constructNotNumericType(t, -1);
         }
         return n;
     }