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 2017/02/15 11:04:20 UTC
svn commit: r1783093 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/c14n/helper/
main/java/org/apache/xml/security/c14n/implementations/ ...
Author: coheigea
Date: Wed Feb 15 11:04:20 2017
New Revision: 1783093
URL: http://svn.apache.org/viewvc?rev=1783093&view=rev
Log:
More code cleanup
Modified:
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/DOMKeyInfoFactory.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/DOMSignatureProperties.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/DOMX509Data.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/DOMXMLSignatureFactory.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/DOMXPathTransform.java
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/c14n/helper/C14nHelper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.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/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -111,16 +111,16 @@ public final class DOMKeyInfo extends Ba
Element childElem = (Element)firstChild;
String localName = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
- if (localName.equals("X509Data") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("X509Data".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
content.add(new DOMX509Data(childElem));
- } else if (localName.equals("KeyName") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("KeyName".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
content.add(new DOMKeyName(childElem));
- } else if (localName.equals("KeyValue") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("KeyValue".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
content.add(DOMKeyValue.unmarshal(childElem));
- } else if (localName.equals("RetrievalMethod") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("RetrievalMethod".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
content.add(new DOMRetrievalMethod(childElem,
context, provider));
- } else if (localName.equals("PGPData") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("PGPData".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
content.add(new DOMPGPData(childElem));
} else { //may be MgmtData, SPKIData or element from other namespace
content.add(new javax.xml.crypto.dom.DOMStructure(childElem));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Wed Feb 15 11:04:20 2017
@@ -70,11 +70,11 @@ public final class DOMKeyInfoFactory ext
@Override
public KeyValue newKeyValue(PublicKey key) throws KeyException {
String algorithm = key.getAlgorithm();
- if (algorithm.equals("DSA")) {
+ if ("DSA".equals(algorithm)) {
return new DOMKeyValue.DSA((DSAPublicKey) key);
- } else if (algorithm.equals("RSA")) {
+ } else if ("RSA".equals(algorithm)) {
return new DOMKeyValue.RSA((RSAPublicKey) key);
- } else if (algorithm.equals("EC")) {
+ } else if ("EC".equals(algorithm)) {
return new DOMKeyValue.EC((ECPublicKey) key);
} else {
throw new KeyException("unsupported key algorithm: " + algorithm);
@@ -169,7 +169,7 @@ public final class DOMKeyInfoFactory ext
throw new MarshalException("Document implementation must " +
"support DOM Level 2 and be namespace aware");
}
- if (tag.equals("KeyInfo") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("KeyInfo".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
} else {
throw new MarshalException("invalid KeyInfo tag: " + namespace + ":" + tag);
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -95,7 +95,7 @@ public final class DOMManifest extends B
while (refElem != null) {
String localName = refElem.getLocalName();
String namespace = refElem.getNamespaceURI();
- if (!localName.equals("Reference") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Reference".equals(localName) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
namespace + ":" + localName + ", expected Reference");
}
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -151,10 +151,10 @@ public final class DOMPGPData extends Ba
Element childElem = (Element)firstChild;
String localName = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
- if (localName.equals("PGPKeyID") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("PGPKeyID".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
String content = XMLUtils.getFullTextChildrenFromElement(childElem);
pgpKeyId = Base64.getMimeDecoder().decode(content);
- } else if (localName.equals("PGPKeyPacket") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("PGPKeyPacket".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
String content = XMLUtils.getFullTextChildrenFromElement(childElem);
pgpKeyPacket = Base64.getMimeDecoder().decode(content);
} else {
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -208,7 +208,7 @@ public final class DOMReference extends
while (transformElem != null) {
String localName = transformElem.getLocalName();
String namespace = transformElem.getNamespaceURI();
- if (!localName.equals("Transform") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Transform".equals(localName) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException(
"Invalid element name: " + localName +
", expected Transform");
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -146,7 +146,7 @@ public final class DOMRetrievalMethod ex
if (transformsElem != null) {
String localName = transformsElem.getLocalName();
String namespace = transformsElem.getNamespaceURI();
- if (!localName.equals("Transforms") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Transforms".equals(localName) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
namespace + ":" + localName + ", expected Transforms");
}
@@ -155,7 +155,7 @@ public final class DOMRetrievalMethod ex
while (transformElem != null) {
String name = transformElem.getLocalName();
namespace = transformElem.getNamespaceURI();
- if (!name.equals("Transform") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Transform".equals(name) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
name + ", expected Transform");
}
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -93,7 +93,7 @@ public final class DOMSignaturePropertie
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
String name = firstChild.getLocalName();
String namespace = firstChild.getNamespaceURI();
- if (!name.equals("SignatureProperty") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"SignatureProperty".equals(name) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " + namespace + ":" + name +
", expected SignatureProperty");
}
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -170,7 +170,7 @@ public final class DOMSignedInfo extends
while (refElem != null) {
String name = refElem.getLocalName();
String namespace = refElem.getNamespaceURI();
- if (!name.equals("Reference") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Reference".equals(name) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
namespace + ":" + name + ", expected Reference");
}
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -112,7 +112,7 @@ public class DOMTransform extends BaseSt
throws MarshalException
{
String parentLocalName = xwriter.getCurrentLocalName();
- String localName = parentLocalName.equals("Transforms") ? "Transform" : "CanonicalizationMethod";
+ String localName = "Transforms".equals(parentLocalName) ? "Transform" : "CanonicalizationMethod";
xwriter.writeStartElement(dsPrefix, localName, XMLSignature.XMLNS);
xwriter.writeAttribute("", "", "Algorithm", getAlgorithm());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Wed Feb 15 11:04:20 2017
@@ -102,16 +102,16 @@ public final class DOMX509Data extends B
Element childElem = (Element)firstChild;
String localName = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
- if (localName.equals("X509Certificate") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("X509Certificate".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(unmarshalX509Certificate(childElem));
- } else if (localName.equals("X509IssuerSerial") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("X509IssuerSerial".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(new DOMX509IssuerSerial(childElem));
- } else if (localName.equals("X509SubjectName") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("X509SubjectName".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(childElem.getFirstChild().getNodeValue());
- } else if (localName.equals("X509SKI") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("X509SKI".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
String content = XMLUtils.getFullTextChildrenFromElement(childElem);
newContent.add(Base64.getMimeDecoder().decode(content));
- } else if (localName.equals("X509CRL") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("X509CRL".equals(localName) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(unmarshalX509CRL(childElem));
} else {
newContent.add(new javax.xml.crypto.dom.DOMStructure(childElem));
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -108,11 +108,11 @@ public final class DOMXMLObject extends
Element childElem = (Element)firstChild;
String tag = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
- if (tag.equals("Manifest") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("Manifest".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(new DOMManifest(childElem, context, provider));
- } else if (tag.equals("SignatureProperties") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("SignatureProperties".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(new DOMSignatureProperties(childElem));
- } else if (tag.equals("X509Data") && XMLSignature.XMLNS.equals(namespace)) {
+ } else if ("X509Data".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
newContent.add(new DOMX509Data(childElem));
} else {
//@@@FIXME: check for other dsig structures
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -157,7 +157,7 @@ public final class DOMXMLSignature exten
while (nextSibling != null) {
String name = nextSibling.getLocalName();
String namespace = nextSibling.getNamespaceURI();
- if (!name.equals("Object") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!"Object".equals(name) || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " + namespace + ":" + name +
", expected KeyInfo or Object");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Wed Feb 15 11:04:20 2017
@@ -202,7 +202,7 @@ public final class DOMXMLSignatureFactor
throw new MarshalException("Document implementation must " +
"support DOM Level 2 and be namespace aware");
}
- if (tag.equals("Signature") && XMLSignature.XMLNS.equals(namespace)) {
+ if ("Signature".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
return new DOMXMLSignature(element, context, getProvider());
} else {
throw new MarshalException("invalid Signature tag: " + namespace + ":" + tag);
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=1783093&r1=1783092&r2=1783093&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 Feb 15 11:04:20 2017
@@ -91,11 +91,11 @@ public final class DOMXPathFilter2Transf
throw new MarshalException("filter cannot be null");
}
XPathType.Filter filter = null;
- if (filterVal.equals("intersect")) {
+ if ("intersect".equals(filterVal)) {
filter = XPathType.Filter.INTERSECT;
- } else if (filterVal.equals("subtract")) {
+ } else if ("subtract".equals(filterVal)) {
filter = XPathType.Filter.SUBTRACT;
- } else if (filterVal.equals("union")) {
+ } else if ("union".equals(filterVal)) {
filter = XPathType.Filter.UNION;
} else {
throw new MarshalException("Unknown XPathType filter type" +
@@ -109,7 +109,7 @@ public final class DOMXPathFilter2Transf
for (int i = 0; i < length; i++) {
Attr attr = (Attr)attributes.item(i);
String prefix = attr.getPrefix();
- if (prefix != null && prefix.equals("xmlns")) {
+ if (prefix != null && "xmlns".equals(prefix)) {
namespaceMap.put(attr.getLocalName(), attr.getValue());
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Wed Feb 15 11:04:20 2017
@@ -76,7 +76,7 @@ public final class DOMXPathTransform ext
for (int i = 0; i < length; i++) {
Attr attr = (Attr)attributes.item(i);
String prefix = attr.getPrefix();
- if (prefix != null && prefix.equals("xmlns")) {
+ if (prefix != null && "xmlns".equals(prefix)) {
namespaceMap.put(attr.getLocalName(), attr.getValue());
}
}
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=1783093&r1=1783092&r2=1783093&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 Wed Feb 15 11:04:20 2017
@@ -189,7 +189,7 @@ public class Init {
continue;
}
String tag = el.getLocalName();
- if (tag.equals("ResourceBundles")) {
+ if ("ResourceBundles".equals(tag)) {
Element resource = (Element)el;
/* configure internationalization */
Attr langAttr = resource.getAttributeNodeNS(null, "defaultLanguageCode");
@@ -201,7 +201,7 @@ public class Init {
I18n.init(languageCode, countryCode);
}
- if (tag.equals("CanonicalizationMethods")) {
+ if ("CanonicalizationMethods".equals(tag)) {
Element[] list =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "CanonicalizationMethod");
@@ -221,7 +221,7 @@ public class Init {
}
}
- if (tag.equals("TransformAlgorithms")) {
+ if ("TransformAlgorithms".equals(tag)) {
Element[] tranElem =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "TransformAlgorithm");
@@ -256,7 +256,7 @@ public class Init {
}
}
- if (tag.equals("SignatureAlgorithms")) {
+ if ("SignatureAlgorithms".equals(tag)) {
Element[] sigElems =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "SignatureAlgorithm");
@@ -281,7 +281,7 @@ public class Init {
}
}
- if (tag.equals("ResourceResolvers")) {
+ if ("ResourceResolvers".equals(tag)) {
Element[] resolverElem =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "Resolver");
@@ -314,7 +314,7 @@ public class Init {
}
}
- if (tag.equals("KeyResolver")){
+ if ("KeyResolver".equals(tag)){
Element[] resolverElem =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "Resolver");
List<String> classNames = new ArrayList<>(resolverElem.length);
@@ -341,7 +341,7 @@ public class Init {
}
- if (tag.equals("PrefixMappings")){
+ if ("PrefixMappings".equals(tag)){
if (LOG.isDebugEnabled()) {
LOG.debug("Now I try to bind prefixes:");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java Wed Feb 15 11:04:20 2017
@@ -96,7 +96,7 @@ public final class C14nHelper {
}
String nodeAttrName = attr.getNodeName();
- boolean definesDefaultNS = nodeAttrName.equals("xmlns");
+ boolean definesDefaultNS = "xmlns".equals(nodeAttrName);
boolean definesNonDefaultNS = nodeAttrName.startsWith("xmlns:");
if ((definesDefaultNS || definesNonDefaultNS) && namespaceIsRelative(attr)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Wed Feb 15 11:04:20 2017
@@ -338,7 +338,7 @@ public abstract class Canonicalizer11 ex
if (!XMLNS_URI.equals(NUri)) {
//A non namespace definition node.
if (XML_LANG_URI.equals(NUri)) {
- if (NName.equals("id")) {
+ if ("id".equals(NName)) {
if (isRealVisible) {
// treat xml:id like any other attribute
// (emit it, but don't inherit it)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Wed Feb 15 11:04:20 2017
@@ -195,7 +195,7 @@ public abstract class AbstractSerializer
for (int i = 0; i < atts.getLength(); ++i) {
Node att = atts.item(i);
String nodeName = att.getNodeName();
- if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
+ if (("xmlns".equals(nodeName) || nodeName.startsWith("xmlns:"))
&& !storedNamespaces.containsKey(att.getNodeName())) {
outputStreamWriter.write(" ");
outputStreamWriter.write(nodeName);
@@ -237,7 +237,7 @@ public abstract class AbstractSerializer
for (int i = 0; i < atts.getLength(); ++i) {
Node att = atts.item(i);
String nodeName = att.getNodeName();
- if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
+ if (("xmlns".equals(nodeName) || nodeName.startsWith("xmlns:"))
&& !storedNamespaces.containsKey(att.getNodeName())) {
sb.append(" ");
sb.append(nodeName);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Wed Feb 15 11:04:20 2017
@@ -432,9 +432,9 @@ public final class XMLSignature extends
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
Element childElem = (Element)firstChild;
String tag = childElem.getLocalName();
- if (tag.equals("Manifest")) {
+ if ("Manifest".equals(tag)) {
new Manifest(childElem, baseURI);
- } else if (tag.equals("SignatureProperties")) {
+ } else if ("SignatureProperties".equals(tag)) {
new SignatureProperties(childElem, baseURI);
}
}
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=1783093&r1=1783092&r2=1783093&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 Wed Feb 15 11:04:20 2017
@@ -78,7 +78,7 @@ public class InclusiveNamespaces extends
StringBuilder sb = new StringBuilder();
for (String prefix : prefixList) {
- if (prefix.equals("xmlns")) {
+ if ("xmlns".equals(prefix)) {
sb.append("#default ");
} else {
sb.append(prefix);
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=1783093&r1=1783092&r2=1783093&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 Wed Feb 15 11:04:20 2017
@@ -449,7 +449,7 @@ public abstract class ElementProxy {
if (prefix == null || prefix.length() == 0) {
throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
- } else if (prefix.equals("xmlns")) {
+ } else if ("xmlns".equals(prefix)) {
throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
} else if (prefix.startsWith("xmlns:")) {
ns = prefix;//"xmlns:" + prefix.substring("xmlns:".length());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1783093&r1=1783092&r2=1783093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Wed Feb 15 11:04:20 2017
@@ -458,17 +458,17 @@ public class BaltimoreEncTest extends or
* @param name Name to map a key from
*/
private SecretKey mapKeyName(String name) throws Exception {
- if (name.equals("job")) {
+ if ("job".equals(name)) {
// Job is a AES-128 key
SecretKey key = new SecretKeySpec(jobBytes, "AES");
return key;
}
- if (name.equals("jeb")) {
+ if ("jeb".equals(name)) {
// Jeb is a AES-192 key
SecretKey key = new SecretKeySpec(jebBytes, "AES");
return key;
}
- if (name.equals("jed")) {
+ if ("jed".equals(name)) {
// Jed is a AES-256 key
SecretKey key = new SecretKeySpec(jedBytes, "AES");
return key;