Move unescapeName to U.fromXml(string).

Author: javadev

src/main/java/com/github/underscore/lodash/Json.java

@@ -333,7 +333,7 @@ public static void writeJson(Map map, JsonStringBuilder builder) {
             while (iter.hasNext()) {
                 Map.Entry entry = (Map.Entry) iter.next();
                 builder.fillSpaces().append(builder.type.getWrapLine());
-                builder.append(JsonValue.unescapeName(String.valueOf(entry.getKey())));
+                builder.append(JsonValue.escape(String.valueOf(entry.getKey())));
                 builder.append(builder.type.getWrapLine());
                 builder.append(':');
                 if (builder.getIdentStep() != JsonStringBuilder.Step.COMPACT) {
@@ -398,56 +398,6 @@ public static void writeJson(Object value, JsonStringBuilder builder) {
             }
         }
 
-        public static String unescapeName(final String name) {
-            final int length = name.length();
-            if (length == 0 || "__EE__EMPTY__EE__".equals(name)) {
-                return "";
-            }
-            if ("-__EE__EMPTY__EE__".equals(name)) {
-                return "-";
-            }
-            if (!name.contains("__")) {
-                return name;
-            }
-            StringBuilder result = new StringBuilder();
-            int underlineCount = 0;
-            StringBuilder lastChars = new StringBuilder();
-            outer:
-            for (int i = 0; i < length; ++i) {
-                char ch = name.charAt(i);
-                if (ch == '_') {
-                    lastChars.append(ch);
-                } else {
-                    if (lastChars.length() == 2) {
-                        StringBuilder nameToDecode = new StringBuilder();
-                        for (int j = i; j < length; ++j) {
-                            if (name.charAt(j) == '_') {
-                                underlineCount += 1;
-                                if (underlineCount == 2) {
-                                    try {
-                                        result.append(JsonValue.escape(Base32.decode(nameToDecode.toString())));
-                                    } catch (Base32.DecodingException ex) {
-                                        result.append("__").append(JsonValue.escape(nameToDecode.toString()))
-                                            .append(lastChars);
-                                    }
-                                    i = j;
-                                    underlineCount = 0;
-                                    lastChars.setLength(0);
-                                    continue outer;
-                                }
-                            } else {
-                                nameToDecode.append(name.charAt(j));
-                                underlineCount = 0;
-                            }
-                        }
-                    }
-                    result.append(lastChars).append(ch);
-                    lastChars.setLength(0);
-                }
-            }
-            return result.append(lastChars).toString();
-        }
-
         public static String escape(String s) {
             if (s == null) {
                 return null;

src/main/java/com/github/underscore/lodash/Xml.java

@@ -1140,6 +1140,59 @@ static String getAttributes(final int sourceIndex, final String source) {
         return "";
     }
 
+    private static String unescapeName(final String name) {
+        if (name == null) {
+            return name;
+        }
+        final int length = name.length();
+        if ("__EE__EMPTY__EE__".equals(name)) {
+            return "";
+        }
+        if ("-__EE__EMPTY__EE__".equals(name)) {
+            return "-";
+        }
+        if (!name.contains("__")) {
+            return name;
+        }
+        StringBuilder result = new StringBuilder();
+        int underlineCount = 0;
+        StringBuilder lastChars = new StringBuilder();
+        outer:
+        for (int i = 0; i < length; ++i) {
+            char ch = name.charAt(i);
+            if (ch == '_') {
+                lastChars.append(ch);
+            } else {
+                if (lastChars.length() == 2) {
+                    StringBuilder nameToDecode = new StringBuilder();
+                    for (int j = i; j < length; ++j) {
+                        if (name.charAt(j) == '_') {
+                            underlineCount += 1;
+                            if (underlineCount == 2) {
+                                try {
+                                    result.append(Base32.decode(nameToDecode.toString()));
+                                } catch (Base32.DecodingException ex) {
+                                    result.append("__").append(nameToDecode.toString())
+                                        .append(lastChars);
+                                }
+                                i = j;
+                                underlineCount = 0;
+                                lastChars.setLength(0);
+                                continue outer;
+                            }
+                        } else {
+                            nameToDecode.append(name.charAt(j));
+                            underlineCount = 0;
+                        }
+                    }
+                }
+                result.append(lastChars).append(ch);
+                lastChars.setLength(0);
+            }
+        }
+        return result.append(lastChars).toString();
+    }
+
     @SuppressWarnings("unchecked")
     private static void addNodeValue(final Map<String, Object> map, final String name, final Object value,
             final BiFunction<Object, Set<String>, String> elementMapper, final Function<Object, Object> nodeMapper,
@@ -1166,7 +1219,7 @@ private static void addNodeValue(final Map<String, Object> map, final String nam
                 }
             }
         } else {
-            final String elementName = elementMapper.apply(name, namespaces);
+            final String elementName = unescapeName(elementMapper.apply(name, namespaces));
             if (elementName != null) {
                 map.put(elementName, nodeMapper.apply(getValue(value)));
             }

src/test/java/com/github/underscore/lodash/StringTest.java

@@ -1435,6 +1435,14 @@ public void toJsonFromXml4() {
                 + "  \"#omit-xml-declaration\": \"yes\"\n"
                 + "}",
                 U.toJson((Map<String, Object>) U.fromXml(xml)));
+        final String xml2 = "<__FUa>"
+                + "</__FUa>";
+        assertEquals("{\n"
+                + "  \"__FUa\": {\n"
+                + "  },\n"
+                + "  \"#omit-xml-declaration\": \"yes\"\n"
+                + "}",
+                U.toJson((Map<String, Object>) U.fromXml(xml2)));
     }
 
     @SuppressWarnings("unchecked")