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 2011/04/28 12:20:22 UTC
svn commit: r1097398 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security:
./ algorithms/implementations/ c14n/ c14n/implementations/
keys/content/x509/ signature/ transforms/implementations/ utils/
utils/resolver/
Author: coheigea
Date: Thu Apr 28 10:20:22 2011
New Revision: 1097398
URL: http://svn.apache.org/viewvc?rev=1097398&view=rev
Log:
[SANTUARIO-207] - Fixed a bunch of findbugs warnings.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Thu Apr 28 10:20:22 2011
@@ -331,20 +331,20 @@ public class Init {
new JCEMapper.Algorithm(null, null)
);
defaultAlgorithms.put(
- XMLCipher.TRIPLEDES_KeyWrap,
- new JCEMapper.Algorithm("DESede", "DESedeWrap")
+ XMLCipher.TRIPLEDES_KeyWrap,
+ new JCEMapper.Algorithm("DESede", "DESedeWrap")
);
defaultAlgorithms.put(
- XMLCipher.AES_128_KeyWrap,
- new JCEMapper.Algorithm("AES", "AESWrap")
+ XMLCipher.AES_128_KeyWrap,
+ new JCEMapper.Algorithm("AES", "AESWrap")
);
defaultAlgorithms.put(
- XMLCipher.AES_192_KeyWrap,
- new JCEMapper.Algorithm("AES", "AESWrap")
+ XMLCipher.AES_192_KeyWrap,
+ new JCEMapper.Algorithm("AES", "AESWrap")
);
defaultAlgorithms.put(
- XMLCipher.AES_256_KeyWrap,
- new JCEMapper.Algorithm("AES", "AESWrap")
+ XMLCipher.AES_256_KeyWrap,
+ new JCEMapper.Algorithm("AES", "AESWrap")
);
//
@@ -413,6 +413,10 @@ public class Init {
break;
}
}
+ if (config == null) {
+ log.error("Error in reading configuration file - Configuration element not found");
+ return;
+ }
for (Node el = config.getFirstChild(); el != null; el = el.getNextSibling()) {
if (el == null || Node.ELEMENT_NODE != el.getNodeType()) {
continue;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java Thu Apr 28 10:20:22 2011
@@ -356,7 +356,7 @@ public abstract class IntegrityHmac exte
Element HMElem =
XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_HMACOUTPUTLENGTH);
Text HMText =
- doc.createTextNode(new Integer(this.HMACOutputLength).toString());
+ doc.createTextNode(Integer.valueOf(this.HMACOutputLength).toString());
HMElem.appendChild(HMText);
XMLUtils.addReturnToElement(element);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java Thu Apr 28 10:20:22 2011
@@ -101,7 +101,7 @@ public class Canonicalizer {
} catch (Exception e) {
Object exArgs[] = { algorithmURI };
throw new InvalidCanonicalizerException(
- "signature.Canonicalizer.UnknownCanonicalizer", exArgs
+ "signature.Canonicalizer.UnknownCanonicalizer", exArgs, e
);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Thu Apr 28 10:20:22 2011
@@ -372,6 +372,9 @@ public abstract class CanonicalizerBase
if (currentNode != null && Node.ELEMENT_NODE == currentNode.getNodeType()) {
getParentNameSpaces((Element)currentNode, ns);
}
+ if (currentNode == null) {
+ return;
+ }
Node sibling = null;
Node parentNode = null;
OutputStream writer = this.writer;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Thu Apr 28 10:20:22 2011
@@ -160,7 +160,6 @@ public class NameSpaceSymbTable {
needsClone();
symb.put(prefix, entry);
entry.rendered = true;
- entry.level = nameSpaces;
entry.lastrendered = entry.uri;
// Return the node for outputing.
return entry.n;
@@ -286,9 +285,6 @@ public class NameSpaceSymbTable {
**/
class NameSpaceSymbEntry implements Cloneable {
- /** the level where the definition was rendered(Only for inclusive) */
- int level = 0;
-
String prefix;
/**The URI that the prefix defines */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Thu Apr 28 10:20:22 2011
@@ -109,7 +109,7 @@ public class XMLX509SKI extends Signatur
throws XMLSecurityException {
if (cert.getVersion() < 3) {
- Object exArgs[] = { new Integer(cert.getVersion()) };
+ Object exArgs[] = { Integer.valueOf(cert.getVersion()) };
throw new XMLSecurityException("certificate.noSki.lowVersion", exArgs);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Thu Apr 28 10:20:22 2011
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
* @author Christian Geuer-Pollmann
* $todo$ check whether an XMLSignatureInput can be _both_, octet stream _and_ node set?
*/
-public class XMLSignatureInput implements Cloneable {
+public class XMLSignatureInput {
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(XMLSignatureInput.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java Thu Apr 28 10:20:22 2011
@@ -154,7 +154,7 @@ public class TransformXPath extends Tran
Object[] eArgs = {currentNode};
throw new XMLSecurityRuntimeException("signature.Transform.node", eArgs, e);
} catch (Exception e) {
- Object[] eArgs = {currentNode, new Short(currentNode.getNodeType())};
+ Object[] eArgs = {currentNode, Short.valueOf(currentNode.getNodeType())};
throw new XMLSecurityRuntimeException("signature.Transform.nodeAndType",eArgs, e);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java Thu Apr 28 10:20:22 2011
@@ -276,7 +276,7 @@ public class CachedXPathFuncHereAPI {
XPath xpath = null;
Class[] classes = new Class[]{String.class, SourceLocator.class, PrefixResolver.class, int.class,
ErrorListener.class, FunctionTable.class};
- Object[] objects = new Object[]{str, null, prefixResolver, new Integer(XPath.SELECT), null, funcTable};
+ Object[] objects = new Object[]{str, null, prefixResolver, Integer.valueOf(XPath.SELECT), null, funcTable};
try {
Constructor constructor = XPath.class.getConstructor(classes);
xpath = (XPath) constructor.newInstance(objects);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java Thu Apr 28 10:20:22 2011
@@ -38,7 +38,7 @@ import org.w3c.dom.Text;
public abstract class ElementProxy {
/** {@link org.apache.commons.logging} logging facility */
- protected static org.apache.commons.logging.Log log =
+ protected static final org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(ElementProxy.class);
/** Field constructionElement */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java Thu Apr 28 10:20:22 2011
@@ -83,7 +83,7 @@ public class RFC2253Parser {
for (int j = 0; (k = DN.indexOf(",", j)) >= 0; j = k + 1) {
l += countQuotes(DN, j, k);
- if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) != 1) {
+ if ((k > 0) && (DN.charAt(k - 1) != '\\') && (l % 2) == 0) {
sb.append(parseRDN(DN.substring(i, k).trim(), toXml) + ",");
i = k + 1;
@@ -116,7 +116,7 @@ public class RFC2253Parser {
for (int j = 0; (k = str.indexOf("+", j)) >= 0; j = k + 1) {
l += countQuotes(str, j, k);
- if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) != 1) {
+ if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
sb.append(parseATAV(trim(str.substring(i, k)), toXml) + "+");
i = k + 1;
@@ -413,7 +413,7 @@ public class RFC2253Parser {
for (int j = 0; (k = str.indexOf(symbol, j)) >= 0; j = k + 1) {
l += countQuotes(str, j, k);
- if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) != 1) {
+ if ((k > 0) && (str.charAt(k - 1) != '\\') && (l % 2) == 0) {
sb.append(trim(str.substring(i, k)) + replace);
i = k + 1;
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=1097398&r1=1097397&r2=1097398&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 28 10:20:22 2011
@@ -495,6 +495,9 @@ public class XMLUtils {
}
}
case Node.ENTITY_REFERENCE_NODE :
+ parent = node;
+ sibling = node.getFirstChild();
+ break;
case Node.DOCUMENT_NODE :
parent = node;
sibling = node.getFirstChild();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1097398&r1=1097397&r2=1097398&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Thu Apr 28 10:20:22 2011
@@ -60,7 +60,7 @@ public abstract class ResourceResolverSp
if (properties == null) {
properties = new HashMap<String, String>();
}
- this.properties.put(key, value);
+ properties.put(key, value);
}
/**
@@ -73,19 +73,19 @@ public abstract class ResourceResolverSp
if (properties == null) {
return null;
}
- return this.properties.get(key);
+ return properties.get(key);
}
/**
*
* @param properties
*/
- public void engineAddProperies(Map<String, String> properties) {
- if (properties != null) {
+ public void engineAddProperies(Map<String, String> newProperties) {
+ if (newProperties != null && !newProperties.isEmpty()) {
if (properties == null) {
properties = new HashMap<String, String>();
}
- this.properties.putAll(properties);
+ properties.putAll(newProperties);
}
}