Fixes for modules and tests that used null as record id.

Author: cboehme

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

@@ -24,32 +24,32 @@
 
 /**
  * Creates a literal for each entry in a map.
- * 
+ *
  * @author Christoph Böhme
  */
 public final class MapToStream extends
 		DefaultObjectPipe<Map<?, ?>, StreamReceiver> {
 
-	
+
 	private Object idKey = StreamConstants.ID;
-	
+
 	public Object getIdKey() {
 		return idKey;
 	}
-	
+
 	public void setIdKey(final Object idKey) {
 		this.idKey = idKey;
 	}
-	
+
 	@Override
 	public void process(final Map<?, ?> map) {
 		final Object id = map.get(idKey);
 		if (id == null) {
-			getReceiver().startRecord(null);
+			getReceiver().startRecord("");
 		} else {
 			getReceiver().startRecord(id.toString());
 		}
-		for (Map.Entry<?, ?> entry: map.entrySet()) {
+		for (final Map.Entry<?, ?> entry: map.entrySet()) {
 			getReceiver().literal(entry.getKey().toString(), entry.getValue().toString());
 		}
 		getReceiver().endRecord();

src/main/java/org/culturegraph/mf/stream/converter/xml/CGXmlHandler.java

@@ -26,9 +26,9 @@
 
 /**
  * Reads CG-XML files.
- * 
+ *
  * @author Christoph Böhme
- * 
+ *
  */
 @Description("Reads CG-XML files")
 @In(XmlReceiver.class)
@@ -46,7 +46,12 @@ public final class CGXmlHandler extends DefaultXmlPipe<StreamReceiver> {
 	public void startElement(final String uri, final String localName,
 			final String qName, final Attributes attributes) {
 		if (RECORD_TAG.equals(localName)) {
-			getReceiver().startRecord(attributes.getValue("", ID_ATTR));
+			final String recordId = attributes.getValue("", ID_ATTR);
+			if (recordId == null) {
+				getReceiver().startRecord("");
+			} else {
+				getReceiver().startRecord(recordId);
+			}
 		} else if (ENTITY_TAG.equals(localName)) {
 			getReceiver().startEntity(attributes.getValue("", NAME_ATTR));
 		} else if (LITERAL_TAG.equals(localName)) {

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

@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import org.culturegraph.mf.exceptions.FormatException;
-import org.culturegraph.mf.stream.converter.MapToStream;
 import org.culturegraph.mf.stream.sink.EventList;
 import org.culturegraph.mf.stream.sink.StreamValidator;
 import org.culturegraph.mf.util.StreamConstants;
@@ -29,9 +28,9 @@
 
 /**
  * Test {@link MapToStream}
- * 
+ *
  * @author Christoph Böhme
- * 
+ *
  */
 public final class MapToStreamTest {
 
@@ -51,16 +50,16 @@ public void testStringStringMap() {
 		expected.literal(KEYS[1], VALUES[1]);
 		expected.literal(StreamConstants.ID, RECORD_ID);
 		expected.endRecord();
-		
+
 		final Map<String, String> map = new HashMap<String, String>();
 		map.put(KEYS[0], VALUES[0]);
 		map.put(KEYS[1], VALUES[1]);
 		map.put(StreamConstants.ID, RECORD_ID);
 
 		final MapToStream mapToStream = new MapToStream();
-		
+
 		Assert.assertEquals(StreamConstants.ID, mapToStream.getIdKey());
-		
+
 		checkResults(expected, mapToStream, map);
 	}
 
@@ -73,48 +72,48 @@ public void testIntIntMap() {
 		expected.literal(KEYS[1], VALUES[1]);
 		expected.literal(Integer.toString(INT_ID_KEY), RECORD_ID);
 		expected.endRecord();
-		
+
 		final Map<Integer, Integer> map = new HashMap<Integer, Integer>();
 		map.put(INT_KEYS[0], INT_VALUES[0]);
 		map.put(INT_KEYS[1], INT_VALUES[1]);
 		map.put(INT_ID_KEY, INT_RECORD_ID);
-		
+
 		final MapToStream mapToStream = new MapToStream();
 		mapToStream.setIdKey(-1);
-		
+
 		Assert.assertEquals(-1, mapToStream.getIdKey());
-		
+
 		checkResults(expected, mapToStream, map);
 	}
-	
+
 	@Test
 	public void testStringIntMap() {
 		final EventList expected = new EventList();
-		expected.startRecord(null);
+		expected.startRecord("");
 		expected.literal(KEYS[0], VALUES[0]);
 		expected.literal(KEYS[1], VALUES[1]);
 		expected.endRecord();
-		
+
 		final Map<String, Integer> map = new HashMap<String, Integer>();
 		map.put(KEYS[0], INT_VALUES[0]);
 		map.put(KEYS[1], INT_VALUES[1]);
-		
+
 		final MapToStream mapToStream = new MapToStream();
-		
+
 		checkResults(expected, mapToStream, map);
 	}
-	
+
 	private void checkResults(final EventList expected, final MapToStream mapToStream, final Map<?, ?> map) {
-		
+
 		final StreamValidator validator = new StreamValidator(expected.getEvents());
-		
+
 		mapToStream.setReceiver(validator);
-		
+
 		try {
 			mapToStream.process(map);
 			mapToStream.closeStream();
-		} catch (FormatException e){
+		} catch (final FormatException e){
 			Assert.fail(e.toString());
-		}		
+		}
 	}
 }

src/test/java/org/culturegraph/mf/stream/converter/xml/CGXmlReaderTest.java

@@ -16,8 +16,6 @@
 package org.culturegraph.mf.stream.converter.xml;
 
 import org.culturegraph.mf.stream.DataFilePath;
-import org.culturegraph.mf.stream.converter.xml.CGXmlHandler;
-import org.culturegraph.mf.stream.converter.xml.XmlDecoder;
 import org.culturegraph.mf.stream.sink.EventList;
 import org.culturegraph.mf.stream.sink.StreamValidator;
 import org.culturegraph.mf.stream.source.ResourceOpener;
@@ -35,27 +33,27 @@ public final class CGXmlReaderTest {
 	private static final String NUMBER = "Number";
 	private static final String POSTCODE = "Postcode";
 	private static final String CITY = "City";
-	
+
 	@Test
 	public void testReadStringStreamReceiver() {
 		final ResourceOpener opener = new ResourceOpener();
 		final XmlDecoder saxReader = new XmlDecoder();
 		final CGXmlHandler cgHandler = new CGXmlHandler();
 		final EventList writer = new EventList();
-		
-		
+
+
 		opener.setReceiver(saxReader)
 				.setReceiver(cgHandler)
 				.setReceiver(writer);
-		
+
 		opener.process(DataFilePath.CG_XML);
 		opener.closeStream();
-		
+
 		final StreamValidator validator = new StreamValidator(writer.getEvents());
 		validator.setStrictRecordOrder(true);
 		validator.setStrictKeyOrder(true);
 		validator.setStrictValueOrder(true);
-		
+
 		validator.startRecord("1");
 			validator.literal(NAME, "Thomas Mann");
 			validator.startEntity(ADDRESS);
@@ -67,7 +65,7 @@ public void testReadStringStreamReceiver() {
 				validator.literal(POSTCODE, null);
 			validator.endEntity();
 		validator.endRecord();
-		validator.startRecord(null);
+		validator.startRecord("");
 			validator.literal(NAME, "Günter Grass");
 			validator.startEntity(ADDRESS);
 				validator.startEntity(STREET);