Make sure that item markers followed by suffixed entities do not create unnecessary empty entities.

Author: cboehme

src/main/java/org/culturegraph/mf/stream/pipe/bib/PicaItemSplitter.java

@@ -37,13 +37,14 @@ public final class PicaItemSplitter extends DefaultStreamPipe<StreamReceiver> {
 
 	private String currentSuffix;
 	private boolean inItemMarker;
+	private boolean itemMarkerFound;
 	private String identifier;
 
 	@Override
 	public void startRecord(final String identifier) {
 		assert !isClosed();
-		this.currentSuffix = null;
 		this.inItemMarker = false;
+		this.itemMarkerFound = false;
 		this.identifier = identifier;
 		getReceiver().startRecord(identifier);
 	}
@@ -60,13 +61,14 @@ public void startEntity(final String name) {
 
 		if (ITEM_MARKER.equals(name)) {
 			inItemMarker = true;
-			currentSuffix = "";
+			itemMarkerFound = true;
+			currentSuffix = null;
 			getReceiver().endRecord();
 			getReceiver().startRecord(identifier);
 			return;
 		}
 
-		if (currentSuffix == null) {
+		if (!itemMarkerFound) {
 			getReceiver().startEntity(name);
 			return;
 		}
@@ -76,7 +78,7 @@ public void startEntity(final String name) {
 			suffixStart = name.length();
 		}
 		final String suffix = name.substring(suffixStart);
-		if (!currentSuffix.equals(suffix)) {
+		if (currentSuffix != null && !currentSuffix.equals(suffix)) {
 			getReceiver().endRecord();
 			getReceiver().startRecord(identifier);
 		}

src/test/java/org/culturegraph/mf/stream/pipe/bib/PicaItemSplitterTest.java

@@ -16,6 +16,8 @@
 package org.culturegraph.mf.stream.pipe.bib;
 
 import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.junit.After;
@@ -83,7 +85,7 @@ public void testShouldSplitAtItemMarkerEntities() {
 	}
 
 	@Test
-	public void testShouldCreateEmptyRecordsIfNothingBeforeOrAfterItemMarkers() {
+	public void testShouldCreateEmptyRecordsIfNoContentIsBeforeOrAfterItemMarkers() {
 		picaItemSplitter.startRecord(RECORD_ID);
 		emitItemMarkerEntity();
 		emitItemMarkerEntity();
@@ -97,6 +99,25 @@ public void testShouldCreateEmptyRecordsIfNothingBeforeOrAfterItemMarkers() {
 		ordered.verify(receiver).endRecord();
 		ordered.verify(receiver).startRecord(RECORD_ID);
 		ordered.verify(receiver).endRecord();
+		verifyNoMoreInteractions(receiver);
+	}
+
+	@Test
+	public void testShouldNotCreateTwoEmptyRecordsIfFirstEntityAfterItemMarkerHasSuffix() {
+		picaItemSplitter.startRecord(RECORD_ID);
+		emitEntity();
+		emitItemMarkerEntity();
+		emitSuffixedEntity1();
+		picaItemSplitter.endRecord();
+		
+		final InOrder ordered = inOrder(receiver);
+		ordered.verify(receiver).startRecord(RECORD_ID);
+		verifyEntity(ordered);
+		ordered.verify(receiver).endRecord();
+		ordered.verify(receiver).startRecord(RECORD_ID);
+		verifySuffixedEntityStripped(ordered);
+		ordered.verify(receiver).endRecord();	
+		verifyNoMoreInteractions(receiver);
 	}
 
 	@Test
@@ -130,7 +151,7 @@ public void testShouldSplitWhenSuffixChanges() {
 		ordered.verify(receiver).endRecord();		
 		ordered.verify(receiver).startRecord(RECORD_ID);
 		verifySuffixedEntityStripped(ordered);
-		ordered.verify(receiver).endRecord();		
+		ordered.verify(receiver).endRecord();
 	}
 
 	@Test
@@ -147,6 +168,7 @@ public void testShouldOnlySplitOnSuffixChangeAfterFirstItemMarkerEntity() {
 		verifySuffixedEntity1(ordered);
 		verifySuffixedEntity2(ordered);
 		ordered.verify(receiver).endRecord();
+		verifyNoMoreInteractions(receiver);
 	}
 
 	private void emitEntity() {