You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2020/04/30 17:02:31 UTC
svn commit: r1877223 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache:
jcp/xml/dsig/internal/dom/ xml/security/algorithms/
xml/security/stax/impl/processor/input/ xml/security/stax/securityToken/
xml/security/transforms/ xml/security/tr...
Author: coheigea
Date: Thu Apr 30 17:02:30 2020
New Revision: 1877223
URL: http://svn.apache.org/viewvc?rev=1877223&view=rev
Log:
SANTUARIO-540 - Optimizing some codes. Thanks to Alanscut <wp...@163.com> for the patch. This closes #29.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Thu Apr 30 17:02:30 2020
@@ -162,7 +162,7 @@ public final class DOMXMLObject extends
throws MarshalException {
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
- Element objElem = objectElem != null ? objectElem : null;
+ Element objElem = objectElem;
if (objElem == null) {
objElem = DOMUtils.createElement(ownerDoc, "Object",
XMLSignature.XMLNS, dsPrefix);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java Thu Apr 30 17:02:30 2020
@@ -87,7 +87,7 @@ public final class Utils {
return null;
}
String id = uri.substring(1);
- if (id != null && id.startsWith("xpointer(id(")) {
+ if (id.startsWith("xpointer(id(")) {
int i1 = id.indexOf('\'');
int i2 = id.indexOf('\'', i1+1);
id = id.substring(i1+1, i2);
@@ -111,6 +111,6 @@ public final class Utils {
private static boolean getBoolean(XMLCryptoContext xc, String name) {
Boolean value = (Boolean)xc.getProperty(name);
- return value != null && value.booleanValue();
+ return value != null && value;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java Thu Apr 30 17:02:30 2020
@@ -19,6 +19,7 @@
package org.apache.xml.security.algorithms;
import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import org.apache.xml.security.signature.XMLSignatureException;
@@ -114,11 +115,7 @@ public final class MessageDigestAlgorith
} else {
md = MessageDigest.getInstance(algorithmID, provider);
}
- } catch (java.security.NoSuchAlgorithmException ex) {
- Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
- } catch (NoSuchProviderException ex) {
+ } catch (NoSuchAlgorithmException | NoSuchProviderException ex) {
Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java Thu Apr 30 17:02:30 2020
@@ -233,15 +233,8 @@ public class XMLEncryptedKeyInputHandler
|| encryptedKeyType.getCipherData().getCipherValue().getContent().isEmpty()) {
throw new XMLSecurityException("stax.encryption.noCipherValue");
}
- } catch (NoSuchPaddingException e) {
- throw new XMLSecurityException(e);
- } catch (NoSuchAlgorithmException e) {
- throw new XMLSecurityException(e);
- } catch (InvalidAlgorithmParameterException e) {
- throw new XMLSecurityException(e);
- } catch (InvalidKeyException e) {
- throw new XMLSecurityException(e);
- } catch (NoSuchProviderException e) {
+ } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidAlgorithmParameterException
+ | InvalidKeyException | NoSuchProviderException e) {
throw new XMLSecurityException(e);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java Thu Apr 30 17:02:30 2020
@@ -50,11 +50,7 @@ public abstract class SecurityTokenFacto
Class<SecurityTokenFactory> securityTokenFactoryClass =
(Class<SecurityTokenFactory>) ClassLoaderUtils.loadClass(stf, callingClass);
instance = securityTokenFactoryClass.newInstance();
- } catch (ClassNotFoundException e) {
- throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
- } catch (InstantiationException e) {
- throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
- } catch (IllegalAccessException e) {
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java Thu Apr 30 17:02:30 2020
@@ -196,12 +196,7 @@ public final class Transform extends Sig
ClassLoaderUtils.loadClass(implementingClass, Transform.class);
try {
transformSpiHash.put(algorithmURI, transformSpiClass.newInstance());
- } catch (InstantiationException ex) {
- Object[] exArgs = { algorithmURI };
- throw new InvalidTransformException(
- ex, "signature.Transform.UnknownTransform", exArgs
- );
- } catch (IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException ex) {
Object[] exArgs = { algorithmURI };
throw new InvalidTransformException(
ex, "signature.Transform.UnknownTransform", exArgs
@@ -232,12 +227,7 @@ public final class Transform extends Sig
}
try {
transformSpiHash.put(algorithmURI, implementingClass.newInstance());
- } catch (InstantiationException ex) {
- Object[] exArgs = { algorithmURI };
- throw new InvalidTransformException(
- ex, "signature.Transform.UnknownTransform", exArgs
- );
- } catch (IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException ex) {
Object[] exArgs = { algorithmURI };
throw new InvalidTransformException(
ex, "signature.Transform.UnknownTransform", exArgs
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java Thu Apr 30 17:02:30 2020
@@ -268,11 +268,7 @@ public class Transforms extends Signatur
}
return xmlSignatureInput;
- } catch (IOException ex) {
- throw new TransformationException(ex);
- } catch (CanonicalizationException ex) {
- throw new TransformationException(ex);
- } catch (InvalidCanonicalizerException ex) {
+ } catch (IOException | CanonicalizationException | InvalidCanonicalizerException ex) {
throw new TransformationException(ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java Thu Apr 30 17:02:30 2020
@@ -27,8 +27,6 @@ import java.util.Set;
import javax.xml.transform.TransformerException;
-import org.apache.xml.security.c14n.CanonicalizationException;
-import org.apache.xml.security.c14n.InvalidCanonicalizerException;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.NodeFilter;
import org.apache.xml.security.signature.XMLSignatureInput;
@@ -124,17 +122,7 @@ public class TransformXPath2Filter exten
);
input.setNodeSet(true);
return input;
- } catch (TransformerException ex) {
- throw new TransformationException(ex);
- } catch (DOMException ex) {
- throw new TransformationException(ex);
- } catch (CanonicalizationException ex) {
- throw new TransformationException(ex);
- } catch (InvalidCanonicalizerException ex) {
- throw new TransformationException(ex);
- } catch (XMLSecurityException ex) {
- throw new TransformationException(ex);
- } catch (IOException ex) {
+ } catch (TransformerException | DOMException | XMLSecurityException | IOException ex) {
throw new TransformationException(ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java Thu Apr 30 17:02:30 2020
@@ -27,7 +27,6 @@ import java.io.OutputStream;
import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
@@ -160,11 +159,7 @@ public class TransformXSLT extends Trans
output.setSecureValidation(secureValidation);
output.setOutputStream(baos);
return output;
- } catch (XMLSecurityException ex) {
- throw new TransformationException(ex);
- } catch (TransformerConfigurationException ex) {
- throw new TransformationException(ex);
- } catch (TransformerException ex) {
+ } catch (XMLSecurityException | TransformerException ex) {
throw new TransformationException(ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java Thu Apr 30 17:02:30 2020
@@ -86,7 +86,7 @@ public final class ClassLoaderUtils {
url = callingClass.getResource(resourceName);
}
- if (url == null && resourceName != null && resourceName.charAt(0) != '/') {
+ if (url == null && resourceName.charAt(0) != '/') {
return getResource('/' + resourceName, callingClass);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1877223&r1=1877222&r2=1877223&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Thu Apr 30 17:02:30 2020
@@ -27,9 +27,9 @@ import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.Canonicalizer;
@@ -222,12 +222,7 @@ public final class XMLUtils {
Canonicalizer.getInstance(
Canonicalizer.ALGO_ID_C14N_PHYSICAL).canonicalizeSubtree(contextNode, os);
- } catch (IOException ex) {
- LOG.debug(ex.getMessage(), ex);
- }
- catch (InvalidCanonicalizerException ex) {
- LOG.debug(ex.getMessage(), ex);
- } catch (CanonicalizationException ex) {
+ } catch (IOException | InvalidCanonicalizerException | CanonicalizationException ex) {
LOG.debug(ex.getMessage(), ex);
}
}
@@ -249,10 +244,7 @@ public final class XMLUtils {
try {
Canonicalizer.getInstance(
Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS).canonicalizeSubtree(contextNode, os);
- } catch (InvalidCanonicalizerException ex) {
- LOG.debug(ex.getMessage(), ex);
- // throw new RuntimeException(ex.getMessage());
- } catch (CanonicalizationException ex) {
+ } catch (InvalidCanonicalizerException | CanonicalizationException ex) {
LOG.debug(ex.getMessage(), ex);
// throw new RuntimeException(ex.getMessage());
}
@@ -779,17 +771,8 @@ public final class XMLUtils {
* @return nodes with the constrain
*/
public static Set<Node> excludeNodeFromSet(Node signatureElement, Set<Node> inputSet) {
- Set<Node> resultSet = new HashSet<>();
- Iterator<Node> iterator = inputSet.iterator();
-
- while (iterator.hasNext()) {
- Node inputNode = iterator.next();
-
- if (!XMLUtils.isDescendantOrSelf(signatureElement, inputNode)) {
- resultSet.add(inputNode);
- }
- }
- return resultSet;
+ return inputSet.stream().filter((inputNode) ->
+ !XMLUtils.isDescendantOrSelf(signatureElement, inputNode)).collect(Collectors.toSet());
}
/**