Baseline work for testing, eventually resolving #1425; now produces better error messages.

Author: cowtowncoder

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

@@ -991,7 +991,7 @@ public Object handleMissingInstantiator(Class<?> instClass, ValueInstantiator va
                 }
                 reportBadDefinition(constructType(instClass), String.format(
 "DeserializationProblemHandler.handleMissingInstantiator() for type %s returned value of type %s",
-                        instClass, instance.getClass()));
+                        instClass, ClassUtil.classNameOf(instance)));
             }
             h = h.next();
         }
@@ -1001,11 +1001,11 @@ public Object handleMissingInstantiator(Class<?> instClass, ValueInstantiator va
         //   match with token.
         if ((valueInst != null) && !valueInst.canInstantiate()) {
             msg = String.format("Can not construct instance of %s (no Creators, like default construct, exist): %s",
-                    instClass.getName(), msg);
+                    ClassUtil.nameOf(instClass), msg);
             return reportBadDefinition(constructType(instClass), msg);
         }
         msg = String.format("Can not construct instance of %s (although at least one Creator exists): %s",
-                instClass.getName(), msg);
+                ClassUtil.nameOf(instClass), msg);
         return reportInputMismatch(instClass, msg);
     }
 
@@ -1232,7 +1232,7 @@ public <T> T reportUnresolvedObjectId(ObjectIdReader oidReader, Object bean)
         throws JsonMappingException
     {
         String msg = String.format("No Object Id found for an instance of %s, to assign to property '%s'",
-                bean.getClass().getName(), oidReader.propertyName);
+                ClassUtil.classNameOf(bean), oidReader.propertyName);
         return reportInputMismatch(oidReader.idProperty, msg);
     }
 
@@ -1452,7 +1452,7 @@ public JsonMappingException weirdKeyException(Class<?> keyClass, String keyValue
             String msg) {
         return InvalidFormatException.from(_parser,
                 String.format("Can not deserialize Map key of type %s from String %s: %s",
-                        keyClass.getName(), _quotedString(keyValue), msg),
+                        ClassUtil.nameOf(keyClass), _quotedString(keyValue), msg),
                 keyValue, keyClass);
     }
 
@@ -1473,7 +1473,7 @@ public JsonMappingException weirdStringException(String value, Class<?> instClas
             String msg) {
         return InvalidFormatException.from(_parser,
                 String.format("Can not deserialize value of type %s from String %s: %s",
-                        instClass.getName(), _quotedString(value), msg),
+                        ClassUtil.nameOf(instClass), _quotedString(value), msg),
                 value, instClass);
     }
 
@@ -1488,7 +1488,7 @@ public JsonMappingException weirdNumberException(Number value, Class<?> instClas
             String msg) {
         return InvalidFormatException.from(_parser,
                 String.format("Can not deserialize value of type %s from number %s: %s",
-                        instClass.getName(), String.valueOf(value), msg),
+                        ClassUtil.nameOf(instClass), String.valueOf(value), msg),
                 value, instClass);
     }
 
@@ -1505,7 +1505,7 @@ public JsonMappingException instantiationException(Class<?> instClass, Throwable
         // Most likely problem with Creator definition, right?
         JavaType type = constructType(instClass);
         String msg = String.format("Can not construct instance of %s, problem: %s",
-                instClass.getName(), cause.getMessage());
+                ClassUtil.nameOf(instClass), cause.getMessage());
         InvalidDefinitionException e = InvalidDefinitionException.from(_parser, msg, type);
         e.initCause(cause);
         return e;
@@ -1523,7 +1523,8 @@ public JsonMappingException instantiationException(Class<?> instClass, Throwable
     public JsonMappingException instantiationException(Class<?> instClass, String msg0) {
         // Most likely problem with Creator definition, right?
         JavaType type = constructType(instClass);
-        String msg = String.format("Can not construct instance of %s: %s", instClass.getName(), msg0);
+        String msg = String.format("Can not construct instance of %s: %s",
+                ClassUtil.nameOf(instClass), msg0);
         return InvalidDefinitionException.from(_parser, msg, type);
     }
 

src/main/java/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java

@@ -356,7 +356,19 @@ public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 
             // Most likely case: base64 encoded String?
             if (t == JsonToken.VALUE_STRING) {
-                return p.getBinaryValue(ctxt.getBase64Variant());
+                try {
+                    return p.getBinaryValue(ctxt.getBase64Variant());
+                } catch (JsonParseException e) {
+                    // 25-Nov-2016, tatu: related to [databind#1425], try to convert
+                    //   to a more usable one, as it's not really a JSON-level parse
+                    //   exception, but rather binding from JSON String into base64 decoded
+                    //   binary data
+                    String msg = e.getOriginalMessage();
+                    if (msg.contains("base64")) {
+                        return (byte[]) ctxt.handleWeirdStringValue(byte[].class,
+                                p.getText(), msg);
+                    }
+                }
             }
             // 31-Dec-2009, tatu: Also may be hidden as embedded Object
             if (t == JsonToken.VALUE_EMBEDDED_OBJECT) {

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

@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.core.io.NumberInput;
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * Value node that contains a text value.
@@ -60,93 +62,16 @@ public String textValue() {
     @SuppressWarnings("resource")
     public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
     {
-        ByteArrayBuilder builder = new ByteArrayBuilder(100);
-        final String str = _value;
-        int ptr = 0;
-        int len = str.length();
-
-        main_loop:
-        while (ptr < len) {
-            // first, we'll skip preceding white space, if any
-            char ch;
-            do {
-                ch = str.charAt(ptr++);
-                if (ptr >= len) {
-                    break main_loop;
-                }
-            } while (ch <= ' ');
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 0);
-            }
-            int decodedData = bits;
-            // then second base64 char; can't get padding yet, nor ws
-            if (ptr >= len) {
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-            // third base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    builder.append(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 2);
-                }
-                // Ok, must get padding
-                if (ptr >= len) {
-                    _reportBase64EOF();
-                }
-                ch = str.charAt(ptr++);
-                if (!b64variant.usesPaddingChar(ch)) {
-                    _reportInvalidBase64(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                }
-                // Got 12 bits, only need 8, need to shift
-                decodedData >>= 4;
-                builder.append(decodedData);
-                continue;
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    decodedData >>= 2;
-                    builder.appendTwoBytes(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 3);
-                }
-                decodedData >>= 2;
-                builder.appendTwoBytes(decodedData);
-            } else {
-                // otherwise, our triple is now complete
-                decodedData = (decodedData << 6) | bits;
-                builder.appendThreeBytes(decodedData);
-            }
+        final String str = _value.trim();
+        ByteArrayBuilder builder = new ByteArrayBuilder(4 + ((str.length() * 3) << 2));
+        try {
+            b64variant.decode(str, builder);
+        } catch (IllegalArgumentException e) {
+            throw InvalidFormatException.from(null,
+                    String.format(
+"Can not access contents of TextNode as binary due to broken Base64 encoding: %s",
+e.getMessage()),
+                    str, byte[].class);
         }
         return builder.toByteArray();
     }
@@ -155,7 +80,7 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws IOException
     public byte[] binaryValue() throws IOException {
         return getBinaryValue(Base64Variants.getDefaultVariant());
     }
-    
+
     /* 
     /**********************************************************
     /* General type coercions
@@ -210,12 +135,12 @@ public double asDouble(double defaultValue) {
      */
 
     @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider) throws IOException
+    public final void serialize(JsonGenerator g, SerializerProvider provider) throws IOException
     {
         if (_value == null) {
-            jg.writeNull();
+            g.writeNull();
         } else {
-            jg.writeString(_value);
+            g.writeString(_value);
         }
     }
 
@@ -258,44 +183,4 @@ protected static void appendQuoted(StringBuilder sb, String content)
         CharTypes.appendQuoted(sb, content);
         sb.append('"');
     }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    protected void _reportInvalidBase64(Base64Variant b64variant, char ch, int bindex)
-        throws JsonParseException
-    {
-        _reportInvalidBase64(b64variant, ch, bindex, null);
-    }
-
-    /**
-     * @param bindex Relative index within base64 character unit; between 0
-     *   and 3 (as unit has exactly 4 characters)
-     */
-    protected void _reportInvalidBase64(Base64Variant b64variant, char ch, int bindex, String msg)
-        throws JsonParseException
-    {
-        String base;
-        if (ch <= ' ') {
-            base = "Illegal white space character (code 0x"+Integer.toHexString(ch)+") as character #"+(bindex+1)+" of 4-char base64 unit: can only used between units";
-        } else if (b64variant.usesPaddingChar(ch)) {
-            base = "Unexpected padding character ('"+b64variant.getPaddingChar()+"') as character #"+(bindex+1)+" of 4-char base64 unit: padding only legal as 3rd or 4th character";
-        } else if (!Character.isDefined(ch) || Character.isISOControl(ch)) {
-            // Not sure if we can really get here... ? (most illegal xml chars are caught at lower level)
-            base = "Illegal character (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        } else {
-            base = "Illegal character '"+ch+"' (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        }
-        if (msg != null) {
-            base = base + ": " + msg;
-        }
-        throw new JsonParseException(null, base, JsonLocation.NA);
-    }
-
-    protected void _reportBase64EOF() throws JsonParseException {
-        throw new JsonParseException(null, "Unexpected end-of-String when base64 content");
-    }
 }

src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java

@@ -715,6 +715,12 @@ public static String nameOf(Class<?> cls) {
         if (cls == null) {
             return "[null]";
         }
+        if (cls.isArray()) {
+            return nameOf(cls.getComponentType())+"[]";
+        }
+        if (cls.isPrimitive()) {
+            cls.getSimpleName();
+        }
         return cls.getName();
     }
 

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

@@ -243,6 +243,11 @@ protected void assertEquals(int[] exp, int[] act)
         assertArrayEquals(exp, act);
     }
 
+    protected void assertEquals(byte[] exp, byte[] act)
+    {
+        assertArrayEquals(exp, act);
+    }
+
     /**
      * Helper method for verifying 3 basic cookie cutter cases;
      * identity comparison (true), and against null (false),