Removing CGEntity and CGText and refactoring test cases to make it

possible

Author: cboehme

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

@@ -37,8 +37,9 @@ public final class IdChangePipe extends DefaultStreamPipe<StreamReceiver> {
 	private String idName = StreamConstants.ID;
 	private final StreamBuffer streamBuffer = new StreamBuffer();
 	private String currentIdentifier;
+	private String originalIdentifier;
 	private int depth;
-	private boolean keepIdless;
+	private boolean keepIdless = true;
 
 	public IdChangePipe() {
 		super();
@@ -61,20 +62,23 @@ public void setKeepIdless(final boolean keepIdless) {
 	public void startRecord(final String identifier) {
 		assert !isClosed();
 		currentIdentifier = null;
+		originalIdentifier = identifier;
 		depth = 0;
 	}
 
 	@Override
 	public void endRecord() {
 		assert !isClosed();
-		if (null != currentIdentifier || keepIdless) {
-			getReceiver().startRecord(currentIdentifier);
+		if (currentIdentifier != null || keepIdless) {
+			if (currentIdentifier == null) {
+				getReceiver().startRecord(originalIdentifier);
+			} else {
+				getReceiver().startRecord(currentIdentifier);
+			}
 			streamBuffer.replay();
-			streamBuffer.clear();
 			getReceiver().endRecord();
-		}else{
-			streamBuffer.clear();
 		}
+		streamBuffer.clear();
 	}
 
 	@Override

src/main/java/org/culturegraph/mf/stream/pipe/IdChangePipe.java

@@ -34,21 +34,21 @@
 public final class StreamMerger 
 		extends DefaultStreamPipe<StreamReceiver> {
 
-	private boolean firstRecord = true;
+	private boolean hasRecordsReceived;
 	private String currentId = "";
 
 	@Override
 	public void startRecord(final String identifier) {
 		assert !isClosed();
 		if (!currentId.equals(identifier)) {
-			if (!firstRecord) {
+			if (hasRecordsReceived) {
 				getReceiver().endRecord();
 			}
 			getReceiver().startRecord(identifier);
 			currentId = identifier;
 		}
 
-		firstRecord = false;
+		hasRecordsReceived = true;
 	}
 
 	@Override
@@ -71,13 +71,13 @@ public void literal(final String name, final String value) {
 
 	@Override
 	protected void onResetStream() {
-		firstRecord = true;
+		hasRecordsReceived = false;
 		currentId = "";
 	}
 
 	@Override
 	protected void onCloseStream() {
-		if (!firstRecord) {
+		if (hasRecordsReceived) {
 			getReceiver().endRecord();
 		}
 		onResetStream();

src/main/java/org/culturegraph/mf/stream/pipe/StreamMerger.java

@@ -57,7 +57,6 @@ public final class JsonEncoderTest {
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
-		
 		encoder = new JsonEncoder();
 		encoder.setReceiver(receiver); 
 	}