Minor improvement wrt #743: ensure that RawValue does get correctly propagated, improve POJONode.toString() a bit

Author: cowtowncoder

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

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.node.*;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
  * Deserializer that can build instances of {@link JsonNode} from any
@@ -225,6 +226,9 @@ protected final ObjectNode deserializeObject(JsonParser p, DeserializationContex
             case JsonTokenId.ID_START_ARRAY:
                 value = deserializeArray(p, ctxt, nodeFactory);
                 break;
+            case JsonTokenId.ID_EMBEDDED_OBJECT:
+                value = _fromEmbedded(p, ctxt, nodeFactory);
+                break;
             case JsonTokenId.ID_STRING:
                 value = nodeFactory.textNode(p.getText());
                 break;
@@ -270,6 +274,8 @@ protected final ArrayNode deserializeArray(JsonParser p, DeserializationContext
                 break;
             case JsonTokenId.ID_END_ARRAY:
                 return node;
+            case JsonTokenId.ID_EMBEDDED_OBJECT:
+                node.add(_fromEmbedded(p, ctxt, nodeFactory));
             case JsonTokenId.ID_STRING:
                 node.add(nodeFactory.textNode(p.getText()));
                 break;
@@ -376,7 +382,11 @@ protected final JsonNode _fromEmbedded(JsonParser p, DeserializationContext ctxt
         if (type == byte[].class) { // most common special case
             return nodeFactory.binaryNode((byte[]) ob);
         }
-        if (JsonNode.class.isAssignableFrom(type)) {
+        // [databind#743]: Don't forget RawValue
+        if (ob instanceof RawValue) {
+            return nodeFactory.rawValueNode((RawValue) ob);
+        }
+        if (ob instanceof JsonNode) {
             // [Issue#433]: but could also be a JsonNode hiding in there!
             return (JsonNode) ob;
         }

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

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.JsonSerializable;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
  * Value node that contains a wrapped POJO, to be serialized as
@@ -158,6 +159,13 @@ protected boolean _pojoEquals(POJONode other)
     @Override
     public String toString()
     {
+        // [databind#743]: Let's try indicating content type, for debugging purposes
+        if (_value instanceof byte[]) {
+            return String.format("(binary value of %d bytes)", ((byte[]) _value).length);
+        }
+        if (_value instanceof RawValue) {
+            return String.format("(raw value '%s')", ((RawValue) _value).toString());
+        }
         return String.valueOf(_value);
     }
 }

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

@@ -99,4 +99,27 @@ protected void _serialize(JsonGenerator gen) throws IOException
             gen.writeRawValue(String.valueOf(_value));
         }
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) return true;
+        if (!(o instanceof RawValue)) return false;
+        RawValue other = (RawValue) o;
+
+        if (_value == other._value) {
+            return true;
+        }
+        return (_value != null) && _value.equals(other._value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return (_value == null) ? 0 : _value.hashCode();
+    }
+    
+    @Override
+    public String toString() {
+        return String.format("[RawValue of type %s]",
+                (_value == null) ? "NULL" : _value.getClass().getName());
+    }
 }

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

@@ -260,9 +260,9 @@ public TokenBuffer append(TokenBuffer other) throws IOException
         }
         _mayHaveNativeIds = _hasNativeTypeIds | _hasNativeObjectIds;
 
-        JsonParser jp = other.asParser();
-        while (jp.nextToken() != null) {
-            copyCurrentStructure(jp);
+        JsonParser p = other.asParser();
+        while (p.nextToken() != null) {
+            copyCurrentStructure(p);
         }
         return this;
     }
@@ -405,10 +405,10 @@ public void serialize(JsonGenerator gen) throws IOException
      * 
      * @since 2.3
      */
-    public TokenBuffer deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
+    public TokenBuffer deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
     {
-        if (jp.getCurrentTokenId() != JsonToken.FIELD_NAME.id()) {
-            copyCurrentStructure(jp);
+        if (p.getCurrentTokenId() != JsonToken.FIELD_NAME.id()) {
+            copyCurrentStructure(p);
             return this;
         }
         /* 28-Oct-2014, tatu: As per #592, need to support a special case of starting from
@@ -418,15 +418,15 @@ public TokenBuffer deserialize(JsonParser jp, DeserializationContext ctxt) throw
         JsonToken t;
         writeStartObject();
         do {
-            copyCurrentStructure(jp);
-        } while ((t = jp.nextToken()) == JsonToken.FIELD_NAME);
+            copyCurrentStructure(p);
+        } while ((t = p.nextToken()) == JsonToken.FIELD_NAME);
         if (t != JsonToken.END_OBJECT) {
             throw ctxt.mappingException("Expected END_OBJECT after copying contents of a JsonParser into TokenBuffer, got "+t);
         }
         writeEndObject();
         return this;
     }
-    
+
     @Override
     @SuppressWarnings("resource")
     public String toString()

src/test/java/com/fasterxml/jackson/databind/ser/RawValueTest.java

@@ -1,8 +1,12 @@
 package com.fasterxml.jackson.databind.ser;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
  * This unit test suite tests functioning of {@link JsonRawValue}
@@ -80,4 +84,16 @@ public void testWithValueToTree() throws Exception
         assertNotNull(w);
         assertEquals("{\"json\":{ }}", MAPPER.writeValueAsString(w));
     }
+
+    // for [databind#743]
+    public void testRawFromMapToTree() throws Exception
+    {
+        RawValue myType = new RawValue("Jackson");
+
+        Map<String, Object> object = new HashMap<String, Object>();
+        object.put("key", myType);
+        JsonNode jsonNode = MAPPER.valueToTree(object);
+        String json = MAPPER.writeValueAsString(jsonNode);
+        assertEquals("{\"key\":Jackson}", json);
+    }
 }