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/27 13:54:41 UTC
svn commit: r1732636 - in /webservices/axiom/trunk/aspects:
core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/
Author: veithen
Date: Sat Feb 27 12:54:41 2016
New Revision: 1732636
URL: http://svn.apache.org/viewvc?rev=1732636&view=rev
Log:
Move the serialization logic to the core model.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.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/CoreProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
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/AxiomDocTypeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.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/AxiomEntityReferenceSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCDATASectionSupport.aj Sat Feb 27 12:54:41 2016
@@ -20,8 +20,11 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreCDATASection;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCDATASectionSupport {
public final NodeType CoreCDATASection.coreGetNodeType() {
@@ -30,4 +33,8 @@ public aspect CoreCDATASectionSupport {
public final <T> void CoreCDATASection.init(ClonePolicy<T> policy, T options, CoreNode other) {
}
+
+ public final void CoreCDATASection.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ handler.processCDATASection(coreGetCharacterData().toString());
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCharacterDataNodeSupport.aj Sat Feb 27 12:54:41 2016
@@ -25,6 +25,8 @@ import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
import org.apache.axiom.core.Semantics;
import org.apache.axiom.core.impl.Flags;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCharacterDataNodeSupport {
/**
@@ -61,4 +63,8 @@ public aspect CoreCharacterDataNodeSuppo
data = o.data instanceof CharacterData ? ((CharacterData)o.data).clone(policy, options) : o.data;
coreSetIgnorable(o.coreIsIgnorable());
}
+
+ public final void CoreCharacterDataNode.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processCharacterData(coreGetCharacterData(), coreIsIgnorable());
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreCommentSupport.aj Sat Feb 27 12:54:41 2016
@@ -20,8 +20,11 @@ package org.apache.axiom.core.impl.mixin
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreComment;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreCommentSupport {
public final NodeType CoreComment.coreGetNodeType() {
@@ -30,4 +33,8 @@ public aspect CoreCommentSupport {
public final <T> void CoreComment.init(ClonePolicy<T> policy, T options, CoreNode other) {
}
+
+ public final void CoreComment.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ handler.processComment(coreGetCharacterData().toString());
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentSupport.aj Sat Feb 27 12:54:41 2016
@@ -25,6 +25,8 @@ import org.apache.axiom.core.CoreElement
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreDocumentSupport {
private String CoreDocument.inputEncoding;
@@ -96,4 +98,10 @@ public aspect CoreDocumentSupport {
coreSetStandalone(o.coreIsStandalone());
coreSetInputEncoding(o.coreGetInputEncoding());
}
+
+ public final void CoreDocument.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ handler.startDocument(coreGetInputEncoding(), coreGetXmlVersion(), coreGetXmlEncoding(), coreIsStandalone());
+ serializeChildren(handler, cache);
+ handler.endDocument();
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreDocumentTypeDeclarationSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,6 +22,8 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreDocumentTypeDeclaration;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreDocumentTypeDeclarationSupport {
private String CoreDocumentTypeDeclaration.rootName;
@@ -72,4 +74,8 @@ public aspect CoreDocumentTypeDeclaratio
coreSetSystemId(o.coreGetSystemId());
coreSetInternalSubset(o.coreGetInternalSubset());
}
+
+ public final void CoreDocumentTypeDeclaration.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processDocumentTypeDeclaration(coreGetRootName(), coreGetPublicId(), coreGetSystemId(), coreGetInternalSubset());
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreEntityReferenceSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,6 +22,8 @@ import org.apache.axiom.core.ClonePolicy
import org.apache.axiom.core.CoreEntityReference;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreEntityReferenceSupport {
private String CoreEntityReference.name;
@@ -52,4 +54,8 @@ public aspect CoreEntityReferenceSupport
coreSetName(o.coreGetName());
coreSetReplacementText(o.coreGetReplacementText());
}
+
+ public final void CoreEntityReference.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
+ handler.processEntityReference(coreGetName(), coreGetReplacementText());
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreNSAwareElementSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,8 +22,11 @@ import org.apache.axiom.core.CoreAttribu
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.DocumentElementExtractingFilterHandler;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlInput;
+import org.apache.axiom.core.stream.XmlReader;
public aspect CoreNSAwareElementSupport {
public final NodeType CoreNSAwareElement.coreGetNodeType() {
@@ -38,13 +41,29 @@ public aspect CoreNSAwareElementSupport
return namespaceURI.equals(coreGetNamespaceURI()) ? coreGetPrefix() : null;
}
- public final void CoreNSAwareElement.coreSerializeStartPart(XmlHandler handler) throws CoreModelException, StreamException {
- handler.startElement(coreGetNamespaceURI(), coreGetLocalName(), coreGetPrefix());
- CoreAttribute attr = coreGetFirstAttribute();
- while (attr != null) {
- attr.internalSerialize(handler, true);
- attr = attr.coreGetNextAttribute();
+ public XmlInput CoreNSAwareElement.getXmlInput(boolean cache) throws StreamException {
+ return null;
+ }
+
+ public final void CoreNSAwareElement.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ XmlInput input = getXmlInput(cache);
+ if (input != null) {
+ // TODO: the serializer ignores namespaceURI and localName
+ XmlReader reader = input.createReader(new DocumentElementExtractingFilterHandler(handler));
+ while (!reader.proceed()) {
+ // Just loop
+ }
+ } else {
+ forceExpand();
+ handler.startElement(coreGetNamespaceURI(), coreGetLocalName(), coreGetPrefix());
+ CoreAttribute attr = coreGetFirstAttribute();
+ while (attr != null) {
+ attr.internalSerialize(handler, true);
+ attr = attr.coreGetNextAttribute();
+ }
+ handler.attributesCompleted();
+ serializeChildren(handler, cache);
+ handler.endElement();
}
- handler.attributesCompleted();
}
}
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=1732636&r1=1732635&r2=1732636&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 Sat Feb 27 12:54:41 2016
@@ -35,6 +35,7 @@ import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.ElementMatcher;
+import org.apache.axiom.core.InputContext;
import org.apache.axiom.core.Mapper;
import org.apache.axiom.core.NodeConsumedException;
import org.apache.axiom.core.NodeFilter;
@@ -43,6 +44,8 @@ import org.apache.axiom.core.Semantics;
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.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreParentNodeSupport {
private Object CoreParentNode.content;
@@ -340,4 +343,36 @@ public aspect CoreParentNodeSupport {
}
}
}
+
+ public final void CoreParentNode.serializeChildren(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ if (getState() == DISCARDED) {
+ Builder builder = coreGetBuilder();
+ if (builder != null) {
+ builder.debugDiscarded(this);
+ }
+ throw new NodeConsumedException();
+ }
+ if (cache) {
+ CoreChildNode child = coreGetFirstChild();
+ while (child != null) {
+ child.internalSerialize(handler, true);
+ child = child.coreGetNextSibling();
+ }
+ } else {
+ // First, recursively serialize all child nodes that have already been created
+ CoreChildNode child = coreGetFirstChildIfAvailable();
+ while (child != null) {
+ child.internalSerialize(handler, cache);
+ child = child.coreGetNextSiblingIfAvailable();
+ }
+ InputContext context = coreGetInputContext();
+ if (context != null) {
+ context.setPassThroughHandler(handler);
+ Builder builder = context.getBuilder();
+ do {
+ builder.next();
+ } while (coreGetInputContext() != null);
+ }
+ }
+ }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreProcessingInstructionSupport.aj Sat Feb 27 12:54:41 2016
@@ -19,9 +19,12 @@
package org.apache.axiom.core.impl.mixin;
import org.apache.axiom.core.ClonePolicy;
+import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.core.NodeType;
+import org.apache.axiom.core.stream.StreamException;
+import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreProcessingInstructionSupport {
private String CoreProcessingInstruction.target;
@@ -41,4 +44,8 @@ public aspect CoreProcessingInstructionS
public final <T> void CoreProcessingInstruction.init(ClonePolicy<T> policy, T options, CoreNode other) {
target = ((CoreProcessingInstruction)other).target;
}
+
+ public final void CoreProcessingInstruction.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
+ handler.processProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData().toString());
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCDATASectionSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,8 +22,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.intf.AxiomCDATASection;
@@ -33,14 +31,6 @@ public aspect AxiomCDATASectionSupport {
return OMNode.CDATA_SECTION_NODE;
}
- public final void AxiomCDATASection.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- try {
- handler.processCDATASection(coreGetCharacterData().toString());
- } catch (CoreModelException ex) {
- throw AxiomExceptionTranslator.translate(ex);
- }
- }
-
public final void AxiomCDATASection.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {
writer.writeCData(coreGetCharacterData().toString());
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCharacterDataNodeSupport.aj Sat Feb 27 12:54:41 2016
@@ -21,8 +21,6 @@ package org.apache.axiom.om.impl.mixin;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.intf.AxiomCharacterDataNode;
@@ -31,10 +29,6 @@ public aspect AxiomCharacterDataNodeSupp
return coreIsIgnorable() ? OMNode.SPACE_NODE : OMNode.TEXT_NODE;
}
- public final void AxiomCharacterDataNode.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- handler.processCharacterData(coreGetCharacterData(), coreIsIgnorable());
- }
-
public final void AxiomCharacterDataNode.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
writer.writeCharacters(coreGetCharacterData().toString());
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,8 +22,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
@@ -45,14 +43,6 @@ public aspect AxiomCommentSupport {
public void AxiomComment.setValue(String text) {
coreSetCharacterData(text, AxiomSemantics.INSTANCE);
}
-
- public final void AxiomComment.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- try {
- handler.processComment(coreGetCharacterData().toString());
- } catch (CoreModelException ex) {
- throw AxiomExceptionTranslator.translate(ex);
- }
- }
public final void AxiomComment.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {
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=1732636&r1=1732635&r2=1732636&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 Feb 27 12:54:41 2016
@@ -36,7 +36,6 @@ import org.apache.axiom.core.CoreModelEx
import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.ElementMatcher;
-import org.apache.axiom.core.InputContext;
import org.apache.axiom.core.Mapper;
import org.apache.axiom.core.stream.NamespaceRepairingFilterHandler;
import org.apache.axiom.core.stream.StreamException;
@@ -355,38 +354,6 @@ public aspect AxiomContainerSupport {
serialize(writer, format, false);
}
- final void AxiomContainer.serializeChildren(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
- if (getState() == AxiomContainer.DISCARDED) {
- Builder builder = coreGetBuilder();
- if (builder != null) {
- builder.debugDiscarded(this);
- }
- throw new NodeUnavailableException();
- }
- if (cache) {
- AxiomChildNode child = (AxiomChildNode)getFirstOMChild();
- while (child != null) {
- child.internalSerialize(handler, true);
- child = (AxiomChildNode)child.getNextOMSibling();
- }
- } else {
- // First, recursively serialize all child nodes that have already been created
- AxiomChildNode child = (AxiomChildNode)coreGetFirstChildIfAvailable();
- while (child != null) {
- child.internalSerialize(handler, cache);
- child = (AxiomChildNode)child.coreGetNextSiblingIfAvailable();
- }
- InputContext context = coreGetInputContext();
- if (context != null) {
- context.setPassThroughHandler(handler);
- Builder builder = context.getBuilder();
- do {
- builder.next();
- } while (coreGetInputContext() != null);
- }
- }
- }
-
public final void AxiomContainer.notifyChildComplete() {
if (getState() == INCOMPLETE && coreGetBuilder() == null) {
for (Iterator<OMNode> iterator = getChildren(); iterator.hasNext(); ) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,7 +22,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.serializer.push.stax.StAXSerializer;
import org.apache.axiom.om.impl.intf.AxiomDocType;
@@ -36,10 +35,6 @@ public aspect AxiomDocTypeSupport {
return coreGetRootName();
}
- public final void AxiomDocType.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- handler.processDocumentTypeDeclaration(coreGetRootName(), coreGetPublicId(), coreGetSystemId(), coreGetInternalSubset());
- }
-
public final void AxiomDocType.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {
internalSerialize(new StAXSerializer(writer), cache);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentSupport.aj Sat Feb 27 12:54:41 2016
@@ -20,8 +20,6 @@ package org.apache.axiom.om.impl.mixin;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
@@ -55,12 +53,6 @@ public aspect AxiomDocumentSupport {
}
}
- public final void AxiomDocument.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
- handler.startDocument(coreGetInputEncoding(), coreGetXmlVersion(), coreGetXmlEncoding(), coreIsStandalone());
- serializeChildren(handler, cache);
- handler.endDocument();
- }
-
public final String AxiomDocument.getCharsetEncoding() {
String inputEncoding = coreGetInputEncoding();
return inputEncoding == null ? "UTF-8" : inputEncoding;
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=1732636&r1=1732635&r2=1732636&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 Sat Feb 27 12:54:41 2016
@@ -43,11 +43,6 @@ import org.apache.axiom.core.CoreParentN
import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.ElementMatcher;
import org.apache.axiom.core.Mapper;
-import org.apache.axiom.core.stream.DocumentElementExtractingFilterHandler;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
-import org.apache.axiom.core.stream.XmlInput;
-import org.apache.axiom.core.stream.XmlReader;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
@@ -531,26 +526,6 @@ public aspect AxiomElementSupport {
return findNamespaceURI("");
}
- public XmlInput AxiomElement.getXmlInput(boolean cache) throws StreamException {
- return null;
- }
-
- public final void AxiomElement.internalSerialize(XmlHandler handler, boolean cache) throws CoreModelException, StreamException {
- XmlInput input = getXmlInput(cache);
- if (input != null) {
- // TODO: the serializer ignores namespaceURI and localName
- XmlReader reader = input.createReader(new DocumentElementExtractingFilterHandler(handler));
- while (!reader.proceed()) {
- // Just loop
- }
- } else {
- forceExpand();
- coreSerializeStartPart(handler);
- serializeChildren(handler, cache);
- handler.endElement();
- }
- }
-
public final String AxiomElement.toStringWithConsume() throws XMLStreamException {
StringWriter sw = new StringWriter();
serializeAndConsume(sw);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceSupport.aj Sat Feb 27 12:54:41 2016
@@ -21,8 +21,6 @@ package org.apache.axiom.om.impl.mixin;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.intf.AxiomEntityReference;
@@ -31,10 +29,6 @@ public aspect AxiomEntityReferenceSuppor
return OMNode.ENTITY_REFERENCE_NODE;
}
- public final void AxiomEntityReference.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- handler.processEntityReference(coreGetName(), coreGetReplacementText());
- }
-
public final void AxiomEntityReference.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
writer.writeEntityRef(coreGetName());
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj?rev=1732636&r1=1732635&r2=1732636&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj Sat Feb 27 12:54:41 2016
@@ -22,8 +22,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
import org.apache.axiom.om.impl.common.AxiomSemantics;
import org.apache.axiom.om.impl.intf.AxiomProcessingInstruction;
@@ -48,14 +46,6 @@ public aspect AxiomProcessingInstruction
public final void AxiomProcessingInstruction.setValue(String value) {
coreSetCharacterData(value, AxiomSemantics.INSTANCE);
}
-
- public final void AxiomProcessingInstruction.internalSerialize(XmlHandler handler, boolean cache) throws StreamException {
- try {
- handler.processProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData().toString());
- } catch (CoreModelException ex) {
- throw AxiomExceptionTranslator.translate(ex);
- }
- }
public final void AxiomProcessingInstruction.serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {