ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1733715 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/ aspects/om-aspects/src/main/java/org/apache/axiom/om...
Date Sat, 05 Mar 2016 13:24:02 GMT
Author: veithen
Date: Sat Mar  5 13:24:01 2016
New Revision: 1733715

URL: http://svn.apache.org/viewvc?rev=1733715&view=rev
Log:
Remove the OMXMLStreamReader interface.

Removed:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/OMXMLStreamReaderExAdapter.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLStreamReader.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/OMXMLStreamReaderValidator.java
Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceURIInterningXMLStreamReaderWrapper.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
    webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
    webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceURIInterningXMLStreamReaderWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceURIInterningXMLStreamReaderWrapper.java?rev=1733715&r1=1733714&r2=1733715&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceURIInterningXMLStreamReaderWrapper.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceURIInterningXMLStreamReaderWrapper.java
Sat Mar  5 13:24:01 2016
@@ -21,7 +21,6 @@ package org.apache.axiom.om.impl.common;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axiom.om.OMXMLStreamReader;
 import org.apache.axiom.om.OMXMLStreamReaderConfiguration;
 import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
 
@@ -29,10 +28,10 @@ import org.apache.axiom.util.stax.wrappe
  * {@link XMLStreamReader} wrapper that interns namespace URIs. It is used to implement the
  * {@link OMXMLStreamReaderConfiguration#isNamespaceURIInterning()} option.
  */
-public final class NamespaceURIInterningXMLStreamReaderWrapper extends XMLStreamReaderWrapper
implements OMXMLStreamReader {
+public final class NamespaceURIInterningXMLStreamReaderWrapper extends XMLStreamReaderWrapper
{
     private NamespaceURIInterningNamespaceContextWrapper namespaceContextWrapper;
     
-    public NamespaceURIInterningXMLStreamReaderWrapper(OMXMLStreamReader parent) {
+    public NamespaceURIInterningXMLStreamReaderWrapper(XMLStreamReader parent) {
         super(parent);
     }
 
@@ -63,13 +62,4 @@ public final class NamespaceURIInterning
         }
         return namespaceContextWrapper;
     }
-
-    public boolean isInlineMTOM() {
-        return ((OMXMLStreamReader)getParent()).isInlineMTOM();
-    }
-
-
-    public void setInlineMTOM(boolean value) {
-        ((OMXMLStreamReader)getParent()).setInlineMTOM(value);
-    }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1733715&r1=1733714&r2=1733715&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
Sat Mar  5 13:24:01 2016
@@ -50,7 +50,6 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.OMSerializable;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.OMXMLStreamReader;
 import org.apache.axiom.om.OMXMLStreamReaderConfiguration;
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
@@ -58,7 +57,6 @@ import org.apache.axiom.om.impl.common.A
 import org.apache.axiom.om.impl.common.NamespaceURIInterningXMLStreamReaderWrapper;
 import org.apache.axiom.om.impl.common.OMChildrenQNameIterator;
 import org.apache.axiom.om.impl.common.SAXResultContentHandler;
-import org.apache.axiom.om.impl.common.serializer.pull.OMXMLStreamReaderExAdapter;
 import org.apache.axiom.om.impl.common.serializer.pull.PullSerializer;
 import org.apache.axiom.om.impl.common.serializer.push.XmlDeclarationRewriterHandler;
 import org.apache.axiom.om.impl.common.serializer.push.XsiTypeFilterHandler;
@@ -67,8 +65,8 @@ import org.apache.axiom.om.impl.common.s
 import org.apache.axiom.om.impl.intf.AxiomChildNode;
 import org.apache.axiom.om.impl.intf.AxiomContainer;
 import org.apache.axiom.om.impl.intf.OMFactoryEx;
-import org.apache.axiom.om.util.OMXMLStreamReaderValidator;
 import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.util.stax.debug.XMLStreamReaderValidator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.InputSource;
@@ -107,7 +105,7 @@ public aspect AxiomContainerSupport {
         if (builder != null && builder.isCompleted() && !cache &&
!isComplete()) {
             throw new UnsupportedOperationException("The parser is already consumed!");
         }
-        OMXMLStreamReader reader = new OMXMLStreamReaderExAdapter(new PullSerializer(this,
cache, configuration.isPreserveNamespaceContext()));
+        XMLStreamReader reader = new PullSerializer(this, cache, configuration.isPreserveNamespaceContext());
         
         if (configuration.isNamespaceURIInterning()) {
             reader = new NamespaceURIInterningXMLStreamReaderWrapper(reader);
@@ -119,7 +117,7 @@ public aspect AxiomContainerSupport {
         
         if (log.isDebugEnabled()) {
             reader = 
-                new OMXMLStreamReaderValidator(reader, // delegate to actual reader
+                new XMLStreamReaderValidator(reader, // delegate to actual reader
                      false); // log problems (true will cause exceptions to be thrown)
         }
         

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java?rev=1733715&r1=1733714&r2=1733715&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMXMLStreamReaderEx.java
Sat Mar  5 13:24:01 2016
@@ -18,14 +18,15 @@
  */
 package org.apache.axiom.om.impl;
 
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMXMLStreamReader;
 
 /**
  * Interface that is used internally by Axiom and that should not be considered being part
of the
  * public API.
  */
-public interface OMXMLStreamReaderEx extends OMXMLStreamReader {
+public interface OMXMLStreamReaderEx extends XMLStreamReader {
     // *** Methods used by StreamingOMSerializer
     
     /**

Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1733715&r1=1733714&r2=1733715&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Sat Mar  5 13:24:01 2016
@@ -145,7 +145,7 @@ Changes in this release
     been processed. That means that after completion, nodes created by a builder
     will be indistinguishable from programmatically created nodes.
 
-*   The `OMAttachmentAccessor` interface has been removed because all if its
-    usages were already deprecated in 1.2.x.
+*   The `OMAttachmentAccessor` and `OMXMLStreamReader` interfaces have been
+    removed because all if their usages were already deprecated in 1.2.x.
 
 [AXIOM-474]: https://issues.apache.org/jira/browse/AXIOM-474

Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java?rev=1733715&r1=1733714&r2=1733715&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
(original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
Sat Mar  5 13:24:01 2016
@@ -26,14 +26,11 @@ import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.OMXMLStreamReader;
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axiom.ts.soap.MTOMSample;
-import org.apache.axiom.util.stax.XMLStreamReaderUtils;
 import org.apache.axiom.util.stax.xop.XOPUtils;
 
 import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamReader;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -77,16 +74,6 @@ public class MTOMStAXSOAPModelBuilderTes
         }
     }
     
-    public void testAccessToCachedParser() throws Exception {
-        OMElement root = createTestMTOMMessage();
-        XMLStreamReader reader = root.getXMLStreamReader(true);
-        
-        XMLStreamReader original = XMLStreamReaderUtils.getOriginalXMLStreamReader(reader);
-        
-        // The caching parser will be an OMStaXWrapper.
-        assertTrue(original instanceof OMXMLStreamReader);
-    }
-    
     public void testCreateOMElement() throws Exception {
         OMElement root = createTestMTOMMessage();
         OMElement body = (OMElement) root.getFirstOMChild();



Mime
View raw message