Implemented #15, support for @JsonUnwrapper, with auto-generated schemas

Author: cowtowncoder

release-notes/VERSION

@@ -1,11 +1,20 @@
-Version: 2.1.4 (26-Feb-2013)
+Project: jackson-dataformat-csv
+Version: 2.2.0 (xx-xxx-2013)
 
-No functional changes
+New minor version.
+
+Changes:
+
+#15: Ensure that `@JsonUnwrapper` works, even with auto-schema
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+2.1.4 (26-Feb-2013)
+
+No functional changes
+
 2.1.2 (04-Dec-2012)
 
 * [Issue#10]: Embedded linefeeds not properly handled

src/main/java/com/fasterxml/jackson/dataformat/csv/CsvMapper.java

@@ -1,7 +1,9 @@
 package com.fasterxml.jackson.dataformat.csv;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
+import com.fasterxml.jackson.databind.util.NameTransformer;
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import com.fasterxml.jackson.dataformat.csv.impl.LRUMap;
@@ -190,34 +192,59 @@ public ObjectReader readerWithTypedSchemaFor(Class<?> pojoType)
     /**********************************************************************
      */
 
-    protected CsvSchema _schemaFor(JavaType pojoType, LRUMap<JavaType,CsvSchema> schemas, boolean typed)
+    protected CsvSchema _schemaFor(JavaType pojoType, LRUMap<JavaType,CsvSchema> schemas,
+            boolean typed)
     {
         synchronized (schemas) {
             CsvSchema s = schemas.get(pojoType);
             if (s != null) {
                 return s;
             }
         }
-        BeanDescription beanDesc = getSerializationConfig().introspect(pojoType);
+        final AnnotationIntrospector intr = _deserializationConfig.getAnnotationIntrospector();
         CsvSchema.Builder builder = CsvSchema.builder();
+        _addSchemaProperties(builder, intr, typed, pojoType, null);
+        CsvSchema result = builder.build();
+        synchronized (schemas) {
+            schemas.put(pojoType, result);
+        }
+        return result;
+    }
+
+    protected void _addSchemaProperties(CsvSchema.Builder builder, AnnotationIntrospector intr,
+            boolean typed,
+            JavaType pojoType, NameTransformer unwrapper)
+    {
+        BeanDescription beanDesc = getSerializationConfig().introspect(pojoType);
         for (BeanPropertyDefinition prop : beanDesc.findProperties()) {
             // ignore setter-only properties:
             if (!prop.couldSerialize()) {
                 continue;
             }
-            // TODO: [Issue#15]: need to handle unwrapped props?
-
-            if (typed) {
-                builder.addColumn(prop.getName(), _determineType(prop.getAccessor().getRawType()));
+            // [Issue#15]: handle unwrapped props
+            AnnotatedMember m = prop.getPrimaryMember();
+            if (m != null) {
+                NameTransformer nextUnwrapper = intr.findUnwrappingNameTransformer(prop.getPrimaryMember());
+                if (nextUnwrapper != null) {
+                    if (unwrapper != null) {
+                        nextUnwrapper = NameTransformer.chainedTransformer(unwrapper, nextUnwrapper);
+                    }
+                    JavaType nextType = m.getType(beanDesc.bindingsForBeanType());
+                    _addSchemaProperties(builder, intr, typed, nextType, nextUnwrapper);
+                    continue;
+                }
+            }
+            // Then name wrapping/unwrapping
+            String name = prop.getName();
+            if (unwrapper != null) {
+                name = unwrapper.transform(name);
+            }
+            if (typed && m != null) {
+                builder.addColumn(name, _determineType(m.getRawType()));
             } else {
-                builder.addColumn(prop.getName());
+                builder.addColumn(name);
             }
         }
-        CsvSchema result = builder.build();
-        synchronized (schemas) {
-            schemas.put(pojoType, result);
-        }
-        return result;
     }
 
     // should not be null since couldSerialize() returned true, so:

src/test/java/com/fasterxml/jackson/dataformat/csv/TestUnwrappingWithCSV.java

@@ -22,7 +22,7 @@ public Location(int x, int y) {
 
     static class Unwrapping {
         public String name;
-        @JsonUnwrapped
+        @JsonUnwrapped(prefix="loc.")
         public Location location;
 
         public Unwrapping() { }
@@ -48,8 +48,8 @@ public void testSimpleUnwrappingRoundtrip() throws Exception
         ObjectMapper mapper = mapperForCsv();
         CsvSchema schema = CsvSchema.builder()
             .addColumn("name")
-            .addColumn("x")
-            .addColumn("y")
+            .addColumn("loc.x")
+            .addColumn("loc.y")
             .build();
         Unwrapping wrapper = mapper.reader(schema).withType(Unwrapping.class).readValue(CSV);
         assertNotNull(wrapper);
@@ -71,22 +71,19 @@ public void testSimpleUnwrappingRoundtrip() throws Exception
      * available via BeanProperty/POJOPropertyBuilder. But it needs to be
      * made; and when this occurs, we can handle this case reasonably well.
      */
-    /*
     public void testSimpleWithAutoSchema() throws Exception
     {
-        final String CSV = "Henry,1,2\n";
+        final String CSV = "Henry,28,12\n";
         CsvMapper mapper = mapperForCsv();
         CsvSchema schema = mapper.schemaFor(Unwrapping.class);
-System.err.println("SChema/auto -> "+schema);        
 
         Unwrapping wrapper = mapper.reader(schema).withType(Unwrapping.class).readValue(CSV);
         assertNotNull(wrapper);
         assertNotNull(wrapper.location);
-        assertEquals(15, wrapper.location.x);
-        assertEquals(27, wrapper.location.y);
+        assertEquals(28, wrapper.location.x);
+        assertEquals(12, wrapper.location.y);
 
         // should also write out the same way
         assertEquals(CSV, mapper.writer(schema).writeValueAsString(wrapper));
     }
-    */
 }