Minor improvements to error reporting

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -1706,7 +1706,9 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
         } else  if (_currToken == JsonToken.VALUE_STRING) {
             return _getBinaryFromString(b64variant);
         } else {
-            _reportError("Current token ("+currentToken()+") not VALUE_EMBEDDED_OBJECT, can not access as binary");
+            throw _constructReadException(
+"Current token (%s) not VALUE_EMBEDDED_OBJECT or VALUE_STRING, can not access as binary",
+                    currentToken());
         }
         return _binaryValue;
     }
@@ -1735,7 +1737,9 @@ public int readBinaryValue(Base64Variant b64variant, OutputStream out) throws IO
                 out.write(b, 0, len);
                 return len;
             }
-            _reportError("Current token ("+currentToken()+") not VALUE_EMBEDDED_OBJECT, can not access as binary");
+            throw _constructReadException(
+"Current token (%s) not VALUE_EMBEDDED_OBJECT or VALUE_STRING, can not access as binary",
+                    currentToken());
         }
         if (!_tokenIncomplete) { // someone already decoded or read
             if (_binaryValue == null) { // if this method called twice in a row
@@ -2774,7 +2778,8 @@ private final String _decodeContiguousName(int len) throws IOException
                     i = 0xDC00 | (i & 0x3FF);
                     break;
                 default: // invalid
-                    _reportError("Invalid UTF-8 byte 0x"+Integer.toHexString(i)+" in Object property name");
+                    throw _constructReadException("Invalid UTF-8 byte 0x%s in Object property name",
+                            Integer.toHexString(i));
                 }
             }
             outBuf[outPtr++] = (char) i;
@@ -3067,7 +3072,9 @@ protected void _skipChunked(int expectedType) throws IOException
                 _skipBytesL(_decode64Bits());
                 break;
             case 31:
-                throw _constructError("Illegal chunked-length indicator within chunked-length value (type "+expectedType+")");
+                throw _constructReadException(
+"Illegal chunked-length indicator within chunked-length value (type %d)",
+expectedType);
             default:
                 _invalidToken(_typeByte);
             }
@@ -3119,11 +3126,12 @@ private final int _decodeTag(int lowBits) throws IOException
             //   only allow for cases where encoder is being wasteful...
             long l = _decode64Bits();
             if (l < MIN_INT_L || l > MAX_INT_L) {
-                _reportError("Illegal Tag value: "+l);
+                throw _constructReadException("Illegal Tag value: %d", l);
             }
             return (int) l;
         }
-        throw _constructError("Invalid low bits for Tag token: 0x"+Integer.toHexString(lowBits));
+        throw _constructReadException("Invalid low bits for Tag token: 0x%s",
+                Integer.toHexString(lowBits));
     }
 
     /**

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java

@@ -536,8 +536,8 @@ public JsonToken nextToken() throws IOException
     // should we change description based on reserved vs illegal? (special cases
     // of null bytes etc)
     private JsonToken _reportUnknownValueTypeToken(int ch) throws IOException {
-        _reportError("Invalid type marker byte 0x"+Integer.toHexString(ch & 0xFF)+" for expected value token");
-        return null;
+        throw _constructReadException("Invalid type marker byte 0x%s for expected value token",
+                Integer.toHexString(ch & 0xFF));
     }
 
     // Helper method called in situations where Smile Header was encountered
@@ -877,8 +877,8 @@ public String nextFieldName() throws IOException
     // Should we try to give more information on kind of problem (reserved vs
     // illegal by definition; suggesting likely problem)
     private String _reportUnknownNameToken(int ch) throws IOException {
-        _reportError("Invalid type marker byte 0x"+Integer.toHexString(ch & 0xFF)+" for expected field name (or END_OBJECT marker)");
-        return null;
+        throw _constructReadException("Invalid type marker byte 0x%s for expected field name (or END_OBJECT marker)",
+                Integer.toHexString(ch & 0xFF));
     }
 
     @Override
@@ -1211,7 +1211,9 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
         } else  if (_currToken == JsonToken.VALUE_STRING) {
             return _getBinaryFromString(b64variant);
         } else {
-            _reportError("Current token ("+currentToken()+") not VALUE_EMBEDDED_OBJECT, can not access as binary");
+            throw _constructReadException(
+"Current token (%s) not VALUE_EMBEDDED_OBJECT or VALUE_STRING, can not access as binary",
+                    currentToken());
         }
         return _binaryValue;
     }
@@ -1240,7 +1242,9 @@ public int readBinaryValue(Base64Variant b64variant, OutputStream out) throws IO
                 out.write(b, 0, len);
                 return len;
             }
-            _reportError("Current token ("+currentToken()+") not VALUE_EMBEDDED_OBJECT, can not access as binary");
+            throw _constructReadException(
+"Current token (%s) not VALUE_EMBEDDED_OBJECT or VALUE_STRING, can not access as binary",
+                    currentToken());
         }
         // Ok, first, unlikely (but legal?) case where someone already requested binary data:
         if (!_tokenIncomplete) {
@@ -1448,8 +1452,8 @@ protected final JsonToken _handleFieldName() throws IOException
             break;
         }
         // Other byte values are illegal
-        _reportError("Invalid type marker byte 0x"+Integer.toHexString(_typeAsInt)+" for expected field name (or END_OBJECT marker)");
-        return null;
+        throw _constructReadException("Invalid type marker byte 0x%s for expected field name (or END_OBJECT marker)",
+                Integer.toHexString(_typeAsInt));
     }
 
     private String _findOrDecodeShortAsciiName(final int len) throws IOException
@@ -1609,7 +1613,8 @@ private final String _decodeShortUnicodeName(int len)
                 default: // invalid
                     // Update pointer here to point to (more) correct location
                     _inputPtr = inPtr;
-                    _reportError(String.format("Invalid byte 0x%02X in short Unicode text block", i));
+                    throw _constructReadException(
+"Invalid byte 0x%02X in short Unicode text block", i);
                 }
             }
             outBuf[outPtr++] = (char) i;
@@ -2454,7 +2459,7 @@ protected final String _decodeShortUnicodeValue(final int byteLen) throws IOExce
                 i = 0xDC00 | (i & 0x3FF);
                 break;
             default: // invalid
-                _reportError(String.format("Invalid byte 0x%02X in short Unicode text block", i));
+                throw _constructReadException("Invalid byte 0x%02X in short Unicode text block", i);
             }
             outBuf[outPtr++] = (char) i;
         }        
@@ -3060,7 +3065,7 @@ protected String _reportTruncatedUTF8InString(int strLenBytes, int truncatedChar
             int firstUTFByteValue, int bytesExpected)
         throws IOException
     {
-        throw _constructError(String.format(
+        throw _constructReadException(String.format(
 "Truncated UTF-8 character in Short Unicode String value (%d bytes): "
 +"byte 0x%02X at offset #%d indicated %d more bytes needed",
 strLenBytes, firstUTFByteValue, truncatedCharOffset, bytesExpected));