Removed 'XmlPayload' from the names of 'XmlPayloadUnmarshallingTransformer' and 'XmlPayloadMarshallingTransformer' since the former can now return a Message instance and the latter now accepts a boolean to specify whether only the payload should be passed to the marshaller or the entire Message.
This commit is contained in:
@@ -38,12 +38,12 @@ import org.springframework.xml.transform.StringResult;
|
||||
/**
|
||||
* @author Mark Fisher
|
||||
*/
|
||||
public class XmlPayloadMarshallingTransformerTests {
|
||||
public class MarshallingTransformerTests {
|
||||
|
||||
@Test
|
||||
public void testStringToStringResult() throws Exception {
|
||||
TestMarshaller marshaller = new TestMarshaller();
|
||||
XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
|
||||
MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
|
||||
transformer.setResultFactory(new StringResultFactory());
|
||||
Message<?> resultMessage = transformer.transform(new StringMessage("world"));
|
||||
Object resultPayload = resultMessage.getPayload();
|
||||
@@ -55,7 +55,7 @@ public class XmlPayloadMarshallingTransformerTests {
|
||||
@Test
|
||||
public void testDefaultResultFactory() throws Exception {
|
||||
TestMarshaller marshaller = new TestMarshaller();
|
||||
XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
|
||||
MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
|
||||
Message<?> resultMessage = transformer.transform(new StringMessage("world"));
|
||||
Object resultPayload = resultMessage.getPayload();
|
||||
assertEquals(DOMResult.class, resultPayload.getClass());
|
||||
@@ -65,7 +65,7 @@ public class XmlPayloadMarshallingTransformerTests {
|
||||
@Test
|
||||
public void testMarshallingEntireMessage() throws Exception {
|
||||
TestMarshaller marshaller = new TestMarshaller();
|
||||
XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
|
||||
MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
|
||||
transformer.setExtractPayload(false);
|
||||
Message<?> message = new StringMessage("test");
|
||||
transformer.transform(message);
|
||||
@@ -36,12 +36,12 @@ import org.springframework.xml.transform.StringSource;
|
||||
* @author Jonas Partner
|
||||
* @author Mark Fisher
|
||||
*/
|
||||
public class XmlPayloadUnmarshallingTransformerTests {
|
||||
public class UnmarshallingTransformerTests {
|
||||
|
||||
@Test
|
||||
public void testStringSourceToString() {
|
||||
Unmarshaller unmarshaller = new TestUnmarshaller(false);
|
||||
XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
|
||||
UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
|
||||
Object transformed = transformer.transformPayload(new StringSource("world"));
|
||||
assertEquals(String.class, transformed.getClass());
|
||||
assertEquals("hello world", transformed.toString());
|
||||
@@ -50,7 +50,7 @@ public class XmlPayloadUnmarshallingTransformerTests {
|
||||
@Test
|
||||
public void testMessageReturnValue() {
|
||||
Unmarshaller unmarshaller = new TestUnmarshaller(true);
|
||||
XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
|
||||
UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
|
||||
Object transformed = transformer.transformPayload(new StringSource("foo"));
|
||||
assertEquals(StringMessage.class, transformed.getClass());
|
||||
assertEquals("message: foo", ((StringMessage) transformed).getPayload());
|
||||
@@ -59,7 +59,7 @@ public class XmlPayloadUnmarshallingTransformerTests {
|
||||
@Test
|
||||
public void testMessageReturnValueFromTopLevel() {
|
||||
Unmarshaller unmarshaller = new TestUnmarshaller(true);
|
||||
XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
|
||||
UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
|
||||
Message<?> result = transformer.transform(MessageBuilder.withPayload(new StringSource("bar")).build());
|
||||
assertNotNull(result);
|
||||
assertEquals("message: bar", result.getPayload());
|
||||
Reference in New Issue
Block a user