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/03/25 21:11:04 UTC
svn commit: r1736651 [2/3] - in /webservices/axiom/trunk:
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/
axiom-api/src/main/java/org/apache/axiom/attachments/ axiom-api/src/ma...
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/activation/DataSourceUtils.java Fri Mar 25 20:11:03 2016
@@ -31,10 +31,10 @@ import org.apache.axiom.ext.activation.S
* Contains utility methods to work with {@link DataSource} objects.
*/
public class DataSourceUtils {
- private static final Class byteArrayDataSourceClass;
+ private static final Class<?> byteArrayDataSourceClass;
static {
- Class clazz;
+ Class<?> clazz;
try {
clazz = Class.forName("javax.mail.util.ByteArrayDataSource");
} catch (ClassNotFoundException e) {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/MapBasedNamespaceContext.java Fri Mar 25 20:11:03 2016
@@ -44,7 +44,7 @@ public class MapBasedNamespaceContext ex
}
protected String doGetNamespaceURI(String prefix) {
- String namespaceURI = (String)namespaces.get(prefix);
+ String namespaceURI = namespaces.get(prefix);
return namespaceURI == null ? XMLConstants.NULL_NS_URI : namespaceURI;
}
@@ -64,7 +64,7 @@ public class MapBasedNamespaceContext ex
protected Iterator<String> doGetPrefixes(String nsURI) {
Set<String> prefixes = null;
for (Map.Entry<String,String> entry : namespaces.entrySet()) {
- String uri = (String) entry.getValue();
+ String uri = entry.getValue();
if (uri.equals(nsURI)) {
if (prefixes == null) {
prefixes = new HashSet<String>();
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/ScopedNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/ScopedNamespaceContext.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/ScopedNamespaceContext.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/namespace/ScopedNamespaceContext.java Fri Mar 25 20:11:03 2016
@@ -180,8 +180,8 @@ public class ScopedNamespaceContext exte
return null;
}
- protected Iterator doGetPrefixes(final String namespaceURI) {
- return new Iterator() {
+ protected Iterator<String> doGetPrefixes(final String namespaceURI) {
+ return new Iterator<String>() {
private int binding = bindings;
private String next;
@@ -204,7 +204,7 @@ public class ScopedNamespaceContext exte
return next != null;
}
- public Object next() {
+ public String next() {
if (hasNext()) {
String result = next;
next = null;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/debug/XMLStreamReaderValidator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/debug/XMLStreamReaderValidator.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/debug/XMLStreamReaderValidator.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/debug/XMLStreamReaderValidator.java Fri Mar 25 20:11:03 2016
@@ -42,7 +42,7 @@ public class XMLStreamReaderValidator ex
private static boolean IS_ADV_DEBUG_ENABLED = false; // Turn this on to trace every event
private boolean throwExceptions = false; // Indicates whether OMException should be thrown if errors are disovered
- private Stack stack = new Stack(); // Stack keeps track of the nested element QName
+ private Stack<QName> stack = new Stack<QName>(); // Stack keeps track of the nested element QName
/**
@@ -89,7 +89,7 @@ public class XMLStreamReaderValidator ex
reportError("An END_ELEMENT event for " + delegateQName +
" was encountered, but the START_ELEMENT stack is empty.");
} else {
- QName expectedQName = (QName) stack.pop();
+ QName expectedQName = stack.pop();
if (!expectedQName.equals(delegateQName)) {
reportError("An END_ELEMENT event for " + delegateQName +
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java Fri Mar 25 20:11:03 2016
@@ -46,7 +46,8 @@ class ImplicitNamespaceContextWrapper ex
return parent.getPrefix(namespaceURI);
}
- protected Iterator doGetPrefixes(String namespaceURI) {
+ @SuppressWarnings("unchecked")
+ protected Iterator<String> doGetPrefixes(String namespaceURI) {
return parent.getPrefixes(namespaceURI);
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/JBossFactoryUnwrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/JBossFactoryUnwrapper.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/JBossFactoryUnwrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/JBossFactoryUnwrapper.java Fri Mar 25 20:11:03 2016
@@ -36,15 +36,15 @@ import org.apache.commons.logging.LogFac
final class JBossFactoryUnwrapper {
private static final Log log = LogFactory.getLog(JBossFactoryUnwrapper.class);
- private final Class wrapperClass;
+ private final Class<?> wrapperClass;
private final Field actual;
- private JBossFactoryUnwrapper(Class factoryType) throws Exception {
+ private JBossFactoryUnwrapper(Class<?> factoryType) throws Exception {
wrapperClass = Class.forName("__redirected.__" + factoryType.getSimpleName());
try {
actual = wrapperClass.getDeclaredField("actual");
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
actual.setAccessible(true);
return null;
}
@@ -63,7 +63,7 @@ final class JBossFactoryUnwrapper {
* @return the unwrapper, or <code>null</code> if the unwrapper could not be created (which
* usually means that the code is not executed inside JBoss)
*/
- static JBossFactoryUnwrapper create(Class factoryType) {
+ static JBossFactoryUnwrapper create(Class<?> factoryType) {
try {
return new JBossFactoryUnwrapper(factoryType);
} catch (Exception ex) {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java Fri Mar 25 20:11:03 2016
@@ -46,7 +46,7 @@ class NamespaceURICorrectingNamespaceCon
return parent.getPrefix(namespaceURI);
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<?> getPrefixes(String namespaceURI) {
return parent.getPrefixes(namespaceURI);
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPNamespaceContextWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPNamespaceContextWrapper.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPNamespaceContextWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPNamespaceContextWrapper.java Fri Mar 25 20:11:03 2016
@@ -42,10 +42,10 @@ class SJSXPNamespaceContextWrapper imple
return parent.getPrefix(namespaceURI);
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<String> getPrefixes(String namespaceURI) {
// SJSXP doesn't correctly handle masked namespace declarations
- List prefixes = new ArrayList(5);
- for (Iterator it = parent.getPrefixes(namespaceURI); it.hasNext(); ) {
+ List<String> prefixes = new ArrayList<String>(5);
+ for (Iterator<?> it = parent.getPrefixes(namespaceURI); it.hasNext(); ) {
String prefix = (String)it.next();
String actualNamespaceURI = parent.getNamespaceURI(prefix);
if (namespaceURI == actualNamespaceURI
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java Fri Mar 25 20:11:03 2016
@@ -72,8 +72,8 @@ public class StAXDialectDetector {
* in the case of a JAR file, this is not the URL pointing to the JAR, but a <tt>jar:</tt>
* URL that points to the root folder of the archive.
*/
- private static final Map/*<URL,StAXDialect>*/ dialectByUrl =
- Collections.synchronizedMap(new HashMap());
+ private static final Map<URL,StAXDialect> dialectByUrl =
+ Collections.synchronizedMap(new HashMap<URL,StAXDialect>());
private StAXDialectDetector() {}
@@ -109,7 +109,7 @@ public class StAXDialectDetector {
}
}
- private static URL getRootUrlForClass(Class cls) {
+ private static URL getRootUrlForClass(Class<?> cls) {
return getRootUrlForResource(cls.getClassLoader(),
cls.getName().replace('.', '/') + ".class");
}
@@ -153,7 +153,7 @@ public class StAXDialectDetector {
* {@link javax.xml.stream.XMLStreamWriter} implementation
* @return the detected dialect
*/
- public static StAXDialect getDialect(Class implementationClass) {
+ public static StAXDialect getDialect(Class<?> implementationClass) {
URL rootUrl = getRootUrlForClass(implementationClass);
if (rootUrl == null) {
log.warn("Unable to determine location of StAX implementation containing class "
@@ -192,7 +192,7 @@ public class StAXDialectDetector {
}
private static StAXDialect getDialect(ClassLoader classLoader, URL rootUrl) {
- StAXDialect dialect = (StAXDialect)dialectByUrl.get(rootUrl);
+ StAXDialect dialect = dialectByUrl.get(rootUrl);
if (dialect != null) {
return dialect;
} else {
@@ -292,12 +292,12 @@ public class StAXDialectDetector {
}
}
- private static Class loadClass(ClassLoader classLoader, URL rootUrl, String name) {
+ private static Class<?> loadClass(ClassLoader classLoader, URL rootUrl, String name) {
try {
if (classLoader == null) {
classLoader = ClassLoader.getSystemClassLoader();
}
- Class cls = classLoader.loadClass(name);
+ Class<?> cls = classLoader.loadClass(name);
// Cross check if the class was loaded from the same location (JAR)
return rootUrl.equals(getRootUrlForClass(cls)) ? cls : null;
} catch (ClassNotFoundException ex) {
@@ -306,7 +306,7 @@ public class StAXDialectDetector {
}
private static StAXDialect detectDialectFromClasses(ClassLoader classLoader, URL rootUrl) {
- Class cls;
+ Class<?> cls;
// Try Sun's implementation found in JREs
cls = loadClass(classLoader, rootUrl, "com.sun.xml.internal.stream.XMLOutputFactoryImpl");
@@ -314,7 +314,7 @@ public class StAXDialectDetector {
// Some JREs (such as IBM Java 1.7) include com.sun.xml.internal.stream.XMLOutputFactoryImpl
// for compatibility (in which case it extends the XMLOutputFactory implementation from
// another StAX implementation, e.g. XLXP). Detect this situation by checking the superclass.
- Class superClass = cls.getSuperclass();
+ Class<?> superClass = cls.getSuperclass();
if (superClass == XMLOutputFactory.class || superClass.getName().startsWith("com.sun.")) {
// Check if the implementation has the bug fixed here:
// https://sjsxp.dev.java.net/source/browse/sjsxp/zephyr/src/com/sun/xml/stream/ZephyrWriterFactory.java?rev=1.8&r1=1.4&r2=1.5
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java Fri Mar 25 20:11:03 2016
@@ -57,7 +57,7 @@ public class XOPEncodingStreamReader ext
* Wrapper that adds the XOP namespace to another namespace context.
*/
private static class NamespaceContextWrapper implements NamespaceContext {
- private static final List xopPrefixList = Arrays.asList(new String[] {
+ private static final List<String> xopPrefixList = Arrays.asList(new String[] {
XOPConstants.DEFAULT_PREFIX });
private final NamespaceContext parent;
@@ -78,16 +78,16 @@ public class XOPEncodingStreamReader ext
: parent.getPrefix(namespaceURI);
}
- public Iterator getPrefixes(String namespaceURI) {
- Iterator prefixes = parent.getPrefixes(namespaceURI);
+ public Iterator<?> getPrefixes(String namespaceURI) {
+ Iterator<?> prefixes = parent.getPrefixes(namespaceURI);
if (XOPConstants.NAMESPACE_URI.equals(namespaceURI)) {
if (!prefixes.hasNext()) {
return xopPrefixList.iterator();
} else {
// This case is very unusual
- List prefixList = new ArrayList();
+ List<String> prefixList = new ArrayList<String>();
do {
- prefixList.add(prefixes.next());
+ prefixList.add((String)prefixes.next());
} while (prefixes.hasNext());
prefixList.add(XOPConstants.DEFAULT_PREFIX);
return prefixList.iterator();
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java Fri Mar 25 20:11:03 2016
@@ -33,7 +33,7 @@ import org.apache.axiom.ext.stax.datahan
* Base class for {@link XOPEncodingStreamReader} and {@link XOPEncodingStreamWriter}.
*/
public abstract class XOPEncodingStreamWrapper implements MimePartProvider {
- private final Map dataHandlerObjects = new LinkedHashMap();
+ private final Map<String,Object> dataHandlerObjects = new LinkedHashMap<String,Object>();
private final ContentIDGenerator contentIDGenerator;
private final OptimizationPolicy optimizationPolicy;
@@ -77,7 +77,7 @@ public abstract class XOPEncodingStreamW
* <tt>xop:Include</tt> element information items have been produced yet, an empty
* set will be returned.
*/
- public Set/*<String>*/ getContentIDs() {
+ public Set<String> getContentIDs() {
return Collections.unmodifiableSet(dataHandlerObjects.keySet());
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java Fri Mar 25 20:11:03 2016
@@ -121,7 +121,7 @@ public class AttachmentsTest extends Abs
InputStream inStream = MTOMSample.SAMPLE1.getInputStream();
Attachments attachments = new Attachments(inStream, MTOMSample.SAMPLE1.getContentType());
- Set idSet = attachments.getContentIDSet();
+ Set<String> idSet = attachments.getContentIDSet();
assertTrue(idSet.contains("0.urn:uuid:A3ADBAEE51A1A87B2A11443668160702@apache.org"));
assertTrue(idSet.contains("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org"));
assertTrue(idSet.contains("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org"));
@@ -133,7 +133,7 @@ public class AttachmentsTest extends Abs
attachments.addDataHandler("id2@apache.org", new DataHandler("content2", "text/plain"));
attachments.addDataHandler("id3@apache.org", new DataHandler("content3", "text/plain"));
- Set idSet = attachments.getContentIDSet();
+ Set<String> idSet = attachments.getContentIDSet();
assertTrue(idSet.contains("id1@apache.org"));
assertTrue(idSet.contains("id2@apache.org"));
assertTrue(idSet.contains("id3@apache.org"));
@@ -368,7 +368,7 @@ public class AttachmentsTest extends Abs
attachments.removeDataHandler("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
- List list2 = attachments.getContentIDList();
+ List<String> list2 = attachments.getContentIDList();
assertEquals(2, list2.size());
assertEquals(2, attachments.getMap().size());
@@ -384,7 +384,7 @@ public class AttachmentsTest extends Abs
InputStream inStream = MTOMSample.SAMPLE1.getInputStream();
Attachments attachments = new Attachments(inStream, MTOMSample.SAMPLE1.getContentType());
attachments.removeDataHandler("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
- Set idSet = attachments.getContentIDSet();
+ Set<String> idSet = attachments.getContentIDSet();
assertEquals(2, idSet.size());
assertTrue(idSet.contains("0.urn:uuid:A3ADBAEE51A1A87B2A11443668160702@apache.org"));
assertFalse(idSet.contains("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org"));
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/MyLifecycleManager.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/MyLifecycleManager.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/MyLifecycleManager.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/MyLifecycleManager.java Fri Mar 25 20:11:03 2016
@@ -27,7 +27,7 @@ import org.apache.axiom.attachments.life
import org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl;
public class MyLifecycleManager extends LifecycleManagerImpl {
- private final Set/*<File>*/ files = new HashSet();
+ private final Set<File> files = new HashSet<File>();
public FileAccessor create(String attachmentDir) throws IOException {
FileAccessor accessor = super.create(attachmentDir);
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java Fri Mar 25 20:11:03 2016
@@ -120,7 +120,7 @@ public class PartOnFileTest extends Test
temp = File.createTempFile("partOnFileTest", ".tmp");
if (!temp.delete()) {
- fail("Cannot delete from temporary directory. File: " + temp.toURL());
+ fail("Cannot delete from temporary directory. File: " + temp);
}
if (!temp.mkdir()) {
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PdfAttachmentStreamingTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PdfAttachmentStreamingTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PdfAttachmentStreamingTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/attachments/PdfAttachmentStreamingTest.java Fri Mar 25 20:11:03 2016
@@ -56,7 +56,7 @@ public class PdfAttachmentStreamingTest
// reading the message again, getting second attachment using datahandlers
inStream = getTestResource(inputFile);
attachments = new Attachments(inStream, contentType);
- DataHandler h = attachments.getDataHandler((String)attachments.getAllContentIDs()[1]);
+ DataHandler h = attachments.getDataHandler(attachments.getAllContentIDs()[1]);
ByteArrayOutputStream input = new ByteArrayOutputStream();
copy(h.getInputStream(), input);
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodCollisionTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodCollisionTestCase.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodCollisionTestCase.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodCollisionTestCase.java Fri Mar 25 20:11:03 2016
@@ -26,23 +26,23 @@ import java.util.Set;
import junit.framework.TestCase;
public class MethodCollisionTestCase extends TestCase {
- private final Class omInterface;
- private final Class domInterface;
+ private final Class<?> omInterface;
+ private final Class<?> domInterface;
private final MethodSignature[] exceptions;
- public MethodCollisionTestCase(Class omInterface, Class domInterface, MethodSignature[] exceptions) {
+ public MethodCollisionTestCase(Class<?> omInterface, Class<?> domInterface, MethodSignature[] exceptions) {
this.omInterface = omInterface;
this.domInterface = domInterface;
this.exceptions = exceptions;
setName(omInterface.getName() + " <-> " + domInterface.getName());
}
- public MethodCollisionTestCase(Class omInterface, Class domInterface) {
+ public MethodCollisionTestCase(Class<?> omInterface, Class<?> domInterface) {
this(omInterface, domInterface, null);
}
- private Set/*<MethodSignature>*/ getMethodSignatures(Class iface) {
- Set result = new HashSet();
+ private Set<MethodSignature> getMethodSignatures(Class<?> iface) {
+ Set<MethodSignature> result = new HashSet<MethodSignature>();
Method[] methods = iface.getMethods();
for (int i=0; i<methods.length; i++) {
result.add(new MethodSignature(methods[i]));
@@ -51,7 +51,7 @@ public class MethodCollisionTestCase ext
}
protected void runTest() throws Throwable {
- Set signatures = getMethodSignatures(omInterface);
+ Set<MethodSignature> signatures = getMethodSignatures(omInterface);
signatures.retainAll(getMethodSignatures(domInterface));
if (exceptions != null) {
signatures.removeAll(Arrays.asList(exceptions));
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodSignature.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodSignature.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodSignature.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/MethodSignature.java Fri Mar 25 20:11:03 2016
@@ -25,9 +25,9 @@ public class MethodSignature {
// Note: Although the JVM considers the return type as part of the signature,
// the Java compiler does not.
private final String name;
- private final Class[] parameterTypes;
+ private final Class<?>[] parameterTypes;
- public MethodSignature(String name, Class[] parameterTypes) {
+ public MethodSignature(String name, Class<?>[] parameterTypes) {
this.name = name;
this.parameterTypes = parameterTypes;
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMDocumentTestBase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMDocumentTestBase.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMDocumentTestBase.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMDocumentTestBase.java Fri Mar 25 20:11:03 2016
@@ -66,9 +66,9 @@ public class OMDocumentTestBase extends
// check for the comment and the PI
boolean commentFound = false;
boolean piFound = false;
- Iterator children = document.getChildren();
+ Iterator<OMNode> children = document.getChildren();
while (children.hasNext()) {
- OMNode omNode = (OMNode) children.next();
+ OMNode omNode = children.next();
if (omNode instanceof OMComment) {
commentFound = true;
} else if (omNode instanceof OMProcessingInstruction) {
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/OMOutputFormatTest.java Fri Mar 25 20:11:03 2016
@@ -34,7 +34,7 @@ public class OMOutputFormatTest extends
Method m = OMOutputFormat.class.getMethod("getProperty", new Class[] {String.class});
assertTrue(m != null);
- Class returnType = m.getReturnType();
+ Class<?> returnType = m.getReturnType();
assertTrue(returnType == Object.class);
}
@@ -42,7 +42,7 @@ public class OMOutputFormatTest extends
Method m = OMOutputFormat.class.getMethod("setProperty", new Class[] {String.class, Object.class});
assertTrue(m != null);
- Class returnType = m.getReturnType();
+ Class<?> returnType = m.getReturnType();
assertTrue(returnType == Object.class);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java Fri Mar 25 20:11:03 2016
@@ -24,7 +24,6 @@ import static org.apache.axiom.truth.xml
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
@@ -74,8 +73,7 @@ public class StreamingOMSerializerTest e
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite();
- for (Iterator it = Multiton.getInstances(XMLSample.class).iterator(); it.hasNext(); ) {
- XMLSample file = (XMLSample)it.next();
+ for (XMLSample file : Multiton.getInstances(XMLSample.class)) {
suite.addTest(new StreamingOMSerializerTest(file.getName(), file));
}
return suite;
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/UIDGeneratorTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/UIDGeneratorTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/UIDGeneratorTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/UIDGeneratorTest.java Fri Mar 25 20:11:03 2016
@@ -36,7 +36,7 @@ public class UIDGeneratorTest extends Te
public void testGenerateContentIdUniqueness() {
// Not very sophisticated, but should catch stupid regressions
- Set values = new HashSet();
+ Set<String> values = new HashSet<String>();
for (int i=0; i<1000; i++) {
assertTrue(values.add(UIDGenerator.generateContentId()));
}
@@ -47,7 +47,7 @@ public class UIDGeneratorTest extends Te
}
public void testGenerateUIDThreadSafety() {
- final Set generatedIds = Collections.synchronizedSet(new HashSet());
+ final Set<String> generatedIds = Collections.synchronizedSet(new HashSet<String>());
final AtomicInteger errorCount = new AtomicInteger(0);
Thread[] threads = new Thread[100];
for (int i = 0; i < threads.length; i++) {
@@ -99,7 +99,7 @@ public class UIDGeneratorTest extends Te
}
}
- Set set = new HashSet();
+ Set<String> set = new HashSet<String>();
for (int i = 0; i < threads.length; i++) {
for (int j = 0; j < urns[i].length; j++) {
String urn = urns[i][j];
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/namespace/ScopedNamespaceContextTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/namespace/ScopedNamespaceContextTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/namespace/ScopedNamespaceContextTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/namespace/ScopedNamespaceContextTest.java Fri Mar 25 20:11:03 2016
@@ -33,10 +33,10 @@ import org.apache.axiom.testutils.namesp
import junit.framework.TestCase;
public class ScopedNamespaceContextTest extends TestCase {
- private static Set getPrefixes(NamespaceContext nc, String namespaceURI) {
- Set result = new HashSet();
- for (Iterator it = nc.getPrefixes(namespaceURI); it.hasNext(); ) {
- result.add(it.next());
+ private static Set<String> getPrefixes(NamespaceContext nc, String namespaceURI) {
+ Set<String> result = new HashSet<String>();
+ for (Iterator<?> it = nc.getPrefixes(namespaceURI); it.hasNext(); ) {
+ result.add((String)it.next());
}
return result;
}
@@ -64,7 +64,7 @@ public class ScopedNamespaceContextTest
nc.setPrefix("b", "urn:ns1");
String prefix = nc.getPrefix("urn:ns1");
assertTrue(prefix.equals("") || prefix.equals("b"));
- assertEquals(new HashSet(Arrays.asList(new String[] { "", "b" })),
+ assertEquals(new HashSet<String>(Arrays.asList("", "b")),
getPrefixes(nc, "urn:ns1"));
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Fri Mar 25 20:11:03 2016
@@ -27,9 +27,7 @@ import java.util.Iterator;
import java.util.Vector;
import org.apache.axiom.core.CoreChildNode;
-import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.dom.DOMDocument;
-import org.apache.axiom.dom.DOMExceptionUtil;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.intf.AxiomDocument;
import org.w3c.dom.Attr;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactoryLoader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactoryLoader.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactoryLoader.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMMetaFactoryLoader.java Fri Mar 25 20:11:03 2016
@@ -24,7 +24,7 @@ import org.apache.axiom.locator.loader.O
import org.apache.axiom.om.OMMetaFactory;
public class OMDOMMetaFactoryLoader implements OMMetaFactoryLoader {
- public OMMetaFactory load(Map properties) {
+ public OMMetaFactory load(Map<String,Object> properties) {
return OMDOMMetaFactory.INSTANCE;
}
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java Fri Mar 25 20:11:03 2016
@@ -19,9 +19,6 @@
package org.apache.axiom.soap.impl.dom;
-import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.intf.AxiomSOAPBody;
public abstract class SOAPBodyImpl extends SOAPElement implements AxiomSOAPBody {
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListMetaFactoryLoader.java Fri Mar 25 20:11:03 2016
@@ -24,7 +24,7 @@ import org.apache.axiom.locator.loader.O
import org.apache.axiom.om.OMMetaFactory;
public class OMLinkedListMetaFactoryLoader implements OMMetaFactoryLoader {
- public OMMetaFactory load(Map properties) {
+ public OMMetaFactory load(Map<String,Object> properties) {
return OMLinkedListMetaFactory.INSTANCE;
}
}
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java Fri Mar 25 20:11:03 2016
@@ -77,7 +77,7 @@ public class FactoryTest {
@Test
public void testLLOMMetaFactoryServicePresent() throws Exception {
- ServiceReference[] omfactRefs = context
+ ServiceReference<?>[] omfactRefs = context
.getServiceReferences("org.apache.axiom.om.OMMetaFactory", "(implementationName=llom)");
assertNotNull(omfactRefs);
assertEquals(1, omfactRefs.length);
@@ -85,7 +85,7 @@ public class FactoryTest {
@Test
public void testDOOMMetaFactoryServicePresent() throws Exception {
- ServiceReference[] omfactRefs = context
+ ServiceReference<?>[] omfactRefs = context
.getServiceReferences("org.apache.axiom.om.OMMetaFactory", "(implementationName=doom)");
assertNotNull(omfactRefs);
assertEquals(1, omfactRefs.length);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java Fri Mar 25 20:11:03 2016
@@ -60,7 +60,7 @@ public abstract class AxiomTestCase exte
assertTrue(isConsumed);
}
- protected static int getChildrenCount(Iterator childrenIter) {
+ protected static int getChildrenCount(Iterator<?> childrenIter) {
int childCount = 0;
while (childrenIter.hasNext()) {
childrenIter.next();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java Fri Mar 25 20:11:03 2016
@@ -20,16 +20,10 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertThat;
-import java.io.StringReader;
-import java.util.Iterator;
-
-import org.apache.axiom.om.OMComment;
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.om.OMXMLBuilderFactory;
import org.apache.axiom.ts.AxiomTestCase;
/**
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChild2.java Fri Mar 25 20:11:03 2016
@@ -44,11 +44,11 @@ public class TestAddChild2 extends Axiom
elem.addChild(childElem);
- Iterator it = elem.getChildrenWithName(new QName(namespace, childLocalName));
+ Iterator<OMElement> it = elem.getChildrenWithName(new QName(namespace, childLocalName));
int count = 0;
while (it.hasNext()) {
- OMElement child = (OMElement) it.next();
+ OMElement child = it.next();
assertEquals("Child local name mismatch", childLocalName, child.getLocalName());
assertEquals("Child namespace mismatch", namespace,
child.getNamespace().getNamespaceURI());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java Fri Mar 25 20:11:03 2016
@@ -38,9 +38,9 @@ public class TestGetChildrenWithLocalNam
protected void runTest() throws Throwable {
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
XMLSample.SIMPLE.getInputStream()).getDocumentElement().getFirstElement();
- Iterator it = elt.getChildrenWithLocalName("subelement");
+ Iterator<OMElement> it = elt.getChildrenWithLocalName("subelement");
assertThat(it.hasNext()).isTrue();
- OMElement child = (OMElement)it.next();
+ OMElement child = it.next();
assertThat(child.getQName()).isEqualTo(new QName("urn:ns2", "subelement"));
assertThat(it.hasNext()).isFalse();
elt.close(false);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName.java Fri Mar 25 20:11:03 2016
@@ -39,7 +39,7 @@ public class TestGetChildrenWithName ext
OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
XMLSample.SIMPLE.getInputStream()).getDocumentElement().getFirstElement();
QName qname = new QName("urn:ns2", "subelement");
- Iterator iter = elt.getChildrenWithName(qname);
+ Iterator<OMElement> iter = elt.getChildrenWithName(qname);
int counter = 0;
while (iter.hasNext()) {
counter ++;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java Fri Mar 25 20:11:03 2016
@@ -26,7 +26,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.ts.AxiomTestCase;
public class TestGetChildrenWithName2 extends AxiomTestCase {
@@ -39,11 +38,11 @@ public class TestGetChildrenWithName2 ex
OMNamespace testNamespace = factory.createOMNamespace("http://test.ws.org", "test");
OMElement documentElement = factory.createOMElement("Employees", testNamespace);
documentElement.declareNamespace(testNamespace);
- OMText txt = factory.createOMText(documentElement, " ");
+ factory.createOMText(documentElement, " ");
OMElement e = factory.createOMElement("Employee", testNamespace, documentElement);
e.setText("Apache Developer");
- Iterator childrenIter = documentElement.getChildrenWithName(new QName("http://test.ws.org", "Employee", "test"));
+ Iterator<OMElement> childrenIter = documentElement.getChildrenWithName(new QName("http://test.ws.org", "Employee", "test"));
int childCount = getChildrenCount(childrenIter);
assertEquals("Iterator must return 1 child with the given qname", childCount, 1);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName3.java Fri Mar 25 20:11:03 2016
@@ -26,7 +26,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.ts.AxiomTestCase;
/**
@@ -42,12 +41,12 @@ public class TestGetChildrenWithName3 ex
OMNamespace testNamespace = factory.createOMNamespace("http://test.ws.org", "test");
OMElement documentElement = factory.createOMElement("Employees", testNamespace);
documentElement.declareNamespace(testNamespace);
- OMText txt = factory.createOMText(documentElement, " ");
+ factory.createOMText(documentElement, " ");
OMElement e = factory.createOMElement("Employee", testNamespace, documentElement);
e.setText("Apache Developer");
- Iterator childrenIter = documentElement.getChildrenWithName(new QName("http://test.ws.org", "Employee", "test"));
- OMElement employee = (OMElement) childrenIter.next(); // should walk past OMText
+ Iterator<OMElement> childrenIter = documentElement.getChildrenWithName(new QName("http://test.ws.org", "Employee", "test"));
+ OMElement employee = childrenIter.next(); // should walk past OMText
assertEquals("Employee test was incorrect", employee.getText(), "Apache Developer");
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNameNextWithoutHasNext.java Fri Mar 25 20:11:03 2016
@@ -45,7 +45,7 @@ public class TestGetChildrenWithNameNext
OMElement element = factory.createOMElement(new QName("root"));
factory.createOMElement(new QName("child1"), element);
OMElement child2 = factory.createOMElement(new QName("child2"), element);
- Iterator it = element.getChildrenWithName(new QName("child2"));
+ Iterator<OMElement> it = element.getChildrenWithName(new QName("child2"));
assertSame(child2, it.next());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithNamespaceURI.java Fri Mar 25 20:11:03 2016
@@ -38,11 +38,11 @@ public class TestGetChildrenWithNamespac
protected void runTest() throws Throwable {
OMElement element = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), new StringReader(
"<root><a xmlns='urn:ns1'/><b xmlns='urn:ns2'/><c xmlns='urn:ns1'/></root>")).getDocumentElement();
- Iterator it = element.getChildrenWithNamespaceURI("urn:ns1");
+ Iterator<OMElement> it = element.getChildrenWithNamespaceURI("urn:ns1");
assertTrue(it.hasNext());
- assertEquals("a", ((OMElement)it.next()).getLocalName());
+ assertEquals("a", it.next().getLocalName());
assertTrue(it.hasNext());
- assertEquals("c", ((OMElement)it.next()).getLocalName());
+ assertEquals("c", it.next().getLocalName());
assertFalse(it.hasNext());
}
}
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=1736651&r1=1736650&r2=1736651&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 Fri Mar 25 20:11:03 2016
@@ -60,7 +60,7 @@ public class TestGetNamespaceContext ext
assertEquals("", context.getPrefix("urn:test4"));
assertNull(context.getPrefix("unbound"));
- Iterator it = context.getPrefixes("urn:test1");
+ Iterator<?> it = context.getPrefixes("urn:test1");
assertFalse(it.hasNext());
it = context.getPrefixes("urn:test2");
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScope.java Fri Mar 25 20:11:03 2016
@@ -36,10 +36,10 @@ public class TestGetNamespacesInScope ex
"<a xmlns:ns1='urn:ns1'><b xmlns:ns2='urn:ns2'/></a>");
boolean ns1seen = false;
boolean ns2seen = false;
- Iterator it = element.getFirstElement().getNamespacesInScope();
+ Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
int count = 0;
while (it.hasNext()) {
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
count++;
if (ns.getPrefix().equals("ns1")) {
ns1seen = true;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithDefaultNamespace.java Fri Mar 25 20:11:03 2016
@@ -34,9 +34,9 @@ public class TestGetNamespacesInScopeWit
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
"<a xmlns='urn:test'><b/></a>");
- Iterator it = element.getFirstElement().getNamespacesInScope();
+ Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("", 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/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedDefaultNamespace.java Fri Mar 25 20:11:03 2016
@@ -22,6 +22,7 @@ import java.util.Iterator;
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;
@@ -33,7 +34,7 @@ public class TestGetNamespacesInScopeWit
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
"<a xmlns='urn:test'><b xmlns=''/></a>");
- Iterator it = element.getFirstElement().getNamespacesInScope();
+ Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
assertFalse(it.hasNext());
}
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespacesInScopeWithMaskedNamespace.java Fri Mar 25 20:11:03 2016
@@ -34,9 +34,9 @@ public class TestGetNamespacesInScopeWit
protected void runTest() throws Throwable {
OMElement element = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
"<a xmlns:p='urn:ns1'><b xmlns:p='urn:ns2'/></a>");
- Iterator it = element.getFirstElement().getNamespacesInScope();
+ Iterator<OMNamespace> it = element.getFirstElement().getNamespacesInScope();
assertTrue(it.hasNext());
- OMNamespace ns = (OMNamespace)it.next();
+ OMNamespace ns = it.next();
assertEquals("p", 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/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=1736651&r1=1736650&r2=1736651&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 Fri Mar 25 20:11:03 2016
@@ -22,9 +22,6 @@ import static org.apache.axiom.truth.Axi
import java.util.Iterator;
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSource.java Fri Mar 25 20:11:03 2016
@@ -62,14 +62,14 @@ public class TestGetSAXSourceWithPushOMD
return false;
}
});
- Iterator it = scenario.getNamespaceContext().entrySet().iterator();
+ Iterator<Map.Entry<String,String>> it = scenario.getNamespaceContext().entrySet().iterator();
OMElement parent;
if (it.hasNext()) {
- Map.Entry binding = (Map.Entry)it.next();
- parent = factory.createOMElement("parent", factory.createOMNamespace((String)binding.getValue(), (String)binding.getKey()));
+ Map.Entry<String,String> binding = it.next();
+ parent = factory.createOMElement("parent", factory.createOMNamespace(binding.getValue(), binding.getKey()));
while (it.hasNext()) {
- binding = (Map.Entry)it.next();
- parent.declareNamespace(factory.createOMNamespace((String)binding.getValue(), (String)binding.getKey()));
+ binding = it.next();
+ parent.declareNamespace(factory.createOMNamespace(binding.getValue(), binding.getKey()));
}
} else {
parent = factory.createOMElement("parent", null);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestPushOMDataSourceExpansion.java Fri Mar 25 20:11:03 2016
@@ -65,13 +65,13 @@ public class TestPushOMDataSourceExpansi
OMFactory factory = metaFactory.getOMFactory();
PushOMDataSource ds = new PushOMDataSource();
OMElement element = factory.createOMElement(ds);
- Iterator it = scenario.getNamespaceContext().entrySet().iterator();
+ Iterator<Map.Entry<String,String>> it = scenario.getNamespaceContext().entrySet().iterator();
if (it.hasNext()) {
- Map.Entry binding = (Map.Entry)it.next();
- OMElement parent = factory.createOMElement("parent", factory.createOMNamespace((String)binding.getValue(), (String)binding.getKey()));
+ Map.Entry<String,String> binding = it.next();
+ OMElement parent = factory.createOMElement("parent", factory.createOMNamespace(binding.getValue(), binding.getKey()));
while (it.hasNext()) {
- binding = (Map.Entry)it.next();
- parent.declareNamespace(factory.createOMNamespace((String)binding.getValue(), (String)binding.getKey()));
+ binding = it.next();
+ parent.declareNamespace(factory.createOMNamespace(binding.getValue(), binding.getKey()));
}
parent.addChild(element);
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java Fri Mar 25 20:11:03 2016
@@ -38,8 +38,8 @@ public class CloseScenario implements Pu
testCase.addTestParameter("scenario", "close");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/GetNamespaceContextScenario.java Fri Mar 25 20:11:03 2016
@@ -38,7 +38,7 @@ public class GetNamespaceContextScenario
testCase.addTestParameter("scenario", "getNamespaceContext");
}
- public Map getNamespaceContext() {
+ public Map<String,String> getNamespaceContext() {
return Collections.singletonMap("p", "urn:test");
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/PushOMDataSourceScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/PushOMDataSourceScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/PushOMDataSourceScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/PushOMDataSourceScenario.java Fri Mar 25 20:11:03 2016
@@ -64,7 +64,7 @@ public interface PushOMDataSourceScenari
*
* @return the namespace context
*/
- Map getNamespaceContext();
+ Map<String,String> getNamespaceContext();
/**
* Write the StAX events to the given {@link XMLStreamWriter}.
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=1736651&r1=1736650&r2=1736651&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 Fri Mar 25 20:11:03 2016
@@ -39,8 +39,8 @@ public class WriteAttributeAutoPrefixSce
testCase.addTestParameter("scenario", "writeAttributeAutoPrefix");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteAttributeNamespaceUnawareScenario.java Fri Mar 25 20:11:03 2016
@@ -37,8 +37,8 @@ public class WriteAttributeNamespaceUnaw
testCase.addTestParameter("scenario", "writeAttributeNoNamespace");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCDataScenario.java Fri Mar 25 20:11:03 2016
@@ -35,8 +35,8 @@ public class WriteCDataScenario implemen
testCase.addTestParameter("scenario", "writeCData");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCharactersCharArrayScenario.java Fri Mar 25 20:11:03 2016
@@ -38,8 +38,8 @@ public class WriteCharactersCharArraySce
testCase.addTestParameter("scenario", "writeCharactersCharArray");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteCommentScenario.java Fri Mar 25 20:11:03 2016
@@ -35,8 +35,8 @@ public class WriteCommentScenario implem
testCase.addTestParameter("scenario", "writeComment");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java Fri Mar 25 20:11:03 2016
@@ -56,8 +56,8 @@ public class WriteDataHandlerProviderSce
testCase.addTestParameter("scenario", "writeDataHandlerProvider");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java Fri Mar 25 20:11:03 2016
@@ -46,8 +46,8 @@ public class WriteDataHandlerScenario im
testCase.addTestParameter("scenario", "writeDataHandler");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementAutoPrefixScenario.java Fri Mar 25 20:11:03 2016
@@ -37,8 +37,8 @@ public class WriteEmptyElementAutoPrefix
testCase.addTestParameter("scenario", "writeEmptyElementAutoPrefix");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java Fri Mar 25 20:11:03 2016
@@ -38,8 +38,8 @@ public class WriteEmptyElementNamespaceU
testCase.addTestParameter("scenario", "writeEmptyElementNamespaceUnaware");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementScenario.java Fri Mar 25 20:11:03 2016
@@ -36,8 +36,8 @@ public class WriteEmptyElementScenario i
testCase.addTestParameter("scenario", "writeEmptyElement");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEntityRefScenario.java Fri Mar 25 20:11:03 2016
@@ -38,8 +38,8 @@ public class WriteEntityRefScenario impl
testCase.addTestParameter("scenario", "writeEntityRef");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
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=1736651&r1=1736650&r2=1736651&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 Fri Mar 25 20:11:03 2016
@@ -49,8 +49,8 @@ public class WriteNamespaceScenario impl
testCase.addTestParameter("uri", namespaceURI);
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction1Scenario.java Fri Mar 25 20:11:03 2016
@@ -35,8 +35,8 @@ public class WriteProcessingInstruction1
testCase.addTestParameter("scenario", "writeProcessingInstruction1");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteProcessingInstruction2Scenario.java Fri Mar 25 20:11:03 2016
@@ -35,8 +35,8 @@ public class WriteProcessingInstruction2
testCase.addTestParameter("scenario", "writeProcessingInstruction2");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementAutoPrefixScenario.java Fri Mar 25 20:11:03 2016
@@ -37,8 +37,8 @@ public class WriteStartElementAutoPrefix
testCase.addTestParameter("scenario", "writeStartElementAutoPrefix");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java?rev=1736651&r1=1736650&r2=1736651&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java Fri Mar 25 20:11:03 2016
@@ -38,8 +38,8 @@ public class WriteStartElementNamespaceU
testCase.addTestParameter("scenario", "writeStartElementNamespaceUnaware");
}
- public Map getNamespaceContext() {
- return Collections.EMPTY_MAP;
+ public Map<String,String> getNamespaceContext() {
+ return Collections.emptyMap();
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {