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 2015/10/21 12:02:23 UTC
svn commit: r1709784 -
/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/
Author: coheigea
Date: Wed Oct 21 10:02:22 2015
New Revision: 1709784
URL: http://svn.apache.org/viewvc?rev=1709784&view=rev
Log:
Some minor fixes thrown up by analysis.apache.org
Modified:
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/DOMKeyValue.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/DOMSignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.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/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/Marshaller.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -123,13 +123,23 @@ public class DOMCanonicalizationMethod e
return result;
}
-
+
private static boolean isC14Nalg(String alg) {
+ return isInclusiveC14Nalg(alg) || isExclusiveC14Nalg(alg) || isC14N11alg(alg);
+ }
+
+ private static boolean isInclusiveC14Nalg(String alg) {
return alg.equals(CanonicalizationMethod.INCLUSIVE)
- || alg.equals(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS)
- || alg.equals(CanonicalizationMethod.EXCLUSIVE)
- || alg.equals(CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS)
- || alg.equals(DOMCanonicalXMLC14N11Method.C14N_11)
+ || alg.equals(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS);
+ }
+
+ private static boolean isExclusiveC14Nalg(String alg) {
+ return alg.equals(CanonicalizationMethod.EXCLUSIVE)
+ || alg.equals(CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS);
+ }
+
+ private static boolean isC14N11alg(String alg) {
+ return alg.equals(DOMCanonicalXMLC14N11Method.C14N_11)
|| alg.equals(DOMCanonicalXMLC14N11Method.C14N_11_WITH_COMMENTS);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java?rev=1709784&r1=1709783&r2=1709784&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java Wed Oct 21 10:02:22 2015
@@ -438,7 +438,7 @@ public abstract class DOMKeyValue<K exte
throw new MarshalException("ECKeyValue not supported",
pae.getException());
}
- ECParameterSpec ecParams = null;
+ ECParameterSpec ellipticParams = null;
Element curElem = DOMUtils.getFirstChildElement(kvtElem);
if (curElem == null) {
throw new MarshalException("KeyValue must contain at least one type");
@@ -455,7 +455,7 @@ public abstract class DOMKeyValue<K exte
if (uri.startsWith("urn:oid:")) {
String oid = uri.substring("urn:oid:".length());
try {
- ecParams = getECParameterSpec(oid);
+ ellipticParams = getECParameterSpec(oid);
} catch (GeneralSecurityException gse) {
throw new MarshalException(gse);
}
@@ -469,7 +469,7 @@ public abstract class DOMKeyValue<K exte
ECPoint ecPoint = null;
try {
Object[] args = new Object[] { Base64.decode(curElem),
- ecParams.getCurve() };
+ ellipticParams.getCurve() };
ecPoint = (ECPoint)decodePoint.invoke(null, args);
} catch (Base64DecodingException bde) {
throw new MarshalException("Invalid EC PublicKey", bde);
@@ -480,9 +480,9 @@ public abstract class DOMKeyValue<K exte
}
/*
ecPoint = sun.security.ec.ECParameters.decodePoint(
- Base64.decode(curElem), ecParams.getCurve());
+ Base64.decode(curElem), ellipticParams.getCurve());
*/
- ECPublicKeySpec spec = new ECPublicKeySpec(ecPoint, ecParams);
+ ECPublicKeySpec spec = new ECPublicKeySpec(ecPoint, ellipticParams);
return (ECPublicKey) generatePublicKey(eckf, spec);
}
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -141,8 +141,8 @@ public final class DOMPGPData extends Ba
*/
public DOMPGPData(Element pdElem) throws MarshalException {
// get all children nodes
- byte[] keyId = null;
- byte[] keyPacket = null;
+ byte[] pgpKeyId = null;
+ byte[] pgpKeyPacket = null;
List<XMLStructure> other = new ArrayList<XMLStructure>();
Node firstChild = pdElem.getFirstChild();
@@ -153,9 +153,9 @@ public final class DOMPGPData extends Ba
String namespace = childElem.getNamespaceURI();
try {
if (localName.equals("PGPKeyID") && XMLSignature.XMLNS.equals(namespace)) {
- keyId = Base64.decode(childElem);
+ pgpKeyId = Base64.decode(childElem);
} else if (localName.equals("PGPKeyPacket") && XMLSignature.XMLNS.equals(namespace)) {
- keyPacket = Base64.decode(childElem);
+ pgpKeyPacket = Base64.decode(childElem);
} else {
other.add
(new javax.xml.crypto.dom.DOMStructure(childElem));
@@ -166,8 +166,8 @@ public final class DOMPGPData extends Ba
}
firstChild = firstChild.getNextSibling();
}
- this.keyId = keyId;
- this.keyPacket = keyPacket;
+ this.keyId = pgpKeyId;
+ this.keyPacket = pgpKeyPacket;
this.externalElements = Collections.unmodifiableList(other);
}
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -196,13 +196,13 @@ public final class DOMReference extends
// unmarshal Transforms, if specified
Element nextSibling = DOMUtils.getFirstChildElement(refElem);
- List<Transform> transforms = new ArrayList<Transform>(5);
+ List<Transform> newTransforms = new ArrayList<Transform>(MAXIMUM_TRANSFORM_COUNT);
if (nextSibling.getLocalName().equals("Transforms")
&& XMLSignature.XMLNS.equals(nextSibling.getNamespaceURI())) {
Element transformElem = DOMUtils.getFirstChildElement(nextSibling,
"Transform",
XMLSignature.XMLNS);
- transforms.add(new DOMTransform(transformElem, context, provider));
+ newTransforms.add(new DOMTransform(transformElem, context, provider));
transformElem = DOMUtils.getNextSiblingElement(transformElem);
while (transformElem != null) {
String localName = transformElem.getLocalName();
@@ -212,9 +212,9 @@ public final class DOMReference extends
"Invalid element name: " + localName +
", expected Transform");
}
- transforms.add
+ newTransforms.add
(new DOMTransform(transformElem, context, provider));
- if (secVal && transforms.size() > MAXIMUM_TRANSFORM_COUNT) {
+ if (secVal && newTransforms.size() > MAXIMUM_TRANSFORM_COUNT) {
String error = "A maxiumum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
@@ -262,7 +262,7 @@ public final class DOMReference extends
this.type = DOMUtils.getAttributeValue(refElem, "Type");
this.here = refElem.getAttributeNodeNS(null, "URI");
this.refElem = refElem;
- this.transforms = transforms;
+ this.transforms = newTransforms;
this.allTransforms = transforms;
this.appliedTransformData = null;
this.provider = provider;
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -139,7 +139,7 @@ public final class DOMRetrievalMethod ex
boolean secVal = Utils.secureValidation(context);
// get Transforms, if specified
- List<Transform> transforms = new ArrayList<Transform>();
+ List<Transform> newTransforms = new ArrayList<Transform>();
Element transformsElem = DOMUtils.getFirstChildElement(rmElem);
if (transformsElem != null) {
@@ -158,9 +158,9 @@ public final class DOMRetrievalMethod ex
throw new MarshalException("Invalid element name: " +
name + ", expected Transform");
}
- transforms.add
+ newTransforms.add
(new DOMTransform(transformElem, context, provider));
- if (secVal && transforms.size() > DOMReference.MAXIMUM_TRANSFORM_COUNT) {
+ if (secVal && newTransforms.size() > 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);
@@ -168,10 +168,10 @@ public final class DOMRetrievalMethod ex
transformElem = DOMUtils.getNextSiblingElement(transformElem);
}
}
- if (transforms.isEmpty()) {
+ if (newTransforms.isEmpty()) {
this.transforms = Collections.emptyList();
} else {
- this.transforms = Collections.unmodifiableList(transforms);
+ this.transforms = Collections.unmodifiableList(newTransforms);
}
}
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -87,7 +87,7 @@ public final class DOMSignaturePropertie
// unmarshal attributes
id = DOMUtils.getIdAttributeValue(propsElem, "Id");
- List<SignatureProperty> properties = new ArrayList<SignatureProperty>();
+ List<SignatureProperty> newProperties = new ArrayList<SignatureProperty>();
Node firstChild = propsElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -97,14 +97,14 @@ public final class DOMSignaturePropertie
throw new MarshalException("Invalid element name: " + namespace + ":" + name +
", expected SignatureProperty");
}
- properties.add(new DOMSignatureProperty((Element)firstChild));
+ newProperties.add(new DOMSignatureProperty((Element)firstChild));
}
firstChild = firstChild.getNextSibling();
}
- if (properties.isEmpty()) {
+ if (newProperties.isEmpty()) {
throw new MarshalException("properties cannot be empty");
} else {
- this.properties = Collections.unmodifiableList(properties);
+ this.properties = Collections.unmodifiableList(newProperties);
}
}
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -95,16 +95,16 @@ public final class DOMSignatureProperty
}
id = DOMUtils.getIdAttributeValue(propElem, "Id");
- List<XMLStructure> content = new ArrayList<XMLStructure>();
+ List<XMLStructure> newContent = new ArrayList<XMLStructure>();
Node firstChild = propElem.getFirstChild();
while (firstChild != null) {
- content.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
+ newContent.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
firstChild = firstChild.getNextSibling();
}
- if (content.isEmpty()) {
+ if (newContent.isEmpty()) {
throw new MarshalException("content cannot be empty");
} else {
- this.content = Collections.unmodifiableList(content);
+ this.content = Collections.unmodifiableList(newContent);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java?rev=1709784&r1=1709783&r2=1709784&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Wed Oct 21 10:02:22 2015
@@ -113,11 +113,11 @@ public class DOMSubTreeData implements N
* @return a set of nodes (minus any comment nodes)
*/
private List<Node> dereferenceSameDocumentURI(Node node) {
- List<Node> nodeSet = new ArrayList<Node>();
+ List<Node> nodes = new ArrayList<Node>();
if (node != null) {
- nodeSetMinusCommentNodes(node, nodeSet, null);
+ nodeSetMinusCommentNodes(node, nodes, null);
}
- return nodeSet;
+ return nodes;
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1709784&r1=1709783&r2=1709784&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Wed Oct 21 10:02:22 2015
@@ -41,7 +41,7 @@ import javax.xml.crypto.dom.*;
*
* @author Sean Mullan
*/
-public class DOMURIDereferencer implements URIDereferencer {
+public final class DOMURIDereferencer implements URIDereferencer {
static final URIDereferencer INSTANCE = new DOMURIDereferencer();
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -337,7 +337,7 @@ public final class DOMUtils {
@Override
public Iterator<Node> iterator() {
return new Iterator<Node>() {
- int index = 0;
+ private int index;
@Override
public void remove() {
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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -94,7 +94,7 @@ public final class DOMX509Data extends B
*/
public DOMX509Data(Element xdElem) throws MarshalException {
// get all children nodes
- List<Object> content = new ArrayList<Object>();
+ List<Object> newContent = new ArrayList<Object>();
Node firstChild = xdElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -102,26 +102,26 @@ public final class DOMX509Data extends B
String localName = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
if (localName.equals("X509Certificate") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(unmarshalX509Certificate(childElem));
+ newContent.add(unmarshalX509Certificate(childElem));
} else if (localName.equals("X509IssuerSerial") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(new DOMX509IssuerSerial(childElem));
+ newContent.add(new DOMX509IssuerSerial(childElem));
} else if (localName.equals("X509SubjectName") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(childElem.getFirstChild().getNodeValue());
+ newContent.add(childElem.getFirstChild().getNodeValue());
} else if (localName.equals("X509SKI") && XMLSignature.XMLNS.equals(namespace)) {
try {
- content.add(Base64.decode(childElem));
+ newContent.add(Base64.decode(childElem));
} catch (Base64DecodingException bde) {
throw new MarshalException("cannot decode X509SKI", bde);
}
} else if (localName.equals("X509CRL") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(unmarshalX509CRL(childElem));
+ newContent.add(unmarshalX509CRL(childElem));
} else {
- content.add(new javax.xml.crypto.dom.DOMStructure(childElem));
+ newContent.add(new javax.xml.crypto.dom.DOMStructure(childElem));
}
}
firstChild = firstChild.getNextSibling();
}
- this.content = Collections.unmodifiableList(content);
+ this.content = Collections.unmodifiableList(newContent);
}
@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=1709784&r1=1709783&r2=1709784&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 Oct 21 10:02:22 2015
@@ -101,7 +101,7 @@ public final class DOMXMLObject extends
}
this.mimeType = DOMUtils.getAttributeValue(objElem, "MimeType");
- List<XMLStructure> content = new ArrayList<XMLStructure>();
+ List<XMLStructure> newContent = new ArrayList<XMLStructure>();
Node firstChild = objElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
@@ -109,17 +109,17 @@ public final class DOMXMLObject extends
String tag = childElem.getLocalName();
String namespace = childElem.getNamespaceURI();
if (tag.equals("Manifest") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(new DOMManifest(childElem, context, provider));
+ newContent.add(new DOMManifest(childElem, context, provider));
} else if (tag.equals("SignatureProperties") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(new DOMSignatureProperties(childElem));
+ newContent.add(new DOMSignatureProperties(childElem));
} else if (tag.equals("X509Data") && XMLSignature.XMLNS.equals(namespace)) {
- content.add(new DOMX509Data(childElem));
+ newContent.add(new DOMX509Data(childElem));
} else {
//@@@FIXME: check for other dsig structures
- content.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
+ newContent.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
}
} else {
- content.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
+ newContent.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
}
firstChild = firstChild.getNextSibling();
}
@@ -130,14 +130,14 @@ public final class DOMXMLObject extends
for (int idx = 0 ; idx < nnm.getLength() ; idx++) {
Node nsDecl = nnm.item(idx);
if (DOMUtils.isNamespace(nsDecl)) {
- content.add(new javax.xml.crypto.dom.DOMStructure(nsDecl));
+ newContent.add(new javax.xml.crypto.dom.DOMStructure(nsDecl));
}
}
- if (content.isEmpty()) {
+ if (newContent.isEmpty()) {
this.content = Collections.emptyList();
} else {
- this.content = Collections.unmodifiableList(content);
+ this.content = Collections.unmodifiableList(newContent);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java?rev=1709784&r1=1709783&r2=1709784&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java Wed Oct 21 10:02:22 2015
@@ -46,6 +46,10 @@ import org.w3c.dom.Node;
* Defines the individual marshallers for each of the different javax.xml.crypto structures.
*/
class Marshaller {
+
+ private Marshaller() {
+ // complete
+ }
public static List<XmlWriter.ToMarshal<? extends XMLStructure>> getMarshallers() {
return MARSHALLERS;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java?rev=1709784&r1=1709783&r2=1709784&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java Wed Oct 21 10:02:22 2015
@@ -37,11 +37,21 @@ import org.w3c.dom.Text;
* Manifestation of XmlWriter interface designed to write to a tree.
*/
public class XmlWriterToTree implements XmlWriter {
+
+ private Document factory;
+
+ private Element createdElement;
+
+ private Node nextSibling;
+
+ private Node currentNode;
+
+ private List<XmlWriter.ToMarshal<? extends XMLStructure>> m_marshallers;
public XmlWriterToTree(List<XmlWriter.ToMarshal<? extends XMLStructure>> marshallers, Node parent) {
m_marshallers = marshallers;
- m_factory = parent instanceof Document ? (Document)parent : parent.getOwnerDocument();
- m_currentNode = parent;
+ factory = parent instanceof Document ? (Document)parent : parent.getOwnerDocument();
+ currentNode = parent;
}
/**
@@ -49,8 +59,8 @@ public class XmlWriterToTree implements
* @param newParent
*/
public void resetToNewParent(Node newParent) {
- m_currentNode = newParent;
- m_createdElement = null;
+ currentNode = newParent;
+ createdElement = null;
}
/**
@@ -58,7 +68,7 @@ public class XmlWriterToTree implements
* @return the root element created with this writer.
*/
public Element getCreatedElement() {
- return m_createdElement;
+ return createdElement;
}
/**
@@ -72,29 +82,29 @@ public class XmlWriterToTree implements
*/
public XmlWriterToTree(List<XmlWriter.ToMarshal<? extends XMLStructure>> marshallers, Node parent, Node nextSibling) {
this(marshallers, parent);
- m_nextSibling = nextSibling;
+ this.nextSibling = nextSibling;
}
@Override
public void writeStartElement(String prefix, String localName, String namespaceURI) {
- Element newElem = m_factory.createElementNS(namespaceURI, DOMUtils.getQNameString(prefix, localName));
- if (m_nextSibling != null) {
- newElem = (Element)m_nextSibling.getParentNode().insertBefore(newElem, m_nextSibling);
+ Element newElem = factory.createElementNS(namespaceURI, DOMUtils.getQNameString(prefix, localName));
+ if (nextSibling != null) {
+ newElem = (Element)nextSibling.getParentNode().insertBefore(newElem, nextSibling);
}
else {
- newElem = (Element)m_currentNode.appendChild(newElem);
+ newElem = (Element)currentNode.appendChild(newElem);
}
- m_nextSibling = null;
- m_currentNode = newElem;
+ nextSibling = null;
+ currentNode = newElem;
- if (m_createdElement == null) {
- m_createdElement = newElem;
+ if (createdElement == null) {
+ createdElement = newElem;
}
}
@Override
public void writeEndElement() {
- m_currentNode = m_currentNode.getParentNode();
+ currentNode = currentNode.getParentNode();
}
@@ -117,15 +127,15 @@ public class XmlWriterToTree implements
@Override
public void writeCharacters(String text) {
- Text textNode = m_factory.createTextNode(text);
- m_currentNode.appendChild(textNode);
+ Text textNode = factory.createTextNode(text);
+ currentNode.appendChild(textNode);
}
@Override
public void writeComment(String text) {
- Comment commentNode = m_factory.createComment(text);
- m_currentNode.appendChild(commentNode);
+ Comment commentNode = factory.createComment(text);
+ currentNode.appendChild(commentNode);
}
@Override
@@ -133,14 +143,14 @@ public class XmlWriterToTree implements
Attr result = null;
if (value != null) {
- result = m_factory.createAttributeNS(namespaceURI, DOMUtils.getQNameString(prefix, localName));
+ result = factory.createAttributeNS(namespaceURI, DOMUtils.getQNameString(prefix, localName));
result.setTextContent(value);
- if (! (m_currentNode instanceof Element)) {
+ if (! (currentNode instanceof Element)) {
throw new IllegalStateException(
"Attempting to add an attribute to something other than an element node. Node is "
- + m_currentNode.toString());
+ + currentNode.toString());
}
- ( (Element)m_currentNode).setAttributeNodeNS(result);
+ ( (Element)currentNode).setAttributeNodeNS(result);
}
return result;
}
@@ -151,18 +161,18 @@ public class XmlWriterToTree implements
return;
}
Attr newAttr = writeAttribute(prefix, namespaceURI, localName, value);
- ( (Element)m_currentNode).setIdAttributeNode(newAttr, true);
+ ( (Element)currentNode).setIdAttributeNode(newAttr, true);
}
@Override
public String getCurrentLocalName() {
- return m_currentNode.getLocalName();
+ return currentNode.getLocalName();
}
@Override
public XMLStructure getCurrentNodeAsStructure() {
- return new DOMStructure(m_currentNode);
+ return new DOMStructure(currentNode);
}
@Override
@@ -180,14 +190,5 @@ public class XmlWriterToTree implements
throw new IllegalArgumentException("Unable to marshal unexpected object of class " + toMarshal.getClass().toString());
}
- private Document m_factory;
-
- private Element m_createdElement;
-
- private Node m_nextSibling;
-
- private Node m_currentNode;
-
- private List<XmlWriter.ToMarshal<? extends XMLStructure>> m_marshallers;
}