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 2019/12/13 17:58:03 UTC
svn commit: r1871342 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache:
jcp/xml/dsig/internal/dom/ xml/security/encryption/
xml/security/keys/keyresolver/implementations/ xml/security/signature/
xml/security/signature/reference/ xml/secu...
Author: coheigea
Date: Fri Dec 13 17:58:03 2019
New Revision: 1871342
URL: http://svn.apache.org/viewvc?rev=1871342&view=rev
Log:
Some trivial fixes
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Fri Dec 13 17:58:03 2019
@@ -222,7 +222,7 @@ public abstract class DOMDigestMethod ex
* parameters. Subclasses should override it if they have parameters.
*
* @param parent the parent element to append the parameters to
- * @param the namespace prefix to use
+ * @param prefix the namespace prefix to use
* @throws MarshalException if the parameters cannot be marshalled
*/
void marshalParams(Element parent, String prefix)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Fri Dec 13 17:58:03 2019
@@ -121,7 +121,7 @@ public class DOMSubTreeData implements N
*
* @param node the node to traverse
* @param nodeSet the set of nodes traversed so far
- * @param the previous sibling node
+ * @param prevSibling the previous sibling node
*/
@SuppressWarnings("fallthrough")
private void nodeSetMinusCommentNodes(Node node, List<Node> nodeSet,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java Fri Dec 13 17:58:03 2019
@@ -200,7 +200,7 @@ public class DOMTransform extends DOMStr
* the specified <code>DOMSignContext</code> before transforming the data.
*
* @param data the data to be transformed
- * @param sc the <code>XMLCryptoContext</code> containing
+ * @param xc the <code>XMLCryptoContext</code> containing
* additional context (may be <code>null</code> if not applicable)
* @param context the marshalling context
* @return the transformed data
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Fri Dec 13 17:58:03 2019
@@ -1099,7 +1099,7 @@ public class XMLCipher {
byte[] serializedOctets = null;
if (serializedData == null) {
- if (type.equals(EncryptionConstants.TYPE_CONTENT)) {
+ if (EncryptionConstants.TYPE_CONTENT.equals(type)) {
NodeList children = element.getChildNodes();
if (null != children) {
serializedOctets = serializer.serializeToByteArray(children);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Fri Dec 13 17:58:03 2019
@@ -199,12 +199,12 @@ public class RetrievalMethodResolver ext
private static X509Certificate resolveCertificate(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
- }
// An element has been provided
if (e != null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ + e.getLocalName() + " Element");
+ }
return KeyResolver.getX509Certificate(e, baseURI, storage);
}
return null;
@@ -221,12 +221,12 @@ public class RetrievalMethodResolver ext
private static PublicKey resolveKey(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
- }
// An element has been provided
if (e != null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ + e.getLocalName() + " Element");
+ }
return KeyResolver.getPublicKey(e, baseURI, storage);
}
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Fri Dec 13 17:58:03 2019
@@ -449,7 +449,7 @@ public class Manifest extends SignatureE
}
}
- return ((ArrayList<VerifiedReference>)verificationResults).get(index).isValid();
+ return verificationResults.get(index).isValid();
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java Fri Dec 13 17:58:03 2019
@@ -120,7 +120,7 @@ public class ReferenceSubTreeData implem
*
* @param node the node to traverse
* @param nodeSet the set of nodes traversed so far
- * @param the previous sibling node
+ * @param prevSibling the previous sibling node
*/
@SuppressWarnings("fallthrough")
private void nodeSetMinusCommentNodes(Node node, List<Node> nodeSet,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1871342&r1=1871341&r2=1871342&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Fri Dec 13 17:58:03 2019
@@ -329,8 +329,7 @@ public class ResourceResolver {
/**
* Method canResolve
*
- * @param uri
- * @param baseURI
+ * @param context
* @return true if it can resolve the uri
*/
private boolean canResolve(ResourceResolverContext context) {