fixed #53

Author: mgeipel

src/main/java/org/culturegraph/mf/stream/sink/SimpleXmlWriter.java

@@ -31,6 +31,7 @@
 import org.culturegraph.mf.framework.annotations.Out;
 import org.culturegraph.mf.types.MultiMap;
 import org.culturegraph.mf.util.ResourceUtil;
+
 //import org.apache.commons.lang.StringEscapeUtils;
 
 /**
@@ -55,16 +56,16 @@ public final class SimpleXmlWriter extends DefaultStreamPipe<ObjectReceiver<Stri
 	private String rootTag = "records";
 	private boolean start = true;
 	private boolean separateRoots;
-	private boolean writeXmlHeader=true;
+	private boolean writeXmlHeader = true;
 
 	public void setRootTag(final String rootTag) {
 		this.rootTag = rootTag;
 	}
-	
+
 	public void setWriteXmlHeader(final boolean writeXmlHeader) {
 		this.writeXmlHeader = writeXmlHeader;
 	}
-	
+
 	public void setSeparateRoots(final boolean separateRoots) {
 		this.separateRoots = separateRoots;
 	}
@@ -78,11 +79,11 @@ public void setNamespaceFile(final String file) {
 
 	private void writeHeader() {
 		final StringBuilder builder = new StringBuilder();
-		
-		if(writeXmlHeader){
+
+		if (writeXmlHeader) {
 			builder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 		}
-		
+
 		builder.append("<");
 		builder.append(rootTag);
 		for (Entry<String, String> entry : namespaces.entrySet()) {
@@ -116,7 +117,7 @@ public void endRecord() {
 		} else {
 			getReceiver().process(element.toString());
 		}
-		if(separateRoots){
+		if (separateRoots) {
 			writeFooter();
 		}
 	}
@@ -153,7 +154,9 @@ public void setRecordTag(final String tag) {
 
 	@Override
 	protected void onCloseStream() {
-		writeFooter();
+		if (!separateRoots) {
+			writeFooter();
+		}
 	}
 
 	private void writeFooter() {
@@ -190,7 +193,7 @@ public void addAttribute(final String name, final String value) {
 			attributes.append(" ");
 			attributes.append(name);
 			attributes.append("=\"");
-			escape(attributes,value);
+			escape(attributes, value);
 			attributes.append("\"");
 		}
 
@@ -230,7 +233,7 @@ public void writeToStringBuilder(final StringBuilder builder, final int indent)
 
 			builder.append(">");
 
-			escape(builder,text);
+			escape(builder, text);
 
 			for (Element element : children) {
 				element.writeToStringBuilder(builder, indent + 1);

src/test/java/org/culturegraph/mf/stream/sink/SimpleXmlWriterTest.java

@@ -17,6 +17,8 @@
 
 
 
+import org.culturegraph.mf.framework.DefaultObjectReceiver;
+import org.culturegraph.mf.framework.StreamReceiver;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -29,6 +31,9 @@
 public final class SimpleXmlWriterTest {
 
 
+	private static final String TAG = "tag";
+	private static final String VALUE = "value";
+
 	//TODO add more tests!
 
 
@@ -39,4 +44,59 @@ public void testShouldOnlyEscapeFiveChars() {
 		SimpleXmlWriter.escape(builder , "&<>'\" üäö");
 		Assert.assertEquals("&amp;&lt;&gt;&apos;&quot; üäö", builder.toString());
 	}
+	
+	@Test
+	public void testShouldHandleSeparateRoots(){
+		final SimpleXmlWriter writer = new SimpleXmlWriter();
+		writer.setRootTag("root");
+		writer.setRecordTag("record");
+		writer.setWriteXmlHeader(false);
+		
+		//separateRoots=false
+		final StringBuilder builder1 = new StringBuilder();
+		writer.setReceiver(new DefaultObjectReceiver<String>() {
+			@Override
+			public void process(final String obj) {
+				builder1.append(obj);
+			}
+		});
+
+		writer.setSeparateRoots(false);
+
+		
+		writeTwoRecords(writer);
+		
+		Assert.assertEquals("<root><record><tag>value</tag></record><record><tag>value</tag></record></root>", builder1.toString().replaceAll("[\\n\\s]", ""));
+	
+		//separateRoots=true
+		final StringBuilder builder2 = new StringBuilder();
+		writer.setReceiver(new DefaultObjectReceiver<String>() {
+			@Override
+			public void process(final String obj) {
+				builder2.append(obj);
+			}
+		});
+
+		writer.setSeparateRoots(true);
+		
+		writeTwoRecords(writer);
+		
+		Assert.assertEquals("<root><record><tag>value</tag></record></root><root><record><tag>value</tag></record></root>", builder2.toString().replaceAll("[\\n\\s]", ""));
+	
+	
+	}
+	
+
+
+	private static void writeTwoRecords(final StreamReceiver writer) {
+		writer.startRecord("X");
+		writer.literal(TAG, VALUE);
+		writer.endRecord();
+		writer.startRecord("Y");
+		writer.literal(TAG, VALUE);
+		writer.endRecord();
+		writer.closeStream();
+	}
+	
+	
 }