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 2015/07/08 21:23:23 UTC
svn commit: r1689943 - in
/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts:
om/element/ soap/fault/ soap/header/
Author: veithen
Date: Wed Jul 8 19:23:22 2015
New Revision: 1689943
URL: http://svn.apache.org/r1689943
Log:
Fix some Java 5 warnings.
Modified:
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/TestGetNamespaceContext.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/MyRolePlayer.java
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=1689943&r1=1689942&r2=1689943&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 Jul 8 19:23:22 2015
@@ -55,12 +55,12 @@ public class TestCloneOMElementNamespace
// Clone the child and check that namespace declarations have been generated automatically
OMElement clone = child.cloneOMElement();
- Set expectedNSDecls = new HashSet();
+ Set<OMNamespace> expectedNSDecls = new HashSet<>();
expectedNSDecls.add(ns1);
expectedNSDecls.add(ns2);
- Set actualNSDecls = new HashSet();
+ Set<OMNamespace> actualNSDecls = new HashSet<>();
for (Iterator it = clone.getAllDeclaredNamespaces(); it.hasNext(); ) {
- actualNSDecls.add(it.next());
+ actualNSDecls.add((OMNamespace)it.next());
}
assertEquals(expectedNSDecls, actualNSDecls);
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java?rev=1689943&r1=1689942&r2=1689943&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java Wed Jul 8 19:23:22 2015
@@ -69,9 +69,9 @@ public class TestGetNamespaceContext ext
assertFalse(it.hasNext());
it = context.getPrefixes("urn:test3");
- Set prefixes = new HashSet();
+ Set<String> prefixes = new HashSet<>();
while (it.hasNext()) {
- prefixes.add(it.next());
+ prefixes.add((String)it.next());
}
assertEquals(2, prefixes.size());
assertTrue(prefixes.contains("q"));
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java?rev=1689943&r1=1689942&r2=1689943&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java Wed Jul 8 19:23:22 2015
@@ -49,10 +49,10 @@ public class TestGetXMLStreamReaderWithP
XMLStreamReader reader = root.getFirstElement().getFirstElement().getXMLStreamReader(true, configuration);
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
assertEquals(4, reader.getNamespaceCount());
- Set prefixes = new HashSet();
+ Set<String> prefixes = new HashSet<>();
for (int i=0; i<4; i++) {
prefixes.add(reader.getNamespacePrefix(i));
}
- assertEquals(new HashSet(Arrays.asList(new String[] { "soapenv", "xsd", "xsi", "ns"} )), prefixes);
+ assertEquals(new HashSet<>(Arrays.asList(new String[] { "soapenv", "xsd", "xsi", "ns"} )), prefixes);
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java?rev=1689943&r1=1689942&r2=1689943&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java Wed Jul 8 19:23:22 2015
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.fault;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -74,9 +73,9 @@ public class TestChildOrder extends SOAP
}
// Calculate the order in which we expect to see the children. Note that a given type
// may be added multiple times. Therefore we need to use a Set.
- SortedSet outputOrder = new TreeSet(new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((SOAPFaultChild)o1).getOrder() - ((SOAPFaultChild)o2).getOrder();
+ SortedSet<SOAPFaultChild> outputOrder = new TreeSet<>(new Comparator<SOAPFaultChild>() {
+ public int compare(SOAPFaultChild o1, SOAPFaultChild o2) {
+ return o1.getOrder() - o2.getOrder();
}
});
outputOrder.addAll(Arrays.asList(inputOrder));
@@ -86,8 +85,7 @@ public class TestChildOrder extends SOAP
Document document = dbf.newDocumentBuilder().parse(serializationStrategy.serialize(fault).getInputSource());
Element domFault = document.getDocumentElement();
Node child = domFault.getFirstChild();
- for (Iterator it = outputOrder.iterator(); it.hasNext(); ) {
- SOAPFaultChild type = (SOAPFaultChild)it.next();
+ for (SOAPFaultChild type : outputOrder) {
assertNotNull(child);
assertEquals(type.getQName(spec).getLocalPart(), child.getLocalName());
child = child.getNextSibling();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/MyRolePlayer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/MyRolePlayer.java?rev=1689943&r1=1689942&r2=1689943&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/MyRolePlayer.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/MyRolePlayer.java Wed Jul 8 19:23:22 2015
@@ -25,7 +25,7 @@ import org.apache.axiom.soap.RolePlayer;
public final class MyRolePlayer implements RolePlayer {
boolean ultimateReceiver;
- List roles;
+ List<String> roles;
public MyRolePlayer(boolean ultimateReceiver) {
this.ultimateReceiver = ultimateReceiver;
roles = null;
@@ -33,13 +33,13 @@ public final class MyRolePlayer implemen
public MyRolePlayer(boolean ultimateReceiver, String [] roles) {
this.ultimateReceiver = ultimateReceiver;
- this.roles = new ArrayList();
+ this.roles = new ArrayList<>();
for (int i = 0; i < roles.length; i++) {
this.roles.add(roles[i]);
}
}
- public List getRoles() {
+ public List<String> getRoles() {
return roles;
}