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 2019/09/24 21:06:05 UTC
svn commit: r1867497 - in /poi/trunk/src/ooxml/java/org/apache/poi:
ooxml/util/XPathHelper.java poifs/crypt/dsig/SignaturePart.java
xssf/extractor/XSSFImportFromXML.java
Author: fanningpj
Date: Tue Sep 24 21:06:04 2019
New Revision: 1867497
URL: http://svn.apache.org/viewvc?rev=1867497&view=rev
Log:
add XPathHelper
Added:
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
- copied, changed from r1867496, poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
Copied: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java (from r1867496, poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java?p2=poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java&p1=poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java&r1=1867496&r2=1867497&rev=1867497&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java Tue Sep 24 21:06:04 2019
@@ -21,29 +21,29 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
import javax.xml.XMLConstants;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.xpath.XPathFactory;
-public final class TransformerHelper {
- private static POILogger logger = POILogFactory.getLogger(TransformerHelper.class);
+public final class XPathHelper {
+ private static POILogger logger = POILogFactory.getLogger(XPathHelper.class);
- private TransformerHelper() {}
+ private XPathHelper() {}
- static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ static final XPathFactory xpathFactory = XPathFactory.newInstance();
static {
- trySetFeature(transformerFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ trySetFeature(xpathFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
}
- public static TransformerFactory getFactory() {
- return transformerFactory;
+ public static XPathFactory getFactory() {
+ return xpathFactory;
}
- private static void trySetFeature(TransformerFactory tf, String feature, boolean enabled) {
+ private static void trySetFeature(XPathFactory xpf, String feature, boolean enabled) {
try {
- tf.setFeature(feature, enabled);
+ xpf.setFeature(feature, enabled);
} catch (Exception e) {
- logger.log(POILogger.WARN, "TransformerFactory Feature unsupported", feature, e);
+ logger.log(POILogger.WARN, "XPathFactory Feature unsupported", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(POILogger.WARN, "Cannot set TransformerFactory feature because outdated XML parser in classpath", feature, ame);
+ logger.log(POILogger.WARN, "Cannot set XPathFactory feature because outdated XML parser in classpath", feature, ame);
}
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java?rev=1867497&r1=1867496&r2=1867497&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java Tue Sep 24 21:06:04 2019
@@ -38,10 +38,10 @@ import javax.xml.namespace.NamespaceCont
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.ooxml.util.DocumentHelper;
+import org.apache.poi.ooxml.util.XPathHelper;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -107,7 +107,7 @@ public class SignaturePart {
*/
public boolean validate() {
KeyInfoKeySelector keySelector = new KeyInfoKeySelector();
- XPath xpath = XPathFactory.newInstance().newXPath();
+ XPath xpath = XPathHelper.getFactory().newXPath();
xpath.setNamespaceContext(new XPathNSContext());
try {
@@ -165,7 +165,7 @@ public class SignaturePart {
signatureConfig.setSigningCertificateChain(certChain);
signatureConfig.setSignatureMethodFromUri(xmlSignature.getSignedInfo().getSignatureMethod().getAlgorithm());
- final XPath xpath = XPathFactory.newInstance().newXPath();
+ final XPath xpath = XPathHelper.getFactory().newXPath();
xpath.setNamespaceContext(new XPathNSContext());
final Map<String,Consumer<String>> m = new HashMap();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java?rev=1867497&r1=1867496&r2=1867497&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java Tue Sep 24 21:06:04 2019
@@ -34,8 +34,8 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
+import org.apache.poi.ooxml.util.XPathHelper;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ooxml.util.DocumentHelper;
@@ -95,8 +95,7 @@ public class XSSFImportFromXML {
List<XSSFTable> tables = _map.getRelatedTables();
- XPathFactory xpathFactory = XPathFactory.newInstance();
- XPath xpath = xpathFactory.newXPath();
+ XPath xpath = XPathHelper.getFactory().newXPath();
// Setting namespace context to XPath
// Assuming that the namespace prefix in the mapping xpath is the
@@ -305,4 +304,5 @@ public class XSSFImportFromXML {
return null;
}
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org