Merge pull request #84 from jenetics/issues/JPX-82-parsing_error

#82: Fix GPX 'extensions' parsing error.

Author: jenetics

README.md

@@ -285,6 +285,12 @@ The library is licensed under the [Apache License, Version 2.0](http://www.apach
 
 ## Release notes
 
+### [1.5.1](https://github.com/jenetics/jpx/releases/tag/v1.5.1)
+
+#### Bugs
+
+* [#82](https://github.com/jenetics/jpx/issues/82): Fix parsing of GPX `extensions`.
+
 ### [1.5.0](https://github.com/jenetics/jpx/releases/tag/v1.5.0)
 
 #### Enhancement

RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 ## Release notes
 
+### [1.5.1](https://github.com/jenetics/jpx/releases/tag/v1.5.1)
+
+#### Bugs
+
+* [#82](https://github.com/jenetics/jpx/issues/82): Fix parsing of GPX `extensions`.
+
 ### [1.5.0](https://github.com/jenetics/jpx/releases/tag/v1.5.0)
 
 #### Enhancement

jpx/src/main/java/io/jenetics/jpx/XMLReader.java

@@ -118,7 +118,7 @@ static enum Type {
 	 * @throws NullPointerException if the given {@code xml} stream reader is
 	 *         {@code null}
 	 */
-	public abstract T read(final XMLStreamReader xml, final boolean lenient)
+	public abstract T read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException;
 
 	/**
@@ -135,7 +135,7 @@ public <B> XMLReader<B> map(final Function<? super T, ? extends B> mapper) {
 
 		return new XMLReader<B>(_name, _type) {
 			@Override
-			public B read(final XMLStreamReader xml, final boolean lenient)
+			public B read(final XMLStreamReaderAdapter xml, final boolean lenient)
 				throws XMLStreamException
 			{
 				try {
@@ -384,7 +384,7 @@ final class AttrReader extends XMLReader<String> {
 	}
 
 	@Override
-	public String read(final XMLStreamReader xml, final boolean lenient)
+	public String read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		xml.require(START_ELEMENT, null, null);
@@ -407,7 +407,7 @@ final class TextReader extends XMLReader<String> {
 	}
 
 	@Override
-	public String read(final XMLStreamReader xml, final boolean lenient)
+	public String read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		final StringBuilder out = new StringBuilder();
@@ -417,7 +417,6 @@ public String read(final XMLStreamReader xml, final boolean lenient)
 			out.append(xml.getText());
 		} while (xml.hasNext() && (type = xml.next()) == CHARACTERS || type == CDATA);
 
-
 		return out.toString();
 	}
 }
@@ -441,7 +440,7 @@ final class ListReader<T> extends XMLReader<List<T>> {
 	}
 
 	@Override
-	public List<T> read(final XMLStreamReader xml, final boolean lenient)
+	public List<T> read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		xml.require(START_ELEMENT, null, name());
@@ -475,7 +474,7 @@ final class IgnoreReader extends XMLReader<Object> {
 	}
 
 	@Override
-	public Object read(final XMLStreamReader xml, final boolean lenient)
+	public Object read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		return _reader.read(xml, true);
@@ -496,7 +495,7 @@ final class DocReader extends XMLReader<Document> {
 	}
 
 	@Override
-	public Document read(final XMLStreamReader xml, final boolean lenient)
+	public Document read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		Document doc = null;
@@ -527,7 +526,8 @@ public String getVersion() {
 				throw e;
 			}
 		}
-
+		// Mark the next XML element as consumed, by the StaX transformer: #82
+		xml.consumed();
 		return doc;
 	}
 
@@ -582,7 +582,7 @@ final class ElemReader<T> extends XMLReader<T> {
 	}
 
 	@Override
-	public T read(final XMLStreamReader xml, final boolean lenient)
+	public T read(final XMLStreamReaderAdapter xml, final boolean lenient)
 		throws XMLStreamException
 	{
 		while (xml.getEventType() == COMMENT) {
@@ -607,18 +607,16 @@ public T read(final XMLStreamReader xml, final boolean lenient)
 			}
 		}
 
-		if (xml.hasNext()) {
-			xml.next();
-
+		if (xml.safeNext()) {
 			boolean hasNext = false;
 			do {
 				switch (xml.getEventType()) {
 					case COMMENT:
 						consumeComment(xml);
 						break;
 					case START_ELEMENT:
-						Integer index = _readerIndexMapping
-							.get(xml.getLocalName());
+						final String localName = xml.getLocalName();
+						Integer index = _readerIndexMapping.get(localName);
 
 						if (index == null && !lenient) {
 							throw new XMLStreamException(format(
@@ -633,12 +631,7 @@ public T read(final XMLStreamReader xml, final boolean lenient)
 
 						if (result != null) {
 							throwUnexpectedElement(xml, lenient, result);
-							if (xml.hasNext()) {
-								hasNext = true;
-								xml.next();
-							} else {
-								hasNext = false;
-							}
+							hasNext = xml.safeNext();
 						}
 
 						break;
@@ -687,7 +680,7 @@ private void consumeComment(final XMLStreamReader xml) throws XMLStreamException
 	}
 
 	private void throwUnexpectedElement(
-		final XMLStreamReader xml,
+		final XMLStreamReaderAdapter xml,
 		final boolean lenient,
 		final ReaderResult text
 	)

jpx/src/main/java/io/jenetics/jpx/XMLStreamReaderAdapter.java

@@ -35,12 +35,30 @@
 class XMLStreamReaderAdapter implements XMLStreamReader, AutoCloseable {
 	private final XMLStreamReader _reader;
 
+	private boolean _consumed;
+
 	XMLStreamReaderAdapter(final XMLStreamReader reader) {
 		_reader = requireNonNull(reader);
 	}
 
+	void consumed() {
+		_consumed = true;
+	}
+
+	boolean safeNext() throws XMLStreamException {
+		final boolean result = hasNext();
+		try {
+			if (result && !_consumed) {
+				next();
+			}
+		} finally {
+			_consumed = false;
+		}
+		return result;
+	}
+
 	@Override
-	public Object getProperty(final String name) throws IllegalArgumentException {
+	public Object getProperty(final String name) {
 		return _reader.getProperty(name);
 	}