Reuse XmlUtil method for escaping

- add parameter to allow only entity escaping
- add some "final" to method parameter list

See #300.

Author: dr0i

metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java

@@ -17,6 +17,7 @@
 
 import java.util.Collections;
 
+import org.metafacture.commons.XmlUtil;
 import org.metafacture.framework.FluxCommand;
 import org.metafacture.framework.MetafactureException;
 import org.metafacture.framework.ObjectReceiver;
@@ -235,39 +236,7 @@ private void writeRaw(final String str) {
 
     /** Writes a escaped sequence */
     private void writeEscaped(final String str) {
-        final int len = str.length();
-        for (int i = 0; i < len; ++i) {
-            final char c = str.charAt(i);
-            final String entityName;
-            switch (c) {
-            case '&':
-                entityName = "amp";
-                break;
-            case '<':
-                entityName = "lt";
-                break;
-            case '>':
-                entityName = "gt";
-                break;
-            case '\'':
-                entityName = "apos";
-                break;
-            case '"':
-                entityName = "quot";
-                break;
-            default:
-                entityName = null;
-                break;
-            }
-
-            if (entityName == null) {
-                builder.append(c);
-            } else {
-                builder.append('&');
-                builder.append(entityName);
-                builder.append(';');
-            }
-        }
+        builder.append(XmlUtil.escape(str, false));
     }
 
     private void prettyPrintIndentation() {

metafacture-commons/src/main/java/org/metafacture/commons/XmlUtil.java

@@ -95,24 +95,28 @@ public static boolean isXmlMimeType(final String mimeType) {
                 mimeType.endsWith(XML_BASE_MIME_TYPE);
     }
 
-    public static String escape(String unescaped) {
+    public static String escape(final String unescaped) {
+        return escape(unescaped, true);
+    }
+
+    public static String escape(final String unescaped, final boolean escapeUnicode) {
         return unescaped.codePoints()
-                .mapToObj(XmlUtil::escapeCodePoint)
+                .mapToObj(value -> escapeCodePoint(value, escapeUnicode))
                 .collect(joining());
     }
-
-    private static String escapeCodePoint(int codePoint) {
+    
+    private static String escapeCodePoint(final int codePoint, final boolean escapeUnicode) {
         final String entity = entityFor(codePoint);
         if (entity != null) {
             return entity;
         }
-        if (codePoint > 0x7f) {
+        if (escapeUnicode && codePoint > 0x7f) {
             return "&#" + Integer.toString(codePoint) + ";";
         }
         return Character.toString((char) codePoint);
     }
 
-    private static String entityFor(int ch) {
+    private static String entityFor(final int ch) {
         switch (ch) {
             case '<': return "&lt;";
             case '>': return "&gt;";

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

@@ -26,6 +26,7 @@
 import java.util.Properties;
 
 import org.metafacture.commons.ResourceUtil;
+import org.metafacture.commons.XmlUtil;
 import org.metafacture.framework.FluxCommand;
 import org.metafacture.framework.MetafactureException;
 import org.metafacture.framework.ObjectReceiver;
@@ -244,40 +245,7 @@ private void writeFooter() {
     }
 
     protected static void writeEscaped(final StringBuilder builder, final String str) {
-
-        final int len = str.length();
-        for (int i = 0; i < len; ++i) {
-            final char c = str.charAt(i);
-            final String entityName;
-            switch (c) {
-            case '&':
-                entityName = "amp";
-                break;
-            case '<':
-                entityName = "lt";
-                break;
-            case '>':
-                entityName = "gt";
-                break;
-            case '\'':
-                entityName = "apos";
-                break;
-            case '"':
-                entityName = "quot";
-                break;
-            default:
-                entityName = null;
-                break;
-            }
-
-            if (entityName == null) {
-                builder.append(c);
-            } else {
-                builder.append('&');
-                builder.append(entityName);
-                builder.append(';');
-            }
-        }
+        builder.append(XmlUtil.escape(str, false));
     }
 
     /**