XML attribute parser has been enhanced

Author: javadev

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

@@ -43,13 +43,7 @@
     "java:S1119",
     "java:S3740",
     "java:S3776",
-    "java:S4276",
-    "java:S5843",
-    "java:S5852",
-    "java:S5998",
-    "java:S6019",
-    "java:S6035",
-    "java:S6395"
+    "java:S4276"
 })
 public final class Xml {
     private Xml() {}
@@ -84,10 +78,6 @@ private Xml() {}
     private static final String DOCTYPE_TEXT = "!DOCTYPE";
     private static final String ROOT = "root";
     private static final String DOCTYPE_HEADER = "<" + DOCTYPE_TEXT + " ";
-    private static final java.util.regex.Pattern ATTRS =
-            java.util.regex.Pattern.compile(
-                    "((?:(?!\\s|=).)*)\\s*?=\\s*?[\"']?((?:(?<=\")(?:(?<=\\\\)\"|[^\"])*|(?<=')"
-                            + "(?:(?<=\\\\)'|[^'])*)|(?:(?!\"|')(?:(?!\\/>|>|\\s).)+))");
     private static final Map<String, String> XML_UNESCAPE = new HashMap<>();
     private static final org.w3c.dom.Document DOCUMENT = Document.createDocument();
 
@@ -1490,19 +1480,18 @@ private static Object addElement(
             final FromType fromType) {
         final Map<String, Object> attrMapLocal = new LinkedHashMap<>();
         if (currentNode.getAttributes().getLength() > 0) {
-            final java.util.regex.Matcher matcher =
-                    ATTRS.matcher(getAttributes(sourceIndex[0], source));
-            while (matcher.find()) {
-                if (matcher.group(1).startsWith("xmlns:")) {
-                    namespaces.add(matcher.group(1).substring(6));
+            final Map<String, String> attributes =
+                    parseAttributes(getAttributes(sourceIndex[0], source));
+            for (Map.Entry<String, String> attribute : attributes.entrySet()) {
+                if (attribute.getKey().startsWith("xmlns:")) {
+                    namespaces.add(attribute.getKey().substring(6));
                 }
             }
-            matcher.reset();
-            while (matcher.find()) {
+            for (Map.Entry<String, String> attribute : attributes.entrySet()) {
                 addNodeValue(
                         attrMapLocal,
-                        '-' + matcher.group(1),
-                        matcher.group(2),
+                        '-' + attribute.getKey(),
+                        attribute.getValue(),
                         elementMapper,
                         nodeMapper,
                         uniqueIds,
@@ -1531,6 +1520,36 @@ private static Object addElement(
                 fromType);
     }
 
+    static Map<String, String> parseAttributes(final String source) {
+        final Map<String, String> result = new LinkedHashMap<>();
+        final StringBuilder key = new StringBuilder();
+        final StringBuilder value = new StringBuilder();
+        boolean quoteFound = false;
+        boolean equalFound = false;
+        for (int index = 0; index < source.length(); index += 1) {
+            if (source.charAt(index) == '=') {
+                equalFound = !equalFound;
+                continue;
+            }
+            if (source.charAt(index) == '"') {
+                if (quoteFound && equalFound) {
+                    result.put(key.toString(), value.toString());
+                    key.setLength(0);
+                    value.setLength(0);
+                    equalFound = false;
+                }
+                quoteFound = !quoteFound;
+            } else if (quoteFound || source.charAt(index) == ' ') {
+                if (quoteFound) {
+                    value.append(source.charAt(index));
+                }
+            } else {
+                key.append(source.charAt(index));
+            }
+        }
+        return result;
+    }
+
     static String getAttributes(final int sourceIndex, final String source) {
         boolean scanQuote = false;
         for (int index = sourceIndex; index < source.length(); index += 1) {
@@ -1745,9 +1764,9 @@ private static Map<String, String> getHeaderAttributes(final String xml) {
                     xml.substring(
                             XML_HEADER.length(),
                             Math.max(XML_HEADER.length(), xml.indexOf("?>", XML_HEADER.length())));
-            final java.util.regex.Matcher matcher = ATTRS.matcher(xmlLocal);
-            while (matcher.find()) {
-                result.put(matcher.group(1), matcher.group(2));
+            final Map<String, String> attributes = parseAttributes(xmlLocal);
+            for (Map.Entry<String, String> attribute : attributes.entrySet()) {
+                result.put(attribute.getKey(), attribute.getValue());
             }
         }
         return result;

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

@@ -2343,6 +2343,26 @@ void toJsonFromXml22() {
         assertEquals("", Xml.getAttributes(0, ""));
     }
 
+    @Test
+    void parseAttributes() {
+        assertEquals(
+                "{version=1.0, encoding=UTF-8}",
+                Xml.parseAttributes("version=\"1.0\" encoding=\"UTF-8\"").toString());
+        assertEquals(
+                "{version=1.0, encoding=UTF-8}",
+                Xml.parseAttributes(" version = \"1.0\"  encoding= \"UTF-8\" ").toString());
+        assertEquals(
+                "{version= 1.0, encoding=UTF-8 }",
+                Xml.parseAttributes(" version = \" 1.0\"  encoding= \"UTF-8 \" ").toString());
+        assertEquals(
+                "{version=1.0}",
+                Xml.parseAttributes(" version = \"1.0\"  encoding= \"UTF-8 ").toString());
+        assertEquals(
+                "{}", Xml.parseAttributes(" version = \"1.0  encoding= \"UTF-8\" ").toString());
+        assertEquals(
+                "{}", Xml.parseAttributes(" version = 1.0\"  encoding= \"UTF-8\" ").toString());
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     void toJsonFromXml23() {