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/05/25 21:37:27 UTC
svn commit: r1681645 - in /webservices/axiom/trunk:
modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/c...
Author: veithen
Date: Mon May 25 19:37:26 2015
New Revision: 1681645
URL: http://svn.apache.org/r1681645
Log:
Rename getAsStream to getInputStream to align the interface of XMLSample with that of SOAPSample and MIMESample.
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElement2.java
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/StreamType.java
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java Mon May 25 19:37:26 2015
@@ -54,7 +54,7 @@ public class TestGetNamespaceContext ext
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
- InputStream in = testResource.getAsStream();
+ InputStream in = testResource.getInputStream();
Set/*<String>*/ prefixes = new HashSet();
Set/*<String>*/ namespaceURIs = new HashSet();
prefixes.add("");
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java Mon May 25 19:37:26 2015
@@ -35,7 +35,7 @@ public class TestCloseWithXMLStreamReade
}
protected void runTest() throws Throwable {
- InputStream in = XMLSample.SIMPLE.getAsStream();
+ InputStream in = XMLSample.SIMPLE.getInputStream();
try {
XMLStreamReader reader = StAXUtils.createXMLStreamReader(in);
OMXMLParserWrapper builder = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(), reader);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java Mon May 25 19:37:26 2015
@@ -53,7 +53,7 @@ public class TestGetXMLStreamReader exte
}
protected final void runTest() throws Throwable {
- InputStream in = file.getAsStream();
+ InputStream in = file.getInputStream();
try {
XMLStreamReader expected = StAXUtils.createXMLStreamReader(TEST_PARSER_CONFIGURATION, file.getUrl().toString(), in);
try {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java Mon May 25 19:37:26 2015
@@ -54,7 +54,7 @@ public class TestSerialize extends Confo
OMContainer container = containerFactory.getContainer(builder);
// We need to clone the InputSource objects so that we can dump their contents
// if the test fails
- InputSource control[] = duplicateInputSource(containerFactory.getControl(file.getAsStream()));
+ InputSource control[] = duplicateInputSource(containerFactory.getControl(file.getInputStream()));
XML actual = serializationStrategy.serialize(container);
try {
// Configure the InputSources such that external entities can be resolved
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java Mon May 25 19:37:26 2015
@@ -33,7 +33,7 @@ public class TestBuild extends AxiomTest
@Override
protected void runTest() throws Throwable {
- InstrumentedInputStream in = new InstrumentedInputStream(XMLSample.LARGE.getAsStream());
+ InstrumentedInputStream in = new InstrumentedInputStream(XMLSample.LARGE.getInputStream());
OMDocument doc = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), in).getDocument();
assertFalse(doc.isComplete());
long countBeforeBuild = in.getCount();
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElement2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElement2.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElement2.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestCloneOMElement2.java Mon May 25 19:37:26 2015
@@ -36,7 +36,7 @@ public class TestCloneOMElement2 extends
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- InputStream in = file.getAsStream();
+ InputStream in = file.getInputStream();
try {
OMElement original = OMXMLBuilderFactory.createOMBuilder(factory, in).getDocumentElement();
OMElement clone = original.cloneOMElement();
Modified: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/StreamType.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/StreamType.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/StreamType.java (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/StreamType.java Mon May 25 19:37:26 2015
@@ -38,7 +38,7 @@ public abstract class StreamType extends
public static final StreamType BYTE_STREAM = new StreamType(InputStream.class) {
@Override
public Closeable getStream(XMLSample sample) {
- return sample.getAsStream();
+ return sample.getInputStream();
}
@Override
@@ -60,7 +60,7 @@ public abstract class StreamType extends
public static final StreamType CHARACTER_STREAM = new StreamType(Reader.class) {
@Override
public Closeable getStream(XMLSample sample) {
- return new InputStreamReader(sample.getAsStream(), Charset.forName(sample.getEncoding()));
+ return new InputStreamReader(sample.getInputStream(), Charset.forName(sample.getEncoding()));
}
@Override
Modified: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1681645&r1=1681644&r2=1681645&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java Mon May 25 19:37:26 2015
@@ -81,7 +81,7 @@ public final class XMLSample extends Mul
return getProperties().hasEntityReferences();
}
- public InputStream getAsStream() {
+ public InputStream getInputStream() {
return XMLSample.class.getClassLoader().getResourceAsStream(resourceName);
}