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 2013/08/09 13:24:00 UTC
svn commit: r1512259 - in /santuario/xml-security-java/trunk: ./
src/main/java/org/apache/xml/security/encryption/
src/main/java/org/apache/xml/security/keys/
src/main/java/org/apache/xml/security/keys/content/
src/main/java/org/apache/xml/security/key...
Author: coheigea
Date: Fri Aug 9 11:23:59 2013
New Revision: 1512259
URL: http://svn.apache.org/r1512259
Log:
More PMD fixes
Modified:
santuario/xml-security-java/trunk/pom.xml
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/encryption/XMLCipherInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.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/keys/keyresolver/KeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.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.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/signature/XMLSignatureInputDebugger.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.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/transforms/implementations/TransformXPath2Filter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.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/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Fri Aug 9 11:23:59 2013
@@ -121,11 +121,6 @@
<failOnViolation>true</failOnViolation>
<verbose>true</verbose>
<targetJdk>1.6</targetJdk>
- <excludes>
- <exclude>
- **/XMLX509SKI.java,**/CryptoBase.java, **/XPathFactory.java,**/DEREncodedKeyValue.java
- </exclude>
- </excludes>
</configuration>
<executions>
<execution>
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=1512259&r1=1512258&r2=1512259&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 Aug 9 11:23:59 2013
@@ -327,7 +327,7 @@ public class XMLCipher {
* @since 1.0.
*/
private static boolean isValidEncryptionAlgorithm(String algorithm) {
- return (
+ return
algorithm.equals(TRIPLEDES) ||
algorithm.equals(AES_128) ||
algorithm.equals(AES_256) ||
@@ -341,8 +341,7 @@ public class XMLCipher {
algorithm.equals(TRIPLEDES_KeyWrap) ||
algorithm.equals(AES_128_KeyWrap) ||
algorithm.equals(AES_256_KeyWrap) ||
- algorithm.equals(AES_192_KeyWrap)
- );
+ algorithm.equals(AES_192_KeyWrap);
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java Fri Aug 9 11:23:59 2013
@@ -78,7 +78,7 @@ public class XMLCipherInput {
* @throws XMLEncryptionException {@link XMLEncryptionException}
*/
public XMLCipherInput(EncryptedType input) throws XMLEncryptionException {
- cipherData = ((input == null) ? null : input.getCipherData());
+ cipherData = input == null ? null : input.getCipherData();
mode = XMLCipher.DECRYPT_MODE;
if (cipherData == null) {
throw new XMLEncryptionException("CipherData is null");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Fri Aug 9 11:23:59 2013
@@ -483,7 +483,7 @@ public class KeyInfo extends SignatureEl
* $todo$ using this method, we don't see unknown Elements
* from Signature NS; revisit
*/
- if ((current.getNodeType() == Node.ELEMENT_NODE)
+ if (current.getNodeType() == Node.ELEMENT_NODE
&& current.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
res++;
}
@@ -697,7 +697,7 @@ public class KeyInfo extends SignatureEl
* $todo$ using this method, we don't see unknown Elements
* from Signature NS; revisit
*/
- if ((current.getNodeType() == Node.ELEMENT_NODE)
+ if (current.getNodeType() == Node.ELEMENT_NODE
&& current.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
res++;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java Fri Aug 9 11:23:59 2013
@@ -117,9 +117,9 @@ public class DEREncodedKeyValue extends
if (publicKey != null) {
return publicKey;
}
- } catch (NoSuchAlgorithmException e) {
+ } catch (NoSuchAlgorithmException e) { //NOPMD
// Do nothing, try the next type
- } catch (InvalidKeySpecException e) {
+ } catch (InvalidKeySpecException e) { //NOPMD
// Do nothing, try the next type
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Fri Aug 9 11:23:59 2013
@@ -62,16 +62,14 @@ public class X509Data extends SignatureE
super(element, baseURI);
Node sibling = getFirstChild();
- while (sibling != null) {
- if (sibling.getNodeType() != Node.ELEMENT_NODE) {
- sibling = sibling.getNextSibling();
- continue;
- }
- return;
+ while (sibling != null && sibling.getNodeType() != Node.ELEMENT_NODE) {
+ sibling = sibling.getNextSibling();
+ }
+ if (sibling == null || sibling.getNodeType() != Node.ELEMENT_NODE) {
+ /* No Elements found */
+ Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
+ throw new XMLSecurityException("xml.WrongContent", exArgs);
}
- /* No Elements found */
- Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
- throw new XMLSecurityException("xml.WrongContent", exArgs);
}
/**
@@ -327,7 +325,7 @@ public class X509Data extends SignatureE
int result = 0;
Node n = getFirstChild();
while (n != null) {
- if ((n.getNodeType() == Node.ELEMENT_NODE)
+ if (n.getNodeType() == Node.ELEMENT_NODE
&& !n.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
result++;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java Fri Aug 9 11:23:59 2013
@@ -79,7 +79,7 @@ public class DSAKeyValue extends Signatu
addReturnToSelf();
- if (key instanceof java.security.interfaces.DSAPublicKey) {
+ if (key instanceof DSAPublicKey) {
DSAParams params = ((DSAPublicKey) key).getParams();
this.addBigIntegerElement(params.getP(), Constants._TAG_P);
this.addBigIntegerElement(params.getQ(), Constants._TAG_Q);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java Fri Aug 9 11:23:59 2013
@@ -74,7 +74,7 @@ public class RSAKeyValue extends Signatu
addReturnToSelf();
- if (key instanceof java.security.interfaces.RSAPublicKey ) {
+ if (key instanceof RSAPublicKey ) {
this.addBigIntegerElement(
((RSAPublicKey) key).getModulus(), Constants._TAG_MODULUS
);
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -48,7 +48,7 @@ public class XMLX509SKI extends Signatur
* A key identifier shall be unique with respect to all key identifiers
* for the subject with which it is used. This extension is always non-critical.
*/
- public static final String SKI_OID = "2.5.29.14";
+ public static final String SKI_OID = "2.5.29.14"; //NOPMD
/**
* Constructor X509SKI
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Fri Aug 9 11:23:59 2013
@@ -90,9 +90,9 @@ public class KeyResolver {
for (KeyResolver resolver : resolverVector) {
if (resolver == null) {
Object exArgs[] = {
- (((element != null)
- && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName() : "null")
+ element != null
+ && element.getNodeType() == Node.ELEMENT_NODE
+ ? element.getTagName() : "null"
};
throw new KeyResolverException("utils.resolver.noClass", exArgs);
@@ -108,8 +108,8 @@ public class KeyResolver {
}
Object exArgs[] = {
- (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName() : "null")
+ element != null && element.getNodeType() == Node.ELEMENT_NODE
+ ? element.getTagName() : "null"
};
throw new KeyResolverException("utils.resolver.noClass", exArgs);
@@ -131,9 +131,9 @@ public class KeyResolver {
for (KeyResolver resolver : resolverVector) {
if (resolver == null) {
Object exArgs[] = {
- (((element != null)
- && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName() : "null")
+ element != null
+ && element.getNodeType() == Node.ELEMENT_NODE
+ ? element.getTagName() : "null"
};
throw new KeyResolverException("utils.resolver.noClass", exArgs);
@@ -149,8 +149,8 @@ public class KeyResolver {
}
Object exArgs[] = {
- (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName() : "null")
+ element != null && element.getNodeType() == Node.ELEMENT_NODE
+ ? element.getTagName() : "null"
};
throw new KeyResolverException("utils.resolver.noClass", exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Fri Aug 9 11:23:59 2013
@@ -104,7 +104,7 @@ public class EncryptedKeyResolver extend
}
/** @inheritDoc */
- public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
+ public SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage
) {
if (log.isDebugEnabled()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Fri Aug 9 11:23:59 2013
@@ -80,7 +80,7 @@ public class X509CertificateResolver ext
try {
Element[] els =
XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509CERTIFICATE);
- if ((els == null) || (els.length == 0)) {
+ if (els == null || els.length == 0) {
Element el =
XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_X509DATA, 0);
if (el != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Fri Aug 9 11:23:59 2013
@@ -89,7 +89,7 @@ public class X509SKIResolver extends Key
Element x509childNodes[] = null;
x509childNodes = XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509SKI);
- if (!((x509childNodes != null) && (x509childNodes.length > 0))) {
+ if (!(x509childNodes != null && x509childNodes.length > 0)) {
if (log.isDebugEnabled()) {
log.debug("I can't");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Fri Aug 9 11:23:59 2013
@@ -89,8 +89,7 @@ public class X509SubjectNameResolver ext
x509childNodes =
XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509SUBJECTNAME);
- if (!((x509childNodes != null)
- && (x509childNodes.length > 0))) {
+ if (!(x509childNodes != null && x509childNodes.length > 0)) {
if (log.isDebugEnabled()) {
log.debug("I can't");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java Fri Aug 9 11:23:59 2013
@@ -148,7 +148,7 @@ public class StorageResolver {
}
currentResolver = findNextResolver();
- return (currentResolver != null);
+ return currentResolver != null;
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Fri Aug 9 11:23:59 2013
@@ -176,7 +176,7 @@ public class CertsInFilesystemDirectoryR
/** @inheritDoc */
public boolean hasNext() {
- return (this.i < this.certs.size());
+ return this.i < this.certs.size();
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java Fri Aug 9 11:23:59 2013
@@ -100,7 +100,7 @@ public class KeyStoreResolver extends St
nextCert = findNextCert();
}
- return (nextCert != null);
+ return nextCert != null;
}
/** @inheritDoc */
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=1512259&r1=1512258&r2=1512259&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 Aug 9 11:23:59 2013
@@ -358,7 +358,7 @@ public class Manifest extends SignatureE
while (nlIterator.hasNext()) {
Node n = nlIterator.next();
- if ((n.getNodeType() == Node.ELEMENT_NODE)
+ if (n.getNodeType() == Node.ELEMENT_NODE
&& ((Element) n).getNamespaceURI().equals(Constants.SignatureSpecNS)
&& ((Element) n).getLocalName().equals(Constants._TAG_MANIFEST)
) {
@@ -442,7 +442,7 @@ public class Manifest extends SignatureE
* @throws XMLSecurityException
*/
public boolean getVerificationResult(int index) throws XMLSecurityException {
- if ((index < 0) || (index > this.getLength() - 1)) {
+ if (index < 0 || index > this.getLength() - 1) {
Object exArgs[] = { Integer.toString(index), Integer.toString(this.getLength()) };
Exception e =
new IndexOutOfBoundsException(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Fri Aug 9 11:23:59 2013
@@ -536,9 +536,9 @@ public class Reference extends Signature
Set<String> inclusiveNamespaces = new HashSet<String>();
if (c14nTransform != null
- && (c14nTransform.length(
+ && c14nTransform.length(
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
- InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES) == 1)) {
+ InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES) == 1) {
// there is one InclusiveNamespaces element
InclusiveNamespaces in =
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -282,8 +282,7 @@ public class XMLSignatureInput {
* @return true if the object has been set up with a Node set
*/
public boolean isNodeSet() {
- return ((inputOctetStreamProxy == null
- && inputNodeSet != null) || isNodeSet);
+ return inputOctetStreamProxy == null && inputNodeSet != null || isNodeSet;
}
/**
@@ -292,8 +291,8 @@ public class XMLSignatureInput {
* @return true if the object has been set up with an Element
*/
public boolean isElement() {
- return (inputOctetStreamProxy == null && subNode != null
- && inputNodeSet == null && !isNodeSet);
+ return inputOctetStreamProxy == null && subNode != null
+ && inputNodeSet == null && !isNodeSet;
}
/**
@@ -302,8 +301,8 @@ public class XMLSignatureInput {
* @return true if the object has been set up with an octet stream
*/
public boolean isOctetStream() {
- return ((inputOctetStreamProxy != null || bytes != null)
- && (inputNodeSet == null && subNode == null));
+ return (inputOctetStreamProxy != null || bytes != null)
+ && inputNodeSet == null && subNode == null;
}
/**
@@ -323,7 +322,7 @@ public class XMLSignatureInput {
* @return true is the object has been set up with an octet stream
*/
public boolean isByteArray() {
- return (bytes != null && (this.inputNodeSet == null && subNode == null));
+ return bytes != null && this.inputNodeSet == null && subNode == null;
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java Fri Aug 9 11:23:59 2013
@@ -144,7 +144,7 @@ public class XMLSignatureInputDebugger {
* @throws XMLSignatureException
*/
public String getHTMLRepresentation() throws XMLSignatureException {
- if ((this.xpathNodeSet == null) || (this.xpathNodeSet.size() == 0)) {
+ if (this.xpathNodeSet == null || this.xpathNodeSet.size() == 0) {
return HTMLPrefix + "<blink>no node set, sorry</blink>" + HTMLSuffix;
}
@@ -254,9 +254,9 @@ public class XMLSignatureInputDebugger {
outputTextToWriter(currentNode.getNodeValue());
for (Node nextSibling = currentNode.getNextSibling();
- (nextSibling != null)
- && ((nextSibling.getNodeType() == Node.TEXT_NODE)
- || (nextSibling.getNodeType() == Node.CDATA_SECTION_NODE));
+ nextSibling != null
+ && (nextSibling.getNodeType() == Node.TEXT_NODE
+ || nextSibling.getNodeType() == Node.CDATA_SECTION_NODE);
nextSibling = nextSibling.getNextSibling()) {
/*
* The XPath data model allows to select only the first of a
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java Fri Aug 9 11:23:59 2013
@@ -67,8 +67,7 @@ public class FuncHere extends Function {
* @return the xobject
* @throws javax.xml.transform.TransformerException
*/
- public XObject execute(XPathContext xctxt)
- throws javax.xml.transform.TransformerException {
+ public XObject execute(XPathContext xctxt) throws TransformerException {
Node xpathOwnerNode = (Node) xctxt.getOwnerObject();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java Fri Aug 9 11:23:59 2013
@@ -157,7 +157,7 @@ public class TransformBase64Decode exten
}
}
- void traverseElement(org.w3c.dom.Element node, StringBuilder sb) {
+ void traverseElement(Element node, StringBuilder sb) {
Node sibling = node.getFirstChild();
while (sibling != null) {
switch (sibling.getNodeType()) {
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -116,7 +116,7 @@ public class TransformXPath extends Tran
* @return true if needs to be circumvent for bug.
*/
private boolean needsCircumvent(String str) {
- return (str.indexOf("namespace") != -1) || (str.indexOf("name()") != -1);
+ return str.indexOf("namespace") != -1 || str.indexOf("name()") != -1;
}
static class XPathNodeFilter implements NodeFilter {
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -204,7 +204,7 @@ class XPath2NodeFilter implements NodeFi
public int isNodeIncludeDO(Node n, int level) {
int result = 1;
if (hasSubtractFilter) {
- if ((inSubtract == -1) || (level <= inSubtract)) {
+ if (inSubtract == -1 || level <= inSubtract) {
if (inList(n, subtractNodes)) {
inSubtract = level;
} else {
@@ -216,7 +216,7 @@ class XPath2NodeFilter implements NodeFi
}
}
if (result != -1 && hasIntersectFilter
- && ((inIntersect == -1) || (level <= inIntersect))) {
+ && (inIntersect == -1 || level <= inIntersect)) {
if (!inList(n, intersectNodes)) {
inIntersect = -1;
result = 0;
@@ -232,13 +232,13 @@ class XPath2NodeFilter implements NodeFi
return 1;
}
if (hasUnionFilter) {
- if ((inUnion == -1) && inList(n, unionNodes)) {
+ if (inUnion == -1 && inList(n, unionNodes)) {
inUnion = level;
}
if (inUnion != -1) {
return 1;
}
- result=0;
+ result = 0;
}
return result;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java Fri Aug 9 11:23:59 2013
@@ -130,7 +130,7 @@ public class InclusiveNamespaces extends
public static SortedSet<String> prefixStr2Set(String inclusiveNamespaces) {
SortedSet<String> prefixes = new TreeSet<String>();
- if ((inclusiveNamespaces == null) || (inclusiveNamespaces.length() == 0)) {
+ if (inclusiveNamespaces == null || inclusiveNamespaces.length() == 0) {
return prefixes;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer04.java Fri Aug 9 11:23:59 2013
@@ -75,8 +75,8 @@ public class XPath2FilterContainer04 ext
setLocalAttribute(XPath2FilterContainer04._ATT_FILTER, filterType);
- if ((xpath2filter.length() > 2)
- && (!Character.isWhitespace(xpath2filter.charAt(0)))) {
+ if (xpath2filter.length() > 2
+ && !Character.isWhitespace(xpath2filter.charAt(0))) {
addReturnToSelf();
appendSelf(createText(xpath2filter));
addReturnToSelf();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/XPathFilterCHGPContainer.java Fri Aug 9 11:23:59 2013
@@ -88,7 +88,7 @@ public class XPathFilterCHGPContainer ex
setLocalAttribute(XPathFilterCHGPContainer._ATT_INCLUDESLASH, "false");
}
- if ((includeButSearch != null) && (includeButSearch.trim().length() > 0)) {
+ if (includeButSearch != null && includeButSearch.trim().length() > 0) {
Element includeButSearchElem =
ElementProxy.createElementForFamily(
doc, this.getBaseNamespace(), XPathFilterCHGPContainer._TAG_INCLUDE_BUT_SEARCH
@@ -101,7 +101,7 @@ public class XPathFilterCHGPContainer ex
appendSelf(includeButSearchElem);
}
- if ((excludeButSearch != null) && (excludeButSearch.trim().length() > 0)) {
+ if (excludeButSearch != null && excludeButSearch.trim().length() > 0) {
Element excludeButSearchElem =
ElementProxy.createElementForFamily(
doc, this.getBaseNamespace(), XPathFilterCHGPContainer._TAG_EXCLUDE_BUT_SEARCH
@@ -114,7 +114,7 @@ public class XPathFilterCHGPContainer ex
appendSelf(excludeButSearchElem);
}
- if ((exclude != null) && (exclude.trim().length() > 0)) {
+ if (exclude != null && exclude.trim().length() > 0) {
Element excludeElem =
ElementProxy.createElementForFamily(
doc, this.getBaseNamespace(), XPathFilterCHGPContainer._TAG_EXCLUDE);
@@ -134,7 +134,7 @@ public class XPathFilterCHGPContainer ex
* @return the string with enters
*/
static String indentXPathText(String xp) {
- if ((xp.length() > 2) && (!Character.isWhitespace(xp.charAt(0)))) {
+ if (xp.length() > 2 && !Character.isWhitespace(xp.charAt(0))) {
return "\n" + xp + "\n";
}
return xp;
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -86,7 +86,7 @@ public final class ClassLoaderUtils {
url = callingClass.getResource(resourceName);
}
- if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ if (url == null && resourceName != null && resourceName.charAt(0) != '/') {
return getResource('/' + resourceName, callingClass);
}
@@ -191,7 +191,7 @@ public final class ClassLoaderUtils {
}
- if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ if (ret.isEmpty() && resourceName != null && resourceName.charAt(0) != '/') {
return getResources('/' + resourceName, callingClass);
}
return ret;
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=1512259&r1=1512258&r2=1512259&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 Fri Aug 9 11:23:59 2013
@@ -122,7 +122,7 @@ public abstract class ElementProxy {
} else {
String baseName = this.getBaseNamespace();
String prefix = ElementProxy.getDefaultPrefix(baseName);
- if ((prefix == null) || (prefix.length() == 0)) {
+ if (prefix == null || prefix.length() == 0) {
result = doc.createElementNS(namespace, localName);
result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns", namespace);
} else {
@@ -153,7 +153,7 @@ public abstract class ElementProxy {
if (namespace == null) {
result = doc.createElementNS(null, localName);
} else {
- if ((prefix == null) || (prefix.length() == 0)) {
+ if (prefix == null || prefix.length() == 0) {
result = doc.createElementNS(namespace, localName);
result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns", namespace);
} else {
@@ -437,7 +437,7 @@ public abstract class ElementProxy {
throws XMLSecurityException {
String ns;
- if ((prefix == null) || (prefix.length() == 0)) {
+ if (prefix == null || prefix.length() == 0) {
throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
} else if (prefix.equals("xmlns")) {
throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java?rev=1512259&r1=1512258&r2=1512259&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java Fri Aug 9 11:23:59 2013
@@ -34,7 +34,7 @@ public abstract class XPathFactory {
if (funcTableClass != null) {
xalanInstalled = true;
}
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
}