Fix #1013

Author: cowtowncoder

release-notes/CREDITS

@@ -350,3 +350,7 @@ Ievgen Pianov (pyanoveugen@github)
 Jayson Minard (apatrida@github)
   * Reported #1005: Synthetic constructors confusing Jackson data binding
    (2.6.4)
+
+David Bakin (david-bakin@github)
+  * Reported #1013: `@JsonUnwrapped` is not treated as assuming `@JsonProperty("")`
+   (2.6.4)

release-notes/VERSION

@@ -12,6 +12,8 @@ Project: jackson-databind
  (reported by Ievgen P)
 #1005: Synthetic constructors confusing Jackson data binding
  (reported by Jayson M)
+#1013: `@JsonUnwrapped` is not treated as assuming `@JsonProperty("")`
+ (reported by David B)
 - Fix a minor problem with `@JsonNaming` not recognizing default value
 
 2.6.3 (12-Oct-2015)

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

@@ -739,9 +739,16 @@ public PropertyName findNameForSerialization(Annotated a)
             JsonProperty pann = _findAnnotation(a, JsonProperty.class);
             if (pann != null) {
                 name = pann.value();
+                /* 22-Apr-2014, tatu: Should figure out a better way to do this, but
+                 *   it's actually bit tricky to do it more efficiently (meta-annotations
+                 *   add more lookups; AnnotationMap costs etc)
+                 */
             } else if (_hasAnnotation(a, JsonSerialize.class)
                     || _hasAnnotation(a, JsonView.class)
-                    || _hasAnnotation(a, JsonRawValue.class)) {
+                    || _hasAnnotation(a, JsonRawValue.class)
+                    || _hasAnnotation(a, JsonUnwrapped.class)
+                    || _hasAnnotation(a, JsonBackReference.class)
+                    || _hasAnnotation(a, JsonManagedReference.class)) {
                 name = "";
             } else {
                 return null;

src/test/java/com/fasterxml/jackson/databind/struct/TestUnwrapped.java

@@ -5,7 +5,9 @@
 import com.fasterxml.jackson.databind.*;
 
 /**
- * Unit tests for verifying [JACKSON-132] implementation.
+ * Unit tests for verifying that basic {@link JsonUnwrapped} annotation
+ * handling works as expected; some more advanced tests are separated out
+ * to more specific test classes (like prefix/suffix handling).
  */
 public class TestUnwrapped extends BaseMapTest
 {
@@ -85,6 +87,16 @@ public Child() { }
         public Child(String f) { field = f; }
     }
 
+    static class Inner {
+        public String animal;
+    }
+
+    static class Outer {
+        // @JsonProperty
+        @JsonUnwrapped
+        private Inner inner;
+    }
+
     /*
     /**********************************************************
     /* Tests, serialization
@@ -166,11 +178,26 @@ public void testIssue615() throws Exception
         assertEquals("name", output.c1.field);
     }
 
+    public void testUnwrappedAsPropertyIndicator() throws Exception
+    {
+        Inner inner = new Inner();
+        inner.animal = "Zebra";
+
+        Outer outer = new Outer();
+        outer.inner = inner;
+
+        String actual = MAPPER.writeValueAsString(outer);
+
+        assertTrue(actual.contains("animal"));
+        assertTrue(actual.contains("Zebra"));
+        assertFalse(actual.contains("inner"));
+    }
+    
     // 22-Apr-2013, tatu: Commented out as it can't be simply fixed; requires implementing
     //    deep-update/merge. But leaving here to help with that effort, if/when it proceeds.
 
     /*
-    // [Issue#211]: Actually just variant of #160
+    // [databind#211]: Actually just variant of #160
 
     static class Issue211Bean {
         public String test1;