Fix #348

Author: cowtowncoder

release-notes/CREDITS

@@ -229,3 +229,8 @@ John Meyer (jpmeyer@github)
 Charles Allen (drcrallen@github):
   * Reported #696: Copy constructor does not preserve `_injectableValues`
    (2.6.0)
+
+Chris Pimlott (pimlottc@github):
+  * Suggested #348: ObjectMapper.valueToTree does not work with @JsonRawValue
+   (2.6.0)
+

release-notes/VERSION

@@ -7,6 +7,8 @@ Project: jackson-databind
 2.6.0 (not yet released)
 
 #312: Support Type Id mappings where two ids map to same Class
+#348: ObjectMapper.valueToTree does not work with @JsonRawValue
+ (reported by Chris P, pimlottc@github)
 #649: Make `BeanDeserializer` use new `parser.nextFieldName()` and `.hasTokenId()` methods
 #696: Copy constructor does not preserve `_injectableValues`
  (reported by Charles A)

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

@@ -2351,12 +2351,14 @@ public <T> T treeToValue(TreeNode n, Class<T> valueType)
      * to serializing value into JSON and parsing JSON as tree, but
      * more efficient.
      *<p>
-     * NOTE: one known difference from actual serialization is that so-called
-     * "raw values" are not supported -- since they are opaque sequence of
-     * bytes to include (which may or may not be supported by the backend)
-     * they can not be converted using this method. It may be possible to
-     * support conversions using full serialization, if raw values must be
-     * preserved.
+     * NOTE: while results are usually identical to that of serialization followed
+     * by deserialization, this is not always the case. In some cases serialization
+     * into intermediate representation will retain encapsulation of things like
+     * raw value ({@link com.fasterxml.jackson.databind.util.RawValue}) or basic
+     * node identity ({@link JsonNode}). If so, result is a valid tree, but values
+     * are not re-constructed through actual JSON representation. So if transformation
+     * requires actual materialization of JSON (or other data format that this mapper
+     * produces), it will be necessary to do actual serialization.
      * 
      * @param <T> Actual node type; usually either basic {@link JsonNode} or
      *  {@link com.fasterxml.jackson.databind.node.ObjectNode}

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -631,7 +631,9 @@ public PropertyName findNameForSerialization(Annotated a)
             JsonProperty pann = _findAnnotation(a, JsonProperty.class);
             if (pann != null) {
                 name = pann.value();
-            } else if (_hasAnnotation(a, JsonSerialize.class) || _hasAnnotation(a, JsonView.class)) {
+            } else if (_hasAnnotation(a, JsonSerialize.class)
+                    || _hasAnnotation(a, JsonView.class)
+                    || _hasAnnotation(a, JsonRawValue.class)) {
                 name = "";
             } else {
                 return null;

src/test/java/com/fasterxml/jackson/databind/ser/TestJsonRawValue.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/RawValueTest.java

@@ -1,14 +1,14 @@
 package com.fasterxml.jackson.databind.ser;
 
 import com.fasterxml.jackson.annotation.*;
-
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * This unit test suite tests functioning of {@link JsonRawValue}
  * annotation with bean serialization.
  */
-public class TestJsonRawValue
+public class RawValueTest
     extends com.fasterxml.jackson.databind.BaseMapTest
 {
     /*
@@ -31,37 +31,53 @@ final static class ClassGetter<T>
 
         @JsonProperty @JsonRawValue protected T value() { return _value; }
     }
-    
+
+    // [databind#348]
+    static class RawWrapped
+    {
+        @JsonRawValue
+        private final String json;
+
+        public RawWrapped(String str) {
+            json = str;
+        }
+    }
+
     /*
     /*********************************************************
     /* Test cases
     /*********************************************************
      */
 
+    private final ObjectMapper MAPPER = objectMapper();
+    
     public void testSimpleStringGetter() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
         String value = "abc";
-        String result = m.writeValueAsString(new ClassGetter<String>(value));
+        String result = MAPPER.writeValueAsString(new ClassGetter<String>(value));
         String expected = String.format("{\"nonRaw\":\"%s\",\"raw\":%s,\"value\":%s}", value, value, value);
         assertEquals(expected, result);
     }
 
     public void testSimpleNonStringGetter() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
         int value = 123;
-        String result = m.writeValueAsString(new ClassGetter<Integer>(value));
+        String result = MAPPER.writeValueAsString(new ClassGetter<Integer>(value));
         String expected = String.format("{\"nonRaw\":%d,\"raw\":%d,\"value\":%d}", value, value, value);
         assertEquals(expected, result);
     }
 
     public void testNullStringGetter() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
-        String result = m.writeValueAsString(new ClassGetter<String>(null));
+        String result = MAPPER.writeValueAsString(new ClassGetter<String>(null));
         String expected = "{\"nonRaw\":null,\"raw\":null,\"value\":null}";
         assertEquals(expected, result);
     }
 
+    public void testWithValueToTree() throws Exception
+    {
+        JsonNode w = MAPPER.valueToTree(new RawWrapped("{ }"));
+        assertNotNull(w);
+        assertEquals("{\"json\":{ }}", MAPPER.writeValueAsString(w));
+    }
 }