Merge branch '296-fix-parsing'

Author: dr0i

metafacture-strings/src/main/java/org/metafacture/strings/LineRecorder.java

@@ -23,12 +23,14 @@
 import org.metafacture.framework.helpers.DefaultObjectPipe;
 
 /**
- * Joins strings and emits them as records when a line matches the pattern.
+ * Collects strings and emits them as records when a line matches the pattern.
+ * Appends to every incoming line a line feed so that the original structure is
+ * preserved.
  *
  * @author Pascal Christoph (dr0i).
  *
  */
-@Description("Joins strings and emits them as records when a line matches the pattern.")
+@Description("Collects strings and emits them as records when a line matches the pattern.")
 @In(String.class)
 @Out(String.class)
 @FluxCommand("lines-to-records")
@@ -50,7 +52,7 @@ public void process(final String line) {
             getReceiver().process(record.toString());
             record = new StringBuilder(SB_CAPACITY);
         } else
-            record.append(line);
+            record.append(line + "\n");
     }
 
 }

metafacture-strings/src/test/java/org/metafacture/strings/LineRecorderTest.java

@@ -32,18 +32,20 @@
  */
 public final class LineRecorderTest {
 
-    private static final String RECORD1_PART1 = "a1\n";
-    private static final String RECORD1_PART2 = "a2\n";
+    private static final String RECORD1_PART1 = "a1";
+    private static final String RECORD1_PART2 = "a2";
     private static final String RECORD1_ENDMARKER = "\n";
 
-    private static final String RECORD2_PART1 = "b1\n";
-    private static final String RECORD2_PART2 = "b2\n";
+    private static final String RECORD2_PART1 = "b1";
+    private static final String RECORD2_PART2 = "b2";
     private static final String RECORD2_ENDMARKER = "\n";
 
-    private static final String RECORD3_PART1 = "c1\n";
-    private static final String RECORD3_PART2 = "c2\n";
+    private static final String RECORD3_PART1 = "c1";
+    private static final String RECORD3_PART2 = "c2";
     private static final String RECORD3_ENDMARKER = "EOR";
 
+    private static final String LINE_SEPARATOR = "\n";
+
     private LineRecorder lineRecorder;
 
     @Mock
@@ -63,13 +65,21 @@ public void shouldEmitRecords() {
         lineRecorder.process(RECORD1_ENDMARKER);
 
         final InOrder ordered = inOrder(receiver);
-        ordered.verify(receiver).process(RECORD1_PART1 + RECORD1_PART2);
+        ordered.verify(receiver).process(
+                RECORD1_PART1 +
+                LINE_SEPARATOR +
+                RECORD1_PART2 +
+                LINE_SEPARATOR);
 
         lineRecorder.process(RECORD2_PART1);
         lineRecorder.process(RECORD2_PART2);
         lineRecorder.process(RECORD2_ENDMARKER);
 
-        ordered.verify(receiver).process(RECORD2_PART1 + RECORD2_PART2);
+        ordered.verify(receiver).process(
+                RECORD2_PART1 +
+                LINE_SEPARATOR +
+                RECORD2_PART2 +
+                LINE_SEPARATOR);
         ordered.verifyNoMoreInteractions();
     }
 
@@ -81,7 +91,11 @@ public void shouldEmitRecordWithNonDefaultRecordMarker() {
         lineRecorder.process(RECORD3_ENDMARKER);
 
         final InOrder ordered = inOrder(receiver);
-        ordered.verify(receiver).process(RECORD3_PART1 + RECORD3_PART2);
+        ordered.verify(receiver).process(
+                RECORD3_PART1 +
+                LINE_SEPARATOR +
+                RECORD3_PART2 +
+                LINE_SEPARATOR);
         ordered.verifyNoMoreInteractions();
     }