Polishing

Issue: SPR-11254

spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.util.xml;
 
 import java.util.Iterator;
-
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
@@ -31,40 +30,54 @@ import javax.xml.stream.events.StartDocument;
 import javax.xml.stream.events.XMLEvent;
 
 /**
- * Implementation of the {@link javax.xml.stream.XMLStreamReader} interface that wraps a {@link XMLEventReader}. Useful,
+ * Implementation of the {@link javax.xml.stream.XMLStreamReader} interface that wraps a
- * because the StAX {@link javax.xml.stream.XMLInputFactory} allows one to create a event reader from a stream reader,
+ * {@link XMLEventReader}. Useful because the StAX {@link javax.xml.stream.XMLInputFactory}
- * but not vice-versa.
+ * allows one to create a event reader from a stream reader, but not vice-versa.
  *
  * @author Arjen Poutsma
  * @since 3.0
  * @see StaxUtils#createEventStreamReader(javax.xml.stream.XMLEventReader)
  */
-@SuppressWarnings("rawtypes")
 class XMLEventStreamReader extends AbstractXMLStreamReader {
 
 	private XMLEvent event;
 
 	private final XMLEventReader eventReader;
 
-	XMLEventStreamReader(XMLEventReader eventReader) throws XMLStreamException {
+
+	public XMLEventStreamReader(XMLEventReader eventReader) throws XMLStreamException {
 		this.eventReader = eventReader;
-		event = eventReader.nextEvent();
+		this.event = eventReader.nextEvent();
 	}
 
+
 	@Override
-	public boolean isStandalone() {
+	public QName getName() {
-		if (event.isStartDocument()) {
+		if (this.event.isStartElement()) {
-			return ((StartDocument) event).isStandalone();
+			return this.event.asStartElement().getName();
+		}
+		else if (this.event.isEndElement()) {
+			return this.event.asEndElement().getName();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
+	@Override
+	public Location getLocation() {
+		return this.event.getLocation();
+	}
+
+	@Override
+	public int getEventType() {
+		return this.event.getEventType();
+	}
+
 	@Override
 	public String getVersion() {
-		if (event.isStartDocument()) {
+		if (this.event.isStartDocument()) {
-			return ((StartDocument) event).getVersion();
+			return ((StartDocument) this.event).getVersion();
 		}
 		else {
 			return null;
@@ -72,17 +85,14 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 	}
 
 	@Override
-	public int getTextStart() {
+	public Object getProperty(String name) throws IllegalArgumentException {
-		return 0;
+		return this.eventReader.getProperty(name);
 	}
 
 	@Override
-	public String getText() {
+	public boolean isStandalone() {
-		if (event.isCharacters()) {
+		if (this.event.isStartDocument()) {
-			return event.asCharacters().getData();
+			return ((StartDocument) event).isStandalone();
-		}
-		else if (event.getEventType() == XMLEvent.COMMENT) {
-			return ((Comment) event).getText();
 		}
 		else {
 			throw new IllegalStateException();
@@ -90,9 +100,9 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 	}
 
 	@Override
-	public String getPITarget() {
+	public boolean standaloneSet() {
-		if (event.isProcessingInstruction()) {
+		if (this.event.isStartDocument()) {
-			return ((ProcessingInstruction) event).getTarget();
+			return ((StartDocument) this.event).standaloneSet();
 		}
 		else {
 			throw new IllegalStateException();
@@ -100,34 +110,19 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 	}
 
 	@Override
-	public String getPIData() {
+	public String getEncoding() {
-		if (event.isProcessingInstruction()) {
+		return null;
-			return ((ProcessingInstruction) event).getData();
-		}
-		else {
-			throw new IllegalStateException();
-		}
 	}
 
 	@Override
-	public int getNamespaceCount() {
+	public String getCharacterEncodingScheme() {
-		Iterator namespaces;
+		return null;
-		if (event.isStartElement()) {
-			namespaces = event.asStartElement().getNamespaces();
-		}
-		else if (event.isEndElement()) {
-			namespaces = event.asEndElement().getNamespaces();
-		}
-		else {
-			throw new IllegalStateException();
-		}
-		return countIterator(namespaces);
 	}
 
 	@Override
-	public NamespaceContext getNamespaceContext() {
+	public String getPITarget() {
-		if (event.isStartElement()) {
+		if (this.event.isProcessingInstruction()) {
-			return event.asStartElement().getNamespaceContext();
+			return ((ProcessingInstruction) this.event).getTarget();
 		}
 		else {
 			throw new IllegalStateException();
@@ -135,12 +130,9 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 	}
 
 	@Override
-	public QName getName() {
+	public String getPIData() {
-		if (event.isStartElement()) {
+		if (this.event.isProcessingInstruction()) {
-			return event.asStartElement().getName();
+			return ((ProcessingInstruction) this.event).getData();
-		}
-		else if (event.isEndElement()) {
-			return event.asEndElement().getName();
 		}
 		else {
 			throw new IllegalStateException();
@@ -148,37 +140,36 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 	}
 
 	@Override
-	public Location getLocation() {
+	public int getTextStart() {
-		return event.getLocation();
+		return 0;
-	}
-
-	@Override
-	public int getEventType() {
-		return event.getEventType();
-	}
-
-	@Override
-	public String getEncoding() {
-		return null;
 	}
 
 	@Override
-	public String getCharacterEncodingScheme() {
+	public String getText() {
-		return null;
+		if (this.event.isCharacters()) {
+			return event.asCharacters().getData();
+		}
+		else if (this.event.getEventType() == XMLEvent.COMMENT) {
+			return ((Comment) this.event).getText();
+		}
+		else {
+			throw new IllegalStateException();
+		}
 	}
 
 	@Override
+	@SuppressWarnings("rawtypes")
 	public int getAttributeCount() {
-		if (!event.isStartElement()) {
+		if (!this.event.isStartElement()) {
 			throw new IllegalStateException();
 		}
-		Iterator attributes = event.asStartElement().getAttributes();
+		Iterator attributes = this.event.asStartElement().getAttributes();
 		return countIterator(attributes);
 	}
 
 	@Override
-	public void close() throws XMLStreamException {
+	public boolean isAttributeSpecified(int index) {
-		eventReader.close();
+		return getAttribute(index).isSpecified();
 	}
 
 	@Override
@@ -196,57 +187,13 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		return getAttribute(index).getValue();
 	}
 
-	@Override
+	@SuppressWarnings("rawtypes")
-	public String getNamespacePrefix(int index) {
-		return getNamespace(index).getPrefix();
-	}
-
-	@Override
-	public String getNamespaceURI(int index) {
-		return getNamespace(index).getNamespaceURI();
-	}
-
-	@Override
-	public Object getProperty(String name) throws IllegalArgumentException {
-		return eventReader.getProperty(name);
-	}
-
-	@Override
-	public boolean isAttributeSpecified(int index) {
-		return getAttribute(index).isSpecified();
-	}
-
-	@Override
-	public int next() throws XMLStreamException {
-		event = eventReader.nextEvent();
-		return event.getEventType();
-	}
-
-	@Override
-	public boolean standaloneSet() {
-		if (event.isStartDocument()) {
-			return ((StartDocument) event).standaloneSet();
-		}
-		else {
-			throw new IllegalStateException();
-		}
-	}
-
-	private int countIterator(Iterator iterator) {
-		int count = 0;
-		while (iterator.hasNext()) {
-			iterator.next();
-			count++;
-		}
-		return count;
-	}
-
 	private Attribute getAttribute(int index) {
-		if (!event.isStartElement()) {
+		if (!this.event.isStartElement()) {
 			throw new IllegalStateException();
 		}
 		int count = 0;
-		Iterator attributes = event.asStartElement().getAttributes();
+		Iterator attributes = this.event.asStartElement().getAttributes();
 		while (attributes.hasNext()) {
 			Attribute attribute = (Attribute) attributes.next();
 			if (count == index) {
@@ -259,13 +206,50 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		throw new IllegalArgumentException();
 	}
 
+	@Override
+	public NamespaceContext getNamespaceContext() {
+		if (this.event.isStartElement()) {
+			return this.event.asStartElement().getNamespaceContext();
+		}
+		else {
+			throw new IllegalStateException();
+		}
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public int getNamespaceCount() {
+		Iterator namespaces;
+		if (this.event.isStartElement()) {
+			namespaces = this.event.asStartElement().getNamespaces();
+		}
+		else if (this.event.isEndElement()) {
+			namespaces = this.event.asEndElement().getNamespaces();
+		}
+		else {
+			throw new IllegalStateException();
+		}
+		return countIterator(namespaces);
+	}
+
+	@Override
+	public String getNamespacePrefix(int index) {
+		return getNamespace(index).getPrefix();
+	}
+
+	@Override
+	public String getNamespaceURI(int index) {
+		return getNamespace(index).getNamespaceURI();
+	}
+
+	@SuppressWarnings("rawtypes")
 	private Namespace getNamespace(int index) {
 		Iterator namespaces;
-		if (event.isStartElement()) {
+		if (this.event.isStartElement()) {
-			namespaces = event.asStartElement().getNamespaces();
+			namespaces = this.event.asStartElement().getNamespaces();
 		}
-		else if (event.isEndElement()) {
+		else if (this.event.isEndElement()) {
-			namespaces = event.asEndElement().getNamespaces();
+			namespaces = this.event.asEndElement().getNamespaces();
 		}
 		else {
 			throw new IllegalStateException();
@@ -282,4 +266,27 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 		throw new IllegalArgumentException();
 	}
+
+	@Override
+	public int next() throws XMLStreamException {
+		this.event = this.eventReader.nextEvent();
+		return this.event.getEventType();
+	}
+
+	@Override
+	public void close() throws XMLStreamException {
+		this.eventReader.close();
+	}
+
+
+	@SuppressWarnings("rawtypes")
+	private static int countIterator(Iterator iterator) {
+		int count = 0;
+		while (iterator.hasNext()) {
+			iterator.next();
+			count++;
+		}
+		return count;
+	}
+
 }