Make simple XML encoder value tag name configurable.

Fixes #379.

Author: blackwinter

metafacture-xml/src/main/java/org/metafacture/xml/SimpleXmlEncoder.java

@@ -55,6 +55,7 @@ public final class SimpleXmlEncoder extends DefaultStreamPipe<ObjectReceiver<Str
 
     public static final String DEFAULT_ROOT_TAG = "records";
     public static final String DEFAULT_RECORD_TAG = "record";
+    public static final String DEFAULT_VALUE_TAG = null;
 
     private static final String NEW_LINE = "\n";
     private static final String INDENT = "\t";
@@ -75,6 +76,7 @@ public final class SimpleXmlEncoder extends DefaultStreamPipe<ObjectReceiver<Str
     private String attributeMarker = ATTRIBUTE_MARKER;
     private String rootTag = DEFAULT_ROOT_TAG;
     private String recordTag = DEFAULT_RECORD_TAG;
+    private String valueTag = DEFAULT_VALUE_TAG;
     private Map<String, String> namespaces = new HashMap<String, String>();
     private boolean writeRootTag = true;
     private boolean writeXmlHeader = true;
@@ -97,6 +99,14 @@ public void setRecordTag(final String tag) {
         recordTag = tag;
     }
 
+    public void setValueTag(final String valueTag) {
+        this.valueTag = valueTag;
+    }
+
+    public String getValueTag() {
+        return valueTag;
+    }
+
     public void setNamespaceFile(final String file) {
         final Properties properties;
         try {
@@ -201,7 +211,7 @@ public void endEntity() {
 
     @Override
     public void literal(final String name, final String value) {
-        if (name.isEmpty()) {
+        if (name.isEmpty() || name.equals(valueTag)) {
             element.setText(value);
         }
         else if (name.startsWith(attributeMarker)) {

metafacture-xml/src/test/java/org/metafacture/xml/SimpleXmlEncoderTest.java

@@ -179,6 +179,59 @@ public void shouldAddNamespaceWithEmptyKeyFromPropertiesFileAsDefaultNamespaceTo
                 getResultXml());
     }
 
+    @Test
+    public void testShouldEncodeEmptyLiteralsAsText() {
+        simpleXmlEncoder.startRecord("");
+        simpleXmlEncoder.literal("", VALUE);
+        simpleXmlEncoder.endRecord();
+        simpleXmlEncoder.closeStream();
+
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<records>" +
+                "<record>" +
+                "value" +
+                "</record>" +
+                "</records>",
+                getResultXml());
+    }
+
+    @Test
+    public void testShouldNotEncodeLiteralsWithDifferentValueTagNameAsText() {
+        simpleXmlEncoder.setValueTag("data");
+
+        simpleXmlEncoder.startRecord("");
+        simpleXmlEncoder.literal(TAG, VALUE);
+        simpleXmlEncoder.endRecord();
+        simpleXmlEncoder.closeStream();
+
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<records>" +
+                "<record>" +
+                "<tag>value</tag>" +
+                "</record>" +
+                "</records>",
+                getResultXml());
+    }
+
+    @Test
+    public void issue379_testShouldEncodeConfiguredValueLiteralsAsText() {
+        final String name = "data";
+        simpleXmlEncoder.setValueTag(name);
+
+        simpleXmlEncoder.startRecord("");
+        simpleXmlEncoder.literal(name, VALUE);
+        simpleXmlEncoder.endRecord();
+        simpleXmlEncoder.closeStream();
+
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<records>" +
+                "<record>" +
+                "value" +
+                "</record>" +
+                "</records>",
+                getResultXml());
+    }
+
     @Test
     public void testShouldEncodeMarkedLiteralsAsAttributes() {
         simpleXmlEncoder.startRecord("");