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

SWS-639 - Deprecate redundant XML classes

Browse Source
This commit is contained in:
Arjen Poutsma
2010-09-01 10:25:17 +00:00
parent f8a4830543
commit 7d79ad134b
16 changed files with 109 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
View File

@@ -30,6 +30,8 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
@@ -41,9 +43,8 @@ import javax.xml.transform.stream.StreamSource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.xml.StaxUtils;
import org.springframework.xml.sax.SaxUtils;
import org.springframework.xml.transform.StaxResult;
import org.springframework.xml.transform.StaxSource;
import org.springframework.xml.transform.StringResult;
import org.custommonkey.xmlunit.XMLUnit;
@@ -96,16 +97,15 @@ public abstract class AbstractWebServiceMessageTestCase {
}
@Test
@SuppressWarnings("Since15")
public void testEventReaderPayload() throws Exception {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLEventReader eventReader = inputFactory.createXMLEventReader(payload.getInputStream());
StaxSource staxSource = new StaxSource(eventReader);
Source staxSource = StaxUtils.createCustomStaxSource(eventReader);
transformer.transform(staxSource, webServiceMessage.getPayloadResult());
StringWriter stringWriter = new StringWriter();
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(stringWriter);
StaxResult staxResult = new StaxResult(eventWriter);
Result staxResult = StaxUtils.createCustomStaxResult(eventWriter);
transformer.transform(webServiceMessage.getPayloadSource(), staxResult);
eventWriter.flush();
assertXMLEqual(getExpectedString(), stringWriter.toString());
@@ -147,16 +147,15 @@ public abstract class AbstractWebServiceMessageTestCase {
}
@Test
@SuppressWarnings("Since15")
public void testStreamReaderPayload() throws Exception {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLStreamReader streamReader = inputFactory.createXMLStreamReader(payload.getInputStream());
StaxSource staxSource = new StaxSource(streamReader);
Source staxSource = StaxUtils.createCustomStaxSource(streamReader);
transformer.transform(staxSource, webServiceMessage.getPayloadResult());
StringWriter stringWriter = new StringWriter();
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(stringWriter);
StaxResult staxResult = new StaxResult(streamWriter);
Result staxResult = StaxUtils.createCustomStaxResult(streamWriter);
transformer.transform(webServiceMessage.getPayloadSource(), staxResult);
streamWriter.flush();
assertXMLEqual(getExpectedString(), stringWriter.toString());

6
core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java
View File

@@ -30,7 +30,7 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
import org.springframework.xml.transform.StaxSource;
import org.springframework.util.xml.StaxUtils;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -71,14 +71,14 @@ public abstract class AbstractEndpointTestCase {
public void testStaxSourceEventReader() throws Exception {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(REQUEST));
testSource(new StaxSource(eventReader));
testSource(new SAXSource(StaxUtils.createXMLReader(eventReader), new InputSource()));
}
@Test
public void testStaxSourceStreamReader() throws Exception {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(REQUEST));
testSource(new StaxSource(streamReader));
testSource(new SAXSource(StaxUtils.createXMLReader(streamReader), new InputSource()));
}
@Test

7
core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java
View File

@@ -61,11 +61,12 @@ public class XomPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
@Override
public void testStaxSourceEventReader() throws Exception {
// overriden, because XOM doesn not support it
// overriden, because XOM doesn't not support it
}
public void testStaxSourceEventReaderJaxp14() throws Exception {
// overriden, because XOM doesn not support it
@Override
public void testStaxSourceStreamReader() throws Exception {
// overriden, because XOM doesn't not support it
}
}

15
core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java
View File

@@ -25,11 +25,9 @@ import javax.xml.transform.stream.StreamSource;
import org.springframework.core.MethodParameter;
import org.springframework.ws.server.endpoint.annotation.RequestPayload;
import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
import org.springframework.xml.transform.StaxSource;
import org.springframework.xml.transform.StringSource;
/** @author Arjen Poutsma */
@SuppressWarnings("Since15")
public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTestCase {
@Override
@@ -41,20 +39,18 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce
protected MethodParameter[] createSupportedParameters() throws NoSuchMethodException {
return new MethodParameter[]{new MethodParameter(getClass().getMethod("source", Source.class), 0),
new MethodParameter(getClass().getMethod("dom", DOMSource.class), 0),
new MethodParameter(getClass().getMethod("stax1", StaxSource.class), 0),
new MethodParameter(getClass().getMethod("sax", SAXSource.class), 0),
new MethodParameter(getClass().getMethod("stream", StreamSource.class), 0),
new MethodParameter(getClass().getMethod("stax2", StAXSource.class), 0)};
new MethodParameter(getClass().getMethod("stax", StAXSource.class), 0)};
}
@Override
protected MethodParameter[] createSupportedReturnTypes() throws NoSuchMethodException {
return new MethodParameter[]{new MethodParameter(getClass().getMethod("source", Source.class), -1),
new MethodParameter(getClass().getMethod("dom", DOMSource.class), -1),
new MethodParameter(getClass().getMethod("stax1", StaxSource.class), -1),
new MethodParameter(getClass().getMethod("sax", SAXSource.class), -1),
new MethodParameter(getClass().getMethod("stream", StreamSource.class), -1),
new MethodParameter(getClass().getMethod("stax2", StAXSource.class), -1)};
new MethodParameter(getClass().getMethod("stax", StAXSource.class), -1)};
}
@Override
@@ -72,11 +68,6 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce
return source;
}
@ResponsePayload
public StaxSource stax1(@RequestPayload StaxSource source) {
return source;
}
@ResponsePayload
public SAXSource sax(@RequestPayload SAXSource source) {
return source;
@@ -88,7 +79,7 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce
}
@ResponsePayload
public StAXSource stax2(@RequestPayload StAXSource source) {
public StAXSource stax(@RequestPayload StAXSource source) {
return source;
}
}

3
core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
View File

@@ -118,8 +118,7 @@ public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryT
"</soapenv:Body></soapenv:Envelope>";
InputStream inputStream = new ByteArrayInputStream(envelope.getBytes("UTF-8"));
AxiomSoapMessage message =
(AxiomSoapMessage) messageFactory.createWebServiceMessage(new MockTransportInputStream(inputStream));
AxiomSoapMessage message = messageFactory.createWebServiceMessage(new MockTransportInputStream(inputStream));
StringResult result = new StringResult();
transformer.transform(message.getPayloadSource(), result);

11
core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
View File

@@ -19,7 +19,7 @@ package org.springframework.ws.soap.axiom;
import java.io.StringWriter;
import javax.xml.stream.XMLStreamWriter;
import org.springframework.xml.transform.StaxResult;
import org.springframework.util.xml.StaxUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
@@ -45,8 +45,7 @@ public class NonCachingPayloadTest {
@Test
public void testDelegatingStreamWriter() throws Exception {
StaxResult result = (StaxResult) payload.getResult();
XMLStreamWriter streamWriter = result.getXMLStreamWriter();
XMLStreamWriter streamWriter = StaxUtils.getXMLStreamWriter(payload.getResult());
String namespace = "http://springframework.org/spring-ws";
streamWriter.setDefaultNamespace(namespace);
@@ -69,8 +68,7 @@ public class NonCachingPayloadTest {
@Test
public void testDelegatingStreamWriterWriteEndDocument() throws Exception {
StaxResult result = (StaxResult) payload.getResult();
XMLStreamWriter streamWriter = result.getXMLStreamWriter();
XMLStreamWriter streamWriter = StaxUtils.getXMLStreamWriter(payload.getResult());
String namespace = "http://springframework.org/spring-ws";
streamWriter.setDefaultNamespace(namespace);
@@ -92,8 +90,7 @@ public class NonCachingPayloadTest {
@Test
public void testDelegatingStreamWriterWriteEmptyElement() throws Exception {
StaxResult result = (StaxResult) payload.getResult();
XMLStreamWriter streamWriter = result.getXMLStreamWriter();
XMLStreamWriter streamWriter = StaxUtils.getXMLStreamWriter(payload.getResult());
String namespace = "http://springframework.org/spring-ws";
streamWriter.setDefaultNamespace(namespace);