From 549ef87a8e0eaf059c3e27c87a5ca1ff2a0e53d6 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 16 May 2018 14:05:15 -0400
Subject: [PATCH] INT-4469: XML Unmarshaller support byte[] payloads

JIRA: https://jira.spring.io/browse/INT-4469
---
 .../transformer/UnmarshallingTransformer.java |  8 +++++--
 .../UnmarshallingTransformerTests.java        | 23 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
index f4bc8fdc53..d4289f1406 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.xml.transformer;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 
@@ -110,6 +111,9 @@ public class UnmarshallingTransformer extends AbstractPayloadTransformer<Object,
 			else if (payload instanceof String) {
 				source = new StringSource((String) payload);
 			}
+			else if (payload instanceof byte[]) {
+				source = new StreamSource(new ByteArrayInputStream((byte[]) payload));
+			}
 			else if (payload instanceof File) {
 				source = new StreamSource((File) payload);
 			}
@@ -136,7 +140,7 @@ public class UnmarshallingTransformer extends AbstractPayloadTransformer<Object,
 
 	private static class MimeMessageUnmarshallerHelper {
 
-		private Unmarshaller delegate;
+		private final Unmarshaller delegate;
 
 		MimeMessageUnmarshallerHelper(Unmarshaller unmarshaller) {
 			this.delegate = unmarshaller;
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java
index 73045daad6..69902b6f86 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import java.io.IOException;
 
 import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Test;
 
@@ -35,9 +36,19 @@ import org.springframework.xml.transform.StringSource;
 /**
  * @author Jonas Partner
  * @author Mark Fisher
+ * @author Gary Russell
  */
 public class UnmarshallingTransformerTests {
 
+	@Test
+	public void testBytesToString() {
+		Unmarshaller unmarshaller = new TestUnmarshaller(false);
+		UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
+		Object transformed = transformer.transformPayload("world".getBytes());
+		assertEquals(String.class, transformed.getClass());
+		assertEquals("hello world", transformed.toString());
+	}
+
 	@Test
 	public void testStringSourceToString() {
 		Unmarshaller unmarshaller = new TestUnmarshaller(false);
@@ -74,6 +85,7 @@ public class UnmarshallingTransformerTests {
 			this.returnMessage = returnMessage;
 		}
 
+		@Override
 		public Object unmarshal(Source source) throws XmlMappingException, IOException {
 			if (source instanceof StringSource) {
 				char[] chars = new char[8];
@@ -83,9 +95,18 @@ public class UnmarshallingTransformerTests {
 				}
 				return "hello " + new String(chars).trim();
 			}
+			else if (source instanceof StreamSource) {
+				byte[] bytes = new byte[8];
+				((StreamSource) source).getInputStream().read(bytes);
+				if (returnMessage) {
+					return new GenericMessage<String>("message: " + new String(bytes).trim());
+				}
+				return "hello " + new String(bytes).trim();
+			}
 			return null;
 		}
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return true;
 		}