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

SWS-170

Browse Source
This commit is contained in:
Arjen Poutsma
2007-09-15 12:00:44 +00:00
parent c73a9b8b67
commit f19d827a04
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java
View File

@@ -17,6 +17,7 @@
package org.springframework.ws.server.endpoint.mapping;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
@@ -52,7 +53,7 @@ public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMappin
transformerFactory = TransformerFactory.newInstance();
}
protected QName resolveQName(MessageContext messageContext) throws TransformerException {
protected QName resolveQName(MessageContext messageContext) throws TransformerException, XMLStreamException {
return PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory);
}

4
core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java
View File

@@ -18,6 +18,7 @@ package org.springframework.ws.server.endpoint.mapping;
import java.lang.reflect.Method;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
@@ -127,7 +128,8 @@ public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping i
}
/** Returns the local part of the payload root element of the request. */
protected String getLookupKeyForMessage(MessageContext messageContext) throws TransformerException {
protected String getLookupKeyForMessage(MessageContext messageContext)
throws TransformerException, XMLStreamException {
WebServiceMessage request = messageContext.getRequest();
QName rootQName = PayloadRootUtils.getPayloadRootQName(request.getPayloadSource(), transformerFactory);
return rootQName.getLocalPart();

6
core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
View File

@@ -18,6 +18,7 @@ package org.springframework.ws.server.endpoint.support;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -51,7 +52,7 @@ public abstract class PayloadRootUtils {
* @return the root element
*/
public static QName getPayloadRootQName(Source source, TransformerFactory transformerFactory)
throws TransformerException {
throws TransformerException, XMLStreamException {
if (source instanceof DOMSource) {
DOMSource domSource = (DOMSource) source;
Node node = domSource.getNode();
@@ -67,6 +68,9 @@ public abstract class PayloadRootUtils {
StaxSource staxSource = (StaxSource) source;
if (staxSource.getXMLStreamReader() != null) {
XMLStreamReader streamReader = staxSource.getXMLStreamReader();
if (streamReader.getEventType() == XMLStreamConstants.START_DOCUMENT) {
streamReader.nextTag();
}
if (streamReader.getEventType() == XMLStreamConstants.START_ELEMENT ||
streamReader.getEventType() == XMLStreamConstants.END_ELEMENT) {
return streamReader.getName();

4
core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java
View File

@@ -21,7 +21,6 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerFactory;
@@ -55,9 +54,6 @@ public class PayloadRootUtilsTest extends TestCase {
String contents = "<prefix:localname xmlns:prefix='namespace'/>";
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(contents));
while (streamReader.getEventType() != XMLStreamConstants.START_ELEMENT) {
streamReader.next();
}
Source source = new StaxSource(streamReader);
QName qName = PayloadRootUtils.getPayloadRootQName(source, TransformerFactory.newInstance());
assertNotNull("getQNameForNode returns null", qName);