SWS-351 - Arbitrary parameter injection for @Endpoints
This commit is contained in:
@@ -32,13 +32,14 @@ import org.springframework.xml.transform.TransformerObjectSupport;
|
||||
import org.apache.axiom.om.OMAbstractFactory;
|
||||
import org.apache.axiom.soap.SOAPFactory;
|
||||
|
||||
public abstract class AbstractPayloadMethodArgumentResolverTest extends TransformerObjectSupport {
|
||||
/** @author Arjen Poutsma */
|
||||
public class AbstractMethodArgumentResolverTest extends TransformerObjectSupport {
|
||||
|
||||
protected static final String NAMESPACE_URI = "http://springframework.org/ws";
|
||||
|
||||
protected static final String LOCAL_NAME = "request";
|
||||
|
||||
private static final String REQUEST = "<" + LOCAL_NAME + " xmlns=\"" + NAMESPACE_URI + "\"/>";
|
||||
protected static final String XML = "<" + LOCAL_NAME + " xmlns=\"" + NAMESPACE_URI + "\"/>";
|
||||
|
||||
protected MessageContext createSaajMessageContext() throws javax.xml.soap.SOAPException {
|
||||
javax.xml.soap.MessageFactory saajFactory = javax.xml.soap.MessageFactory.newInstance();
|
||||
@@ -48,15 +49,14 @@ public abstract class AbstractPayloadMethodArgumentResolverTest extends Transfor
|
||||
}
|
||||
|
||||
protected MessageContext createMockMessageContext() throws TransformerException {
|
||||
MockWebServiceMessage request =
|
||||
new MockWebServiceMessage(new StringSource(REQUEST));
|
||||
MockWebServiceMessage request = new MockWebServiceMessage(new StringSource(XML));
|
||||
return new DefaultMessageContext(request, new MockWebServiceMessageFactory());
|
||||
}
|
||||
|
||||
protected MessageContext createCachingAxiomMessageContext() throws Exception {
|
||||
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory();
|
||||
AxiomSoapMessage request = new AxiomSoapMessage(axiomFactory, true, false);
|
||||
transform(new StringSource(REQUEST), request.getPayloadResult());
|
||||
transform(new StringSource(XML), request.getPayloadResult());
|
||||
AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
|
||||
soapMessageFactory.afterPropertiesSet();
|
||||
return new DefaultMessageContext(request, soapMessageFactory);
|
||||
@@ -65,11 +65,10 @@ public abstract class AbstractPayloadMethodArgumentResolverTest extends Transfor
|
||||
protected MessageContext createNonCachingAxiomMessageContext() throws Exception {
|
||||
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory();
|
||||
AxiomSoapMessage request = new AxiomSoapMessage(axiomFactory, false, false);
|
||||
transform(new StringSource(REQUEST), request.getPayloadResult());
|
||||
transform(new StringSource(XML), request.getPayloadResult());
|
||||
AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
|
||||
soapMessageFactory.setPayloadCaching(false);
|
||||
soapMessageFactory.afterPropertiesSet();
|
||||
return new DefaultMessageContext(request, soapMessageFactory);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -16,37 +16,18 @@
|
||||
|
||||
package org.springframework.ws.server.endpoint.adapter.method;
|
||||
|
||||
import javax.xml.transform.TransformerException;
|
||||
|
||||
import org.springframework.core.MethodParameter;
|
||||
import org.springframework.ws.MockWebServiceMessage;
|
||||
import org.springframework.ws.MockWebServiceMessageFactory;
|
||||
import org.springframework.ws.context.DefaultMessageContext;
|
||||
import org.springframework.ws.context.MessageContext;
|
||||
import org.springframework.ws.soap.axiom.AxiomSoapMessage;
|
||||
import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
|
||||
import org.springframework.ws.soap.saaj.SaajSoapMessage;
|
||||
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
|
||||
import org.springframework.xml.transform.StringSource;
|
||||
import org.springframework.xml.transform.TransformerObjectSupport;
|
||||
|
||||
import org.apache.axiom.om.OMAbstractFactory;
|
||||
import org.apache.axiom.soap.SOAPFactory;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
public abstract class AbstractPayloadMethodProcessorTest extends TransformerObjectSupport {
|
||||
public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest {
|
||||
|
||||
protected static final String NAMESPACE_URI = "http://springframework.org/ws";
|
||||
|
||||
protected static final String LOCAL_NAME = "request";
|
||||
|
||||
protected static final String XML = "<" + LOCAL_NAME + " xmlns=\"" + NAMESPACE_URI + "\"/>";
|
||||
|
||||
protected AbstractPayloadMethodProcessor processor;
|
||||
private AbstractPayloadMethodProcessor processor;
|
||||
|
||||
private MethodParameter[] supportedParameters;
|
||||
|
||||
@@ -152,37 +133,6 @@ public abstract class AbstractPayloadMethodProcessorTest extends TransformerObje
|
||||
|
||||
protected abstract Object getReturnValue(MethodParameter returnType) throws Exception;
|
||||
|
||||
protected MessageContext createSaajMessageContext() throws javax.xml.soap.SOAPException {
|
||||
javax.xml.soap.MessageFactory saajFactory = javax.xml.soap.MessageFactory.newInstance();
|
||||
javax.xml.soap.SOAPMessage saajMessage = saajFactory.createMessage();
|
||||
saajMessage.getSOAPBody().addChildElement(LOCAL_NAME, "", NAMESPACE_URI);
|
||||
return new DefaultMessageContext(new SaajSoapMessage(saajMessage), new SaajSoapMessageFactory(saajFactory));
|
||||
}
|
||||
|
||||
protected MessageContext createMockMessageContext() throws TransformerException {
|
||||
MockWebServiceMessage request = new MockWebServiceMessage(new StringSource(XML));
|
||||
return new DefaultMessageContext(request, new MockWebServiceMessageFactory());
|
||||
}
|
||||
|
||||
protected MessageContext createCachingAxiomMessageContext() throws Exception {
|
||||
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory();
|
||||
AxiomSoapMessage request = new AxiomSoapMessage(axiomFactory, true, false);
|
||||
transform(new StringSource(XML), request.getPayloadResult());
|
||||
AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
|
||||
soapMessageFactory.afterPropertiesSet();
|
||||
return new DefaultMessageContext(request, soapMessageFactory);
|
||||
}
|
||||
|
||||
protected MessageContext createNonCachingAxiomMessageContext() throws Exception {
|
||||
SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory();
|
||||
AxiomSoapMessage request = new AxiomSoapMessage(axiomFactory, false, false);
|
||||
transform(new StringSource(XML), request.getPayloadResult());
|
||||
AxiomSoapMessageFactory soapMessageFactory = new AxiomSoapMessageFactory();
|
||||
soapMessageFactory.setPayloadCaching(false);
|
||||
soapMessageFactory.afterPropertiesSet();
|
||||
return new DefaultMessageContext(request, soapMessageFactory);
|
||||
}
|
||||
|
||||
public String unsupported(String s) {
|
||||
return s;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
/*
|
||||
* Copyright 2005-2010 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.ws.server.endpoint.adapter.method;
|
||||
|
||||
import javax.xml.stream.XMLEventReader;
|
||||
import javax.xml.stream.XMLStreamConstants;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
import javax.xml.stream.events.StartElement;
|
||||
import javax.xml.stream.events.XMLEvent;
|
||||
|
||||
import org.springframework.core.MethodParameter;
|
||||
import org.springframework.ws.context.MessageContext;
|
||||
import org.springframework.ws.server.endpoint.annotation.RequestPayload;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
/** @author Arjen Poutsma */
|
||||
@SuppressWarnings("Since15")
|
||||
public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumentResolverTest {
|
||||
|
||||
private StaxPayloadMethodArgumentResolver resolver;
|
||||
|
||||
private MethodParameter streamParameter;
|
||||
|
||||
private MethodParameter eventParameter;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
resolver = new StaxPayloadMethodArgumentResolver();
|
||||
streamParameter = new MethodParameter(getClass().getMethod("streamReader", XMLStreamReader.class), 0);
|
||||
eventParameter = new MethodParameter(getClass().getMethod("eventReader", XMLEventReader.class), 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveStreamReaderSaaj() throws Exception {
|
||||
MessageContext messageContext = createSaajMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, streamParameter);
|
||||
|
||||
testStreamReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveStreamReaderAxiomCaching() throws Exception {
|
||||
MessageContext messageContext = createCachingAxiomMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, streamParameter);
|
||||
|
||||
testStreamReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveStreamReaderAxiomNonCaching() throws Exception {
|
||||
MessageContext messageContext = createNonCachingAxiomMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, streamParameter);
|
||||
|
||||
testStreamReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveStreamReaderStream() throws Exception {
|
||||
MessageContext messageContext = createMockMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, streamParameter);
|
||||
|
||||
testStreamReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveEventReaderSaaj() throws Exception {
|
||||
MessageContext messageContext = createSaajMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, eventParameter);
|
||||
|
||||
testEventReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveEventReaderAxiomCaching() throws Exception {
|
||||
MessageContext messageContext = createCachingAxiomMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, eventParameter);
|
||||
|
||||
testEventReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveEventReaderAxiomNonCaching() throws Exception {
|
||||
MessageContext messageContext = createNonCachingAxiomMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, eventParameter);
|
||||
|
||||
testEventReader(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveEventReaderStream() throws Exception {
|
||||
MessageContext messageContext = createMockMessageContext();
|
||||
|
||||
Object result = resolver.resolveArgument(messageContext, eventParameter);
|
||||
|
||||
testEventReader(result);
|
||||
}
|
||||
|
||||
|
||||
private void testStreamReader(Object result) throws XMLStreamException {
|
||||
assertTrue("resolver does not return XMLStreamReader", result instanceof XMLStreamReader);
|
||||
XMLStreamReader streamReader = (XMLStreamReader) result;
|
||||
assertTrue("streamReader has no next element", streamReader.hasNext());
|
||||
assertEquals(XMLStreamConstants.START_ELEMENT, streamReader.nextTag());
|
||||
assertEquals("Invalid namespace", NAMESPACE_URI, streamReader.getNamespaceURI());
|
||||
assertEquals("Invalid local name", LOCAL_NAME, streamReader.getLocalName());
|
||||
}
|
||||
|
||||
private void testEventReader(Object result) throws XMLStreamException {
|
||||
assertTrue("resolver does not return XMLEventReader", result instanceof XMLEventReader);
|
||||
XMLEventReader eventReader = (XMLEventReader) result;
|
||||
assertTrue("eventReader has no next element", eventReader.hasNext());
|
||||
XMLEvent event = eventReader.nextTag();
|
||||
assertEquals(XMLStreamConstants.START_ELEMENT, event.getEventType());
|
||||
StartElement startElement = (StartElement) event;
|
||||
assertEquals("Invalid namespace", NAMESPACE_URI, startElement.getName().getNamespaceURI());
|
||||
assertEquals("Invalid local name", LOCAL_NAME, startElement.getName().getLocalPart());
|
||||
}
|
||||
|
||||
|
||||
public void invalid(XMLStreamReader streamReader) {
|
||||
}
|
||||
|
||||
public void streamReader(@RequestPayload XMLStreamReader streamReader) {
|
||||
}
|
||||
|
||||
public void eventReader(@RequestPayload XMLEventReader streamReader) {
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user