more test coverage

Author: cowtowncoder

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

@@ -25,6 +25,15 @@
  */
 public abstract class DatabindContext
 {
+    /**
+     * Let's limit length of error messages, for cases where underlying data
+     * may be very large -- no point in spamming logs with megabytes of meaningless
+     * data.
+     *
+     * @since 2.9
+     */
+    private final static int MAX_ERROR_STR_LEN = 500;
+
     /*
     /**********************************************************
     /* Generic config access
@@ -250,4 +259,75 @@ public Converter<Object,Object> converterInstance(Annotated annotated,
     public <T> T reportBadDefinition(Class<?> type, String msg) throws JsonMappingException {
         return reportBadDefinition(constructType(type), msg);
     }
+
+    /*
+    /**********************************************************
+    /* Helper methods
+    /**********************************************************
+     */
+
+    /**
+     * @since 2.9
+     */
+    protected final String _format(String msg, Object... msgArgs) {
+        if (msgArgs.length > 0) {
+            return String.format(msg, msgArgs);
+        }
+        return msg;
+    }
+
+    /**
+     * @since 2.9
+     */
+    protected final String _truncate(String desc) {
+        if (desc == null) {
+            return "";
+        }
+        if (desc.length() <= MAX_ERROR_STR_LEN) {
+            return desc;
+        }
+        return desc.substring(0, MAX_ERROR_STR_LEN) + "]...[" + desc.substring(desc.length() - MAX_ERROR_STR_LEN);
+    }
+
+    /**
+     * @since 2.9
+     */
+    protected String _quotedString(String desc) {
+        if (desc == null) {
+            return "[N/A]";
+        }
+        // !!! should we quote it? (in case there are control chars, linefeeds)
+        return String.format("\"%s\"", _truncate(desc));
+    }
+    
+    /**
+     * @since 2.9
+     */
+    protected String _colonConcat(String msgBase, String extra) {
+        if (extra == null) {
+            return msgBase;
+        }
+        return msgBase + ": " + extra;
+    }
+    
+    /**
+     * @since 2.9
+     */
+    protected String _calcName(Class<?> cls) {
+        if (cls.isArray()) {
+            return _calcName(cls.getComponentType())+"[]";
+        }
+        return cls.getName();
+    }
+
+    /**
+     * @since 2.9
+     */
+    protected String _desc(String desc) {
+        if (desc == null) {
+            return "[N/A]";
+        }
+        // !!! should we quote it? (in case there are control chars, linefeeds)
+        return _truncate(desc);
+    }
 }

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

@@ -53,13 +53,6 @@ public abstract class DeserializationContext
 {
     private static final long serialVersionUID = 1L; // 2.6
 
-    /**
-     * Let's limit length of error messages, for cases where underlying data
-     * may be very large -- no point in spamming logs with megs of meaningless
-     * data.
-     */
-    private final static int MAX_ERROR_STR_LEN = 500;
-
     /*
     /**********************************************************
     /* Configuration, immutable
@@ -1681,60 +1674,4 @@ protected DateFormat getDateFormat()
         _dateFormat = df = (DateFormat) df.clone();
         return df;
     }
-
-    protected String _calcName(Class<?> cls) {
-        if (cls.isArray()) {
-            return _calcName(cls.getComponentType())+"[]";
-        }
-        return cls.getName();
-    }
-
-    protected String _valueDesc() {
-        try {
-            return _desc(_parser.getText());
-        } catch (Exception e) {
-            return "[N/A]";
-        }
-    }
-
-    protected String _desc(String desc) {
-        if (desc == null) {
-            return "[N/A]";
-        }
-        // !!! should we quote it? (in case there are control chars, linefeeds)
-        if (desc.length() > MAX_ERROR_STR_LEN) {
-            desc = desc.substring(0, MAX_ERROR_STR_LEN) + "]...[" + desc.substring(desc.length() - MAX_ERROR_STR_LEN);
-        }
-        return desc;
-    }
-
-    // @since 2.7
-    protected String _quotedString(String desc) {
-        if (desc == null) {
-            return "[N/A]";
-        }
-        // !!! should we quote it? (in case there are control chars, linefeeds)
-        if (desc.length() > MAX_ERROR_STR_LEN) {
-            return String.format("\"%s]...[%s\"",
-                    desc.substring(0, MAX_ERROR_STR_LEN),
-                    desc.substring(desc.length() - MAX_ERROR_STR_LEN));
-        }
-        return String.format("\"%s\"", desc);
-    }
-
-    // @since 2.9
-    protected String _colonConcat(String msgBase, String extra) {
-        if (extra == null) {
-            return msgBase;
-        }
-        return msgBase + ": " + extra;
-    }
-
-    // @since 2.9
-    protected String _format(String msg, Object... msgArgs) {
-        if (msgArgs.length > 0) {
-            return String.format(msg, msgArgs);
-        }
-        return msg;
-    }
 }

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

@@ -71,7 +71,7 @@ public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
                 ctxt.reportBadDefinition(ClassUtil.classOf(valueId),
                         String.format(
                         "Unrecognized inject value id type (%s), expecting String",
-                        ClassUtil.classNameOf(valueId, "[null]")));
+                        ClassUtil.classNameOf(valueId)));
             }
             String key = (String) valueId;
             Object ob = _values.get(key);

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

@@ -1404,20 +1404,6 @@ protected JsonSerializer<Object> _handleResolvable(JsonSerializer<?> ser)
     /**********************************************************
      */
 
-    protected String _desc(Object value) {
-        if (value == null) {
-            return "N/A";
-        }
-        return "'"+value+"'";
-    }
-
-    protected String _quotedString(Object value) {
-        if (value == null) {
-            return "N/A";
-        }
-        return String.valueOf(value);
-    }
-
     protected final DateFormat _dateFormat()
     {
         if (_dateFormat != null) {
@@ -1439,12 +1425,4 @@ protected final DateFormat _dateFormat()
         */
         return df;
     }
-
-    // @since 2.9
-    protected String _format(String msg, Object... msgArgs) {
-        if (msgArgs.length > 0) {
-            return String.format(msg, msgArgs);
-        }
-        return msg;
-    }
 }

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java

@@ -551,7 +551,7 @@ protected void addBeanProps(DeserializationContext ctxt,
                 if (cprop == null) {
                     ctxt.reportBadTypeDefinition(beanDesc,
                             "Could not find creator property with name '%s' (in class %s)",
-                            name, beanDesc.getBeanClass().getName());
+                            name, ClassUtil.classNameOf(beanDesc.getBeanClass()));
                     continue;
                 }
                 if (prop != null) {

src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java

@@ -195,7 +195,7 @@ protected void _throwAsIOE(Exception e, Object propName, Object value)
         throws IOException
     {
         if (e instanceof IllegalArgumentException) {
-            String actType = ClassUtil.classNameOf(value, "[NULL]");
+            String actType = ClassUtil.classNameOf(value);
             StringBuilder msg = new StringBuilder("Problem deserializing \"any\" property '").append(propName);
             msg.append("' of class "+getClassName()+" (expected type: ").append(_type);
             msg.append("; actual type: ").append(actType).append(")");

src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java

@@ -522,7 +522,7 @@ public final Object deserializeWith(JsonParser p, DeserializationContext ctxt,
     protected void _throwAsIOE(JsonParser p, Exception e, Object value) throws IOException
     {
         if (e instanceof IllegalArgumentException) {
-            String actType = ClassUtil.classNameOf(value, "[NULL]");
+            String actType = ClassUtil.classNameOf(value);
             StringBuilder msg = new StringBuilder("Problem deserializing property '").append(getName());
             msg.append("' (expected type: ").append(getType());
             msg.append("; actual type: ").append(actType).append(")");

src/main/java/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java

@@ -605,9 +605,6 @@ public void acceptJsonFormatVisitor(JavaType javaType, JsonFormatVisitorWrapper
     public com.fasterxml.jackson.databind.jsonschema.JsonSchema generateJsonSchema(Class<?> type)
         throws JsonMappingException
     {
-        if (type == null) {
-            throw new IllegalArgumentException("A class must be provided");
-        }
         /* no need for embedded type information for JSON schema generation (all
          * type information it needs is accessible via "untyped" serializer)
          */

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

@@ -662,9 +662,9 @@ public static boolean hasClass(Object inst, Class<?> raw) {
     /**
      * @since 2.9
      */
-    public static String classNameOf(Object inst, String defName) {
+    public static String classNameOf(Object inst) {
         if (inst == null) {
-            return defName;
+            return "[null]";
         }
         return inst.getClass().getName();
     }

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

@@ -119,6 +119,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return String.format("[RawValue of type %s]", ClassUtil.classNameOf(_value, "NULL"));
+        return String.format("[RawValue of type %s]", ClassUtil.classNameOf(_value));
     }
 }