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/11/17 21:17:06 UTC
svn commit: r1714872 - in /webservices/axiom/branches/datatypes: ./
testing/multiton/src/main/java/org/apache/axiom/testing/multiton/
testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/
testing/testutils/src/main/java/org/apache/axiom/testut...
Author: veithen
Date: Tue Nov 17 20:17:06 2015
New Revision: 1714872
URL: http://svn.apache.org/viewvc?rev=1714872&view=rev
Log:
Merge latest changes from trunk.
Modified:
webservices/axiom/branches/datatypes/ (props changed)
webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Adapters.java
webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Multiton.java
webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java
webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java
webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/InvocationCounter.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/concurrent/ConcurrentTestUtils.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/namespace/NamespaceContextTestUtils.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistry.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/AttributeSortingXMLStreamReaderFilter.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/XMLStreamReaderComparator.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java
webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java
webservices/axiom/branches/datatypes/testing/testutils/src/test/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistryTest.java
webservices/axiom/branches/datatypes/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/DOMTraverser.java
webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/RedundantNamespaceDeclarationFilter.java
webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXTraverser.java
webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java
Propchange: webservices/axiom/branches/datatypes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 20:17:06 2015
@@ -11,3 +11,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
+/webservices/axiom/trunk:1714490-1714865
Modified: webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Adapters.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Adapters.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Adapters.java (original)
+++ webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Adapters.java Tue Nov 17 20:17:06 2015
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Set;
public final class Adapters {
- private final Map<Class<?>,Object> adapters = new HashMap<Class<?>,Object>();
+ private final Map<Class<?>,Object> adapters = new HashMap<>();
private boolean initialized;
public <T> void add(Class<T> type, T adapter) {
Modified: webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Multiton.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Multiton.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Multiton.java (original)
+++ webservices/axiom/branches/datatypes/testing/multiton/src/main/java/org/apache/axiom/testing/multiton/Multiton.java Tue Nov 17 20:17:06 2015
@@ -46,8 +46,8 @@ import java.util.ServiceLoader;
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public abstract class Multiton {
- private static final Map<Class<?>,List<?>> instancesMap = new HashMap<Class<?>,List<?>>();
- private static final Map<Class,List<AdapterFactory>> adapterFactoryMap = new HashMap<Class,List<AdapterFactory>>();
+ private static final Map<Class<?>,List<?>> instancesMap = new HashMap<>();
+ private static final Map<Class,List<AdapterFactory>> adapterFactoryMap = new HashMap<>();
private final Adapters adapters = new Adapters();
static {
@@ -57,7 +57,7 @@ public abstract class Multiton {
Class clazz = ((Class<?>)((ParameterizedType)adapterFactory.getClass().getGenericInterfaces()[0]).getActualTypeArguments()[0]).asSubclass(Multiton.class);
List<AdapterFactory> adapterFactories = adapterFactoryMap.get(clazz);
if (adapterFactories == null) {
- adapterFactories = new ArrayList<AdapterFactory>();
+ adapterFactories = new ArrayList<>();
adapterFactoryMap.put(clazz, adapterFactories);
}
adapterFactories.add(adapterFactory);
@@ -75,7 +75,7 @@ public abstract class Multiton {
public static synchronized <T extends Multiton> List<T> getInstances(Class<T> multitonClass) {
List<T> instances = (List<T>)instancesMap.get(multitonClass);
if (instances == null) {
- instances = new ArrayList<T>();
+ instances = new ArrayList<>();
for (Field field : multitonClass.getDeclaredFields()) {
int mod = field.getModifiers();
if (Modifier.isPublic(mod) && Modifier.isStatic(mod) && Modifier.isFinal(mod)
Modified: webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java (original)
+++ webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPElementType.java Tue Nov 17 20:17:06 2015
@@ -99,8 +99,8 @@ public abstract class SOAPElementType ex
addRelation(FAULT, SOAPFaultChild.DETAIL);
}
- private final List<SOAPElementType> parentTypes = new ArrayList<SOAPElementType>();
- private final List<SOAPElementType> childTypes = new ArrayList<SOAPElementType>();
+ private final List<SOAPElementType> parentTypes = new ArrayList<>();
+ private final List<SOAPElementType> childTypes = new ArrayList<>();
SOAPElementType() {}
Modified: webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java (original)
+++ webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSample.java Tue Nov 17 20:17:06 2015
@@ -54,7 +54,7 @@ public class SOAPSample extends XMLSampl
@Instances
private static SOAPSample[] instances() {
- List<SOAPSample> instances = new ArrayList<SOAPSample>();
+ List<SOAPSample> instances = new ArrayList<>();
for (SOAPSampleSet set : getInstances(SOAPSampleSet.class)) {
for (SOAPSpec spec : getInstances(SOAPSpec.class)) {
instances.add(set.getMessage(spec));
Modified: webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java (original)
+++ webservices/axiom/branches/datatypes/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java Tue Nov 17 20:17:06 2015
@@ -214,13 +214,13 @@ public abstract class SOAPSpec extends M
* @return an array with the recognized boolean literals
*/
public final BooleanLiteral[] getBooleanLiterals() {
- return (BooleanLiteral[])booleanLiterals.clone();
+ return booleanLiterals.clone();
}
- private static List getReps(BooleanLiteral[] literals) {
- List result = new ArrayList(literals.length);
- for (int i=0; i<literals.length; i++) {
- result.add(literals[i].getLexicalRepresentation());
+ private static List<String> getReps(BooleanLiteral[] literals) {
+ List<String> result = new ArrayList<>(literals.length);
+ for (BooleanLiteral literal : literals) {
+ result.add(literal.getLexicalRepresentation());
}
return result;
}
@@ -239,15 +239,15 @@ public abstract class SOAPSpec extends M
* @return an array of invalid boolean literals
*/
public final String[] getInvalidBooleanLiterals() {
- Set result = new LinkedHashSet();
+ Set<String> result = new LinkedHashSet<>();
result.addAll(getReps(getAltSpec().booleanLiterals));
- List valid = getReps(booleanLiterals);
+ List<String> valid = getReps(booleanLiterals);
result.removeAll(valid);
result.add("invalid");
if (valid.contains("true")) {
result.add("TRUE");
}
- return (String[])result.toArray(new String[result.size()]);
+ return result.toArray(new String[result.size()]);
}
/**
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/InvocationCounter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/InvocationCounter.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/InvocationCounter.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/InvocationCounter.java Tue Nov 17 20:17:06 2015
@@ -66,14 +66,14 @@ public class InvocationCounter {
* @return the proxy instance
*/
public Object createProxy(Object target) {
- Set ifaces = new HashSet();
- Class clazz = target.getClass();
+ Set<Class<?>> ifaces = new HashSet<>();
+ Class<?> clazz = target.getClass();
do {
ifaces.addAll(Arrays.asList(clazz.getInterfaces()));
clazz = clazz.getSuperclass();
} while (clazz != null);
return Proxy.newProxyInstance(InvocationCounter.class.getClassLoader(),
- (Class[])ifaces.toArray(new Class[ifaces.size()]), new InvocationHandlerImpl(target));
+ ifaces.toArray(new Class<?>[ifaces.size()]), new InvocationHandlerImpl(target));
}
/**
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/concurrent/ConcurrentTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/concurrent/ConcurrentTestUtils.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/concurrent/ConcurrentTestUtils.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/concurrent/ConcurrentTestUtils.java Tue Nov 17 20:17:06 2015
@@ -20,14 +20,13 @@
package org.apache.axiom.testutils.concurrent;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
public class ConcurrentTestUtils {
public static void testThreadSafety(final Action action) throws Throwable {
int threadCount = 10;
- final List results = new ArrayList(threadCount);
+ final List<Throwable> results = new ArrayList<>(threadCount);
for (int i=0; i<threadCount; i++) {
new Thread(new Runnable() {
public void run() {
@@ -52,8 +51,7 @@ public class ConcurrentTestUtils {
results.wait();
}
}
- for (Iterator it = results.iterator(); it.hasNext(); ) {
- Throwable result = (Throwable)it.next();
+ for (Throwable result : results) {
if (result != null) {
throw result;
}
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/namespace/NamespaceContextTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/namespace/NamespaceContextTestUtils.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/namespace/NamespaceContextTestUtils.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/namespace/NamespaceContextTestUtils.java Tue Nov 17 20:17:06 2015
@@ -24,7 +24,7 @@ import java.util.Iterator;
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
-import junit.framework.Assert;
+import org.junit.Assert;
public final class NamespaceContextTestUtils {
private NamespaceContextTestUtils() {}
@@ -36,7 +36,7 @@ public final class NamespaceContextTestU
Assert.assertEquals(XMLConstants.XML_NS_PREFIX, nc.getPrefix(XMLConstants.XML_NS_URI));
Assert.assertEquals(XMLConstants.XMLNS_ATTRIBUTE, nc.getPrefix(XMLConstants.XMLNS_ATTRIBUTE_NS_URI));
- Iterator it = nc.getPrefixes(XMLConstants.XML_NS_URI);
+ Iterator<?> it = nc.getPrefixes(XMLConstants.XML_NS_URI);
Assert.assertTrue(it.hasNext());
Assert.assertEquals(XMLConstants.XML_NS_PREFIX, it.next());
Assert.assertFalse(it.hasNext());
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistry.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistry.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistry.java Tue Nov 17 20:17:06 2015
@@ -29,7 +29,7 @@ import javax.activation.DataSource;
public final class DataSourceRegistry {
private static boolean handlerRegistered;
- private static final Map<String,DataSource> dataSources = new HashMap<String,DataSource>();
+ private static final Map<String,DataSource> dataSources = new HashMap<>();
private DataSourceRegistry() {}
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/AttributeSortingXMLStreamReaderFilter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/AttributeSortingXMLStreamReaderFilter.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/AttributeSortingXMLStreamReaderFilter.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/AttributeSortingXMLStreamReaderFilter.java Tue Nov 17 20:17:06 2015
@@ -49,7 +49,7 @@ final class AttributeSortingXMLStreamRea
if (indexMap == null) {
int n = super.getAttributeCount();
indexMap = new int[n];
- SortedMap<String,Integer> map = new TreeMap<String,Integer>();
+ SortedMap<String,Integer> map = new TreeMap<>();
for (int i=0; i<n; i++) {
map.put(super.getAttributeName(i).toString(), i);
}
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/XMLStreamReaderComparator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/XMLStreamReaderComparator.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/XMLStreamReaderComparator.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/stax/XMLStreamReaderComparator.java Tue Nov 17 20:17:06 2015
@@ -52,19 +52,19 @@ public class XMLStreamReaderComparator {
private boolean compareCharacterEncodingScheme = true;
private boolean compareEncoding = true;
private boolean sortAttributes = false;
- private final LinkedList<QName> path = new LinkedList<QName>();
+ private final LinkedList<QName> path = new LinkedList<>();
/**
* Set collecting all prefixes seen in the document to be able to test
* {@link XMLStreamReader#getNamespaceURI(String)}.
*/
- private final Set<String> prefixes = new HashSet<String>();
+ private final Set<String> prefixes = new HashSet<>();
/**
* Set collecting all namespace URIs seen in the document to be able to
* test {@link NamespaceContext#getPrefix(String)}.
*/
- private final Set<String> namespaceURIs = new HashSet<String>();
+ private final Set<String> namespaceURIs = new HashSet<>();
public XMLStreamReaderComparator(XMLStreamReader expected, XMLStreamReader actual) {
this.expected = expected;
@@ -160,7 +160,7 @@ public class XMLStreamReaderComparator {
}
private Set<String> toPrefixSet(Iterator<?> it) {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
while (it.hasNext()) {
String prefix = (String)it.next();
// TODO: Woodstox returns null instead of "" for the default namespace.
@@ -273,8 +273,8 @@ public class XMLStreamReaderComparator {
assertSameResult("getName");
Integer namespaceCount = (Integer)assertSameResult("getNamespaceCount");
if (namespaceCount != null) {
- Map<String,String> expectedNamespaces = new HashMap<String,String>();
- Map<String,String> actualNamespaces = new HashMap<String,String>();
+ Map<String,String> expectedNamespaces = new HashMap<>();
+ Map<String,String> actualNamespaces = new HashMap<>();
for (int i=0; i<namespaceCount.intValue(); i++) {
String expectedPrefix = expected.getNamespacePrefix(i);
String expectedNamespaceURI = expected.getNamespaceURI(i);
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java Tue Nov 17 20:17:06 2015
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
* A test case that can be executed multiple times with different parameters.
*/
public abstract class MatrixTestCase extends TestCase {
- private final Dictionary<String,String> parameters = new Hashtable<String,String>();
+ private final Dictionary<String,String> parameters = new Hashtable<>();
public MatrixTestCase() {
setName(getClass().getName());
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java Tue Nov 17 20:17:06 2015
@@ -49,7 +49,7 @@ public abstract class MatrixTestSuiteBui
}
}
- private final List<Exclude> excludes = new ArrayList<Exclude>();
+ private final List<Exclude> excludes = new ArrayList<>();
private TestSuite suite;
public final void exclude(Class<? extends MatrixTestCase> testClass, String filter) {
Modified: webservices/axiom/branches/datatypes/testing/testutils/src/test/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistryTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/testutils/src/test/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistryTest.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/testutils/src/test/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistryTest.java (original)
+++ webservices/axiom/branches/datatypes/testing/testutils/src/test/java/org/apache/axiom/testutils/net/protocol/mem/DataSourceRegistryTest.java Tue Nov 17 20:17:06 2015
@@ -36,7 +36,7 @@ public class DataSourceRegistryTest exte
// We must be able to connect to the URL after converting it to a String
URL url = new URL(registration.getURL().toString());
URLConnection connection = url.openConnection();
- IOTestUtils.compareStreams(connection.getInputStream(), ds.getInputStream());
+ IOTestUtils.compareStreams(connection.getInputStream(), "actual", ds.getInputStream(), "expected");
} finally {
registration.unregister();
}
Modified: webservices/axiom/branches/datatypes/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java Tue Nov 17 20:17:06 2015
@@ -130,7 +130,7 @@ public class XMLSample extends MessageSa
private static XMLSample[] instances() throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(
XMLSample.class.getResourceAsStream("bulk/filelist")));
- List<XMLSample> result = new ArrayList<XMLSample>(10);
+ List<XMLSample> result = new ArrayList<>(10);
String name;
while ((name = in.readLine()) != null) {
result.add(new XMLSample("bulk/" + name));
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/DOMTraverser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/DOMTraverser.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/DOMTraverser.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/DOMTraverser.java Tue Nov 17 20:17:06 2015
@@ -154,7 +154,7 @@ final class DOMTraverser implements Trav
Attr attr = (Attr)attributes.item(i);
if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attr.getNamespaceURI())) {
if (result == null) {
- result = new HashMap<QName,String>();
+ result = new HashMap<>();
}
result.put(getQName(attr), attr.getValue());
}
@@ -170,7 +170,7 @@ final class DOMTraverser implements Trav
Attr attr = (Attr)attributes.item(i);
if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attr.getNamespaceURI())) {
if (result == null) {
- result = new HashMap<String,String>();
+ result = new HashMap<>();
}
String prefix = attr.getPrefix();
result.put(XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ? attr.getLocalName() : "", attr.getValue());
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/RedundantNamespaceDeclarationFilter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/RedundantNamespaceDeclarationFilter.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/RedundantNamespaceDeclarationFilter.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/RedundantNamespaceDeclarationFilter.java Tue Nov 17 20:17:06 2015
@@ -34,7 +34,7 @@ final class RedundantNamespaceDeclaratio
private static final Map<String,String> implicitNamespaces;
static {
- implicitNamespaces = new HashMap<String,String>();
+ implicitNamespaces = new HashMap<>();
implicitNamespaces.put("", "");
implicitNamespaces.put(XMLConstants.XML_NS_PREFIX, XMLConstants.XML_NS_URI);
implicitNamespaces.put(XMLConstants.XMLNS_ATTRIBUTE, XMLConstants.XMLNS_ATTRIBUTE_NS_URI);
@@ -44,7 +44,7 @@ final class RedundantNamespaceDeclaratio
RedundantNamespaceDeclarationFilter(Traverser parent) {
super(parent);
- stack = new ArrayList<Map<String,String>>(10);
+ stack = new ArrayList<>(10);
stack.add(implicitNamespaces);
}
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXTraverser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXTraverser.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXTraverser.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/StAXTraverser.java Tue Nov 17 20:17:06 2015
@@ -101,7 +101,7 @@ final class StAXTraverser implements Tra
if (attributeCount == 0) {
return null;
} else {
- Map<QName,String> attributes = new HashMap<QName,String>();
+ Map<QName,String> attributes = new HashMap<>();
for (int i=0; i<attributeCount; i++) {
attributes.put(reader.getAttributeName(i), reader.getAttributeValue(i));
}
@@ -115,7 +115,7 @@ final class StAXTraverser implements Tra
if (namespaceCount == 0) {
return null;
} else {
- Map<String,String> namespaces = new HashMap<String,String>();
+ Map<String,String> namespaces = new HashMap<>();
for (int i=0; i<namespaceCount; i++) {
namespaces.put(Strings.nullToEmpty(reader.getNamespacePrefix(i)), reader.getNamespaceURI(i));
}
Modified: webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java?rev=1714872&r1=1714871&r2=1714872&view=diff
==============================================================================
--- webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java (original)
+++ webservices/axiom/branches/datatypes/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java Tue Nov 17 20:17:06 2015
@@ -315,7 +315,7 @@ public final class XMLSubject extends Su
}
};
}
- final Set<Event> ignoredEvents = new HashSet<Event>();
+ final Set<Event> ignoredEvents = new HashSet<>();
if (ignoreComments) {
ignoredEvents.add(Event.COMMENT);
}
@@ -370,7 +370,7 @@ public final class XMLSubject extends Su
}
private static Map<QName,String> extractPrefixes(Set<QName> qnames) {
- Map<QName,String> result = new HashMap<QName,String>();
+ Map<QName,String> result = new HashMap<>();
for (QName qname : qnames) {
result.put(qname, qname.getPrefix());
}