Changed default separator to the global separator (0x001d).

Author: cboehme

src/main/java/org/culturegraph/mf/stream/converter/RecordReader.java

@@ -28,10 +28,10 @@
 /**
  * <p>Reads data from a {@code Reader} and splits it into individual
  * records.</p>
- * 
- * <p>The default separator is the new line character (0x0a). Empty
- * records are skipped by default.</p>
- * 
+ *
+ * <p>The default separator is the global separator character (0x001d).
+ * Empty records are skipped by default.</p>
+ *
  * @author Christoph Böhme
  *
  */
@@ -41,28 +41,28 @@
 public final class RecordReader extends
 		DefaultObjectPipe<Reader, ObjectReceiver<String>> {
 
-	public static final char DEFAULT_SEPARATOR = '\n';
-	
+	public static final char DEFAULT_SEPARATOR = '\u001d';
+
 	private static final int BUFFER_SIZE = 1024 * 1024 * 16;
 
 	private final StringBuilder builder = new StringBuilder();
 	private final char[] buffer = new char[BUFFER_SIZE];
-	
+
 	private char separator = DEFAULT_SEPARATOR;
 	private boolean skipEmptyRecords = true;
-	
+
 	public void setSeparator(final char separator) {
 		this.separator = separator;
 	}
-	
+
 	public char getSeparator() {
 		return separator;
 	}
-	
+
 	public void setSkipEmptyRecords(final boolean skipEmptyRecords) {
 		this.skipEmptyRecords = skipEmptyRecords;
 	}
-	
+
 	public boolean getSkipEmptyRecords() {
 		return skipEmptyRecords;
 	}
@@ -89,18 +89,18 @@ public void process(final Reader reader) {
 			if (!nothingRead) {
 				emitRecord();
 			}
-			
+
 		} catch (final IOException e) {
 			throw new MetafactureException(e);
 		}
 	}
-	
+
 	private void emitRecord() {
 		final String record = builder.toString();
 		if (!skipEmptyRecords || !record.isEmpty()) {
 			getReceiver().process(record);
 			builder.delete(0, builder.length());
 		}
 	}
-	
+
 }

src/test/java/org/culturegraph/mf/stream/converter/RecordReaderTest.java

@@ -32,7 +32,7 @@
 
 /**
  * Tests for {@link RecordReader}.
- * 
+ *
  * @author Christoph Böhme
  *
  */
@@ -42,20 +42,20 @@ public final class RecordReaderTest {
 	private static final String RECORD2 = "record2";
 	private static final String EMPTY_RECORD = "";
 	private static final char SEPARATOR = ':';
-	private static final char DEFAULT_SEPARATOR = '\n';
-	
+	private static final char DEFAULT_SEPARATOR = '\u001d';
+
 	private RecordReader recordReader;
-	
+
 	@Mock
 	private ObjectReceiver<String> receiver;
-	
+
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
 		recordReader = new RecordReader();
 		recordReader.setReceiver(receiver);
 	}
-	
+
 	@After
 	public void cleanup() {
 		recordReader.closeStream();
@@ -68,7 +68,7 @@ public void testShouldProcessRecordsFollowedbySeparator() {
 		recordReader.process(new StringReader(
 				RECORD1 + SEPARATOR +
 				RECORD2 + SEPARATOR));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
@@ -78,56 +78,56 @@ public void testShouldProcessRecordsFollowedbySeparator() {
 	@Test
 	public void testShouldProcessRecordsPrecededbySeparator() {
 		recordReader.setSeparator(SEPARATOR);
-		
+
 		recordReader.process(new StringReader(
 				SEPARATOR + RECORD1 +
 				SEPARATOR + RECORD2));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldProcessRecordsSeparatedBySeparator() {
 		recordReader.setSeparator(SEPARATOR);
 
 		recordReader.process(new StringReader(
 				RECORD1 + SEPARATOR +
 				RECORD2));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldProcessSingleRecordWithoutSeparator() {
 		recordReader.setSeparator(SEPARATOR);
 
 		recordReader.process(new StringReader(
 				RECORD1));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldNotEmitRecordIfInputIsEmpty() {
 		recordReader.setSeparator(SEPARATOR);
 		// Make sure empty records are
 		// normally emitted:
 		recordReader.setSkipEmptyRecords(false);
-		
+
 		recordReader.process(new StringReader(
 				EMPTY_RECORD));
-		
+
 		verifyZeroInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldSkipEmptyRecordsByDefault() {
 		recordReader.setSeparator(SEPARATOR);
@@ -136,13 +136,13 @@ public void testShouldSkipEmptyRecordsByDefault() {
 				RECORD1 + SEPARATOR +
 				EMPTY_RECORD + SEPARATOR +
 				RECORD2));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldOutputEmptyRecordsIfConfigured() {
 		recordReader.setSeparator(SEPARATOR);
@@ -152,14 +152,14 @@ public void testShouldOutputEmptyRecordsIfConfigured() {
 				RECORD1 + SEPARATOR +
 				EMPTY_RECORD + SEPARATOR +
 				RECORD2));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(EMPTY_RECORD);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldOutputEmptyRecordsAtStartOfInputIfConfigured() {
 		recordReader.setSeparator(SEPARATOR);
@@ -169,14 +169,14 @@ public void testShouldOutputEmptyRecordsAtStartOfInputIfConfigured() {
 				EMPTY_RECORD + SEPARATOR +
 				RECORD1 + SEPARATOR +
 				RECORD2));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(EMPTY_RECORD);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldOutputEmptyRecordsAtEndOfInputIfConfigured() {
 		recordReader.setSeparator(SEPARATOR);
@@ -186,7 +186,7 @@ public void testShouldOutputEmptyRecordsAtEndOfInputIfConfigured() {
 				RECORD1 + SEPARATOR +
 				RECORD2 + SEPARATOR +
 				EMPTY_RECORD));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
@@ -195,17 +195,17 @@ public void testShouldOutputEmptyRecordsAtEndOfInputIfConfigured() {
 	}
 
 	@Test
-	public void testShouldUseNewLineAsDefaultSeparator() {
+	public void testShouldUseGlobalSeparatorAsDefaultSeparator() {
 		recordReader.process(new StringReader(
 				RECORD1 + DEFAULT_SEPARATOR +
 				RECORD2 + DEFAULT_SEPARATOR));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver).process(RECORD2);
 		verifyNoMoreInteractions(receiver);
 	}
-	
+
 	@Test
 	public void testShouldProcessMultipleReaders() {
 		recordReader.setSeparator(SEPARATOR);
@@ -216,13 +216,13 @@ public void testShouldProcessMultipleReaders() {
 		recordReader.process(new StringReader(
 				RECORD2 + SEPARATOR +
 				RECORD1));
-		
+
 		final InOrder ordered = inOrder(receiver);
 		ordered.verify(receiver).process(RECORD1);
 		ordered.verify(receiver, times(2)).process(RECORD2);
 		ordered.verify(receiver).process(RECORD1);
 		verifyNoMoreInteractions(receiver);
-		
+
 	}
-	
+
 }