Merge branch '2.6'

Author: cowtowncoder

release-notes/VERSION

@@ -21,6 +21,8 @@ Project: jackson-dataformat-csv
 
 #93: CSV mapper does not support Views or filtering correctly for serialization
  (reported by triviski@github; fix contributed by Rob B)
+#96: SortedBy only apply to headers and actual data
+ (reported by ShijunK@github)
 
 2.6.4 (07-Dec-2015)
 

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

@@ -77,7 +77,7 @@
 public class CsvSchema 
     implements FormatSchema,
         Iterable<CsvSchema.Column>,
-        java.io.Serializable // since 2.4.3
+        java.io.Serializable // since 2.5
 {
     private static final long serialVersionUID = 1L; // 2.5
 
@@ -289,9 +289,13 @@ public Column(int index, String name, ColumnType type, String arrayElementSep)
             _next = null;
         }
 
-        public Column(Column src, Column next)
+        public Column(Column src, Column next) {
+            this(src, src._index, next);
+        }
+
+        protected Column(Column src, int index, Column next)
         {
-            _index = src._index;
+            _index = index;
             _name = src._name;
             _type = src._type;
             _arrayElementSeparator = src._arrayElementSeparator;
@@ -334,6 +338,16 @@ public Column withNext(Column next) {
             }
             return new Column(this, next);
         }
+
+        /**
+         * @since 2.7
+         */
+        public Column withNext(int index, Column next) {
+            if ((_index == index) && (_next == next)) {
+                return this;
+            }
+            return new Column(this, index, next);
+        }
 
         public int getIndex() { return _index; }
         public String getName() { return _name; }
@@ -768,7 +782,7 @@ public CsvSchema(Column[] columns, int features,
         _escapeChar = escapeChar;
         _lineSeparator = lineSeparator;
         _nullValue = nullValue;
-        
+
         // and then we may need to create a mapping
         if (_columns.length == 0) {
             _columnsByName = Collections.emptyMap();
@@ -805,7 +819,8 @@ protected CsvSchema(Column[] columns, int features,
      * Copy constructor used for creating variants using
      * <code>sortedBy()</code> methods.
      */
-    protected CsvSchema(CsvSchema base, Column[] columns) {
+    protected CsvSchema(CsvSchema base, Column[] columns)
+    {
         _columns = _link(columns);
         _features = base._features;
         _columnSeparator = base._columnSeparator;
@@ -814,7 +829,16 @@ protected CsvSchema(CsvSchema base, Column[] columns) {
         _lineSeparator = base._lineSeparator;
         _arrayElementSeparator = base._arrayElementSeparator;
         _nullValue = base._nullValue;
-        _columnsByName = base._columnsByName;
+ 
+        // and then we may need to create a mapping
+        if (_columns.length == 0) {
+            _columnsByName = Collections.emptyMap();
+        } else {
+            _columnsByName = new HashMap<String,Column>(4 + _columns.length);
+            for (Column c : _columns) {
+                _columnsByName.put(c.getName(), c);
+            }
+        }
     }
 
     /**
@@ -835,14 +859,16 @@ protected CsvSchema(CsvSchema base, int features) {
     }
 
     /**
-     * Helper method used for chaining columns together using next-linkage
+     * Helper method used for chaining columns together using next-linkage,
+     * as well as ensuring that indexes are correct.
      */
-    private static Column[] _link(Column[] orig) {
+    private static Column[] _link(Column[] orig)
+    {
         int i = orig.length;
         Column[] result = new Column[i];
         Column prev = null;
         for (; --i >= 0; ) {
-            Column curr = orig[i].withNext(prev);
+            Column curr = orig[i].withNext(i, prev);
             result[i] = curr;
             prev = curr;
         }
@@ -1080,7 +1106,8 @@ public CsvSchema withoutColumns() {
      * 
      * @since 2.4
      */
-    public CsvSchema sortedBy(String... columnNames) {
+    public CsvSchema sortedBy(String... columnNames)
+    {
         LinkedHashMap<String,Column> map = new LinkedHashMap<String,Column>();
         for (String colName : columnNames) {
             Column col = _columnsByName.get(colName);

src/test/java/com/fasterxml/jackson/dataformat/csv/ser/SchemaReorderTest.java

@@ -0,0 +1,37 @@
+package com.fasterxml.jackson.dataformat.csv.ser;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.dataformat.csv.CsvMapper;
+import com.fasterxml.jackson.dataformat.csv.CsvSchema;
+import com.fasterxml.jackson.dataformat.csv.ModuleTestBase;
+
+public class SchemaReorderTest extends ModuleTestBase
+{
+    // should work ok since CsvMapper forces alphabetic ordering as default:
+    static class Reordered {
+        public int a, b, c, d;
+    }
+    
+    private final CsvMapper MAPPER = new CsvMapper();
+
+    public void testSchemaWithOrdering() throws Exception
+    {
+        CsvSchema schema = MAPPER.schemaFor(Reordered.class);
+        assertEquals(aposToQuotes("['a','b','c','d']"), schema.getColumnDesc());
+        schema = schema.sortedBy("b", "c");
+        assertEquals(aposToQuotes("['b','c','a','d']"), schema.getColumnDesc());
+
+        Reordered value = new Reordered();
+        value.a = 1;
+        value.b = 2;
+        value.c = 3;
+        value.d = 4;
+
+        schema = schema.withHeader();
+        String csv = MAPPER.writer(schema).writeValueAsString(Arrays.asList(value));
+        assertEquals("b,c,a,d\n2,3,1,4\n", csv);
+
+//        _verifyLinks(schema);
+    }
+}