Bit more work for #743: also add support in ContainerNode, JsonNodeFactory (for ObjectNode, ArrayNode)

Author: cowtowncoder

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

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -338,6 +339,20 @@ public ArrayNode addPOJO(Object value)
         return this;
     }
 
+    /**
+     * @return This array node, to allow chaining
+     * 
+     * @since 2.6
+     */
+    public ArrayNode addRawValue(RawValue raw) {
+        if (raw == null) {
+            addNull();
+        } else {
+            _add(rawValueNode(raw));
+        }
+        return this;
+    }
+    
     /**
      * Method that will add a null value at the end of this array node.
      * 

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

@@ -4,8 +4,8 @@
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
  * This intermediate base class is used for all container nodes,
@@ -22,8 +22,7 @@ public abstract class ContainerNode<T extends ContainerNode<T>>
      */
     protected final JsonNodeFactory _nodeFactory;
 
-    protected ContainerNode(JsonNodeFactory nc)
-    {
+    protected ContainerNode(JsonNodeFactory nc) {
         _nodeFactory = nc;
     }
 
@@ -126,12 +125,9 @@ public final NumericNode numberNode(long v) {
     @Override
     public final ValueNode pojoNode(Object pojo) { return _nodeFactory.pojoNode(pojo); }
 
-    /**
-     * @deprecated Since 2.3 Use {@link #pojoNode} instead.
-     */
-    @Deprecated
-    public final POJONode POJONode(Object pojo) { return (POJONode) _nodeFactory.pojoNode(pojo); }
-    
+    @Override
+    public final ValueNode rawValueNode(RawValue value) { return _nodeFactory.rawValueNode(value); }
+
     /*
     /**********************************************************
     /* Common mutators

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

@@ -3,6 +3,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.fasterxml.jackson.databind.util.RawValue;
+
 /**
  * Interface that defines common "creator" functionality implemented
  * both by {@link JsonNodeFactory} and {@link ContainerNode} (that is,
@@ -34,13 +36,29 @@ public interface JsonNodeCreator
     public ValueNode numberNode(Double value);
     public ValueNode numberNode(BigDecimal v);
 
-    // Textual nodes, other value (non-structured) nodes
+    // Textual nodes
 
     public ValueNode textNode(String text);
+
+    // Other value (non-structured) nodes
+    
     public ValueNode binaryNode(byte[] data);
     public ValueNode binaryNode(byte[] data, int offset, int length);
     public ValueNode pojoNode(Object pojo);
 
+    /**
+     * Factory method to use for adding "raw values"; pre-encoded values
+     * that are included exactly as-is when node is serialized.
+     * This may be used, for example, to include fully serialized JSON
+     * sub-trees.
+     * Note that the concept may not work with all backends, and since
+     * no translation of any kinds is done it will not work when converting
+     * between data formats.
+     * 
+     * @since 2.6
+     */
+    public ValueNode rawValueNode(RawValue value);
+
     // Structured nodes:
     // (bit unkosher, due to forward references... but has to do for now)
 

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

@@ -3,6 +3,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.fasterxml.jackson.databind.util.RawValue;
+
 /**
  * Base class that specifies methods for getting access to
  * Node instances (newly constructed, or shared, depending
@@ -15,7 +17,7 @@ public class JsonNodeFactory
         ,JsonNodeCreator // since 2.3
 {
     // with 2.2
-    private static final long serialVersionUID = -3271940633258788634L;
+    private static final long serialVersionUID = 1L;
 
     private final boolean _cfgBigDecimalExact;
 
@@ -327,11 +329,10 @@ public BinaryNode binaryNode(byte[] data, int offset, int length) {
     @Override
     public ValueNode pojoNode(Object pojo) { return new POJONode(pojo); }
 
-    /**
-     * @deprecated Since 2.3 Use {@link #pojoNode} instead.
-     */
-    @Deprecated
-    public POJONode POJONode(Object pojo) { return new POJONode(pojo); }
+    @Override
+    public ValueNode rawValueNode(RawValue value) {
+        return new POJONode(value);
+    }
 
     /*
     /**********************************************************

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

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -568,6 +569,13 @@ public ObjectNode putPOJO(String fieldName, Object pojo) {
         return _put(fieldName, pojoNode(pojo));
     }
 
+    /**
+     * @since 2.6
+     */
+    public ObjectNode putRawValue(String fieldName, RawValue raw) {
+        return _put(fieldName, rawValueNode(raw));
+    }
+    
     /**
      * @return This node (to allow chaining)
      */

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

@@ -3,9 +3,9 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.JsonSerializable;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
-
 /**
  * Value node that contains a wrapped POJO, to be serialized as
  * a JSON constructed through data mapping (usually done by
@@ -102,13 +102,14 @@ public double asDouble(double defaultValue)
      */
 
     @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
+    public final void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException
     {
         if (_value == null) {
-            provider.defaultSerializeNull(jg);
+            serializers.defaultSerializeNull(gen);
+        } else if (_value instanceof JsonSerializable) {
+            ((JsonSerializable) _value).serialize(gen, serializers);
         } else {
-            jg.writeObject(_value);
+            gen.writeObject(_value);
         }
     }
 

src/test/java/com/fasterxml/jackson/databind/node/TestJsonNode.java

@@ -1,14 +1,18 @@
 package com.fasterxml.jackson.databind.node;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
  * Basic tests for {@link JsonNode} base class and some features
  * of implementation classes
  */
 public class TestJsonNode extends NodeTestBase
 {
+    private final ObjectMapper MAPPER = objectMapper();
+
     public void testText()
     {
         assertNull(TextNode.valueOf(null));
@@ -107,4 +111,13 @@ public void testPOJO()
         // but if wrapping actual number, use it
         assertNodeNumbers(new POJONode(Integer.valueOf(123)), 123, 123.0);
     }
+
+    // [databind#743]
+    public void testRawValue() throws Exception
+    {
+        ObjectNode root = MAPPER.createObjectNode();
+        root.putRawValue("a", new RawValue(new SerializedString("[1, 2, 3]")));
+
+        assertEquals("{\"a\":[1, 2, 3]}", MAPPER.writeValueAsString(root));
+    }
 }

src/test/java/com/fasterxml/jackson/databind/node/TestObjectNode.java

@@ -43,7 +43,7 @@ public DataImpl(JsonNode n) {
     /* Test methods
     /**********************************************************
      */
-    
+
     private final ObjectMapper MAPPER = objectMapper();
 
     public void testSimpleObject() throws Exception