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 2013/01/14 23:32:44 UTC
svn commit: r1433181 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/
Author: veithen
Date: Mon Jan 14 22:32:44 2013
New Revision: 1433181
URL: http://svn.apache.org/viewvc?rev=1433181&view=rev
Log:
Removed a method (from an internal API) that was only used in a unit test (and that was not essential for the unit test).
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMStAXWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/StreamSwitch.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java?rev=1433181&r1=1433180&r2=1433181&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java Mon Jan 14 22:32:44 2013
@@ -41,8 +41,4 @@ public interface OMXMLStreamReaderEx ext
* @return OMDataSource if available
*/
OMDataSource getDataSource();
-
- // *** Methods that potentially could be promoted to OMXMLStreamReader ***
-
- boolean isClosed();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMStAXWrapper.java?rev=1433181&r1=1433180&r2=1433181&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMStAXWrapper.java Mon Jan 14 22:32:44 2013
@@ -107,13 +107,6 @@ class OMStAXWrapper extends StreamReader
}
}
- // TODO: need to check which of these delegate methods are really necessary;
- // some of them should also be defined properly by an interface
-
- public boolean isClosed() {
- return streamSwitch.isClosed();
- }
-
public OMDataSource getDataSource() {
return streamSwitch.getDataSource();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/StreamSwitch.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/StreamSwitch.java?rev=1433181&r1=1433180&r2=1433181&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/StreamSwitch.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/StreamSwitch.java Mon Jan 14 22:32:44 2013
@@ -23,10 +23,6 @@ import javax.xml.stream.util.StreamReade
import org.apache.axiom.om.OMDataSource;
public class StreamSwitch extends StreamReaderDelegate {
- public boolean isClosed() {
- return ((SwitchingWrapper)getParent()).isClosed();
- }
-
public OMDataSource getDataSource() {
return ((SwitchingWrapper)getParent()).getDataSource();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1433181&r1=1433180&r2=1433181&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Mon Jan 14 22:32:44 2013
@@ -1358,7 +1358,7 @@ class SwitchingWrapper extends AbstractX
/**
* @return if parser is closed
*/
- public boolean isClosed() {
+ private boolean isClosed() {
// If there is a builder, the builder owns the parser
// and knows the isClosed status
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java?rev=1433181&r1=1433180&r2=1433181&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java Mon Jan 14 22:32:44 2013
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMXMLStreamReaderEx;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.ts.AxiomTestCase;
@@ -52,12 +51,6 @@ public class TestGetXMLStreamReaderClose
XMLStreamReader reader = element.getXMLStreamReader(cache);
- // Make sure the reader is an OMStAXWrapper
- if (reader instanceof OMXMLStreamReaderEx) {
- OMXMLStreamReaderEx wrapper = (OMXMLStreamReaderEx) reader;
- assertTrue(!wrapper.isClosed());
- }
-
while (reader.hasNext()) {
reader.next();
}