Removed accidental backport of StAX code in 3.2.5 (restoring Java 5 compatibility)

Issue: SPR-11341

Author: jhoeller

spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java

@@ -17,21 +17,18 @@
 package org.springframework.http.converter.xml;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Set;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
@@ -43,7 +40,6 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -52,7 +48,6 @@
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.springframework.util.StreamUtils;
-import org.springframework.util.xml.StaxUtils;
 
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter}
@@ -63,102 +58,100 @@
  */
 public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMessageConverter<T> {
 
-    private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+	private static final Set<Class<?>> SUPPORTED_CLASSES = new HashSet<Class<?>>(4);
 
-    private boolean processExternalEntities = false;
+	static {
+		SUPPORTED_CLASSES.add(DOMSource.class);
+		SUPPORTED_CLASSES.add(SAXSource.class);
+		SUPPORTED_CLASSES.add(StreamSource.class);
+		SUPPORTED_CLASSES.add(Source.class);
+	}
+
+
+	private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+
+	private boolean processExternalEntities = false;
 
-    /**
-     * Sets the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes}
-     * to {@code text/xml} and {@code application/xml}, and {@code application/*-xml}.
-     */
-    public SourceHttpMessageConverter() {
-        super(MediaType.APPLICATION_XML, MediaType.TEXT_XML, new MediaType("application", "*+xml"));
-    }
 
+	/**
+	 * Sets the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes}
+	 * to {@code text/xml} and {@code application/xml}, and {@code application/*-xml}.
+	 */
+	public SourceHttpMessageConverter() {
+		super(MediaType.APPLICATION_XML, MediaType.TEXT_XML, new MediaType("application", "*+xml"));
+	}
+
+
+	/**
+	 * Indicates whether external XML entities are processed when converting to a Source.
+	 * <p>Default is {@code false}, meaning that external entities are not resolved.
+	 */
+	public void setProcessExternalEntities(boolean processExternalEntities) {
+		this.processExternalEntities = processExternalEntities;
+	}
 
-    /**
-     * Indicates whether external XML entities are processed when converting
-     * to a Source.
-     * <p>Default is {@code false}, meaning that external entities are not resolved.
-     */
-    public void setProcessExternalEntities(boolean processExternalEntities) {
-        this.processExternalEntities = processExternalEntities;
-    }
 
-    @Override
+	@Override
 	public boolean supports(Class<?> clazz) {
-		return DOMSource.class.equals(clazz) || SAXSource.class.equals(clazz)
-				|| StreamSource.class.equals(clazz) || Source.class.equals(clazz);
+		return SUPPORTED_CLASSES.contains(clazz);
 	}
 
-    @Override
-    protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage)
-            throws IOException, HttpMessageNotReadableException {
-
-        InputStream body = inputMessage.getBody();
-        if (DOMSource.class.equals(clazz)) {
-            return (T) readDOMSource(body);
-        }
-        else if (StaxUtils.isStaxSourceClass(clazz)) {
-            return (T) readStAXSource(body);
-        }
-        else if (SAXSource.class.equals(clazz)) {
-            return (T) readSAXSource(body);
-        }
-        else if (StreamSource.class.equals(clazz) || Source.class.equals(clazz)) {
-            return (T) readStreamSource(body);
-        }
-        else {
-            throw new HttpMessageConversionException("Could not read class [" + clazz +
-                    "]. Only DOMSource, SAXSource, and StreamSource are supported.");
-        }
-    }
-
-    private DOMSource readDOMSource(InputStream body) throws IOException {
-        try {
-            DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-            documentBuilderFactory.setNamespaceAware(true);
-            documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", processExternalEntities);
-            DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-            Document document = documentBuilder.parse(body);
-            return new DOMSource(document);
-        }
-        catch (ParserConfigurationException ex) {
-            throw new HttpMessageNotReadableException("Could not set feature: " + ex.getMessage(), ex);
-        }
-        catch (SAXException ex) {
-            throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
-        }
-    }
-
-    private SAXSource readSAXSource(InputStream body) throws IOException {
-        try {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            reader.setFeature("http://xml.org/sax/features/external-general-entities", processExternalEntities);
-            byte[] bytes = StreamUtils.copyToByteArray(body);
-            return new SAXSource(reader, new InputSource(new ByteArrayInputStream(bytes)));
-        }
-        catch (SAXException ex) {
-            throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
-        }
-    }
-
-    private Source readStAXSource(InputStream body) {
-        try {
-            XMLInputFactory inputFactory = XMLInputFactory.newFactory();
-            inputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", processExternalEntities);
-            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(body);
-            return StaxUtils.createStaxSource(streamReader);
-        }
-        catch (XMLStreamException ex) {
-            throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
-        }
-    }
-
-    private StreamSource readStreamSource(InputStream body) throws IOException {
-        byte[] bytes = StreamUtils.copyToByteArray(body);
-        return new StreamSource(new ByteArrayInputStream(bytes));
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage)
+			throws IOException, HttpMessageNotReadableException {
+
+		InputStream body = inputMessage.getBody();
+		if (DOMSource.class.equals(clazz)) {
+			return (T) readDOMSource(body);
+		}
+		else if (SAXSource.class.equals(clazz)) {
+			return (T) readSAXSource(body);
+		}
+		else if (StreamSource.class.equals(clazz) || Source.class.equals(clazz)) {
+			return (T) readStreamSource(body);
+		}
+		else {
+			throw new HttpMessageConversionException("Could not read class [" + clazz +
+					"]. Only DOMSource, SAXSource, and StreamSource are supported.");
+		}
+	}
+
+	private DOMSource readDOMSource(InputStream body) throws IOException {
+		try {
+			DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+			documentBuilderFactory.setNamespaceAware(true);
+			documentBuilderFactory.setFeature(
+					"http://xml.org/sax/features/external-general-entities", this.processExternalEntities);
+			DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+			Document document = documentBuilder.parse(body);
+			return new DOMSource(document);
+		}
+		catch (ParserConfigurationException ex) {
+			throw new HttpMessageNotReadableException("Could not set feature: " + ex.getMessage(), ex);
+		}
+		catch (SAXException ex) {
+			throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
+		}
+	}
+
+	private SAXSource readSAXSource(InputStream body) throws IOException {
+		try {
+			XMLReader reader = XMLReaderFactory.createXMLReader();
+			reader.setFeature(
+					"http://xml.org/sax/features/external-general-entities", this.processExternalEntities);
+			byte[] bytes = StreamUtils.copyToByteArray(body);
+			return new SAXSource(reader, new InputSource(new ByteArrayInputStream(bytes)));
+		}
+		catch (SAXException ex) {
+			throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
+		}
+	}
+
+	private StreamSource readStreamSource(InputStream body) throws IOException {
+		byte[] bytes = StreamUtils.copyToByteArray(body);
+		return new StreamSource(new ByteArrayInputStream(bytes));
+	}
 
 	@Override
 	protected Long getContentLength(T t, MediaType contentType) {
@@ -175,40 +168,40 @@ protected Long getContentLength(T t, MediaType contentType) {
 		return null;
 	}
 
-    @Override
-    protected void writeInternal(T t, HttpOutputMessage outputMessage)
-            throws IOException, HttpMessageNotWritableException {
+	@Override
+	protected void writeInternal(T t, HttpOutputMessage outputMessage)
+			throws IOException, HttpMessageNotWritableException {
 		try {
-            Result result = new StreamResult(outputMessage.getBody());
+			Result result = new StreamResult(outputMessage.getBody());
 			transform(t, result);
 		}
 		catch (TransformerException ex) {
 			throw new HttpMessageNotWritableException("Could not transform [" + t + "] to output message", ex);
 		}
 	}
 
-    private void transform(Source source, Result result) throws TransformerException {
-        this.transformerFactory.newTransformer().transform(source, result);
-    }
+	private void transform(Source source, Result result) throws TransformerException {
+		this.transformerFactory.newTransformer().transform(source, result);
+	}
 
 
-    private static class CountingOutputStream extends OutputStream {
+	private static class CountingOutputStream extends OutputStream {
 
-		private long count = 0;
+		long count = 0;
 
 		@Override
 		public void write(int b) throws IOException {
-			count++;
+			this.count++;
 		}
 
 		@Override
 		public void write(byte[] b) throws IOException {
-			count += b.length;
+			this.count += b.length;
 		}
 
 		@Override
 		public void write(byte[] b, int off, int len) throws IOException {
-			count += len;
+			this.count += len;
 		}
 	}