Remove special chars from xml output

Author: slawekjaranowski

src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java

@@ -231,7 +231,7 @@ private static String escapeXml(String text) {
     private static final Pattern lowersText = Pattern.compile("([\000-\010\013-\014\016-\037])");
 
     private static String escapeXmlAttribute(String text) {
-        text = escapeXml(text);
+        text = escapeXmlText(text);
 
         // Windows
         Matcher crlfmatcher = crlf.matcher(text);
@@ -255,7 +255,7 @@ private static String escapeXmlText(String text) {
         Matcher m = lowersText.matcher(text);
         StringBuffer b = new StringBuffer();
         while (m.find()) {
-            m = m.appendReplacement(b, "&#" + Integer.toString(m.group(1).charAt(0)) + ";");
+            m = m.appendReplacement(b, "");
         }
         m.appendTail(b);
 

src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java

@@ -943,10 +943,8 @@ protected void writeElementContent(String text, Writer out) throws IOException {
                         // out.write(';');
                         // pos = i + 1;
                     } else {
+                        // skip special char
                         if (i > pos) out.write(text.substring(pos, i));
-                        out.write("&#");
-                        out.write(Integer.toString(ch));
-                        out.write(';');
                         pos = i + 1;
                     }
                 }

src/test/java/org/codehaus/plexus/util/xml/Xpp3DomWriterTest.java

@@ -83,7 +83,7 @@ private String createExpectedXML(boolean escape) {
         buf.append("  </el6>");
         buf.append(LS);
         if (escape) {
-            buf.append("  <el8>special-char-&#7;</el8>");
+            buf.append("  <el8>special-char-</el8>");
         } else {
             buf.append("  <el8>special-char-" + (char) 7 + "</el8>");
         }
@@ -101,7 +101,7 @@ private Xpp3Dom createXpp3Dom() {
         dom.addChild(el1);
 
         Xpp3Dom el2 = new Xpp3Dom("el2");
-        el2.setAttribute("att2", "attribute2\nnextline");
+        el2.setAttribute("att2", "attribute2\nnextline" + (char) 7);
         dom.addChild(el2);
 
         Xpp3Dom el3 = new Xpp3Dom("el3");

src/test/java/org/codehaus/plexus/util/xml/pull/MXSerializerTest.java

@@ -0,0 +1,58 @@
+package org.codehaus.plexus.util.xml.pull;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MXSerializerTest {
+
+    @Test
+    void testSerialize() throws Exception {
+
+        StringWriter writer = new StringWriter();
+
+        MXSerializer sr = new MXSerializer();
+        sr.setOutput(writer);
+
+        sr.startDocument(null, Boolean.TRUE);
+        sr.startTag(null, "root");
+        for (int i : Arrays.asList(8, 9, 10, 11, 13, 15)) {
+            sr.startTag(null, "char");
+            sr.text(Character.getName(i) + ": " + ((char) i));
+            sr.endTag(null, "char");
+        }
+
+        sr.endTag(null, "root");
+        sr.endDocument();
+        assertEquals(expectedOutput(), writer.toString());
+    }
+
+    @Test
+    void testDeserialize() throws Exception {
+        MXParser parser = new MXParser();
+        parser.setInput(new StringReader(expectedOutput()));
+        int eventType = parser.getEventType();
+
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            eventType = parser.next();
+        }
+    }
+
+    private String expectedOutput() {
+        StringBuilder out = new StringBuilder();
+        out.append("<?xml version=\"1.0\" standalone=\"yes\"?>");
+        out.append("<root>");
+        out.append("<char>BACKSPACE: </char>");
+        out.append("<char>CHARACTER TABULATION: \t");
+        out.append("</char><char>LINE FEED (LF): \n");
+        out.append("</char><char>LINE TABULATION: </char>");
+        out.append("<char>CARRIAGE RETURN (CR): \r");
+        out.append("</char><char>SHIFT IN: </char>");
+        out.append("</root>");
+        return out.toString();
+    }
+}