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/10 09:31:28 UTC
svn commit: r1729546 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/
aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
aspects...
Author: veithen
Date: Wed Feb 10 08:31:27 2016
New Revision: 1729546
URL: http://svn.apache.org/viewvc?rev=1729546&view=rev
Log:
Remove references to OMXMLParserWrapper from core-aspects.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/Builder.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java Wed Feb 10 08:31:27 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.core;
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.core.builder.Builder;
/**
* Interface for parent nodes.
@@ -30,8 +30,8 @@ public interface CoreParentNode extends
int DISCARDED = 3;
int COMPACT = 4;
- OMXMLParserWrapper coreGetBuilder();
- void coreSetBuilder(OMXMLParserWrapper builder);
+ Builder coreGetBuilder();
+ void coreSetBuilder(Builder builder);
int getState();
void coreSetState(int state);
void build();
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java?rev=1729546&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java Wed Feb 10 08:31:27 2016
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.builder;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMContainer;
+
+public interface Builder {
+ int next();
+ boolean isCompleted();
+ void close();
+ boolean isClosed();
+
+ /**
+ * Get the value of a feature/property from the underlying XMLStreamReader implementation
+ * without accessing the XMLStreamReader. https://issues.apache.org/jira/browse/AXIOM-348
+ *
+ * @param name
+ * @return TODO
+ */
+ Object getReaderProperty(String name) throws IllegalArgumentException;
+
+ XMLStreamReader disableCaching();
+
+ void reenableCaching(OMContainer container);
+
+ void discard(OMContainer container);
+
+ void debugDiscarded(Object container);
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/builder/Builder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj Wed Feb 10 08:31:27 2016
@@ -33,7 +33,6 @@ import org.apache.axiom.core.SelfRelatio
import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.Flags;
import org.apache.axiom.om.NodeUnavailableException;
-import org.apache.axiom.om.impl.builder.Builder;
public aspect CoreChildNodeSupport {
private CoreParentNode CoreChildNode.owner;
@@ -121,7 +120,7 @@ public aspect CoreChildNodeSupport {
if (parent != null && parent.coreGetBuilder() != null) {
switch (parent.getState()) {
case CoreParentNode.DISCARDED:
- ((Builder)parent.coreGetBuilder()).debugDiscarded(parent);
+ parent.coreGetBuilder().debugDiscarded(parent);
throw new NodeUnavailableException();
case CoreParentNode.INCOMPLETE:
do {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Wed Feb 10 08:31:27 2016
@@ -37,14 +37,13 @@ import org.apache.axiom.core.Mapper;
import org.apache.axiom.core.NodeFilter;
import org.apache.axiom.core.NodeIterator;
import org.apache.axiom.core.Semantics;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.core.impl.ElementsIterator;
import org.apache.axiom.core.impl.Flags;
import org.apache.axiom.core.impl.NodesIterator;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.Builder;
public aspect CoreParentNodeSupport {
private Object CoreParentNode.content;
@@ -107,10 +106,10 @@ public aspect CoreParentNodeSupport {
}
public void CoreParentNode.buildNext() {
- OMXMLParserWrapper builder = coreGetBuilder();
+ Builder builder = coreGetBuilder();
if (builder == null) {
throw new IllegalStateException("The node has no builder");
- } else if (((Builder)builder).isClosed()) {
+ } else if (builder.isClosed()) {
throw new IllegalStateException("The builder has already been closed");
} else if (!builder.isCompleted()) {
builder.next();
@@ -126,7 +125,7 @@ public aspect CoreParentNodeSupport {
if (firstChild == null) {
switch (getState()) {
case CoreParentNode.DISCARDED:
- ((Builder)coreGetBuilder()).debugDiscarded(this);
+ coreGetBuilder().debugDiscarded(this);
throw new NodeUnavailableException();
case CoreParentNode.INCOMPLETE:
do {
@@ -219,7 +218,7 @@ public aspect CoreParentNodeSupport {
if (lastChild instanceof CoreParentNode) {
((CoreParentNode)lastChild).build();
}
- ((Builder)coreGetBuilder()).discard((OMContainer)this);
+ coreGetBuilder().discard((OMContainer)this);
updateState = true;
} else {
updateState = false;
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj Wed Feb 10 08:31:27 2016
@@ -19,17 +19,17 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.DeferringParentNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.core.builder.Builder;
public aspect DeferringParentNodeSupport {
- private OMXMLParserWrapper DeferringParentNode.builder;
+ private Builder DeferringParentNode.builder;
- public final OMXMLParserWrapper DeferringParentNode.coreGetBuilder() {
+ public final Builder DeferringParentNode.coreGetBuilder() {
forceExpand();
return builder;
}
- public final void DeferringParentNode.coreSetBuilder(OMXMLParserWrapper builder) {
+ public final void DeferringParentNode.coreSetBuilder(Builder builder) {
this.builder = builder;
coreSetState(builder == null ? COMPLETE : INCOMPLETE);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj Wed Feb 10 08:31:27 2016
@@ -19,14 +19,14 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.NonDeferringParentNode;
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.core.builder.Builder;
public aspect NonDeferringParentNodeSupport {
- public final OMXMLParserWrapper NonDeferringParentNode.coreGetBuilder() {
+ public final Builder NonDeferringParentNode.coreGetBuilder() {
return null;
}
- public final void NonDeferringParentNode.coreSetBuilder(OMXMLParserWrapper builder) {
+ public final void NonDeferringParentNode.coreSetBuilder(Builder builder) {
throw new UnsupportedOperationException();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractBuilder.java Wed Feb 10 08:31:27 2016
@@ -19,6 +19,7 @@
package org.apache.axiom.om.impl.common.builder;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.intf.AxiomDocument;
@@ -26,7 +27,7 @@ import org.apache.axiom.om.impl.intf.Axi
import org.apache.axiom.om.impl.stream.NamespaceRepairingFilterHandler;
import org.apache.axiom.om.impl.stream.XmlHandler;
-public abstract class AbstractBuilder implements OMXMLParserWrapper {
+public abstract class AbstractBuilder implements OMXMLParserWrapper, Builder, org.apache.axiom.om.impl.builder.Builder {
protected final BuilderHandler builderHandler;
protected final XmlHandler handler;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/AbstractPushBuilder.java Wed Feb 10 08:31:27 2016
@@ -18,7 +18,10 @@
*/
package org.apache.axiom.om.impl.common.builder;
+import javax.xml.stream.XMLStreamReader;
+
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.impl.intf.AxiomSourcedElement;
@@ -69,4 +72,33 @@ public abstract class AbstractPushBuilde
// Force processing of the SAX source
getDocument();
}
+
+ @Override
+ public final boolean isClosed() {
+ return true;
+ }
+
+ @Override
+ public final Object getReaderProperty(String name) throws IllegalArgumentException {
+ return null;
+ }
+
+ @Override
+ public final XMLStreamReader disableCaching() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public final void reenableCaching(OMContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public final void discard(OMContainer container) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public final void debugDiscarded(Object container) {
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Wed Feb 10 08:31:27 2016
@@ -26,12 +26,12 @@ import javax.xml.stream.XMLStreamConstan
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSerializable;
-import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.intf.AxiomAttribute;
@@ -60,7 +60,7 @@ public final class BuilderHandler implem
private final NodeFactory nodeFactory;
private final Model model;
private final AxiomSourcedElement root;
- private final OMXMLParserWrapper builder;
+ private final Builder builder;
private final OMNamespaceCache nsCache = new OMNamespaceCache();
public AxiomContainer target;
// returns the state of completion
@@ -84,7 +84,7 @@ public final class BuilderHandler implem
private ArrayList<NodePostProcessor> nodePostProcessors;
- public BuilderHandler(NodeFactory nodeFactory, Model model, AxiomSourcedElement root, OMXMLParserWrapper builder) {
+ public BuilderHandler(NodeFactory nodeFactory, Model model, AxiomSourcedElement root, Builder builder) {
this.nodeFactory = nodeFactory;
this.model = model;
this.root = root;
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=1729546&r1=1729545&r2=1729546&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 Wed Feb 10 08:31:27 2016
@@ -24,7 +24,6 @@ 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.impl.builder.Builder;
import org.apache.axiom.om.impl.builder.CustomBuilder;
import org.apache.axiom.om.impl.builder.CustomBuilderSupport;
import org.apache.axiom.om.impl.builder.Detachable;
@@ -40,7 +39,7 @@ import javax.xml.namespace.QName;
import java.io.Closeable;
-public class StAXOMBuilder extends AbstractBuilder implements Builder, CustomBuilderSupport {
+public class StAXOMBuilder extends AbstractBuilder implements CustomBuilderSupport {
private static final Log log = LogFactory.getLog(StAXOMBuilder.class);
private final StAXHelper helper;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Wed Feb 10 08:31:27 2016
@@ -42,6 +42,7 @@ import org.apache.axiom.core.CoreNSAware
import org.apache.axiom.core.CoreNamespaceDeclaration;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.ext.stax.CharacterDataReader;
import org.apache.axiom.ext.stax.DTDReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
@@ -60,8 +61,6 @@ import org.apache.axiom.om.OMProcessingI
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.Builder;
import org.apache.axiom.om.impl.common.util.OMDataSourceUtil;
import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
import org.apache.axiom.util.stax.XMLEventUtils;
@@ -639,7 +638,7 @@ final class Navigator extends PullSerial
namespaceCount = -1;
} else {
CoreParentNode container = (CoreParentNode)node;
- Builder builder = (Builder)container.coreGetBuilder();
+ Builder builder = container.coreGetBuilder();
int depth = 1;
// Find the root node for the builder (i.e. the topmost node having the same
// builder as the current node)
@@ -676,17 +675,16 @@ final class Navigator extends PullSerial
} else {
container = ((CoreChildNode)node).coreGetParent();
}
- OMXMLParserWrapper builder = container.coreGetBuilder();
+ Builder builder = container.coreGetBuilder();
// Delegate to the builder's parser.
- if (builder != null && builder instanceof Builder) {
- Builder staxBuilder = (Builder) builder;
- if (!staxBuilder.isClosed()) {
+ if (builder != null) {
+ if (!builder.isClosed()) {
// If the parser was closed by something other
// than the builder, an IllegalStateException is
// thrown. For now, return null as this is unexpected
// by the caller.
try {
- return ((Builder) builder).getReaderProperty(s);
+ return builder.getReaderProperty(s);
} catch (IllegalStateException ise) {
return null;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullThroughWrapper.java Wed Feb 10 08:31:27 2016
@@ -21,9 +21,9 @@ package org.apache.axiom.om.impl.common.
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
-import org.apache.axiom.om.impl.builder.Builder;
final class PullThroughWrapper extends AbstractWrapper {
private final Builder builder;
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=1729546&r1=1729545&r2=1729546&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 Wed Feb 10 08:31:27 2016
@@ -34,6 +34,7 @@ import org.apache.axiom.core.CoreNSAware
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.ElementMatcher;
import org.apache.axiom.core.Mapper;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -45,7 +46,6 @@ import org.apache.axiom.om.OMXMLParserWr
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.builder.Builder;
import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.NamespaceURIInterningXMLStreamReaderWrapper;
@@ -78,7 +78,7 @@ public aspect AxiomContainerSupport {
}
public final OMXMLParserWrapper AxiomContainer.getBuilder() {
- return coreGetBuilder();
+ return (OMXMLParserWrapper)coreGetBuilder();
}
public final XMLStreamReader AxiomContainer.getXMLStreamReader() {
@@ -98,7 +98,7 @@ public aspect AxiomContainerSupport {
}
public final XMLStreamReader AxiomContainer.defaultGetXMLStreamReader(boolean cache, OMXMLStreamReaderConfiguration configuration) {
- OMXMLParserWrapper builder = coreGetBuilder();
+ Builder builder = coreGetBuilder();
if (builder != null && builder.isCompleted() && !cache && !isComplete()) {
throw new UnsupportedOperationException("The parser is already consumed!");
}
@@ -164,7 +164,7 @@ public aspect AxiomContainerSupport {
}
public final void AxiomContainer.build() {
- OMXMLParserWrapper builder = coreGetBuilder();
+ Builder builder = coreGetBuilder();
// builder is null. Meaning this is a programatical created element but it has children which are not completed
// Build them all.
if (builder == null && getState() == INCOMPLETE) {
@@ -175,7 +175,7 @@ public aspect AxiomContainerSupport {
} else {
if (getState() == AxiomContainer.DISCARDED) {
if (builder != null) {
- ((Builder)builder).debugDiscarded(this);
+ builder.debugDiscarded(this);
}
throw new NodeUnavailableException();
}
@@ -355,7 +355,7 @@ public aspect AxiomContainerSupport {
final void AxiomContainer.serializeChildren(XmlHandler handler, OMOutputFormat format, boolean cache) throws StreamException {
if (getState() == AxiomContainer.DISCARDED) {
- Builder builder = (Builder)coreGetBuilder();
+ Builder builder = coreGetBuilder();
if (builder != null) {
builder.debugDiscarded(this);
}
@@ -378,7 +378,7 @@ public aspect AxiomContainerSupport {
// and serialize the nodes that have not been built yet by copying the
// events from the underlying XMLStreamReader.
if (!isComplete() && coreGetBuilder() != null) {
- Builder builder = (Builder)coreGetBuilder();
+ Builder builder = coreGetBuilder();
StAXHelper helper = new StAXHelper(builder.disableCaching(), handler);
int depth = 0;
loop: while (true) {
@@ -423,15 +423,14 @@ public aspect AxiomContainerSupport {
}
public final void AxiomContainer.close(boolean build) {
- OMXMLParserWrapper builder = coreGetBuilder();
+ Builder builder = coreGetBuilder();
if (build) {
this.build();
}
setComplete(true);
- // If this is a StAXBuilder, close it.
- if (builder instanceof Builder) {
- ((Builder) builder).close();
+ if (builder != null) {
+ builder.close();
}
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj Wed Feb 10 08:31:27 2016
@@ -52,7 +52,6 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.builder.Builder;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.common.LiveNamespaceContext;
import org.apache.axiom.om.impl.common.NSUtil;
@@ -242,7 +241,7 @@ public aspect AxiomElementSupport {
public final void AxiomElement.discard() {
if (getState() == CoreParentNode.INCOMPLETE && coreGetBuilder() != null) {
- ((Builder)coreGetBuilder()).discard((OMContainer)this);
+ coreGetBuilder().discard(this);
}
detach();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj Wed Feb 10 08:31:27 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.CoreNode;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
@@ -214,7 +215,7 @@ public aspect AxiomSourcedElementSupport
}
}
- OMXMLParserWrapper builder;
+ Builder builder;
if (OMDataSourceUtil.isPushDataSource(dataSource)) {
builder = new PushOMBuilder(this, dataSource);
} else {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/Builder.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/Builder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/Builder.java Wed Feb 10 08:31:27 2016
@@ -18,9 +18,6 @@
*/
package org.apache.axiom.om.impl.builder;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMXMLParserWrapper;
/**
@@ -40,12 +37,4 @@ public interface Builder extends OMXMLPa
* @return TODO
*/
Object getReaderProperty(String name) throws IllegalArgumentException;
-
- XMLStreamReader disableCaching();
-
- void reenableCaching(OMContainer container);
-
- void discard(OMContainer container);
-
- void debugDiscarded(Object container);
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1729546&r1=1729545&r2=1729546&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Wed Feb 10 08:31:27 2016
@@ -19,13 +19,12 @@
package org.apache.axiom.soap.impl.llom;
+import org.apache.axiom.core.builder.Builder;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.Builder;
import org.apache.axiom.om.impl.stream.StreamException;
import org.apache.axiom.om.impl.stream.XmlHandler;
import org.apache.axiom.soap.SOAPBody;
@@ -136,30 +135,20 @@ public abstract class SOAPEnvelopeImpl e
if (!cache) {
// let's try to close the builder/parser here since we are now done with the
// non-caching code block serializing the top-level SOAPEnvelope element
- // TODO: should use 'instance of OMXMLParserWrapper' instead? StAXBuilder is more generic
- OMXMLParserWrapper builder = coreGetBuilder();
- if ((builder != null) && (builder instanceof Builder)) {
+ Builder builder = coreGetBuilder();
+ if (builder != null) {
try {
if (log.isDebugEnabled()) {
log.debug("closing builder: " + builder);
}
- Builder staxBuilder = (Builder) builder;
- staxBuilder.close();
+ builder.close();
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.error("Could not close builder or parser due to: ", e);
}
}
} else {
- if (log.isDebugEnabled()) {
- log.debug("Could not close builder or parser due to:");
- if (builder == null) {
- log.debug("builder is null");
- }
- if ((builder != null) && !(builder instanceof Builder)) {
- log.debug("builder is not instance of " + Builder.class.getName());
- }
- }
+ log.debug("Could not close builder or parser due to: builder is null");
}
}
}