Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-1034 - Add support for Java 11.

Browse Source 
Backported to 2.x
This commit is contained in:
Greg Turnquist
2018-09-17 16:29:43 -05:00
parent 743fb29e50
commit d1e49a5d86
3 changed files with 140 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java
View File

@@ -18,7 +18,7 @@ package org.springframework.ws.soap.saaj;
import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.Node;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPHeaderElement;
@@ -52,7 +52,7 @@ abstract class SaajSoapHeader extends SaajSoapElement<SOAPHeader> implements Soa
@Override
@SuppressWarnings("unchecked")
public Iterator<SoapHeaderElement> examineHeaderElements(QName name) throws SoapHeaderException {
Iterator<SOAPHeaderElement> iterator = getSaajHeader().getChildElements(name);
Iterator<Node> iterator = getSaajHeader().getChildElements(name);
return new SaajSoapHeaderElementIterator(iterator);
}
@@ -78,9 +78,9 @@ abstract class SaajSoapHeader extends SaajSoapElement<SOAPHeader> implements Soa
@SuppressWarnings("unchecked")
@Override
public void removeHeaderElement(QName name) throws SoapHeaderException {
Iterator<SOAPElement> iterator = getSaajHeader().getChildElements(name);
Iterator<Node> iterator = getSaajHeader().getChildElements(name);
if (iterator.hasNext()) {
SOAPElement element = iterator.next();
Node element = iterator.next();
element.detachNode();
}
}
@@ -96,9 +96,9 @@ abstract class SaajSoapHeader extends SaajSoapElement<SOAPHeader> implements Soa
protected static class SaajSoapHeaderElementIterator implements Iterator<SoapHeaderElement> {
private final Iterator<SOAPHeaderElement> iterator;
private final Iterator<? extends Node> iterator;
protected SaajSoapHeaderElementIterator(Iterator<SOAPHeaderElement> iterator) {
protected SaajSoapHeaderElementIterator(Iterator<? extends Node> iterator) {
Assert.notNull(iterator, "iterator must not be null");
this.iterator = iterator;
}
@@ -110,8 +110,12 @@ abstract class SaajSoapHeader extends SaajSoapElement<SOAPHeader> implements Soa
@Override
public SoapHeaderElement next() {
SOAPHeaderElement saajHeaderElement = iterator.next();
return new SaajSoapHeaderElement(saajHeaderElement);
Node saajHeaderElement = iterator.next();
if (saajHeaderElement instanceof SOAPHeaderElement) {
return new SaajSoapHeaderElement((SOAPHeaderElement) saajHeaderElement);
} else {
throw new RuntimeException("saajHeaderElement is not an instance of SOAPHeaderElement");
}
}
@Override