Author: fanningpj
Date: Sat Oct 26 18:12:39 2024
New Revision: 1921576
URL: http://svn.apache.org/viewvc?rev=1921576&view=rev
Log:
immutable lists
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java?rev=1921576&r1=1921575&r2=1921576&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
Sat Oct 26 18:12:39 2024
@@ -118,12 +118,12 @@ public class SignatureConfig {
private static final String XMLSEC_SANTUARIO =
"org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI";
private static final String XMLSEC_JDK =
"org.jcp.xml.dsig.internal.dom.XMLDSigRI";
- private static final List<Supplier<SignatureFacet>> DEFAULT_FACETS =
Arrays.asList(
+ private static final List<Supplier<SignatureFacet>> DEFAULT_FACETS =
Collections.unmodifiableList(Arrays.asList(
OOXMLSignatureFacet::new,
KeyInfoSignatureFacet::new,
XAdESSignatureFacet::new,
Office2010SignatureFacet::new
- );
+ ));
private List<SignatureFacet> signatureFacets = new ArrayList<>();
private HashAlgorithm digestAlgo = HashAlgorithm.sha256;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java?rev=1921576&r1=1921575&r2=1921576&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
Sat Oct 26 18:12:39 2024
@@ -23,6 +23,7 @@ import static org.apache.poi.poifs.crypt
import static org.apache.poi.poifs.crypt.dsig.facets.SignatureFacet.XML_NS;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -51,7 +52,8 @@ public class SignatureMarshalDefaultList
private static final String OBJECT_TAG = "Object";
private static final Set<String> IGNORE_NS = new
HashSet<>(Arrays.asList(null, XML_NS, XML_DIGSIG_NS));
- private static final List<String> DIRECT_NS = Arrays.asList(OO_DIGSIG_NS,
MS_DIGSIG_NS);
+ private static final List<String> DIRECT_NS = Collections.unmodifiableList(
+ Arrays.asList(OO_DIGSIG_NS, MS_DIGSIG_NS));
@Override
public void handleElement(SignatureInfo signatureInfo, Document doc,
EventTarget target, EventListener parentListener) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
