Removed nested rows

Removes the construction of nested rows (rows in rows), when a literal
stream contains a sequence of literals that has the same name.

This feature adds more confusion to the output, due to the fact that
a nested row is a csv row on its own. A removal of this feature
keeps the implementation simple and predictable.

Author: eberhardtj

README.adoc

@@ -45,10 +45,6 @@ CSV Dialect:
 * Line Terminator: \n
 * Quoting: Quote All
 
-NOTE: If a sequence of literals (2 or more) share the same name,
-the values of those literals will be collected in the corresponding row.
-The column will contain a inner row (a nested csv row).
-
 ==== Syntax
 
 ```

src/main/java/org/metafacture/csv/SimpleCsvEncoder.java

@@ -16,8 +16,6 @@
 package org.metafacture.csv;
 
 import com.opencsv.CSVWriter;
-import com.opencsv.CSVWriterBuilder;
-import com.opencsv.ICSVWriter;
 import org.metafacture.framework.FluxCommand;
 import org.metafacture.framework.MetafactureException;
 import org.metafacture.framework.ObjectReceiver;
@@ -52,14 +50,8 @@ public class SimpleCsvEncoder extends DefaultStreamPipe<ObjectReceiver<String>>
 
     /** List of items that will be written to a row */
     private List<String> rowItems;
-    /** Last encountered literal name */
-    private String lastLiteralName;
-    /** List of literal values that has the same name */
-    private List<String> literalValues;
     /** Flag for the first record encounter */
     private boolean isFirstRecord;
-    /** Flag for the first literal encounter in a record */
-    private boolean isFirstLiteral;
 
     private List<String> header;
     private char separator;
@@ -77,11 +69,7 @@ public SimpleCsvEncoder(char separator) {
         this.header = new ArrayList<>();
 
         this.isFirstRecord = true;
-        this.isFirstLiteral = true;
-
         this.rowItems = new ArrayList<>();
-        this.lastLiteralName = null;
-        this.literalValues = new ArrayList<>();
     }
 
     /**
@@ -124,23 +112,7 @@ private String[] arrayOf(List<String> list) {
         return list.toArray(new String[length]);
     }
 
-    private String innerRowOf(List<String> items) {
-        StringWriter writer = new StringWriter();
-        ICSVWriter csvWriter = new CSVWriterBuilder(writer)
-                .withSeparator(separator)
-                .withQuoteChar(CSVWriter.DEFAULT_QUOTE_CHARACTER)
-                .withLineEnd("")
-                .build();
-
-        String row[] = arrayOf(items);
-        csvWriter.writeNext(row);
-        String line = writer.toString().trim();
-        return line;
-    }
-
     private void resetCaches() {
-        isFirstLiteral = true;
-        literalValues = new ArrayList<>();
         rowItems = new ArrayList<>();
     }
 
@@ -180,9 +152,6 @@ public void endRecord() {
             isFirstRecord = false;
         }
 
-        String rowItem = literalValues.size() == 1 ? literalValues.get(0) : innerRowOf(literalValues);
-        rowItems.add(rowItem);
-
         writeRow(rowItems);
 
         resetCaches();
@@ -193,23 +162,7 @@ public void literal(final String name, final String value) {
         if (isFirstRecord) {
             header.add(name);
         }
-
-        if (isFirstLiteral) {
-            lastLiteralName = name;
-            isFirstLiteral = false;
-        }
-
-        if (name.equals(lastLiteralName)) {
-            literalValues.add(value);
-        } else {
-            String rowItem = literalValues.size() == 1 ? literalValues.get(0) : innerRowOf(literalValues);
-            rowItems.add(rowItem);
-
-            literalValues = new ArrayList<>();
-            literalValues.add(value);
-        }
-
-        lastLiteralName = name;
+        rowItems.add(value);
     }
 
     @Override
@@ -228,11 +181,7 @@ public void onResetStream() {
         this.header = new ArrayList<>();
 
         this.isFirstRecord = true;
-        this.isFirstLiteral = true;
-
         this.rowItems = new ArrayList<>();
-        this.lastLiteralName = null;
-        this.literalValues = new ArrayList<>();
     }
 
     @Override

src/test/java/org/metafacture/csv/SimpleCsvEncoderTest.java

@@ -95,7 +95,6 @@ public void shouldReceiveSingleRecordWithRecordIdAndHeader() {
         ordered.verify(receiver).process(ticksToQuotes("'1' 'a' 'b'"));
     }
 
-
     @Test
     public void shouldReceiveThreeRows() {
         encoder.startRecord("1");
@@ -126,7 +125,7 @@ public void shouldUseCommaAsSeparator() {
         encoder.literal("column 1", "a");
         encoder.literal("column 2", "b");
         encoder.endRecord();
-        encoder.startRecord("1");
+        encoder.startRecord("2");
         encoder.literal("column 1", "c");
         encoder.literal("column 2", "d");
         encoder.endRecord();
@@ -148,7 +147,7 @@ public void shouldCreateNestedCsvInColumn() {
         encoder.closeStream();
 
         final InOrder ordered = inOrder(receiver);
-        ordered.verify(receiver).process(ticksToQuotes("'a' '''a1'' ''a2'' ''a3'''"));
+        ordered.verify(receiver).process(ticksToQuotes("'a' 'a1' 'a2' 'a3'"));
     }
 
     private String ticksToQuotes(String s) {