root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ensure XmlEventDecoder compiles on JDK 9 and 11

This commit is contained in:
Sam Brannen 2019-04-06 15:59:14 +02:00
parent 55b764bac3
commit ab1b8dee58
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
View File

@ -18,6 +18,7 @@ package org.springframework.http.codec.xml;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@ -76,6 +77,7 @@ import org.springframework.util.xml.StaxUtils;
* by other decoders which are registered by default.
*
* @author Arjen Poutsma
* @author Sam Brannen
* @since 5.0
*/
public class XmlEventDecoder extends AbstractDecoder<XMLEvent> {
@ -94,7 +96,7 @@ public class XmlEventDecoder extends AbstractDecoder<XMLEvent> {
@Override
@SuppressWarnings({"rawtypes", "unchecked"}) // on JDK 9 where XMLEventReader is Iterator<Object>
@SuppressWarnings({"rawtypes", "unchecked", "cast"}) // on JDK 9 where XMLEventReader is Iterator<Object> instead of simply Iterator
public Flux<XMLEvent> decode(Publisher<DataBuffer> inputStream, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
@ -110,7 +112,9 @@ public class XmlEventDecoder extends AbstractDecoder<XMLEvent> {
InputStream is = dataBuffer.asInputStream();
return () -> {
try {
return inputFactory.createXMLEventReader(is);
// Explicit cast to (Iterator) is necessary on JDK 9+ since XMLEventReader
// now extends Iterator<Object> instead of simply Iterator
return (Iterator) inputFactory.createXMLEventReader(is);
}
catch (XMLStreamException ex) {
throw Exceptions.propagate(ex);