You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/20 21:51:31 UTC
svn commit: r1725812 [1/2] - in
/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts:
om/ om/builder/ om/document/ om/element/ om/factory/ om/node/
om/sourcedelement/ om/sourcedelement/push/ omdom/attr/ soap/envelope/ soap...
Author: veithen
Date: Wed Jan 20 20:51:30 2016
New Revision: 1725812
URL: http://svn.apache.org/viewvc?rev=1725812&view=rev
Log:
Use generics.
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/builder/TestBuilder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/builder/TestBuilder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java Wed Jan 20 20:51:30 2016
@@ -148,10 +148,10 @@ public abstract class SetNamespaceTestCa
assertEquals(expectedPrefix, qname.getPrefix());
assertEquals(namespaceURI == null ? "" : namespaceURI, qname.getNamespaceURI());
if (element != null) {
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
if (expectNSDecl) {
assertTrue(it.hasNext());
- OMNamespace decl = (OMNamespace)it.next();
+ OMNamespace decl = it.next();
assertEquals(expectedPrefix, decl.getPrefix());
assertEquals(namespaceURI == null ? "" : namespaceURI, decl.getNamespaceURI());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java Wed Jan 20 20:51:30 2016
@@ -45,9 +45,9 @@ public class TestCreateStAXOMBuilderName
OMElement element = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
new NamespaceDeclarationFilter(reader)).getDocumentElement();
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("p", ns.getPrefix());
assertEquals("urn:ns1", ns.getNamespaceURI());
assertFalse(it.hasNext());
@@ -55,7 +55,7 @@ public class TestCreateStAXOMBuilderName
OMElement child = element.getFirstElement();
it = child.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- ns = (OMNamespace)it.next();
+ ns = it.next();
assertEquals("q", ns.getPrefix());
assertEquals("urn:ns2", ns.getNamespaceURI());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java Wed Jan 20 20:51:30 2016
@@ -47,9 +47,9 @@ public class TestCreateStAXOMBuilderName
OMElement element = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
new NamespaceDeclarationFilter(reader)).getDocumentElement();
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("", ns.getPrefix());
assertEquals("urn:test", ns.getNamespaceURI());
assertFalse(it.hasNext());
@@ -57,7 +57,7 @@ public class TestCreateStAXOMBuilderName
OMElement child = element.getFirstElement();
it = child.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- ns = (OMNamespace)it.next();
+ ns = it.next();
assertEquals("", ns.getPrefix());
assertEquals("", ns.getNamespaceURI());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestStandaloneConfiguration.java Wed Jan 20 20:51:30 2016
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMDocType;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.StAXParserConfiguration;
@@ -47,10 +48,10 @@ public class TestStandaloneConfiguration
OMElement root = builder.getDocumentElement();
assertTrue(root.getLocalName().equals("web-app"));
OMDocument document = builder.getDocument();
- Iterator i = document.getChildren();
+ Iterator<OMNode> i = document.getChildren();
OMDocType docType = null;
while (docType == null && i.hasNext()) {
- Object obj = i.next();
+ OMNode obj = i.next();
if (obj instanceof OMDocType) {
docType = (OMDocType) obj;
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildIncomplete.java Wed Jan 20 20:51:30 2016
@@ -47,7 +47,7 @@ public class TestAddChildIncomplete exte
OMFactory factory = metaFactory.getOMFactory();
OMDocument parent = OMXMLBuilderFactory.createOMBuilder(factory, new StringReader("<!--a--><b/><!--c-->")).getDocument();
parent.addChild(factory.createOMComment(null, "d"));
- Iterator it = parent.getChildren();
+ Iterator<OMNode> it = parent.getChildren();
assertEquals("a", ((OMComment)it.next()).getValue());
assertEquals("b", ((OMElement)it.next()).getLocalName());
assertEquals("c", ((OMComment)it.next()).getValue());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNew.java Wed Jan 20 20:51:30 2016
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.ts.AxiomTestCase;
/**
@@ -44,7 +45,7 @@ public class TestSetOMDocumentElementNew
document.setOMDocumentElement(documentElement);
assertSame(documentElement, document.getOMDocumentElement());
assertSame(document, documentElement.getParent());
- Iterator it = document.getChildren();
+ Iterator<OMNode> it = document.getChildren();
assertTrue(it.hasNext());
assertSame(comment, it.next());
assertTrue(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplace.java Wed Jan 20 20:51:30 2016
@@ -46,15 +46,15 @@ public class TestSetOMDocumentElementRep
OMElement documentElement = factory.createOMElement("new", null);
document.setOMDocumentElement(documentElement);
assertSame(documentElement, document.getOMDocumentElement());
- Iterator it = document.getChildren();
+ Iterator<OMNode> it = document.getChildren();
assertTrue(it.hasNext());
- OMNode child = (OMNode)it.next();
+ OMNode child = it.next();
assertTrue(child instanceof OMComment);
assertEquals("comment1", ((OMComment)child).getValue());
assertTrue(it.hasNext());
assertSame(documentElement, it.next());
assertTrue(it.hasNext());
- child = (OMNode)it.next();
+ child = it.next();
assertTrue(child instanceof OMComment);
assertEquals("comment2", ((OMComment)child).getValue());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeAlreadyOwnedByElement.java Wed Jan 20 20:51:30 2016
@@ -44,7 +44,7 @@ public class TestAddAttributeAlreadyOwne
OMAttribute result = element.addAttribute(att);
assertSame(result, att);
assertSame(element, att.getOwner());
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
assertTrue(it.hasNext());
assertSame(att, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeGeneratedPrefix.java Wed Jan 20 20:51:30 2016
@@ -52,7 +52,7 @@ public class TestAddAttributeGeneratedPr
OMAttribute attr = element.addAttribute("attr", "value", factory.createOMNamespace("urn:test", null));
OMNamespace ns = attr.getNamespace();
assertTrue(ns.getPrefix().length() > 0);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeReplace.java Wed Jan 20 20:51:30 2016
@@ -53,7 +53,7 @@ public class TestAddAttributeReplace ext
OMElement element = factory.createOMElement(new QName("test"));
OMAttribute att1 = strategy.addAttribute(element, "test", ns1, "value1");
OMAttribute att2 = strategy.addAttribute(element, "test", ns2, "value2");
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
ASSERT.that(it.hasNext()).isTrue();
ASSERT.that(it.next()).isSameAs(att2);
ASSERT.that(it.hasNext()).isFalse();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationInScope.java Wed Jan 20 20:51:30 2016
@@ -49,7 +49,7 @@ public class TestAddAttributeWithExistin
root.declareNamespace(ns);
OMElement child = factory.createOMElement(new QName("test"), root);
strategy.addAttribute(child, "test", ns, "test");
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertFalse(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithExistingNamespaceDeclarationOnSameElement.java Wed Jan 20 20:51:30 2016
@@ -48,7 +48,7 @@ public class TestAddAttributeWithExistin
OMNamespace ns = factory.createOMNamespace("urn:ns", "p");
element.declareNamespace(ns);
strategy.addAttribute(element, "test", ns, "test");
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java Wed Jan 20 20:51:30 2016
@@ -65,7 +65,7 @@ public class TestAddAttributeWithMaskedN
element2.declareNamespace(ns2);
OMElement element3 = factory.createOMElement(new QName("c"), element2);
strategy.addAttribute(element3, "attr", ns1, "test");
- Iterator it = element3.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element3.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns1, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutExistingNamespaceDeclaration.java Wed Jan 20 20:51:30 2016
@@ -48,7 +48,7 @@ public class TestAddAttributeWithoutExis
OMNamespace ns = factory.createOMNamespace("urn:ns", "p");
strategy.addAttribute(element, "test", ns, "test");
assertEquals(ns, element.findNamespace(ns.getNamespaceURI(), ns.getPrefix()));
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithoutNamespace.java Wed Jan 20 20:51:30 2016
@@ -49,10 +49,10 @@ public class TestAddAttributeWithoutName
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", "urn:test", "");
// Retrieve the namespace declaration generated by createOMElement
- OMNamespace ns = (OMNamespace)element.getAllDeclaredNamespaces().next();
+ OMNamespace ns = element.getAllDeclaredNamespaces().next();
OMAttribute attr = addAttributeStrategy.addAttribute(element, "test", noNamespaceStrategy.createOMNamespace(factory), "test");
assertNull(attr.getNamespace());
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildIncomplete.java Wed Jan 20 20:51:30 2016
@@ -45,7 +45,7 @@ public class TestAddChildIncomplete exte
OMFactory factory = metaFactory.getOMFactory();
OMElement parent = OMXMLBuilderFactory.createOMBuilder(factory, new StringReader("<root><a/><b/></root>")).getDocumentElement();
parent.addChild(factory.createOMElement("c", null));
- Iterator it = parent.getChildren();
+ Iterator<OMNode> it = parent.getChildren();
assertEquals("a", ((OMElement)it.next()).getLocalName());
assertEquals("b", ((OMElement)it.next()).getLocalName());
assertEquals("c", ((OMElement)it.next()).getLocalName());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElementNamespaceRepairing.java Wed Jan 20 20:51:30 2016
@@ -59,8 +59,8 @@ public class TestCloneOMElementNamespace
expectedNSDecls.add(ns1);
expectedNSDecls.add(ns2);
Set<OMNamespace> actualNSDecls = new HashSet<>();
- for (Iterator it = clone.getAllDeclaredNamespaces(); it.hasNext(); ) {
- actualNSDecls.add((OMNamespace)it.next());
+ for (Iterator<OMNamespace> it = clone.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ actualNSDecls.add(it.next());
}
assertEquals(expectedNSDecls, actualNSDecls);
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespace1.java Wed Jan 20 20:51:30 2016
@@ -37,9 +37,9 @@ public class TestDeclareNamespace1 exten
OMNamespace ns = element.declareNamespace("urn:ns1", "ns1");
assertEquals("urn:ns1", ns.getNamespaceURI());
assertEquals("ns1", ns.getPrefix());
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns2 = (OMNamespace)it.next();
+ OMNamespace ns2 = it.next();
assertEquals(ns, ns2);
assertFalse(it.hasNext());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix1.java Wed Jan 20 20:51:30 2016
@@ -44,9 +44,9 @@ public class TestDeclareNamespaceWithGen
assertEquals("urn:ns", ns.getNamespaceURI());
assertNotNull(ns.getPrefix());
assertTrue(ns.getPrefix().length() > 0);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns2 = (OMNamespace)it.next();
+ OMNamespace ns2 = it.next();
assertEquals(ns, ns2);
assertFalse(it.hasNext());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix2.java Wed Jan 20 20:51:30 2016
@@ -45,9 +45,9 @@ public class TestDeclareNamespaceWithGen
assertEquals("urn:ns", ns.getNamespaceURI());
assertNotNull(ns.getPrefix());
assertTrue(ns.getPrefix().length() > 0);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns2 = (OMNamespace)it.next();
+ OMNamespace ns2 = it.next();
assertEquals(ns, ns2);
assertFalse(it.hasNext());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithGeneratedPrefix3.java Wed Jan 20 20:51:30 2016
@@ -44,9 +44,9 @@ public class TestDeclareNamespaceWithGen
assertEquals("urn:ns", ns.getNamespaceURI());
assertNotNull(ns.getPrefix());
assertTrue(ns.getPrefix().length() > 0);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns2 = (OMNamespace)it.next();
+ OMNamespace ns2 = it.next();
assertEquals(ns, ns2);
assertFalse(it.hasNext());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes1.java Wed Jan 20 20:51:30 2016
@@ -37,12 +37,12 @@ public class TestGetAllAttributes1 exten
OMElement element = metaFactory.getOMFactory().createOMElement("test", null);
element.addAttribute("attr1", "value1", null);
element.addAttribute("attr2", "value2", null);
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
assertTrue(it.hasNext());
- OMAttribute attr = (OMAttribute)it.next();
+ OMAttribute attr = it.next();
assertEquals("attr1", attr.getLocalName());
assertTrue(it.hasNext());
- attr = (OMAttribute)it.next();
+ attr = it.next();
assertEquals("attr2", attr.getLocalName());
assertFalse(it.hasNext());
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllAttributes2.java Wed Jan 20 20:51:30 2016
@@ -37,9 +37,9 @@ public class TestGetAllAttributes2 exten
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<e xmlns:p='urn:test' p:attr='test'/>");
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
assertTrue(it.hasNext());
- OMAttribute attr = (OMAttribute)it.next();
+ OMAttribute attr = it.next();
assertEquals("urn:test", attr.getNamespace().getNamespaceURI());
assertEquals("attr", attr.getLocalName());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespaces.java Wed Jan 20 20:51:30 2016
@@ -33,9 +33,9 @@ public class TestGetAllDeclaredNamespace
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<e xmlns:p='urn:test' p:attr='test'/>");
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("p", ns.getPrefix());
assertEquals("urn:test", ns.getNamespaceURI());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.NoSuchElementException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.ts.AxiomTestCase;
@@ -37,7 +38,7 @@ public class TestGetAllDeclaredNamespace
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(), "<e xmlns:p='urn:test' p:attr='test'/>");
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
it.next();
try {
it.next();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java Wed Jan 20 20:51:30 2016
@@ -50,8 +50,8 @@ public class TestGetAllDeclaredNamespace
element.declareNamespace("urn:" + prefix, prefix);
}
Set<String> seenPrefixes = new HashSet<String>();
- for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
- OMNamespace ns = (OMNamespace)it.next();
+ for (Iterator<OMNamespace> it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ OMNamespace ns = it.next();
String prefix = ns.getPrefix();
if (prefix.equals(prefixToRemove)) {
it.remove();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java Wed Jan 20 20:51:30 2016
@@ -36,14 +36,14 @@ public class TestGetChildElements extend
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
- Iterator iter = elt.getChildElements();
+ Iterator<OMElement> iter = elt.getChildElements();
int counter = 0;
while (iter.hasNext()) {
counter ++;
- Object o = iter.next();
+ OMElement o = iter.next();
assertNotNull("Must return not null objects!", o);
assertTrue("All these should be elements!",
- ((OMNode) o).getType() == OMNode.ELEMENT_NODE);
+ o.getType() == OMNode.ELEMENT_NODE);
}
assertEquals("This element should contain only two elements ", 2, counter);
elt.close(false);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java Wed Jan 20 20:51:30 2016
@@ -43,9 +43,9 @@ public class TestGetChildElementsConcurr
factory.createOMElement("child1", null, parent);
factory.createOMElement("child2", null, parent);
factory.createOMElement("child3", null, parent);
- Iterator it = parent.getChildElements();
+ Iterator<OMElement> it = parent.getChildElements();
it.next();
- OMElement child2 = (OMElement)it.next();
+ OMElement child2 = it.next();
child2.detach();
try {
it.next();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java Wed Jan 20 20:51:30 2016
@@ -57,7 +57,7 @@ public class TestGetChildElementsConsume
//try to find the children of the document element. This should produce an
//error since the underlying stream is fully consumed without building the object tree
try {
- Iterator childElements = documentElement.getChildElements();
+ Iterator<OMElement> childElements = documentElement.getChildElements();
while (childElements.hasNext()) {
childElements.next();
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -35,7 +36,7 @@ public class TestGetChildren extends Axi
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
- Iterator iter = elt.getChildren();
+ Iterator<OMNode> iter = elt.getChildren();
int counter = 0;
while (iter.hasNext()) {
counter ++;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java Wed Jan 20 20:51:30 2016
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.ts.AxiomTestCase;
/**
@@ -43,7 +44,7 @@ public class TestGetChildrenConcurrentMo
factory.createOMElement("child1", null, parent);
factory.createOMElement("child2", null, parent);
factory.createOMElement("child3", null, parent);
- Iterator it = parent.getChildren();
+ Iterator<OMNode> it = parent.getChildren();
it.next();
OMElement child2 = (OMElement)it.next();
child2.detach();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -35,7 +36,7 @@ public class TestGetChildrenRemove1 exte
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root><child/></root>")).getDocumentElement();
- Iterator iter = elt.getChildren();
+ Iterator<OMNode> iter = elt.getChildren();
//this is supposed to throw an illegal state exception
try {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -35,7 +36,7 @@ public class TestGetChildrenRemove2 exte
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root><child1/><child2/></root>")).getDocumentElement();
- Iterator iter = elt.getChildren();
+ Iterator<OMNode> iter = elt.getChildren();
if (iter.hasNext()) {
iter.next();
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -35,7 +36,7 @@ public class TestGetChildrenRemove3 exte
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
- Iterator iter = elt.getChildren();
+ Iterator<OMNode> iter = elt.getChildren();
while (iter.hasNext()) {
iter.next();
iter.remove();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -35,7 +36,7 @@ public class TestGetChildrenRemove4 exte
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
- Iterator iter = elt.getChildren();
+ Iterator<OMNode> iter = elt.getChildren();
int firstChildrenCount = 0;
int secondChildrenCount = 0;
while (iter.hasNext()) {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithCaching.java Wed Jan 20 20:51:30 2016
@@ -54,7 +54,7 @@ public class TestGetXMLStreamReaderWithC
//try to find the children of the document element. This should *NOT* produce an
//error even when the underlying stream is fully consumed , the object tree is already complete
- Iterator childElements = documentElement.getChildElements();
+ Iterator<OMElement> childElements = documentElement.getChildElements();
int count = 0;
while (childElements.hasNext()) {
childElements.next();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttribute.java Wed Jan 20 20:51:30 2016
@@ -41,7 +41,7 @@ public class TestRemoveAttribute extends
OMAttribute attr2 = element.addAttribute("attr2", "value2", null);
element.removeAttribute(attr1);
assertNull(attr1.getOwner());
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
assertTrue(it.hasNext());
assertSame(attr2, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQName.java Wed Jan 20 20:51:30 2016
@@ -43,8 +43,8 @@ public class TestSetTextQName extends Ax
QName qname = new QName("urn:ns1", "test", "ns");
element.setText(qname);
boolean foundNamespace = false;
- for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
- OMNamespace ns = (OMNamespace)it.next();
+ for (Iterator<OMNamespace> it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
+ OMNamespace ns = it.next();
if ("urn:ns1".equals(ns.getNamespaceURI()) && "ns".equals(ns.getPrefix())) {
foundNamespace = true;
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetTextQNameWithEmptyPrefix.java Wed Jan 20 20:51:30 2016
@@ -42,9 +42,9 @@ public class TestSetTextQNameWithEmptyPr
OMElement element = factory.createOMElement("test", null);
QName qname = new QName("urn:test", "test");
element.setText(qname);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("urn:test", ns.getNamespaceURI());
String prefix = ns.getPrefix();
assertTrue(prefix.length() > 0);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUndeclarePrefix.java Wed Jan 20 20:51:30 2016
@@ -35,9 +35,9 @@ public class TestUndeclarePrefix extends
protected void runTest() throws Throwable {
OMElement element = metaFactory.getOMFactory().createOMElement(new QName("test"));
element.undeclarePrefix("p");
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("", ns.getNamespaceURI());
assertEquals("p", ns.getPrefix());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithDefaultNamespace.java Wed Jan 20 20:51:30 2016
@@ -37,7 +37,7 @@ public class TestCreateOMElementWithDefa
assertEquals("test", element.getLocalName());
OMNamespace ns = factory.createOMNamespace("urn:ns", "");
assertEquals(ns, element.getNamespace());
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithGeneratedPrefix.java Wed Jan 20 20:51:30 2016
@@ -45,7 +45,7 @@ public class TestCreateOMElementWithGene
assertEquals("urn:test", ns.getNamespaceURI());
// Axiom auto-generates a prefix here
assertTrue(ns.getPrefix().length() != 0);
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope1.java Wed Jan 20 20:51:30 2016
@@ -44,7 +44,7 @@ public class TestCreateOMElementWithName
assertEquals("child", child.getLocalName());
OMNamespace ns = factory.createOMNamespace("urn:test", "p");
assertEquals(ns, child.getNamespace());
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertFalse(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope2.java Wed Jan 20 20:51:30 2016
@@ -42,7 +42,7 @@ public class TestCreateOMElementWithName
OMElement child = variant.createOMElement(factory, parent, "child", "urn:test", "p2");
OMNamespace ns = factory.createOMNamespace("urn:test", "p2");
assertEquals(ns, child.getNamespace());
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope3.java Wed Jan 20 20:51:30 2016
@@ -42,7 +42,7 @@ public class TestCreateOMElementWithName
OMElement child = variant.createOMElement(factory, parent, "child", "urn:test", "");
OMNamespace ns = factory.createOMNamespace("urn:test", "");
assertEquals(ns, child.getNamespace());
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNonDefaultNamespace.java Wed Jan 20 20:51:30 2016
@@ -37,7 +37,7 @@ public class TestCreateOMElementWithNonD
assertEquals("test", element.getLocalName());
OMNamespace ns = factory.createOMNamespace("urn:ns", "ns");
assertEquals(ns, element.getNamespace());
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
assertEquals(ns, it.next());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace2.java Wed Jan 20 20:51:30 2016
@@ -46,9 +46,9 @@ public class TestCreateOMElementWithoutN
OMElement child = variant.createOMElement(factory, parent, "test", "", "");
assertEquals("test", child.getLocalName());
assertNull(child.getNamespace());
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertTrue(it.hasNext());
- OMNamespace decl = (OMNamespace)it.next();
+ OMNamespace decl = it.next();
assertEquals("", decl.getPrefix());
assertEquals("", decl.getNamespaceURI());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNamespace;
/**
* Tests the behavior of the <code>createOMElement</code> methods in {@link OMFactory} when
@@ -45,7 +46,7 @@ public class TestCreateOMElementWithoutN
OMElement child = variant.createOMElement(factory, parent, "test", "", "");
assertEquals("test", child.getLocalName());
assertNull(child.getNamespace());
- Iterator it = child.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = child.getAllDeclaredNamespaces();
assertFalse(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespaceNullPrefix.java Wed Jan 20 20:51:30 2016
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNamespace;
/**
* Tests the behavior of the <code>createOMElement</code> methods in {@link OMFactory} when
@@ -41,7 +42,7 @@ public class TestCreateOMElementWithoutN
OMElement element = variant.createOMElement(factory, parentSupplier.createParent(factory), "test", "", null);
assertEquals("test", element.getLocalName());
assertNull(element.getNamespace());
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertFalse(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterSameParent.java Wed Jan 20 20:51:30 2016
@@ -46,7 +46,7 @@ public class TestInsertSiblingAfterSameP
parent.addChild(text3);
text1.insertSiblingAfter(text3);
assertSame(parent, text3.getParent());
- Iterator it = parent.getChildren();
+ Iterator<OMNode> it = parent.getChildren();
assertSame(text1, it.next());
assertSame(text3, it.next());
assertSame(text2, it.next());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeSameParent.java Wed Jan 20 20:51:30 2016
@@ -46,7 +46,7 @@ public class TestInsertSiblingBeforeSame
parent.addChild(text3);
text2.insertSiblingBefore(text3);
assertSame(parent, text3.getParent());
- Iterator it = parent.getChildren();
+ Iterator<OMNode> it = parent.getChildren();
assertSame(text1, it.next());
assertSame(text3, it.next());
assertSame(text2, it.next());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java Wed Jan 20 20:51:30 2016
@@ -57,7 +57,7 @@ public class TestAddAttribute extends Ax
OMAttribute attr2 = element.getAttribute(new QName("attr"));
ASSERT.that(attr2).isSameAs(attr);
ASSERT.that(attr2.getAttributeValue()).isEqualTo("newvalue");
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
ASSERT.that(it.hasNext()).isTrue();
ASSERT.that(it.next()).isSameAs(attr);
ASSERT.that(it.hasNext()).isFalse();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java Wed Jan 20 20:51:30 2016
@@ -54,7 +54,7 @@ public class TestDeclareNamespace extend
ASSERT.that(ns).isNotNull();
ASSERT.that(ns.getPrefix()).isEqualTo("p");
ASSERT.that(ns.getNamespaceURI()).isEqualTo("urn:ns2");
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
ASSERT.that(it.hasNext()).isTrue();
ASSERT.that(it.next()).isSameAs(ns);
ASSERT.that(it.hasNext()).isFalse();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java Wed Jan 20 20:51:30 2016
@@ -44,9 +44,9 @@ public class TestGetAllAttributes extend
OMFactory factory = metaFactory.getOMFactory();
OMSourcedElement element = factory.createOMElement(
new PullOMDataSource("<root attr='value'/>"), "root", null);
- Iterator attributes = element.getAllAttributes();
+ Iterator<OMAttribute> attributes = element.getAllAttributes();
ASSERT.that(attributes.hasNext()).isTrue();
- OMAttribute attr = (OMAttribute)attributes.next();
+ OMAttribute attr = attributes.next();
ASSERT.that(attr.getLocalName()).isEqualTo("attr");
ASSERT.that(attributes.hasNext()).isFalse();
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java Wed Jan 20 20:51:30 2016
@@ -44,9 +44,9 @@ public class TestGetAllDeclaredNamespace
OMFactory factory = metaFactory.getOMFactory();
OMSourcedElement element = factory.createOMElement(
new PullOMDataSource("<root xmlns:p='urn:ns1'/>"), "root", null);
- Iterator attributes = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> attributes = element.getAllDeclaredNamespaces();
ASSERT.that(attributes.hasNext()).isTrue();
- OMNamespace ns = (OMNamespace)attributes.next();
+ OMNamespace ns = attributes.next();
ASSERT.that(ns.getPrefix()).isEqualTo("p");
ASSERT.that(ns.getNamespaceURI()).isEqualTo("urn:ns1");
ASSERT.that(attributes.hasNext()).isFalse();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestRemoveChildrenUnexpanded.java Wed Jan 20 20:51:30 2016
@@ -44,9 +44,9 @@ public class TestRemoveChildrenUnexpande
"<element attr='value'><a/></element>".getBytes("utf-8"), "utf-8"));
element.removeChildren();
// Check that the attribute has been added
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
assertTrue(it.hasNext());
- OMAttribute attr = (OMAttribute)it.next();
+ OMAttribute attr = it.next();
assertEquals("attr", attr.getLocalName());
assertEquals("value", attr.getAttributeValue());
assertFalse(it.hasNext());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeAutoPrefixScenario.java Wed Jan 20 20:51:30 2016
@@ -52,9 +52,9 @@ public class WriteAttributeAutoPrefixSce
}
public void validate(OMElement element, boolean dataHandlersPreserved) throws Throwable {
- Iterator it = element.getAllAttributes();
+ Iterator<OMAttribute> it = element.getAllAttributes();
Assert.assertTrue(it.hasNext());
- OMAttribute attr = (OMAttribute)it.next();
+ OMAttribute attr = it.next();
Assert.assertEquals("p", attr.getPrefix());
Assert.assertEquals("urn:test", attr.getNamespaceURI());
Assert.assertEquals("attr", attr.getLocalName());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java?rev=1725812&r1=1725811&r2=1725812&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteNamespaceScenario.java Wed Jan 20 20:51:30 2016
@@ -62,9 +62,9 @@ public class WriteNamespaceScenario impl
public void validate(OMElement element, boolean dataHandlersPreserved) throws Throwable {
OMNamespace decl = null;
- Iterator it = element.getAllDeclaredNamespaces();
+ Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
while (it.hasNext()) {
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
if (!ns.getPrefix().equals("_p_")) {
if (decl != null) {
Assert.fail("Found unexpected namespace declaration");