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/04/09 13:58:48 UTC
svn commit: r1738354 - in /webservices/axiom/trunk/axiom-api/src:
main/java/org/apache/axiom/util/stax/dialect/
test/java/org/apache/axiom/util/stax/dialect/
Author: veithen
Date: Sat Apr 9 11:58:48 2016
New Revision: 1738354
URL: http://svn.apache.org/viewvc?rev=1738354&view=rev
Log:
Remove the deprecated DelegatingXMLStreamReader API from the StAX dialect wrappers.
Removed:
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEAStreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/DisallowDoctypeDeclStreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceContextCorrectingXMLStreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPStreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox3StreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4StreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEAStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEAStreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEAStreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEAStreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -23,10 +23,9 @@ import javax.xml.namespace.NamespaceCont
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-class BEAStreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class BEAStreamReaderWrapper extends XMLStreamReaderWrapper {
/**
* The character set encoding as inferred from the start bytes of the stream.
*/
@@ -143,8 +142,4 @@ class BEAStreamReaderWrapper extends XML
return new ImplicitNamespaceContextWrapper(
new NamespaceURICorrectingNamespaceContextWrapper(super.getNamespaceContext()));
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/DisallowDoctypeDeclStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/DisallowDoctypeDeclStreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/DisallowDoctypeDeclStreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/DisallowDoctypeDeclStreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -22,10 +22,9 @@ package org.apache.axiom.util.stax.diale
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-class DisallowDoctypeDeclStreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class DisallowDoctypeDeclStreamReaderWrapper extends XMLStreamReaderWrapper {
public DisallowDoctypeDeclStreamReaderWrapper(XMLStreamReader parent) {
super(parent);
}
@@ -37,8 +36,4 @@ class DisallowDoctypeDeclStreamReaderWra
}
return event;
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceContextCorrectingXMLStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceContextCorrectingXMLStreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceContextCorrectingXMLStreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceContextCorrectingXMLStreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -23,7 +23,6 @@ import javax.xml.namespace.NamespaceCont
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.namespace.ScopedNamespaceContext;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
@@ -36,7 +35,7 @@ import org.apache.axiom.util.stax.wrappe
* {@link XMLStreamReader#getNamespaceContext()} and {@link XMLStreamReader#getNamespaceURI(String)}
* methods. Invocations of these two methods will therefore never reach the underlying reader.
*/
-class NamespaceContextCorrectingXMLStreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class NamespaceContextCorrectingXMLStreamReaderWrapper extends XMLStreamReaderWrapper {
private final ScopedNamespaceContext namespaceContext = new ScopedNamespaceContext();
/**
@@ -86,8 +85,4 @@ class NamespaceContextCorrectingXMLStrea
String uri = namespaceContext.getNamespaceURI(prefix);
return uri.length() == 0 ? null : uri;
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPStreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPStreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPStreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -25,10 +25,9 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.DTDReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-class SJSXPStreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class SJSXPStreamReaderWrapper extends XMLStreamReaderWrapper {
public SJSXPStreamReaderWrapper(XMLStreamReader parent) {
super(parent);
}
@@ -159,8 +158,4 @@ class SJSXPStreamReaderWrapper extends X
public NamespaceContext getNamespaceContext() {
return new SJSXPNamespaceContextWrapper(super.getNamespaceContext());
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox3StreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox3StreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox3StreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox3StreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -21,10 +21,9 @@ package org.apache.axiom.util.stax.diale
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-class Woodstox3StreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class Woodstox3StreamReaderWrapper extends XMLStreamReaderWrapper {
public Woodstox3StreamReaderWrapper(XMLStreamReader reader) {
super(reader);
}
@@ -77,8 +76,4 @@ class Woodstox3StreamReaderWrapper exten
public NamespaceContext getNamespaceContext() {
return new NamespaceURICorrectingNamespaceContextWrapper(super.getNamespaceContext());
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4StreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4StreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4StreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4StreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -26,10 +26,9 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.CharacterDataReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.codehaus.stax2.XMLStreamReader2;
-class Woodstox4StreamReaderWrapper extends StAX2StreamReaderWrapper implements DelegatingXMLStreamReader, CharacterDataReader {
+class Woodstox4StreamReaderWrapper extends StAX2StreamReaderWrapper implements CharacterDataReader {
public Woodstox4StreamReaderWrapper(XMLStreamReader reader) {
super(reader);
}
@@ -116,10 +115,6 @@ class Woodstox4StreamReaderWrapper exten
return new NamespaceURICorrectingNamespaceContextWrapper(super.getNamespaceContext());
}
- public XMLStreamReader getParent() {
- return super.getParent();
- }
-
public Object getProperty(String name) throws IllegalArgumentException {
if (CharacterDataReader.PROPERTY.equals(name)) {
return this;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java Sat Apr 9 11:58:48 2016
@@ -21,10 +21,9 @@ package org.apache.axiom.util.stax.diale
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.DTDReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-class XLXPStreamReaderWrapper extends XMLStreamReaderWrapper implements DelegatingXMLStreamReader {
+class XLXPStreamReaderWrapper extends XMLStreamReaderWrapper {
public XLXPStreamReaderWrapper(XMLStreamReader parent) {
super(parent);
}
@@ -47,8 +46,4 @@ class XLXPStreamReaderWrapper extends XM
// XLXP returns true for SPACE events as well; this is not correct
return getEventType() == CHARACTERS;
}
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java?rev=1738354&r1=1738353&r2=1738354&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java Sat Apr 9 11:58:48 2016
@@ -175,7 +175,6 @@ public class DialectTestSuiteBuilder ext
addTest(new TestNextAfterEndDocument(staxImpl));
addTest(new TestSetPrefixScope(staxImpl));
addTest(new TestStandaloneSet(staxImpl));
- addTest(new TestGetOriginalXMLStreamReader(staxImpl));
addTest(new TestWriteStartDocumentWithNullEncoding(staxImpl));
}
}