Merge pull request #68 from seanjmullan/master
Fix for https://bugs.openjdk.org/browse/JDK-8287246.
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
index a3b845d..2cb5bd0 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
@@ -23,7 +23,6 @@
import java.security.interfaces.ECPublicKey;
import java.security.spec.*;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
public final class ECDSAUtils {
@@ -780,9 +779,7 @@
field = ecFieldF2m.getReductionPolynomial();
}
- Iterator<ECCurveDefinition> ecCurveDefinitionIterator = ecCurveDefinitions.iterator();
- while (ecCurveDefinitionIterator.hasNext()) {
- ECCurveDefinition ecCurveDefinition = ecCurveDefinitionIterator.next();
+ for (ECCurveDefinition ecCurveDefinition : ecCurveDefinitions) {
String oid = ecCurveDefinition.equals(field, a, b, affineX, affineY, order, h);
if (oid != null) {
return oid;
@@ -792,9 +789,7 @@
}
public static ECCurveDefinition getECCurveDefinition(String oid) {
- Iterator<ECCurveDefinition> ecCurveDefinitionIterator = ecCurveDefinitions.iterator();
- while (ecCurveDefinitionIterator.hasNext()) {
- ECCurveDefinition ecCurveDefinition = ecCurveDefinitionIterator.next();
+ for (ECCurveDefinition ecCurveDefinition : ecCurveDefinitions) {
if (ecCurveDefinition.getOid().equals(oid)) {
return ecCurveDefinition;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
index 473199b..328a1b0 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
@@ -23,7 +23,6 @@
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -456,9 +455,8 @@
protected int isVisibleDO(Node currentNode, int level) {
if (nodeFilter != null) {
- Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
- int i = it.next().isNodeIncludeDO(currentNode, level);
+ for (NodeFilter filter : nodeFilter) {
+ int i = filter.isNodeIncludeDO(currentNode, level);
if (i != 1) {
return i;
}
@@ -472,9 +470,8 @@
protected int isVisibleInt(Node currentNode) {
if (nodeFilter != null) {
- Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
- int i = it.next().isNodeInclude(currentNode);
+ for (NodeFilter filter : nodeFilter) {
+ int i = filter.isNodeInclude(currentNode);
if (i != 1) {
return i;
}
@@ -488,9 +485,8 @@
protected boolean isVisible(Node currentNode) {
if (nodeFilter != null) {
- Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
- if (it.next().isNodeInclude(currentNode) != 1) {
+ for (NodeFilter filter : nodeFilter) {
+ if (filter.isNodeInclude(currentNode) != 1) {
return false;
}
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
index 62a0eb8..51722af 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
@@ -71,9 +70,7 @@
* @param result the list where to fill the unrendered xmlns definitions.
**/
public void getUnrenderedNodes(Collection<Attr> result) {
- Iterator<NameSpaceSymbEntry> it = symb.entrySet().iterator();
- while (it.hasNext()) {
- NameSpaceSymbEntry n = it.next();
+ for (NameSpaceSymbEntry n : symb.entrySet()) {
//put them rendered?
if (!n.rendered && n.n != null) {
n = n.clone();
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java b/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
index 7c2338a..50ca9fd 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
@@ -125,20 +125,16 @@
}
}
if (!baseAttrs.isEmpty()) {
- Iterator<Attr> it = col.iterator();
String base = null;
Attr baseAttr = null;
- while (it.hasNext()) {
- Attr n = it.next();
+ for (Attr n : col) {
if ("base".equals(n.getLocalName())) {
base = n.getValue();
baseAttr = n;
break;
}
}
- it = baseAttrs.iterator();
- while (it.hasNext()) {
- Attr n = it.next();
+ for (Attr n : baseAttrs) {
if (base == null) {
base = n.getValue();
baseAttr = n;
@@ -158,9 +154,7 @@
} else {
for (; size >= 0; size--) {
e = levels.get(size);
- Iterator<Attr> it = e.nodes.iterator();
- while (it.hasNext()) {
- Attr n = it.next();
+ for (Attr n : e.nodes) {
if (!loa.containsKey(n.getName())) {
loa.put(n.getName(), n);
}
diff --git a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
index 5d63f1c..7cc1da6 100644
--- a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
+++ b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
@@ -3176,9 +3176,8 @@
);
result.appendChild(mgfElement);
}
- Iterator<Element> itr = encryptionMethodInformation.iterator();
- while (itr.hasNext()) {
- result.appendChild(itr.next());
+ for (Element element : encryptionMethodInformation) {
+ result.appendChild(element);
}
return result;
@@ -3463,10 +3462,8 @@
EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_REFERENCELIST
);
- Iterator<Reference> eachReference = references.iterator();
- while (eachReference.hasNext()) {
- Reference reference = eachReference.next();
- result.appendChild(((ReferenceImpl) reference).toElement());
+ for (Reference reference : references) {
+ result.appendChild(((ReferenceImpl)reference).toElement());
}
return result;
}
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
index 9ab4cc0..c1abe2b 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
@@ -27,7 +27,6 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
@@ -286,10 +285,8 @@
}
private static Element getDocumentElement(Set<Node> set) {
- Iterator<Node> it = set.iterator();
Element e = null;
- while (it.hasNext()) {
- Node currentNode = it.next();
+ for (Node currentNode : set) {
if (currentNode != null && Node.ELEMENT_NODE == currentNode.getNodeType()) {
e = (Element) currentNode;
break;
diff --git a/src/main/java/org/apache/xml/security/signature/Manifest.java b/src/main/java/org/apache/xml/security/signature/Manifest.java
index 3a565b1..bbba3b9 100644
--- a/src/main/java/org/apache/xml/security/signature/Manifest.java
+++ b/src/main/java/org/apache/xml/security/signature/Manifest.java
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -352,11 +351,8 @@
currentRef.dereferenceURIandPerformTransforms(null);
Set<Node> nl = signedManifestNodes.getNodeSet();
Manifest referencedManifest = null;
- Iterator<Node> nlIterator = nl.iterator();
- while (nlIterator.hasNext()) {
- Node n = nlIterator.next();
-
+ for (Node n : nl) {
if (n.getNodeType() == Node.ELEMENT_NODE
&& ((Element) n).getNamespaceURI().equals(Constants.SignatureSpecNS)
&& ((Element) n).getLocalName().equals(Constants._TAG_MANIFEST)
diff --git a/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java b/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
index 9be3930..6b38ded 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
@@ -36,7 +36,6 @@
import javax.xml.stream.XMLStreamReader;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
/**
@@ -134,9 +133,7 @@
List<InputProcessor> additionalInputProcessors = securityProperties.getInputProcessorList();
if (!additionalInputProcessors.isEmpty()) {
- Iterator<InputProcessor> inputProcessorIterator = additionalInputProcessors.iterator();
- while (inputProcessorIterator.hasNext()) {
- InputProcessor inputProcessor = inputProcessorIterator.next();
+ for (InputProcessor inputProcessor : additionalInputProcessors) {
inputProcessorChain.addProcessor(inputProcessor);
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
index 6788951..0e8e45b 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
@@ -33,7 +33,6 @@
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -129,9 +128,8 @@
references = new HashMap<>((int) Math.ceil(dataReferenceOrKeyReferenceSize / 0.75));
processedReferences = new ArrayList<>(dataReferenceOrKeyReferenceSize);
- Iterator<JAXBElement<ReferenceType>> referenceTypeIterator = dataReferenceOrKeyReference.iterator();
- while (referenceTypeIterator.hasNext()) {
- ReferenceType referenceType = referenceTypeIterator.next().getValue();
+ for (JAXBElement<ReferenceType> referenceTypeJAXBElement : dataReferenceOrKeyReference) {
+ ReferenceType referenceType = referenceTypeJAXBElement.getValue();
if (referenceType.getURI() == null) {
throw new XMLSecurityException("stax.emptyReferenceURI");
}
@@ -600,9 +598,7 @@
//here we check if all references where processed.
if (references != null) {
- Iterator<Map.Entry<String, ReferenceType>> refEntryIterator = this.references.entrySet().iterator();
- while (refEntryIterator.hasNext()) {
- Map.Entry<String, ReferenceType> referenceTypeEntry = refEntryIterator.next();
+ for (Map.Entry<String, ReferenceType> referenceTypeEntry : this.references.entrySet()) {
if (!processedReferences.contains(referenceTypeEntry.getValue())) {
throw new XMLSecurityException("stax.encryption.unprocessedReferences");
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
index e9a7a0e..ab7a31d 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -108,9 +107,7 @@
externalReferences = new ArrayList<>(referencesTypeList.size());
processedReferences = new ArrayList<>(referencesTypeList.size());
- Iterator<ReferenceType> referenceTypeIterator = referencesTypeList.iterator();
- while (referenceTypeIterator.hasNext()) {
- ReferenceType referenceType = referenceTypeIterator.next();
+ for (ReferenceType referenceType : referencesTypeList) {
if (!doNotThrowExceptionForManifests && XMLSecurityConstants.NS_XMLDSIG_MANIFEST.equals(referenceType.getType())) {
throw new XMLSecurityException(
"secureProcessing.DoNotThrowExceptionForManifests"
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
index 40be657..f98b58a 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
@@ -200,9 +200,7 @@
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureMethod);
- Iterator<SignaturePartDef> signaturePartDefIterator = signaturePartDefList.iterator();
- while (signaturePartDefIterator.hasNext()) {
- SignaturePartDef signaturePartDef = signaturePartDefIterator.next();
+ for (SignaturePartDef signaturePartDef : signaturePartDefList) {
String uriString;
if (signaturePartDef.isExternalResource()) {
uriString = signaturePartDef.getSigRefId();
@@ -310,8 +308,7 @@
Set<String> prefixSet = XMLSecurityUtils.getExcC14NInclusiveNamespacePrefixes(xmlSecStartElement, false);
StringBuilder prefixes = new StringBuilder();
- for (Iterator<String> iterator = prefixSet.iterator(); iterator.hasNext(); ) {
- String prefix = iterator.next();
+ for (String prefix : prefixSet) {
if (prefixes.length() != 0) {
prefixes.append(' ');
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
index fc14cde..0e4a9ab 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
@@ -226,8 +226,7 @@
xmlSecStartElement, signaturePartDef.isExcludeVisibleC14Nprefixes()
);
StringBuilder prefixes = new StringBuilder();
- for (Iterator<String> iterator = prefixSet.iterator(); iterator.hasNext(); ) {
- String prefix = iterator.next();
+ for (String prefix : prefixSet) {
if (prefixes.length() != 0) {
prefixes.append(' ');
}