Now parsing all XML attributes (not only the first one)

nurkiewicz · Jun 8, 2011 · 9b51833 · 9b51833 · cowtowncoder · Jun 8, 2011
1 parent e7d0207
commit 9b51833
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/xml/util/XmlTokenStream.java b/src/main/java/com/fasterxml/jackson/xml/util/XmlTokenStream.java
@@ -161,9 +161,9 @@ private final int _next() throws XMLStreamException
             // fall through
         case XML_START_ELEMENT: // attributes to return?
             if (_nextAttributeIndex < _attributeCount) {
-                _localName = _xmlReader.getAttributeLocalName(0);
-                _namespaceURI = _xmlReader.getAttributeNamespace(0);
-                _textValue = _xmlReader.getAttributeValue(0);
+                _localName = _xmlReader.getAttributeLocalName(_nextAttributeIndex);
+                _namespaceURI = _xmlReader.getAttributeNamespace(_nextAttributeIndex);
+                _textValue = _xmlReader.getAttributeValue(_nextAttributeIndex);
                 return (_currentState = XML_ATTRIBUTE_NAME);
             }
             // otherwise need to find START/END_ELEMENT or text

diff --git a/src/test/java/com/fasterxml/jackson/xml/TestXmlParser.java b/src/test/java/com/fasterxml/jackson/xml/TestXmlParser.java
@@ -210,13 +210,36 @@ public void testForceElementAsArray() throws Exception
         assertTrue(xp.getParsingContext().inRoot());
         xp.close();
     }
-    
+
     /*
     /**********************************************************
     /* Helper methods
     /**********************************************************
      */
 
+
+    public void testXmlAttributes() throws Exception
+    {
+        final String XML = "<data max=\"7\" offset=\"9\"/>";
+
+        FromXmlParser xp = (FromXmlParser) _xmlFactory.createJsonParser(new StringReader(XML));
+
+        // First: verify handling without forcing array handling:
+        assertToken(JsonToken.START_OBJECT, xp.nextToken()); // <data>
+        assertToken(JsonToken.FIELD_NAME, xp.nextToken()); // <max>
+        assertEquals("max", xp.getCurrentName());
+        assertToken(JsonToken.VALUE_STRING, xp.nextToken());
+        assertEquals("7", xp.getText());
+
+        assertToken(JsonToken.FIELD_NAME, xp.nextToken()); // <offset>
+        assertEquals("offset", xp.getCurrentName());
+        assertToken(JsonToken.VALUE_STRING, xp.nextToken());
+        assertEquals("9", xp.getText());
+
+        assertToken(JsonToken.END_OBJECT, xp.nextToken()); // </data>
+        xp.close();
+    }
+
     private String _readXmlWriteJson(String xml) throws IOException
     {
         StringWriter w = new StringWriter();