Support 'empty' StreamSource in Jaxb2Marshaller

Arjen Poutsma · rstoyanchev · commit 8efac21c2b31 · 2013-08-13T18:16:42.000-04:00
Added support for StreamSources that do not have a InputStream or
Reader, but do have a System ID.

Issue: 10828
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -784,6 +784,9 @@ else if (source instanceof StreamSource) {
 			else if (streamSource.getReader() != null) {
 				inputSource = new InputSource(streamSource.getReader());
 			}
+			else {
+				inputSource = new InputSource(streamSource.getSystemId());
+			}
 		}
 
 		try {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.oxm.jaxb;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.StringReader;
-
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.xml.bind.JAXBElement;
@@ -26,7 +27,11 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
+import static org.junit.Assert.*;
 import org.junit.Test;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.mock;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.AbstractUnmarshallerTests;
@@ -36,9 +41,6 @@
 import org.springframework.oxm.mime.MimeContainer;
 import org.springframework.util.xml.StaxUtils;
 
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
-
 /**
  * @author Arjen Poutsma
  * @author Biju Kunjummen
@@ -134,4 +136,13 @@ public void unmarshalAnXmlReferingToAWrappedXmlElementDecl() throws Exception {
 				"test", airplane.getValue().getName());
 	}
 
+	@Test
+	public void unmarshalFile() throws IOException {
+		Resource resource = new ClassPathResource("jaxb2.xml", getClass());
+		File file = resource.getFile();
+
+		Flights f = (Flights) unmarshaller.unmarshal(new StreamSource(file));
+		testFlights(f);
+	}
+
 }
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/jaxb2.xml b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/jaxb2.xml
@@ -0,0 +1,5 @@
+<tns:flights xmlns:tns="http://samples.springframework.org/flight">
+    <tns:flight>
+        <tns:number>42</tns:number>
+    </tns:flight>
+</tns:flights>

Original file line number	Diff line number	Diff line change
`@@ -784,6 +784,9 @@ else if (source instanceof StreamSource) {`
`784`	`784`	`else if (streamSource.getReader() != null) {`
`785`	`785`	`inputSource = new InputSource(streamSource.getReader());`
`786`	`786`	`}`
	`787`	`+ else {`
	`788`	`+ inputSource = new InputSource(streamSource.getSystemId());`
	`789`	`+ }`
`787`	`790`	`}`
`788`	`791`
`789`	`792`	`try {`