You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2017/06/24 13:53:47 UTC
svn commit: r1799772 - in /poi/trunk/src:
java/org/apache/poi/util/StaxHelper.java
testcases/org/apache/poi/util/TestStaxHelper.java
Author: fanningpj
Date: Sat Jun 24 13:53:47 2017
New Revision: 1799772
URL: http://svn.apache.org/viewvc?rev=1799772&view=rev
Log:
expand StaxHelper
Added:
poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java (with props)
Modified:
poi/trunk/src/java/org/apache/poi/util/StaxHelper.java
Modified: poi/trunk/src/java/org/apache/poi/util/StaxHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/StaxHelper.java?rev=1799772&r1=1799771&r2=1799772&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/StaxHelper.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/StaxHelper.java Sat Jun 24 13:53:47 2017
@@ -17,7 +17,9 @@
package org.apache.poi.util;
+import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
/**
@@ -39,11 +41,37 @@ public final class StaxHelper {
trySetProperty(factory, XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
return factory;
}
+
+ /**
+ * Creates a new StAX XMLOutputFactory, with sensible defaults
+ */
+ public static XMLOutputFactory newXMLOutputFactory() {
+ XMLOutputFactory factory = XMLOutputFactory.newFactory();
+ trySetProperty(factory, XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
+ return factory;
+ }
+
+ /**
+ * Creates a new StAX XMLEventFactory, with sensible defaults
+ */
+ public static XMLEventFactory newXMLEventFactory() {
+ return XMLEventFactory.newFactory();
+ }
private static void trySetProperty(XMLInputFactory factory, String feature, boolean flag) {
try {
factory.setProperty(feature, flag);
} catch (Exception e) {
+ logger.log(POILogger.WARN, "StAX Property unsupported", feature, e);
+ } catch (AbstractMethodError ame) {
+ logger.log(POILogger.WARN, "Cannot set StAX property because outdated StAX parser in classpath", feature, ame);
+ }
+ }
+
+ private static void trySetProperty(XMLOutputFactory factory, String feature, boolean flag) {
+ try {
+ factory.setProperty(feature, flag);
+ } catch (Exception e) {
logger.log(POILogger.WARN, "StAX Property unsupported", feature, e);
} catch (AbstractMethodError ame) {
logger.log(POILogger.WARN, "Cannot set StAX property because outdated StAX parser in classpath", feature, ame);
Added: poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java?rev=1799772&view=auto
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java (added)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java Sat Jun 24 13:53:47 2017
@@ -0,0 +1,64 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
+import org.junit.Test;
+
+/**
+ * Unit test for StaxHelper
+ */
+public class TestStaxHelper {
+
+ /**
+ * test that newXMLInputFactory returns a factory with sensible defaults
+ */
+ @Test
+ public void testNewXMLInputFactory() throws XMLStreamException {
+ XMLInputFactory factory = StaxHelper.newXMLInputFactory();
+ assertEquals(true, factory.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE));
+ assertEquals(false, factory.getProperty(XMLInputFactory.IS_VALIDATING));
+ assertEquals(false, factory.getProperty(XMLInputFactory.SUPPORT_DTD));
+ assertEquals(false, factory.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES));
+ }
+
+ /**
+ * test that newXMLOutputFactory returns a factory with sensible defaults
+ */
+ @Test
+ public void testNewXMLOutputFactory() {
+ XMLOutputFactory factory = StaxHelper.newXMLOutputFactory();
+ assertEquals(true, factory.getProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES));
+ }
+
+ /**
+ * test that newXMLEventFactory returns a factory
+ */
+ @Test
+ public void testNewXMLEventFactory() {
+ assertNotNull(StaxHelper.newXMLEventFactory());
+ }
+
+}
+
Propchange: poi/trunk/src/testcases/org/apache/poi/util/TestStaxHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org