moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

add stax entries to forbidden apis due to android issues

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1843009 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-10-06 09:38:58 +00:00
parent 5baa52f86e
commit 9f106fe8ec
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -244,8 +244,8 @@ under the License.
<!-- license and api checks --> <!-- license and api checks -->
<property name="rat.jar" location="${main.lib}/apache-rat-0.12.jar"/> <property name="rat.jar" location="${main.lib}/apache-rat-0.12.jar"/>
<property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.12/apache-rat-0.12.jar"/> <property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.12/apache-rat-0.12.jar"/>
<property name="forbidden.jar" location="${main.lib}/forbiddenapis-2.5.jar"/> <property name="forbidden.jar" location="${main.lib}/forbiddenapis-2.6.jar"/>
<property name="forbidden.url" value="${repository.m2}/maven2/de/thetaphi/forbiddenapis/2.5/forbiddenapis-2.5.jar"/> <property name="forbidden.url" value="${repository.m2}/maven2/de/thetaphi/forbiddenapis/2.6/forbiddenapis-2.6.jar"/>
<property name="maven.ooxml.xsds.version.id" value="1.4"/> <property name="maven.ooxml.xsds.version.id" value="1.4"/>
@ -652,6 +652,7 @@ under the License.
<include name="forbiddenapis-2.0.jar"/> <include name="forbiddenapis-2.0.jar"/>
<include name="forbiddenapis-2.1.jar"/> <include name="forbiddenapis-2.1.jar"/>
<include name="forbiddenapis-2.3.jar"/> <include name="forbiddenapis-2.3.jar"/>
<include name="forbiddenapis-2.5.jar"/>
<include name="apache-rat-0.11.jar"/> <include name="apache-rat-0.11.jar"/>
<include name="mockito-core-2.13.0.jar"/> <include name="mockito-core-2.13.0.jar"/>
</fileset> </fileset>

4
src/java/org/apache/poi/util/StaxHelper.java
View File

@ -34,7 +34,7 @@ public final class StaxHelper {
* Creates a new StAX XMLInputFactory, with sensible defaults * Creates a new StAX XMLInputFactory, with sensible defaults
*/ */
public static XMLInputFactory newXMLInputFactory() { public static XMLInputFactory newXMLInputFactory() {
XMLInputFactory factory = XMLInputFactory.newFactory(); XMLInputFactory factory = XMLInputFactory.newInstance();
trySetProperty(factory, XMLInputFactory.IS_NAMESPACE_AWARE, true); trySetProperty(factory, XMLInputFactory.IS_NAMESPACE_AWARE, true);
trySetProperty(factory, XMLInputFactory.IS_VALIDATING, false); trySetProperty(factory, XMLInputFactory.IS_VALIDATING, false);
trySetProperty(factory, XMLInputFactory.SUPPORT_DTD, false); trySetProperty(factory, XMLInputFactory.SUPPORT_DTD, false);
@ -46,7 +46,7 @@ public final class StaxHelper {
* Creates a new StAX XMLOutputFactory, with sensible defaults * Creates a new StAX XMLOutputFactory, with sensible defaults
*/ */
public static XMLOutputFactory newXMLOutputFactory() { public static XMLOutputFactory newXMLOutputFactory() {
XMLOutputFactory factory = XMLOutputFactory.newFactory(); XMLOutputFactory factory = XMLOutputFactory.newInstance();
trySetProperty(factory, XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); trySetProperty(factory, XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
return factory; return factory;
} }

5
src/resources/devtools/forbidden-signatures.txt
View File

@ -123,6 +123,11 @@ java.util.concurrent.Future#cancel(boolean)
@defaultMessage Don't use ...InputStream.available() as it gives wrong result for certain streams - use IOUtils.toByteArray to read the stream fully and then count the available bytes @defaultMessage Don't use ...InputStream.available() as it gives wrong result for certain streams - use IOUtils.toByteArray to read the stream fully and then count the available bytes
java.io.InputStream#available() java.io.InputStream#available()
@defaultMessage Use newInstance, as newFactory does not seem to work on Android - https://github.com/centic9/poi-on-android/issues/44#issuecomment-426517981
javax.xml.stream.XMLEventFactory#newFactory()
javax.xml.stream.XMLInputFactory#newFactory()
javax.xml.stream.XMLOutputFactory#newFactory()
@defaultMessage Unnecessary, inefficient, and confusing conversion of String.toString @defaultMessage Unnecessary, inefficient, and confusing conversion of String.toString
java.lang.String#toString() java.lang.String#toString()