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/01/23 19:31:29 UTC
svn commit: r1726434 - 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/builder/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/co...
Author: veithen
Date: Sat Jan 23 18:31:28 2016
New Revision: 1726434
URL: http://svn.apache.org/viewvc?rev=1726434&view=rev
Log:
Eliminate OMContainerEx and OMNodeEx.
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.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/factory/OMFactoryImpl.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/PushOMBuilder.java Sat Jan 23 18:31:28 2016
@@ -32,8 +32,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.builder.OMFactoryEx;
+import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
import org.apache.axiom.util.stax.AbstractXMLStreamWriter;
@@ -131,7 +131,7 @@ public class PushOMBuilder extends Abstr
} else {
// Since we use the createOMElement variant that takes a OMXMLParserWrapper parameter,
// we need to update the completion status.
- ((OMContainerEx)parent).setComplete(true);
+ ((AxiomContainer)parent).setComplete(true);
parent = (OMElement)parent.getParent();
}
}
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=1726434&r1=1726433&r2=1726434&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 Sat Jan 23 18:31:28 2016
@@ -32,12 +32,12 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.OMContainerEx;
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;
import org.apache.axiom.om.impl.builder.OMFactoryEx;
+import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.util.stax.XMLEventUtils;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
@@ -101,7 +101,7 @@ public class StAXOMBuilder implements Bu
private final Closeable closeable;
/** Field lastNode */
- protected OMContainerEx target;
+ protected AxiomContainer target;
// returns the state of completion
@@ -198,7 +198,7 @@ public class StAXOMBuilder implements Bu
// Use this constructor because the parser is passed the START_DOCUMENT state.
this(factory, parser, characterEncoding, true, null, null);
elementLevel = 1;
- target = (OMContainerEx)element;
+ target = (AxiomContainer)element;
populateOMElement(element);
}
@@ -274,7 +274,7 @@ public class StAXOMBuilder implements Bu
}
}
- private void discarded(OMContainerEx container) {
+ private void discarded(AxiomContainer container) {
container.discarded();
if (discardTracker != null) {
discardTracker.put(container, new Throwable());
@@ -303,10 +303,10 @@ public class StAXOMBuilder implements Bu
public final void discard(OMContainer container) {
int targetElementLevel = elementLevel;
- OMContainerEx current = target;
+ AxiomContainer current = target;
while (current != container) {
targetElementLevel--;
- current = (OMContainerEx)((OMElement)current).getParent();
+ current = (AxiomContainer)((OMElement)current).getParent();
}
if (targetElementLevel == 0 || targetElementLevel == 1 && document == null) {
close();
@@ -316,7 +316,7 @@ public class StAXOMBuilder implements Bu
if (current == container) {
break;
}
- current = (OMContainerEx)((OMElement)current).getParent();
+ current = (AxiomContainer)((OMElement)current).getParent();
}
return;
}
@@ -332,7 +332,7 @@ public class StAXOMBuilder implements Bu
} else {
discarded(target);
boolean found = container == target;
- target = (OMContainerEx)((OMElement)target).getParent();
+ target = (AxiomContainer)((OMElement)target).getParent();
elementLevel--;
if (found) {
break loop;
@@ -431,10 +431,10 @@ public class StAXOMBuilder implements Bu
if (!cache) {
parserAccessed = true;
// Mark all containers in the hierarchy as discarded because they can no longer be built
- OMContainerEx current = target;
+ AxiomContainer current = target;
while (elementLevel > 0) {
discarded(current);
- current = (OMContainerEx)((OMElement)current).getParent();
+ current = (AxiomContainer)((OMElement)current).getParent();
elementLevel--;
}
if (current != null && current == document) {
@@ -468,7 +468,7 @@ public class StAXOMBuilder implements Bu
// This method expects that the parser is currently positioned on the
// end event corresponding to the container passed as parameter
public final void reenableCaching(OMContainer container) {
- OMContainerEx current = target;
+ AxiomContainer current = target;
while (true) {
discarded(current);
if (elementLevel == 0) {
@@ -481,7 +481,7 @@ public class StAXOMBuilder implements Bu
if (current == container) {
break;
}
- current = (OMContainerEx)((OMElement)current).getParent();
+ current = (AxiomContainer)((OMElement)current).getParent();
}
// Note that at this point current == container
if (container == document) {
@@ -495,7 +495,7 @@ public class StAXOMBuilder implements Bu
target = null;
done = true;
} else {
- target = (OMContainerEx)((OMElement)container).getParent();
+ target = (AxiomContainer)((OMElement)container).getParent();
}
if (log.isDebugEnabled()) {
log.debug("Caching re-enabled; new element level: " + elementLevel + "; done=" + done);
@@ -559,7 +559,7 @@ public class StAXOMBuilder implements Bu
document.setXMLVersion(parser.getVersion());
document.setXMLEncoding(parser.getCharacterEncodingScheme());
document.setStandalone(parser.isStandalone() ? "yes" : "no");
- target = (OMContainerEx)document;
+ target = (AxiomContainer)document;
}
}
@@ -668,7 +668,7 @@ public class StAXOMBuilder implements Bu
// If the node was created by a custom builder, then it will be complete;
// in this case, the target doesn't change
if (!node.isComplete()) {
- target = (OMContainerEx)node;
+ target = (AxiomContainer)node;
}
break;
}
@@ -684,7 +684,7 @@ public class StAXOMBuilder implements Bu
break;
case XMLStreamConstants.END_DOCUMENT:
done = true;
- ((OMContainerEx) this.document).setComplete(true);
+ ((AxiomContainer) this.document).setComplete(true);
target = null;
break;
case XMLStreamConstants.SPACE:
@@ -929,9 +929,9 @@ public class StAXOMBuilder implements Bu
// This is relevant for OMSourcedElements and for the case where the document has been discarded
// using getDocumentElement(true). In these cases, this will actually set target to null. In all
// other cases, this will have the same effect as the instruction in the else clause.
- target = (OMContainerEx)document;
+ target = (AxiomContainer)document;
} else {
- target = (OMContainerEx)((OMElement)target).getParent();
+ target = (AxiomContainer)((OMElement)target).getParent();
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Sat Jan 23 18:31:28 2016
@@ -42,7 +42,6 @@ import org.apache.axiom.om.OMSourcedElem
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.builder.OMFactoryEx;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.common.builder.StAXOMBuilder;
@@ -110,7 +109,7 @@ public class OMFactoryImpl implements OM
node.coreSetSystemId(systemId);
node.coreSetInternalSubset(internalSubset);
if (parent != null) {
- ((OMContainerEx)parent).addChild(node, fromBuilder);
+ ((AxiomContainer)parent).addChild(node, fromBuilder);
}
return node;
}
@@ -136,7 +135,7 @@ public class OMFactoryImpl implements OM
throw new IllegalArgumentException("Invalid node type");
}
if (parent != null) {
- ((OMContainerEx)parent).addChild(node, fromBuilder);
+ ((AxiomContainer)parent).addChild(node, fromBuilder);
}
node.coreSetCharacterData(content, AxiomSemantics.INSTANCE);
return node;
@@ -214,7 +213,7 @@ public class OMFactoryImpl implements OM
node.coreSetTarget(piTarget);
node.coreSetCharacterData(piData, AxiomSemantics.INSTANCE);
if (parent != null) {
- ((OMContainerEx)parent).addChild(node, fromBuilder);
+ ((AxiomContainer)parent).addChild(node, fromBuilder);
}
return node;
}
@@ -228,7 +227,7 @@ public class OMFactoryImpl implements OM
node.coreSetName(name);
node.coreSetReplacementText(replacementText);
if (parent != null) {
- ((OMContainerEx)parent).addChild(node, fromBuilder);
+ ((AxiomContainer)parent).addChild(node, fromBuilder);
}
return node;
}
@@ -241,7 +240,7 @@ public class OMFactoryImpl implements OM
AxiomComment node = createNode(AxiomComment.class);
node.coreSetCharacterData(content, AxiomSemantics.INSTANCE);
if (parent != null) {
- ((OMContainerEx)parent).addChild(node, fromBuilder);
+ ((AxiomContainer)parent).addChild(node, fromBuilder);
}
return node;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java Sat Jan 23 18:31:28 2016
@@ -25,10 +25,10 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.builder.OMFactoryEx;
import org.apache.axiom.om.impl.common.OMContentHandler;
import org.apache.axiom.om.impl.common.builder.BuilderUtil;
+import org.apache.axiom.om.impl.intf.AxiomContainer;
import org.apache.axiom.om.impl.intf.AxiomElement;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -56,7 +56,7 @@ public class SAXOMBuilder extends OMCont
}
protected void doEndDocument() {
- ((OMContainerEx)document).setComplete(true);
+ ((AxiomContainer)document).setComplete(true);
}
public OMDocument getDocument() {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java Sat Jan 23 18:31:28 2016
@@ -19,8 +19,8 @@
package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreChildNode;
-import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.OMNode;
-public interface AxiomChildNode extends OMNodeEx, CoreChildNode, AxiomSerializable {
+public interface AxiomChildNode extends OMNode, CoreChildNode, AxiomSerializable {
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java Sat Jan 23 18:31:28 2016
@@ -18,11 +18,15 @@
*/
package org.apache.axiom.om.impl.intf;
+import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.OMContainerEx;
-public interface AxiomContainer extends OMContainerEx, AxiomCoreParentNode {
+public interface AxiomContainer extends OMContainer, AxiomCoreParentNode {
+ void discarded();
+
+ void addChild(OMNode omNode, boolean fromBuilder);
+
/**
* Check if the node can be added as a child of this container.
*
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=1726434&r1=1726433&r2=1726434&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java Sat Jan 23 18:31:28 2016
@@ -26,7 +26,6 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.util.CommonUtils;
import org.apache.commons.logging.Log;