Fix #88

4 files changed, 38 insertions, 52 deletions

diff --git a/src/main/java/com/fasterxml/jackson/databind/JavaType.java b/src/main/java/com/fasterxml/jackson/databind/JavaType.java
index 828666fcb..9d48dc8e4 100644
--- a/src/main/java/com/fasterxml/jackson/databind/JavaType.java
+++ b/src/main/java/com/fasterxml/jackson/databind/JavaType.java
@@ -19,7 +19,7 @@ public abstract class JavaType
     implements java.io.Serializable, // 2.1
         java.lang.reflect.Type // 2.2
 {
-    private static final long serialVersionUID = 6774285981275451126L;
+    private static final long serialVersionUID = 1;
 
     /**
      * This is the nominal type-erased Class that would be close to the
@@ -30,7 +30,7 @@ public abstract class JavaType
      */
     protected final Class<?> _class;
 
-    protected final int _hashCode;
+    protected final int _hash;
 
     /**
      * Optional handler (codec) that can be attached to indicate 
@@ -74,7 +74,7 @@ public abstract class JavaType
             Object valueHandler, Object typeHandler, boolean asStatic)
     {
         _class = raw;
-        _hashCode = raw.getName().hashCode() + additionalHash;
+        _hash = raw.getName().hashCode() + additionalHash;
         _valueHandler = valueHandler;
         _typeHandler = typeHandler;
         _asStatic = asStatic;
@@ -231,9 +231,7 @@ public abstract class JavaType
      * true if instantiation of this Type is given (type-erased) Class.
      */
     @Override
-    public final boolean hasRawClass(Class<?> clz) {
-        return _class == clz;
-    }
+    public final boolean hasRawClass(Class<?> clz) { return _class == clz; }
 
     @Override
     public boolean isAbstract() {
@@ -254,16 +252,11 @@ public abstract class JavaType
         /* 19-Feb-2010, tatus: Holy mackarel; primitive types
          *    have 'abstract' flag set...
          */
-        if (_class.isPrimitive()) {
-            return true;
-        }
-        return false;
+        return _class.isPrimitive();
     }
 
     @Override
-    public boolean isThrowable() {
-        return Throwable.class.isAssignableFrom(_class);
-    }
+    public boolean isThrowable() { return Throwable.class.isAssignableFrom(_class); }
 
     @Override
     public boolean isArrayType() { return false; }
@@ -311,9 +304,7 @@ public abstract class JavaType
      * 
      * @since 2.2
      */
-    public final boolean useStaticType() {
-        return _asStatic;
-    }
+    public final boolean useStaticType() { return _asStatic; }
     
     /*
     /**********************************************************
@@ -322,10 +313,7 @@ public abstract class JavaType
      */
 
     @Override
-    public boolean hasGenericTypes()
-    {
-        return containedTypeCount() > 0;
-    }
+    public boolean hasGenericTypes() { return containedTypeCount() > 0; }
 
     @Override
     public JavaType getKeyType() { return null; }
@@ -422,8 +410,7 @@ public abstract class JavaType
     /**********************************************************
      */
 
-    protected void _assertSubclass(Class<?> subclass, Class<?> superClass)
-    {
+    protected void _assertSubclass(Class<?> subclass, Class<?> superClass) {
         if (!_class.isAssignableFrom(subclass)) {
             throw new IllegalArgumentException("Class "+subclass.getName()+" is not assignable to "+_class.getName());
         }
@@ -442,5 +429,5 @@ public abstract class JavaType
     public abstract boolean equals(Object o);
 
     @Override
-    public final int hashCode() { return _hashCode; }
+    public final int hashCode() { return _hash; }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
index 6fabc8d44..b73db7fe6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -72,6 +72,11 @@ public class ObjectMapper
      * to specify what kind of types (classes) default typing should
      * be used for. It will only be used if no explicit type information
      * is found, but this enumeration further limits subset of those types.
+     *<p>
+     * Since 2.4 there are special exceptions for JSON Tree model
+     * types (sub-types of {@link TreeNode}: default typing is never
+     * applied to them
+     * (see <a href="https://github.com/FasterXML/jackson-databind/issues/88">Issue#88</a> for details)
      */
     public enum DefaultTyping {
         /**
@@ -87,6 +92,8 @@ public class ObjectMapper
          * properties with declared type of {@link java.lang.Object}
          * or an abstract type (abstract class or interface).
          * Note that this does <b>not</b> include array types.
+         *<p>
+         * Since 2.4, this does NOT apply to {@link TreeNode} and its subtypes.
          */
         OBJECT_AND_NON_CONCRETE,
 
@@ -94,6 +101,8 @@ public class ObjectMapper
          * Value that means that default typing will be used for
          * all types covered by {@link #OBJECT_AND_NON_CONCRETE}
          * plus all array types for them.
+         *<p>
+         * Since 2.4, this does NOT apply to {@link TreeNode} and its subtypes.
          */
         NON_CONCRETE_AND_ARRAYS,
         
@@ -103,6 +112,8 @@ public class ObjectMapper
          * "natural" types (String, Boolean, Integer, Double), which
          * can be correctly inferred from JSON; as well as for
          * all arrays of non-final types.
+         *<p>
+         * Since 2.4, this does NOT apply to {@link TreeNode} and its subtypes.
          */
         NON_FINAL
     }
@@ -163,12 +174,15 @@ public class ObjectMapper
                 }
                 // fall through
             case OBJECT_AND_NON_CONCRETE:
-                return (t.getRawClass() == Object.class) || !t.isConcrete();
+                return (t.getRawClass() == Object.class) || !t.isConcrete()
+                        // [Issue#88] Should not apply to JSON tree models:
+                        || TreeNode.class.isAssignableFrom(t.getRawClass());
             case NON_FINAL:
                 while (t.isArrayType()) {
                     t = t.getContentType();
                 }
-                return !t.isFinal(); // includes Object.class
+                // [Issue#88] Should not apply to JSON tree models:
+                return !t.isFinal() && !TreeNode.class.isAssignableFrom(t.getRawClass());
             default:
             //case JAVA_LANG_OBJECT:
                 return (t.getRawClass() == Object.class);
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
index 7c060262d..5f2909d6a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
@@ -366,7 +366,7 @@ public class BeanDeserializerFactory
         }
         Class<?> implClass = objectIdInfo.getGeneratorType();
         JavaType idType;
-    	SettableBeanProperty idProp;
+        SettableBeanProperty idProp;
         ObjectIdGenerator<?> gen;
 
         // Just one special case: Property-based generator is trickier
diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java
index 2b169898b..b299e7f01 100644
--- a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java
@@ -13,8 +13,6 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
 /**
  * Default {@link TypeResolverBuilder} implementation.
- *
- * @author tatu
  */
 public class StdTypeResolverBuilder
     implements TypeResolverBuilder<StdTypeResolverBuilder>
@@ -68,13 +66,12 @@ public class StdTypeResolverBuilder
         return this;
     }
 
+    @SuppressWarnings("incomplete-switch")
     @Override
     public TypeSerializer buildTypeSerializer(SerializationConfig config,
             JavaType baseType, Collection<NamedType> subtypes)
     {
-        if (_idType == JsonTypeInfo.Id.NONE) {
-            return null;
-        }
+        if (_idType == JsonTypeInfo.Id.NONE) { return null; }
         TypeIdResolver idRes = idResolver(config, baseType, subtypes, true, false);
         switch (_includeAs) {
         case WRAPPER_ARRAY:
@@ -91,13 +88,12 @@ public class StdTypeResolverBuilder
         throw new IllegalStateException("Do not know how to construct standard type serializer for inclusion type: "+_includeAs);
     }
 
+    @SuppressWarnings("incomplete-switch")
     @Override
     public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
             JavaType baseType, Collection<NamedType> subtypes)
     {
-        if (_idType == JsonTypeInfo.Id.NONE) {
-            return null;
-        }
+        if (_idType == JsonTypeInfo.Id.NONE) { return null; }
 
         TypeIdResolver idRes = idResolver(config, baseType, subtypes, false, true);
         
@@ -139,8 +135,7 @@ public class StdTypeResolverBuilder
      * (property name to use for type id when using "as-property" inclusion).
      */
     @Override
-    public StdTypeResolverBuilder typeProperty(String typeIdPropName)
-    {
+    public StdTypeResolverBuilder typeProperty(String typeIdPropName) {
         // ok to have null/empty; will restore to use defaults
         if (typeIdPropName == null || typeIdPropName.length() == 0) {
             typeIdPropName = _idType.getDefaultPropertyName();
@@ -150,8 +145,7 @@ public class StdTypeResolverBuilder
     }
 
     @Override
-    public StdTypeResolverBuilder defaultImpl(Class<?> defaultImpl)
-    {
+    public StdTypeResolverBuilder defaultImpl(Class<?> defaultImpl) {
         _defaultImpl = defaultImpl;
         return this;
     }
@@ -168,13 +162,9 @@ public class StdTypeResolverBuilder
     /**********************************************************
      */
 
-    public String getTypeProperty() { return _typeProperty; }
-
-    @Override
-    public Class<?> getDefaultImpl() {
-        return _defaultImpl;
-    }
+    @Override public Class<?> getDefaultImpl() { return _defaultImpl; }
 
+    public String getTypeProperty() { return _typeProperty; }
     public boolean isTypeIdVisible() { return _typeIdVisible; }
     
     /*
@@ -189,16 +179,11 @@ public class StdTypeResolverBuilder
      * given configuration.
      */
     protected TypeIdResolver idResolver(MapperConfig<?> config,
-            JavaType baseType, Collection<NamedType> subtypes,
-            boolean forSer, boolean forDeser)
+            JavaType baseType, Collection<NamedType> subtypes, boolean forSer, boolean forDeser)
     {
         // Custom id resolver?
-        if (_customIdResolver != null) {
-            return _customIdResolver;
-        }
-        if (_idType == null) {
-            throw new IllegalStateException("Can not build, 'init()' not yet called");
-        }
+        if (_customIdResolver != null) { return _customIdResolver; }
+        if (_idType == null) throw new IllegalStateException("Can not build, 'init()' not yet called");
         switch (_idType) {
         case CLASS:
             return new ClassNameIdResolver(baseType, config.getTypeFactory());