support both schemas

Author: jeanetteclark

src/main/java/edu/ucsb/nceas/mdqengine/serialize/XmlMarshaller.java

@@ -20,41 +20,50 @@
 public class XmlMarshaller {
 
 	public static String toXml(Object obj, Boolean unescapeXML) throws JAXBException, UnsupportedEncodingException {
-		
-	    JAXBContext context = JAXBContext.newInstance(obj.getClass());
 
-	    Marshaller m = context.createMarshaller();
-	    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+		JAXBContext context = JAXBContext.newInstance(obj.getClass());
 
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    m.marshal(obj, baos);
+		Marshaller m = context.createMarshaller();
+		m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 
-		// JAXB annotations (e.g. in Check.java) are unable to prevent marshalling from performing
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		m.marshal(obj, baos);
+
+		// JAXB annotations (e.g. in Check.java) are unable to prevent marshalling from
+		// performing
 		// XML special character encoding (i.e. '"' to '&quot', so we have to unescape
 		// these character for the entire report here.
-	    if(unescapeXML) {
+		if (unescapeXML) {
 			return StringEscapeUtils.unescapeXml(baos.toString("UTF-8"));
 		} else {
 			return baos.toString("UTF-8");
 		}
 
-	  }
-	
+	}
+
 	public static Object fromXml(String xml, Class clazz) throws JAXBException, IOException, SAXException {
-		
-	    JAXBContext context = JAXBContext.newInstance(clazz);
-	    Unmarshaller u = context.createUnmarshaller();
-
-	    // TODO: include the schema in jar
-	    InputStream schemaStream = XmlMarshaller.class.getResourceAsStream("/schemas/schema1.1.xsd");
-	    //InputStream schemaStream = new FileInputStream("/Users/leinfelder/git/mdqengine/target/schemas/schema1.xsd");
-	    
-	    SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-		Schema schema = factory.newSchema(new StreamSource(schemaStream));
+
+		JAXBContext context = JAXBContext.newInstance(clazz);
+		Unmarshaller u = context.createUnmarshaller();
+
+		// TODO: include the schema in jar
+		InputStream schemaStreamV1 = XmlMarshaller.class.getResourceAsStream("/schemas/schema1.xsd");
+		InputStream schemaStreamV11 = XmlMarshaller.class.getResourceAsStream("/schemas/schema1.1.xsd");
+
+		if (schemaStreamV1 == null || schemaStreamV11 == null) {
+			throw new IOException("One or more schema files not found");
+		}
+
+		SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+		Schema schema = factory.newSchema(new StreamSource[] {
+				new StreamSource(schemaStreamV1),
+				new StreamSource(schemaStreamV11)
+		});
 		u.setSchema(schema);
-		
-	    Object obj = u.unmarshal(IOUtils.toInputStream(xml, "UTF-8"));
-	    return obj;
+		u.setSchema(schema);
+
+		Object obj = u.unmarshal(IOUtils.toInputStream(xml, "UTF-8"));
+		return obj;
 
-	  }
+	}
 }