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/07 15:17:54 UTC
svn commit: r1511298 - in /santuario/xml-security-java/trunk/src/main/java:
javax/xml/crypto/dom/ javax/xml/crypto/dsig/ javax/xml/crypto/dsig/keyinfo/
org/apache/jcp/xml/dsig/internal/dom/
Author: coheigea
Date: Wed Aug 7 13:17:53 2013
New Revision: 1511298
URL: http://svn.apache.org/r1511298
Log:
Some PMD fixes
Modified:
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dom/DOMCryptoContext.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/Transform.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
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/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.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/jcp/xml/dsig/internal/dom/DOMUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
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/DOMXMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.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/jcp/xml/dsig/internal/dom/XmlWriter.java
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dom/DOMCryptoContext.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dom/DOMCryptoContext.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dom/DOMCryptoContext.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dom/DOMCryptoContext.java Wed Aug 7 13:17:53 2013
@@ -71,7 +71,7 @@ public class DOMCryptoContext implements
throw new NullPointerException("namespaceURI cannot be null");
}
String prefix = nsMap.get(namespaceURI);
- return (prefix != null ? prefix : defaultPrefix);
+ return prefix != null ? prefix : defaultPrefix;
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/Transform.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/Transform.java Wed Aug 7 13:17:53 2013
@@ -114,7 +114,7 @@ public interface Transform extends XMLSt
* @throws TransformException if an error occurs while executing the
* transform
*/
- public abstract Data transform(Data data, XMLCryptoContext context)
+ Data transform(Data data, XMLCryptoContext context)
throws TransformException;
/**
@@ -137,7 +137,6 @@ public interface Transform extends XMLSt
* @throws TransformException if an error occurs while executing the
* transform
*/
- public abstract Data transform
- (Data data, XMLCryptoContext context, OutputStream os)
+ Data transform(Data data, XMLCryptoContext context, OutputStream os)
throws TransformException;
}
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLSignature.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLSignature.java Wed Aug 7 13:17:53 2013
@@ -196,7 +196,7 @@ public interface XMLSignature extends XM
* @author Sean Mullan
* @author JSR 105 Expert Group
*/
- public interface SignatureValue extends XMLStructure {
+ interface SignatureValue extends XMLStructure {
/**
* Returns the optional <code>Id</code> attribute of this
* <code>SignatureValue</code>, which permits this element to be
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java Wed Aug 7 13:17:53 2013
@@ -38,7 +38,6 @@ import javax.xml.crypto.NoSuchMechanismE
import javax.xml.crypto.URIDereferencer;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.*;
/**
* A factory for creating {@link KeyInfo} objects from scratch or for
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java Wed Aug 7 13:17:53 2013
@@ -177,8 +177,8 @@ abstract class AbstractDOMSignatureMetho
}
SignatureMethod osm = (SignatureMethod)o;
- return (getAlgorithm().equals(osm.getAlgorithm()) &&
- paramsEqual(osm.getParameterSpec()));
+ return getAlgorithm().equals(osm.getAlgorithm()) &&
+ paramsEqual(osm.getParameterSpec());
}
@Override
@@ -201,6 +201,6 @@ abstract class AbstractDOMSignatureMetho
*/
boolean paramsEqual(AlgorithmParameterSpec spec)
{
- return (getParameterSpec() == spec);
+ return getParameterSpec() == spec;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java Wed Aug 7 13:17:53 2013
@@ -109,8 +109,8 @@ public class DOMCanonicalizationMethod e
}
CanonicalizationMethod ocm = (CanonicalizationMethod)o;
- return (getAlgorithm().equals(ocm.getAlgorithm()) &&
- DOMUtils.paramsEqual(getParameterSpec(), ocm.getParameterSpec()));
+ return getAlgorithm().equals(ocm.getAlgorithm()) &&
+ DOMUtils.paramsEqual(getParameterSpec(), ocm.getParameterSpec());
}
@Override
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=1511298&r1=1511297&r2=1511298&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 Wed Aug 7 13:17:53 2013
@@ -169,10 +169,10 @@ public abstract class DOMDigestMethod ex
}
DigestMethod odm = (DigestMethod)o;
- boolean paramsEqual = (params == null ? odm.getParameterSpec() == null :
- params.equals(odm.getParameterSpec()));
+ boolean paramsEqual = params == null ? odm.getParameterSpec() == null :
+ params.equals(odm.getParameterSpec());
- return (getAlgorithm().equals(odm.getAlgorithm()) && paramsEqual);
+ return getAlgorithm().equals(odm.getAlgorithm()) && paramsEqual;
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Wed Aug 7 13:17:53 2013
@@ -201,7 +201,7 @@ public abstract class DOMHMACSignatureMe
}
HMACParameterSpec ospec = (HMACParameterSpec)spec;
- return (outputLength == ospec.getOutputLength());
+ return outputLength == ospec.getOutputLength();
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Wed Aug 7 13:17:53 2013
@@ -124,7 +124,7 @@ public final class DOMKeyInfo extends Ba
} else if (localName.equals("PGPData")) {
content.add(new DOMPGPData(childElem));
} else { //may be MgmtData, SPKIData or element from other namespace
- content.add(new javax.xml.crypto.dom.DOMStructure((childElem)));
+ content.add(new javax.xml.crypto.dom.DOMStructure(childElem));
}
}
keyInfoTypes = Collections.unmodifiableList(content);
@@ -197,10 +197,10 @@ public final class DOMKeyInfo extends Ba
}
KeyInfo oki = (KeyInfo)o;
- boolean idsEqual = (id == null ? oki.getId() == null
- : id.equals(oki.getId()));
+ boolean idsEqual = id == null ? oki.getId() == null
+ : id.equals(oki.getId());
- return (keyInfoTypes.equals(oki.getContent()) && idsEqual);
+ return keyInfoTypes.equals(oki.getContent()) && idsEqual;
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Wed Aug 7 13:17:53 2013
@@ -96,7 +96,7 @@ public final class DOMManifest extends B
refElem = DOMUtils.getNextSiblingElement(refElem);
refCount++;
- if (secVal && (refCount > DOMSignedInfo.MAXIMUM_REFERENCE_COUNT)) {
+ if (secVal && refCount > DOMSignedInfo.MAXIMUM_REFERENCE_COUNT) {
String error = "A maxiumum of " + DOMSignedInfo.MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
@@ -145,10 +145,10 @@ public final class DOMManifest extends B
}
Manifest oman = (Manifest)o;
- boolean idsEqual = (id == null ? oman.getId() == null
- : id.equals(oman.getId()));
+ boolean idsEqual = id == null ? oman.getId() == null
+ : id.equals(oman.getId());
- return (idsEqual && references.equals(oman.getReferences()));
+ return idsEqual && references.equals(oman.getReferences());
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java Wed Aug 7 13:17:53 2013
@@ -171,12 +171,12 @@ public final class DOMPGPData extends Ba
@Override
public byte[] getKeyId() {
- return (keyId == null ? null : keyId.clone());
+ return keyId == null ? null : keyId.clone();
}
@Override
public byte[] getKeyPacket() {
- return (keyPacket == null ? null : keyPacket.clone());
+ return keyPacket == null ? null : keyPacket.clone();
}
@Override
@@ -212,8 +212,8 @@ public final class DOMPGPData extends Ba
}
// tag value must be 6, 14, 5 or 7
- if (((tag & 6) != 6) && ((tag & 14) != 14) &&
- ((tag & 5) != 5) && ((tag & 7) != 7)) {
+ if ((tag & 6) != 6 && (tag & 14) != 14 &&
+ (tag & 5) != 5 && (tag & 7) != 7) {
throw new IllegalArgumentException("keypacket tag is invalid: " +
"must be 6, 14, 5, or 7");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Wed Aug 7 13:17:53 2013
@@ -167,7 +167,7 @@ public final class DOMReference extends
}
this.digestMethod = dm;
this.uri = uri;
- if ((uri != null) && (!uri.equals(""))) {
+ if (uri != null && !uri.equals("")) {
try {
new URI(uri);
} catch (URISyntaxException e) {
@@ -208,7 +208,7 @@ public final class DOMReference extends
transformElem = DOMUtils.getNextSiblingElement(transformElem);
transformCount++;
- if (secVal && (transformCount > MAXIMUM_TRANSFORM_COUNT)) {
+ if (secVal && transformCount > MAXIMUM_TRANSFORM_COUNT) {
String error = "A maxiumum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
@@ -276,13 +276,13 @@ public final class DOMReference extends
@Override
public byte[] getDigestValue() {
- return (digestValue == null ? null : digestValue.clone());
+ return digestValue == null ? null : digestValue.clone();
}
@Override
public byte[] getCalculatedDigestValue() {
- return (calcDigestValue == null ? null
- : calcDigestValue.clone());
+ return calcDigestValue == null ? null
+ : calcDigestValue.clone();
}
@Override
@@ -456,7 +456,7 @@ public final class DOMReference extends
if (!c14n11) {
Boolean prop = (Boolean)context.getProperty
("org.apache.xml.security.useC14N11");
- c14n11 = (prop != null && prop);
+ c14n11 = prop != null && prop;
if (c14n11) {
c14nalg = "http://www.w3.org/2006/12/xml-c14n11";
}
@@ -568,12 +568,12 @@ public final class DOMReference extends
}
Reference oref = (Reference)o;
- boolean idsEqual = (id == null ? oref.getId() == null
- : id.equals(oref.getId()));
- boolean urisEqual = (uri == null ? oref.getURI() == null
- : uri.equals(oref.getURI()));
- boolean typesEqual = (type == null ? oref.getType() == null
- : type.equals(oref.getType()));
+ boolean idsEqual = id == null ? oref.getId() == null
+ : id.equals(oref.getId());
+ boolean urisEqual = uri == null ? oref.getURI() == null
+ : uri.equals(oref.getURI());
+ boolean typesEqual = type == null ? oref.getType() == null
+ : type.equals(oref.getType());
boolean digestValuesEqual =
Arrays.equals(digestValue, oref.getDigestValue());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Wed Aug 7 13:17:53 2013
@@ -141,7 +141,7 @@ public final class DOMRetrievalMethod ex
transformElem = DOMUtils.getNextSiblingElement(transformElem);
transformCount++;
- if (secVal && (transformCount > DOMReference.MAXIMUM_TRANSFORM_COUNT)) {
+ if (secVal && transformCount > DOMReference.MAXIMUM_TRANSFORM_COUNT) {
String error = "A maxiumum of " + DOMReference.MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
@@ -260,11 +260,11 @@ public final class DOMRetrievalMethod ex
}
RetrievalMethod orm = (RetrievalMethod)obj;
- boolean typesEqual = (type == null ? orm.getType() == null
- : type.equals(orm.getType()));
+ boolean typesEqual = type == null ? orm.getType() == null
+ : type.equals(orm.getType());
- return (uri.equals(orm.getURI()) &&
- transforms.equals(orm.getTransforms()) && typesEqual);
+ return uri.equals(orm.getURI()) &&
+ transforms.equals(orm.getTransforms()) && typesEqual;
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Wed Aug 7 13:17:53 2013
@@ -249,23 +249,23 @@ public abstract class DOMSignatureMethod
byte rLength = asn1Bytes[3];
int i;
- for (i = rLength; (i > 0) && (asn1Bytes[(4 + rLength) - i] == 0); i--);
+ for (i = rLength; i > 0 && asn1Bytes[4 + rLength - i] == 0; i--);
byte sLength = asn1Bytes[5 + rLength];
int j;
for (j = sLength;
- (j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
+ j > 0 && asn1Bytes[6 + rLength + sLength - j] == 0; j--);
- if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
- || (asn1Bytes[2] != 2) || (i > 20)
- || (asn1Bytes[4 + rLength] != 2) || (j > 20)) {
+ if (asn1Bytes[0] != 48 || asn1Bytes[1] != asn1Bytes.length - 2
+ || asn1Bytes[2] != 2 || i > 20
+ || asn1Bytes[4 + rLength] != 2 || j > 20) {
throw new IOException("Invalid ASN.1 format of DSA signature");
} else {
byte xmldsigBytes[] = new byte[40];
- System.arraycopy(asn1Bytes, (4+rLength)-i, xmldsigBytes, 20-i, i);
- System.arraycopy(asn1Bytes, (6+rLength+sLength)-j, xmldsigBytes,
+ System.arraycopy(asn1Bytes, 4 + rLength - i, xmldsigBytes, 20 - i, i);
+ System.arraycopy(asn1Bytes, 6 + rLength + sLength - j, xmldsigBytes,
40 - j, j);
return xmldsigBytes;
@@ -292,7 +292,7 @@ public abstract class DOMSignatureMethod
int i;
- for (i = 20; (i > 0) && (xmldsigBytes[20 - i] == 0); i--);
+ for (i = 20; i > 0 && xmldsigBytes[20 - i] == 0; i--);
int j = i;
@@ -302,7 +302,7 @@ public abstract class DOMSignatureMethod
int k;
- for (k = 20; (k > 0) && (xmldsigBytes[40 - k] == 0); k--);
+ for (k = 20; k > 0 && xmldsigBytes[40 - k] == 0; k--);
int l = k;
@@ -317,12 +317,12 @@ public abstract class DOMSignatureMethod
asn1Bytes[2] = 2;
asn1Bytes[3] = (byte)j;
- System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, (4 + j) - i, i);
+ System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, 4 + j - i, i);
asn1Bytes[4 + j] = 2;
asn1Bytes[5 + j] = (byte) l;
- System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, (6 + j + l) - k, k);
+ System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, 6 + j + l - k, k);
return asn1Bytes;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Wed Aug 7 13:17:53 2013
@@ -145,10 +145,10 @@ public final class DOMSignaturePropertie
}
SignatureProperties osp = (SignatureProperties)o;
- boolean idsEqual = (id == null ? osp.getId() == null
- : id.equals(osp.getId()));
+ boolean idsEqual = id == null ? osp.getId() == null
+ : id.equals(osp.getId());
- return (properties.equals(osp.getProperties()) && idsEqual);
+ return properties.equals(osp.getProperties()) && idsEqual;
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Wed Aug 7 13:17:53 2013
@@ -154,13 +154,13 @@ public final class DOMSignatureProperty
}
SignatureProperty osp = (SignatureProperty)o;
- boolean idsEqual = (id == null ? osp.getId() == null
- : id.equals(osp.getId()));
+ boolean idsEqual = id == null ? osp.getId() == null
+ : id.equals(osp.getId());
@SuppressWarnings("unchecked")
List<XMLStructure> ospContent = osp.getContent();
- return (equalsContent(ospContent) &&
- target.equals(osp.getTarget()) && idsEqual);
+ return equalsContent(ospContent) &&
+ target.equals(osp.getTarget()) && idsEqual;
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Wed Aug 7 13:17:53 2013
@@ -151,8 +151,8 @@ public final class DOMSignedInfo extends
boolean secVal = Utils.secureValidation(context);
String signatureMethodAlgorithm = signatureMethod.getAlgorithm();
- if (secVal && ((ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5.equals(signatureMethodAlgorithm)
- || ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5.equals(signatureMethodAlgorithm)))) {
+ if (secVal && (ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5.equals(signatureMethodAlgorithm)
+ || ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5.equals(signatureMethodAlgorithm))) {
throw new MarshalException(
"It is forbidden to use algorithm " + signatureMethod + " when secure validation is enabled"
);
@@ -168,7 +168,7 @@ public final class DOMSignedInfo extends
refElem = DOMUtils.getNextSiblingElement(refElem);
refCount++;
- if (secVal && (refCount > MAXIMUM_REFERENCE_COUNT)) {
+ if (secVal && refCount > MAXIMUM_REFERENCE_COUNT) {
String error = "A maxiumum of " + MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
@@ -283,12 +283,12 @@ public final class DOMSignedInfo extends
}
SignedInfo osi = (SignedInfo)o;
- boolean idEqual = (id == null ? osi.getId() == null
- : id.equals(osi.getId()));
+ boolean idEqual = id == null ? osi.getId() == null
+ : id.equals(osi.getId());
- return (canonicalizationMethod.equals(osi.getCanonicalizationMethod())
+ return canonicalizationMethod.equals(osi.getCanonicalizationMethod())
&& signatureMethod.equals(osi.getSignatureMethod()) &&
- references.equals(osi.getReferences()) && idEqual);
+ references.equals(osi.getReferences()) && idEqual;
}
@SuppressWarnings("unchecked")
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=1511298&r1=1511297&r2=1511298&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 Wed Aug 7 13:17:53 2013
@@ -30,13 +30,18 @@ import java.security.NoSuchAlgorithmExce
import java.security.Provider;
import java.security.spec.AlgorithmParameterSpec;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.TransformService;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.dom.DOMSignContext;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-
/**
* DOM-based abstract implementation of Transform.
*
@@ -168,9 +173,9 @@ public class DOMTransform extends BaseSt
}
Transform otransform = (Transform)o;
- return (getAlgorithm().equals(otransform.getAlgorithm()) &&
+ return getAlgorithm().equals(otransform.getAlgorithm()) &&
DOMUtils.paramsEqual(getParameterSpec(),
- otransform.getParameterSpec()));
+ otransform.getParameterSpec());
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Wed Aug 7 13:17:53 2013
@@ -70,7 +70,7 @@ public class DOMUtils {
* @return The string for the qName, for example, "xsd:element".
*/
public static String getQNameString(String prefix, String localName) {
- String qName = (prefix == null || prefix.length() == 0)
+ String qName = prefix == null || prefix.length() == 0
? localName : prefix + ":" + localName;
return qName;
@@ -388,8 +388,8 @@ public class DOMUtils {
private static boolean paramsEqual(XPathFilterParameterSpec spec1,
XPathFilterParameterSpec spec2)
{
- return (spec1.getXPath().equals(spec2.getXPath()) &&
- spec1.getNamespaceMap().equals(spec2.getNamespaceMap()));
+ return spec1.getXPath().equals(spec2.getXPath()) &&
+ spec1.getNamespaceMap().equals(spec2.getNamespaceMap());
}
private static boolean paramsEqual(XSLTTransformParameterSpec spec1,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Wed Aug 7 13:17:53 2013
@@ -97,8 +97,8 @@ public final class DOMX509IssuerSerial e
return false;
}
X509IssuerSerial ois = (X509IssuerSerial)obj;
- return (issuerName.equals(ois.getIssuerName()) &&
- serialNumber.equals(ois.getSerialNumber()));
+ return issuerName.equals(ois.getIssuerName()) &&
+ serialNumber.equals(ois.getSerialNumber());
}
@Override
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=1511298&r1=1511297&r2=1511298&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 Wed Aug 7 13:17:53 2013
@@ -197,17 +197,17 @@ public final class DOMXMLObject extends
}
XMLObject oxo = (XMLObject)o;
- boolean idsEqual = (id == null ? oxo.getId() == null
- : id.equals(oxo.getId()));
+ boolean idsEqual = id == null ? oxo.getId() == null
+ : id.equals(oxo.getId());
boolean encodingsEqual =
- (encoding == null ? oxo.getEncoding() == null
- : encoding.equals(oxo.getEncoding()));
+ encoding == null ? oxo.getEncoding() == null
+ : encoding.equals(oxo.getEncoding());
boolean mimeTypesEqual =
- (mimeType == null ? oxo.getMimeType() == null
- : mimeType.equals(oxo.getMimeType()));
+ mimeType == null ? oxo.getMimeType() == null
+ : mimeType.equals(oxo.getMimeType());
- return (idsEqual && encodingsEqual && mimeTypesEqual &&
- equalsContent(getXmlObjectContent(oxo)));
+ return idsEqual && encodingsEqual && mimeTypesEqual &&
+ equalsContent(getXmlObjectContent(oxo));
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Wed Aug 7 13:17:53 2013
@@ -407,15 +407,15 @@ public final class DOMXMLSignature exten
XMLSignature osig = (XMLSignature)o;
boolean idEqual =
- (id == null ? osig.getId() == null : id.equals(osig.getId()));
+ id == null ? osig.getId() == null : id.equals(osig.getId());
boolean keyInfoEqual =
- (ki == null ? osig.getKeyInfo() == null
- : ki.equals(osig.getKeyInfo()));
+ ki == null ? osig.getKeyInfo() == null
+ : ki.equals(osig.getKeyInfo());
- return (idEqual && keyInfoEqual &&
+ return idEqual && keyInfoEqual &&
sv.equals(osig.getSignatureValue()) &&
si.equals(osig.getSignedInfo()) &&
- objects.equals(osig.getObjects()));
+ objects.equals(osig.getObjects());
}
@Override
@@ -568,7 +568,7 @@ public final class DOMXMLSignature exten
SignatureValue osv = (SignatureValue)o;
boolean idEqual =
- (id == null ? osv.getId() == null : id.equals(osv.getId()));
+ id == null ? osv.getId() == null : id.equals(osv.getId());
//XXX compare signature values?
return idEqual;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Wed Aug 7 13:17:53 2013
@@ -130,7 +130,7 @@ public final class DOMXPathFilter2Transf
XPathFilter2ParameterSpec xp =
(XPathFilter2ParameterSpec)getParameterSpec();
String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
- String qname = (prefix == null || prefix.length() == 0)
+ String qname = prefix == null || prefix.length() == 0
? "xmlns" : "xmlns:" + prefix;
@SuppressWarnings("unchecked")
List<XPathType> xpathList = xp.getXPathList();
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=1511298&r1=1511297&r2=1511298&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 Wed Aug 7 13:17:53 2013
@@ -102,7 +102,7 @@ public final class Utils {
* Returns true if uri is a same-document URI, false otherwise.
*/
public static boolean sameDocumentURI(String uri) {
- return (uri != null && (uri.length() == 0 || uri.charAt(0) == '#'));
+ return uri != null && (uri.length() == 0 || uri.charAt(0) == '#');
}
static boolean secureValidation(XMLCryptoContext xc) {
@@ -114,6 +114,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.booleanValue();
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java?rev=1511298&r1=1511297&r2=1511298&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java Wed Aug 7 13:17:53 2013
@@ -41,7 +41,7 @@ public interface XmlWriter {
*
* @param <CLZ>
*/
- public static abstract class ToMarshal<CLZ extends XMLStructure> {
+ static abstract class ToMarshal<CLZ extends XMLStructure> {
public final Class<CLZ> clazzToMatch;
public ToMarshal(Class<CLZ> clazzToMatch) {