Merge pull request #78 from tan9/feature/configurable-xml-reader

Fixes #77 Disable DTD support on XMLInputFactory.

pom.xml

@@ -37,6 +37,12 @@
             <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>6.5.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

src/com/github/miachm/sods/XmlReaderEventImpl.java

@@ -13,6 +13,10 @@ class XmlReaderEventImpl implements XmlReader {
     @Override
     public XmlReaderInstanceEventImpl load(InputStream in) throws IOException {
         try {
+            // #77 Make the ODS files with DTD work on the JBoss-bundled Woodstox,
+            //     or ensure they work on another StAX implementation set to validate by default.
+            inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+
             reader = inputFactory.createXMLStreamReader(in);
             // Skip start of document
             try {

tests/com/github/miachm/sods/XMLInputFactoriesTest.java

@@ -0,0 +1,44 @@
+package com.github.miachm.sods;
+
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+import javax.xml.stream.XMLInputFactory;
+import java.io.File;
+
+import static org.testng.AssertJUnit.*;
+
+public class XMLInputFactoriesTest {
+
+    // Disable this test by default, because XmlReaderEventImpl stores a static XMLInputFactory
+    // instance, which is not reset after the test.
+    @Test(enabled = false)
+    public void testLoadUsingBundledXMLInputFactory() throws Exception {
+        testUsingFactory("com.sun.xml.internal.stream.XMLInputFactoryImpl");
+    }
+
+    @Test
+    public void testLoadUsingWoodstoxXMLInputFactory() throws Exception {
+        testUsingFactory("com.ctc.wstx.stax.WstxInputFactory");
+    }
+
+    private void testUsingFactory(String factoryName) throws Exception {
+        // Skip test if factory is not available
+        try {
+            Class.forName(factoryName);
+        } catch (ClassNotFoundException e) {
+            throw new SkipException(factoryName + " not found, ignore this test.");
+        }
+
+        try {
+            System.setProperty(XMLInputFactory.class.getName(), factoryName);
+
+            SpreadSheet spread = new SpreadSheet(new File("resources/metadataWithDtd.ods"));
+            assertEquals(spread.getNumSheets(),1);
+
+        } finally {
+            System.clearProperty(XMLInputFactory.class.getName());
+        }
+    }
+
+}