minor cleanup

Author: cowtowncoder

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

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * Intermediate base deserializer class that adds more shared accessor
@@ -93,9 +94,7 @@ protected void wrapAndThrow(Throwable t, Object ref, String key) throws IOExcept
             throw (IOException) t;
         }
         // for [databind#1141]
-        if (key == null) {
-            key = "N/A";
-        }
+        key = ClassUtil.nonNull(key, "N/A");
         throw JsonMappingException.wrapWithPath(t, ref, key);
     }
 }

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

@@ -602,6 +602,46 @@ public static <T> Constructor<T> findConstructor(Class<T> cls, boolean canFixAcc
         return null;
     }
 
+    /*
+    /**********************************************************
+    /* Class classification
+    /**********************************************************
+     */
+    
+    public static boolean isBogusClass(Class<?> cls) {
+        return (cls == Void.class || cls == Void.TYPE
+                || cls == com.fasterxml.jackson.databind.annotation.NoClass.class);
+    }
+
+    public static boolean isNonStaticInnerClass(Class<?> cls) {
+        return !Modifier.isStatic(cls.getModifiers())
+                && (getEnclosingClass(cls) != null);
+    }
+
+    /**
+     * @since 2.7
+     */
+    public static boolean isObjectOrPrimitive(Class<?> cls) {
+        return (cls == CLS_OBJECT) || cls.isPrimitive();
+    }
+
+    /**
+     * @since 2.9
+     */
+    public static <T> T nonNull(T valueOrNull, T defaultValue) {
+        return (valueOrNull == null) ? defaultValue : valueOrNull;
+    }
+
+    /**
+     * @since 2.9
+     */
+    public static String nullOrToString(Object value) {
+        if (value == null) {
+            return null;
+        }
+        return value.toString();
+    }
+
     /*
     /**********************************************************
     /* Primitive type support
@@ -889,23 +929,6 @@ public static boolean isJacksonStdImpl(Class<?> implClass) {
         return (implClass.getAnnotation(JacksonStdImpl.class) != null);
     }
 
-    public static boolean isBogusClass(Class<?> cls) {
-        return (cls == Void.class || cls == Void.TYPE
-                || cls == com.fasterxml.jackson.databind.annotation.NoClass.class);
-    }
-
-    public static boolean isNonStaticInnerClass(Class<?> cls) {
-        return !Modifier.isStatic(cls.getModifiers())
-                && (getEnclosingClass(cls) != null);
-    }
-
-    /**
-     * @since 2.7
-     */
-    public static boolean isObjectOrPrimitive(Class<?> cls) {
-        return (cls == CLS_OBJECT) || cls.isPrimitive();
-    }
-
     /*
     /**********************************************************
     /* Access to various Class definition aspects; possibly

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

@@ -1423,16 +1423,15 @@ public String getText()
                 if (ob instanceof String) {
                     return (String) ob;
                 }
-                return (ob == null) ? null : ob.toString();
+                return ClassUtil.nullOrToString(ob);
             }
             if (_currToken == null) {
                 return null;
             }
             switch (_currToken) {
             case VALUE_NUMBER_INT:
             case VALUE_NUMBER_FLOAT:
-                Object ob = _currentObject();
-                return (ob == null) ? null : ob.toString();
+                return ClassUtil.nullOrToString(_currentObject());
             default:
             	return _currToken.asString();
             }