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/02/26 22:59:50 UTC
svn commit: r1732564 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
axiom-api/src/main/java/org/apache/axiom/om/
axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/
src/site/markdown/...
Author: veithen
Date: Fri Feb 26 21:59:49 2016
New Revision: 1732564
URL: http://svn.apache.org/viewvc?rev=1732564&view=rev
Log:
Remove the OMXMLParserWrapper#getParser() method.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.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/builder/PushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java?rev=1732564&r1=1732563&r2=1732564&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java Fri Feb 26 21:59:49 2016
@@ -61,10 +61,6 @@ public final class PushBuilder extends A
throw new UnsupportedOperationException();
}
- public final Object getParser() {
- throw new UnsupportedOperationException();
- }
-
public final OMElement getDocumentElement() {
return getDocument().getOMDocumentElement();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1732564&r1=1732563&r2=1732564&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Fri Feb 26 21:59:49 2016
@@ -21,10 +21,8 @@ package org.apache.axiom.om.impl.common.
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.ds.custombuilder.CustomBuilder;
import org.apache.axiom.om.ds.custombuilder.CustomBuilderSupport;
import org.apache.axiom.om.ds.custombuilder.CustomBuilder.Selector;
@@ -187,50 +185,6 @@ public class StAXOMBuilder extends Abstr
return helper.parser.getPrefix();
}
- /**
- * Get the underlying {@link XMLStreamReader} used by this builder. Note that for this type of
- * builder, accessing the underlying parser implies that can no longer be used, and any attempt
- * to call {@link #next()} will result in an exception.
- *
- * @return The {@link XMLStreamReader} object used by this builder. Note that the constraints
- * described in the Javadoc of the <code>reader</code> parameter of the
- * {@link CustomBuilder#create(String, String, OMContainer, XMLStreamReader, OMFactory)}
- * method also apply to the stream reader returned by this method, i.e.:
- * <ul>
- * <li>The caller should use
- * {@link org.apache.axiom.util.stax.xop.XOPUtils#getXOPEncodedStream(XMLStreamReader)}
- * to get an XOP encoded stream from the return value.
- * <li>To get access to the bare StAX parser implementation, the caller should use
- * {@link org.apache.axiom.util.stax.XMLStreamReaderUtils#getOriginalXMLStreamReader(XMLStreamReader)}.
- * </ul>
- * @throws IllegalStateException
- * if the parser has already been accessed
- */
- public final Object getParser() {
- if (parserAccessed) {
- throw new IllegalStateException(
- "Parser already accessed!");
- }
- if (!builderHandler.cache) {
- parserAccessed = true;
- // Mark all containers in the hierarchy as discarded because they can no longer be built
- Context current = builderHandler.context;
- while (builderHandler.depth > 0) {
- discarded(current.target);
- current = current.parentContext;
- builderHandler.depth--;
- }
- if (current != null && current.target == builderHandler.document) {
- discarded(current.target);
- }
- builderHandler.context = null;
- return helper.parser;
- } else {
- throw new IllegalStateException(
- "cache must be switched off to access the parser");
- }
- }
-
public final XMLStreamReader disableCaching() {
builderHandler.cache = false;
// Always advance to the event right after the current node; this also takes
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java?rev=1732564&r1=1732563&r2=1732564&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java Fri Feb 26 21:59:49 2016
@@ -59,15 +59,6 @@ public interface OMXMLParserWrapper {
*/
boolean isCache();
- /**
- * Allows to access the underlying parser. Since the parser depends on the underlying
- * implementation, an Object is returned. However the implementations may have restrictions in
- * letting access to the parser.
- *
- * @return Returns Object.
- */
- Object getParser();
-
/** @return Returns the complete status. */
boolean isCompleted();
Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1732564&r1=1732563&r2=1732564&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Fri Feb 26 21:59:49 2016
@@ -87,10 +87,6 @@ public class StAXSOAPModelBuilder implem
return target.isCache();
}
- public Object getParser() {
- return target.getParser();
- }
-
public boolean isCompleted() {
return target.isCompleted();
}
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=1732564&r1=1732563&r2=1732564&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 Fri Feb 26 21:59:49 2016
@@ -43,6 +43,10 @@ Changes in this release
should use the `OMXMLBuilderFactory` API to create builders. Code written for
Axiom 1.2.x that uses that API remains compatible with Axiom 1.3.x.
+* Several methods have been removed from the `OMXMLParserWrapper` interface.
+ This includes formerly deprecated methods as well as methods that would
+ allow manipulation of the state of the underlying parser.
+
* The `BuilderAwareReader` API introduced by [AXIOM-268][] has been removed
without replacement. There are multiple reasons for this:
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=1732564&r1=1732563&r2=1732564&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 Fri Feb 26 21:59:49 2016
@@ -26,7 +26,6 @@ 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.OMXMLParserWrapper;
import org.apache.axiom.om.OMXMLStreamReader;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.ts.soap.MTOMSample;
@@ -78,28 +77,6 @@ public class MTOMStAXSOAPModelBuilderTes
}
}
- public void testAccessToParser() throws Exception {
- OMElement root = createTestMTOMMessage();
- OMXMLParserWrapper builder = root.getBuilder();
- // Disable caching so that the reader can be accessed.
- builder.setCache(false);
- XMLStreamReader reader = (XMLStreamReader) builder.getParser();
-
- // For an MTOM message, the reader is actually an XOPDecodingStreamReader. This one
- // cannot be unwrapped by getOriginalXMLStreamReader
- assertSame(reader, XMLStreamReaderUtils.getOriginalXMLStreamReader(reader));
-
- // To get access to the original reader, we first need to unwrap the
- // XOPDecodingStreamReader using XOPUtils
- XMLStreamReader encodedReader = XOPUtils.getXOPEncodedStream(reader).getReader();
- assertTrue(encodedReader != reader);
-
- // Now we can get to the original parser
- XMLStreamReader original = XMLStreamReaderUtils.getOriginalXMLStreamReader(encodedReader);
-
- assertTrue(!original.getClass().getName().startsWith("org.apache.axiom."));
- }
-
public void testAccessToCachedParser() throws Exception {
OMElement root = createTestMTOMMessage();
XMLStreamReader reader = root.getXMLStreamReader(true);