You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by aj...@apache.org on 2004/12/15 03:53:59 UTC
svn commit: r111921 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/impl/llom java/org/apache/axis/impl/llom/wrapper java/org/apache/axis/om test/org/apache/axis/om/impl/streamwrapper
Author: ajith
Date: Tue Dec 14 18:53:58 2004
New Revision: 111921
URL: http://svn.apache.org/viewcvs?view=rev&rev=111921
Log:
New method added to the OMElement to get the parser (the parser wrapper) that will generate the pull events for that particular element. OMStaxWrapper is moved one level up and the constructor given package access.
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/wrapper/
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java?view=diff&rev=111921&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java&r1=111920&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java&r2=111921
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java Tue Dec 14 18:53:58 2004
@@ -2,9 +2,11 @@
import org.apache.axis.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis.impl.llom.traverse.OMChildrenQNameIterator;
+import org.apache.axis.impl.llom.OMStAXWrapper;
import org.apache.axis.om.*;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.ListIterator;
@@ -319,5 +321,12 @@
*/
public short getType() throws OMException {
return OMNode.ELEMENT_NODE;
+ }
+
+ /**
+ *
+ */
+ public XMLStreamReader getPullParser(boolean cacheOff) {
+ return new OMStAXWrapper(builder,this,cacheOff);
}
}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java?view=auto&rev=111921
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java Tue Dec 14 18:53:58 2004
@@ -0,0 +1,868 @@
+package org.apache.axis.impl.llom;
+
+import org.apache.axis.impl.llom.OMNavigator;
+import org.apache.axis.impl.llom.exception.OMStreamingException;
+import org.apache.axis.om.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.Location;
+import java.util.Iterator;
+import java.util.Stack;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+
+/**
+ * Note - This class also implements the streaming constants interface
+ * to get access to the StAX constants
+ */
+public class OMStAXWrapper implements XMLStreamReader, XMLStreamConstants {
+
+
+ private OMNavigator navigator;
+ private OMXMLParserWrapper builder;
+ private XMLStreamReader parser;
+ private OMNode rootNode;
+ private boolean isFirst = true;
+ //the boolean flag that keeps the state of the document!
+ private boolean complete = false;
+
+
+ private int currentEvent = 0;
+ // navigable means the output should be taken from the navigator
+ // as soon as the navigator returns a null navigable will be reset
+ //to false and the subsequent events will be taken from the builder
+ //or the parser directly
+ private boolean navigable = true;
+
+ // SwitchingAllowed is set to false by default
+ // this means that unless the user explicitly states
+ // that he wants things not to be cached, everything will
+ // be cached
+ boolean switchingAllowed = false;
+
+ private Stack elementStack = new Stack();
+
+ //keeps the next event. The parser actually keeps one step ahead to
+ //detect the end of navigation. (at the end of the stream the navigator
+ //returns a null
+ private OMNode nextNode = null;
+
+ //holder for the current node. Needs this to generate events from the current node
+ private OMNode currentNode = null;
+
+ //needs this to refer to the last known node
+ private OMNode lastNode = null;
+
+ private boolean switched = false;
+
+ public void setAllowSwitching(boolean b) {
+ this.switchingAllowed = b;
+ }
+
+ public boolean isAllowSwitching() {
+ return switchingAllowed;
+ }
+
+ /**
+ * When constructing the OMStaxWrapper, the creator must produce the
+ * builder (an instance of the OMXMLparserWrapper of the input) and the
+ * Element Node to start parsing. The wrapper wil parse(proceed) until
+ * the end of the given element. hence care should be taken to pass the
+ * root element if the entire document is needed
+ */
+ OMStAXWrapper(OMXMLParserWrapper builder, OMElement startNode) {
+ this(builder,startNode,false);
+ }
+
+ OMStAXWrapper(OMXMLParserWrapper builder, OMElement startNode,boolean cacheOff) {
+ //create a navigator
+ this.navigator = new OMNavigator(startNode);
+ this.builder = builder;
+ this.rootNode = startNode;
+ //initaite the next and current nodes
+ //Note - navigator is written in such a way that it first
+ //returns the starting node at the first call to it
+ currentNode = navigator.next();
+ nextNode = navigator.next();
+ switchingAllowed = cacheOff;
+ }
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getPrefix()
+ */
+ public String getPrefix() {
+ String returnStr = null;
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
+ if (navigable) {
+ OMNamespace ns = ((OMElement) lastNode).getNamespace();
+ returnStr = ns == null ? null : ns.getPrefix();
+ } else {
+ returnStr = parser.getPrefix();
+ }
+ }
+ return returnStr;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getNamespaceURI()
+ */
+ public String getNamespaceURI() {
+ String returnStr = null;
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT || currentEvent == NAMESPACE) {
+ if (navigable) {
+ OMNamespace ns = ((OMElement) lastNode).getNamespace();
+ returnStr = ns == null ? null : ns.getName();
+ } else {
+ returnStr = parser.getNamespaceURI();
+ }
+ }
+
+ return returnStr;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#hasName()
+ */
+ public boolean hasName() {
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ *@see javax.xml.stream.XMLStreamReader#getLocalName()
+ */
+ public String getLocalName() {
+ String returnStr = null;
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT || currentEvent == ENTITY_REFERENCE) {
+ if (navigable) {
+ returnStr = ((OMElement) lastNode).getLocalName();
+ } else {
+ //System.out.println(parser.getEventType());
+ returnStr = parser.getLocalName();
+ }
+ }
+ return returnStr;
+ }
+
+ /**
+ *@see javax.xml.stream.XMLStreamReader#getName()
+ */
+ public QName getName() {
+ QName returnName = null;
+ if (currentEvent == START_ELEMENT || currentEvent == END_ELEMENT) {
+ if (navigable) {
+ returnName = getQName((OMNamedNode) lastNode);
+ } else {
+ returnName = parser.getName();
+ }
+ }
+ return returnName;
+ }
+
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#hasText()
+ */
+ public boolean hasText() {
+ return (currentEvent == CHARACTERS ||
+ currentEvent == DTD ||
+ currentEvent == ENTITY_REFERENCE ||
+ currentEvent == COMMENT ||
+ currentEvent == SPACE);
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getTextLength()
+ */
+ public int getTextLength() {
+ int returnLength = 0;
+ if (hasText()) {
+ if (navigable) {
+ OMText textNode = (OMText) lastNode;
+ returnLength = textNode.getValue().length();
+ } else {
+ returnLength = parser.getTextLength();
+ }
+
+ }
+ return returnLength;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getTextStart()
+ */
+ public int getTextStart() {
+ int returnLength = 0;
+ if (hasText()) {
+ if (!navigable) {
+ returnLength = parser.getTextStart();
+ }
+ //Note - this has no relevant method in the OM
+ }
+ return returnLength;
+ }
+
+ /**
+ *
+ * @see javax.xml.stream.XMLStreamReader#getTextCharacters(int, char[], int, int)
+ */
+ public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
+ int returnLength = 0;
+ if (hasText()) {
+ if (!navigable) {
+ try {
+ returnLength = parser.getTextCharacters(i, chars, i1, i2);
+ } catch (XMLStreamException e) {
+ throw new OMStreamingException(e);
+ }
+ }
+ //Note - this has no relevant method in the OM
+ }
+ return returnLength;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getTextCharacters()
+ */
+ public char[] getTextCharacters() {
+ char[] returnArray = null;
+ if (hasText()) {
+ if (navigable) {
+ OMText textNode = (OMText) lastNode;
+ String str = textNode.getValue();
+ returnArray = str.toCharArray();
+ } else {
+ returnArray = parser.getTextCharacters();
+ }
+
+ }
+ return returnArray;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getText()
+ */
+ public String getText() {
+ String returnString = null;
+ if (hasText()) {
+ if (navigable) {
+ OMText textNode = (OMText) lastNode;
+ returnString = textNode.getValue();
+ } else {
+ returnString = parser.getText();
+ }
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getEventType()
+ */
+ //todo this should be improved
+ public int getEventType() {
+ return currentEvent;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getNamespaceURI
+ *
+ */
+ public String getNamespaceURI(int i) {
+ String returnString = null;
+ if (isStartElement() || isEndElement() || currentEvent == NAMESPACE) {
+ if (navigable) {
+ //Nothing to do here! How to get the namespacace references
+ } else {
+ returnString = parser.getNamespaceURI(i);
+ }
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getNamespacePrefix
+ */
+ public String getNamespacePrefix(int i) {
+ String returnString = null;
+ if (isStartElement() || isEndElement() || currentEvent == NAMESPACE) {
+ if (navigable) {
+ //Nothing to do here! How to get the namespacace references
+ } else {
+ returnString = parser.getNamespacePrefix(i);
+ }
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getNamespaceCount()
+ */
+ public int getNamespaceCount() {
+ int returnCount = 0;
+ if (isStartElement() || isEndElement() || currentEvent == NAMESPACE) {
+ if (navigable) {
+ //Nothing to do here! How to get the namespacace references
+ } else {
+ returnCount = parser.getNamespaceCount();
+ }
+ }
+ return returnCount;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#isAttributeSpecified
+ */
+ public boolean isAttributeSpecified(int i) {
+ boolean returnValue = false;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ //theres nothing to be returned here
+ } else {
+ returnValue = parser.isAttributeSpecified(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute type accessed in illegal event!");
+ }
+ return returnValue;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getAttributeValue
+ */
+ public String getAttributeValue(int i) {
+ String returnString = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ OMAttribute attrib = getAttribute((OMElement) lastNode, i);
+ if (attrib != null) {
+ returnString = attrib.getValue();
+ }
+ } else {
+ returnString = parser.getAttributeValue(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute type accessed in illegal event!");
+ }
+ return returnString;
+ }
+
+ /**
+ *
+ * @see javax.xml.stream.XMLStreamReader#getAttributeType
+ */
+ public String getAttributeType(int i) {
+ String returnString = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ //todo implement this
+ } else {
+ returnString = parser.getAttributeType(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute type accessed in illegal event!");
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getAttributePrefix
+ */
+ public String getAttributePrefix(int i) {
+ String returnString = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ OMAttribute attrib = getAttribute((OMElement) lastNode, i);
+ if (attrib != null) {
+ OMNamespace nameSpace = attrib.getNamespace();
+ if (nameSpace != null) {
+ returnString = nameSpace.getPrefix();
+ }
+ }
+ } else {
+ returnString = parser.getAttributePrefix(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute prefix accessed in illegal event!");
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getAttributeLocalName
+ */
+ public String getAttributeLocalName(int i) {
+ String returnString = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ OMAttribute attrib = getAttribute((OMElement) lastNode, i);
+ if (attrib != null)
+ returnString = attrib.getLocalName();
+
+ } else {
+ returnString = parser.getAttributeLocalName(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute localName accessed in illegal event!");
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getAttributeNamespace
+ */
+ public String getAttributeNamespace(int i) {
+ String returnString = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ OMAttribute attrib = getAttribute((OMElement) lastNode, i);
+ if (attrib != null) {
+ OMNamespace nameSpace = attrib.getNamespace();
+ if (nameSpace != null) {
+ returnString = nameSpace.getName();
+ }
+ }
+ } else {
+ returnString = parser.getAttributeNamespace(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute nameSpace accessed in illegal event!");
+ }
+ return returnString;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getAttributeName
+ */
+ public QName getAttributeName(int i) {
+ QName returnQName = null;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ returnQName = getAttribute((OMElement) lastNode, i).getQName();
+ } else {
+ returnQName = parser.getAttributeName(i);
+ }
+ } else {
+ throw new IllegalStateException("attribute count accessed in illegal event!");
+ }
+ return returnQName;
+ }
+
+ /**
+ * @return
+ * @see javax.xml.stream.XMLStreamReader#getAttributeCount
+ */
+ public int getAttributeCount() {
+ int returnCount = 0;
+ if (isStartElement() || currentEvent == ATTRIBUTE) {
+ if (navigable) {
+ OMElement elt = (OMElement) lastNode;
+ returnCount = getCount(elt.getAttributes());
+ } else {
+ returnCount = parser.getAttributeCount();
+ }
+
+ } else {
+ throw new IllegalStateException("attribute count accessed in illegal event!");
+ }
+
+ return returnCount;
+ }
+
+
+ //todo
+ public String getAttributeValue(String s, String s1) {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isWhiteSpace() {
+ boolean b;
+ if (navigable) {
+ b = (currentEvent == SPACE);
+ } else {
+ b = parser.isWhiteSpace();
+ }
+
+ return b;
+ }
+
+ public boolean isCharacters() {
+ boolean b;
+ if (navigable) {
+ b = (currentEvent == CHARACTERS);
+ } else {
+ b = parser.isCharacters();
+ }
+ return b;
+ }
+
+ public boolean isEndElement() {
+ boolean b;
+ if (navigable) {
+ b = (currentEvent == END_ELEMENT);
+ } else {
+ b = parser.isEndElement();
+ }
+ return b;
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#require(int, String, String)
+ * @param i
+ * @param s
+ * @param s1
+ * @throws XMLStreamException
+ */
+ public void require(int i, String s, String s1) throws XMLStreamException {
+ throw new XMLStreamException();
+ }
+
+ public boolean isStartElement() {
+ boolean b;
+ if (navigable) {
+ b = (currentEvent == START_ELEMENT);
+ } else {
+ b = parser.isStartElement();
+ }
+ return b;
+ }
+
+ public String getNamespaceURI(String s) {
+ String returnString = null;
+ if (isStartElement() || isEndElement() || currentEvent == NAMESPACE) {
+ if (navigable) {
+ //Nothing to do here! How to get the namespacace references
+ } else {
+ returnString = parser.getNamespaceURI(s);
+ }
+ }
+ return returnString;
+ }
+
+ public void close() throws XMLStreamException {
+ //this doesnot mean anything with respect to the OM
+ if (!navigable) {
+ parser.close();
+
+ }
+
+ }
+
+ public boolean hasNext() throws XMLStreamException {
+ return !complete;
+ }
+
+ /**
+ * Not implemented yet
+ *
+ * @return
+ * @throws org.apache.axis.impl.llom.exception.OMStreamingException
+ *
+ */
+ public int nextTag() throws XMLStreamException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @see javax.xml.stream.XMLStreamReader#getElementText()
+ */
+ public String getElementText() throws XMLStreamException {
+
+ String returnText = "";
+
+ if (navigable) {
+ if (currentNode.getType() == OMNode.ELEMENT_NODE) {
+ //todo complete this
+ return null;
+ }
+ } else {
+ try {
+ returnText = parser.getElementText();
+ } catch (XMLStreamException e) {
+ throw new OMStreamingException(e);
+ }
+ }
+ return returnText;
+ }
+
+ public int next() throws XMLStreamException {
+
+ if (complete) {
+ throw new OMStreamingException("Parser completed!");
+ }
+
+ if (switched){
+ //set navigable to false.Now the subsequent requests will be directed to
+ //the parser
+ navigable = false;
+ }
+ if (navigable) {
+ currentEvent = generateEvents(currentNode);
+ updateCompleteStatus();
+ updateNextNode();
+ } else {
+ currentEvent = builder.next();
+ updateCompleteStatus();
+ }
+ return currentEvent;
+ }
+
+ public Object getProperty(String s) throws IllegalArgumentException {
+ throw new UnsupportedOperationException();
+ }
+
+
+ /**
+ * This is a very important method. this keeps the
+ * navigator one step ahead and pushes the navigator
+ * one event ahead. If the nextNode is null then navigable is set to false;
+ * At the same time the parser and builder are set up for the upcoming event
+ * generation
+ */
+ private void updateNextNode() throws XMLStreamException {
+ lastNode = currentNode;
+ currentNode = nextNode;
+
+ if (navigator.isNavigable()) {
+ nextNode = navigator.next();
+ } else {
+ if (!switchingAllowed) {
+ if (navigator.isCompleted()) {
+ nextNode = null;
+ } else {
+ builder.next();
+ navigator.step();
+ nextNode = navigator.next();
+ }
+ } else {
+ //reset caching (the default is ON so it was not needed in the
+ //earlier case!
+ builder.setCache(false);
+ //load the parser
+ try {
+ parser = (XMLStreamReader) builder.getParser();
+ } catch (ClassCastException e) {
+ throw new XMLStreamException("incompatible parser found!", e);
+ }
+
+ switched = true;
+
+
+
+ }
+ }
+ }
+
+ private void updateCompleteStatus() {
+
+ if (!navigable) {
+ complete = (currentEvent == END_DOCUMENT);
+ } else {
+ if (rootNode.equals(currentNode))
+ if (isFirst)
+ isFirst = false;
+ else
+ complete = true;
+ }
+ }
+
+
+ public NamespaceContext getNamespaceContext() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getEncoding() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Location getLocation() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getVersion() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isStandalone() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean standaloneSet() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getCharacterEncodingScheme() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getPITarget() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getPIData() {
+ throw new UnsupportedOperationException();
+ }
+
+ /*
+
+ ################################################################
+ Generator methods for the OMNodes returned by the navigator
+ ################################################################
+
+ */
+
+ private int generateEvents(OMNode node) {
+ int returnEvent = 0;
+
+ int nodeType = node.getType();
+ switch (nodeType) {
+ case OMNode.ELEMENT_NODE:
+ returnEvent = generateElementEvents((OMElement) node);
+ break;
+ case OMNode.TEXT_NODE:
+ returnEvent = generateTextEvents();
+ break;
+ case OMNode.COMMENT_NODE:
+ returnEvent = generateCommentEvents();
+ break;
+ case OMNode.CDATA_SECTION_NODE:
+ returnEvent = generateCdataEvents();
+ break;
+ default:
+ break; //just ignore any other nodes
+ }
+
+ return returnEvent;
+ }
+
+
+ private int generateElementEvents(OMElement elt) {
+ int returnValue = START_ELEMENT;
+ if (!elementStack.isEmpty() && elementStack.peek().equals(elt)) {
+ returnValue = END_ELEMENT;
+ elementStack.pop();
+ } else {
+ elementStack.push(elt);
+ }
+ return returnValue;
+ }
+
+
+ private int generateTextEvents() {
+ return CHARACTERS;
+ }
+
+ private int generateCommentEvents() {
+ return COMMENT;
+ }
+
+ private int generateCdataEvents() {
+ return CDATA;
+ }
+
+ /*
+ ####################################################################
+ Other helper methods
+ ####################################################################
+ */
+
+ /**
+ * helper method
+ *
+ * @param it
+ * @return
+ */
+ private int getCount(Iterator it) {
+ int count = 0;
+ if (it != null) {
+ while (it.hasNext()) {
+ it.next();
+ count++;
+ }
+ }
+ return count;
+ }
+
+ /**
+ * Helper method
+ *
+ * @param it
+ * @param index
+ * @return
+ */
+ private Object getItemFromIterator(Iterator it, int index) {
+ int count = 0;
+ Object returnObject = null;
+ boolean found = false;
+ if (it != null) {
+ while (it.hasNext()) {
+ returnObject = it.next();
+ if (index == count++) {
+ found = true;
+ break;
+ }
+ }
+ }
+
+ if (found) {
+ return returnObject;
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Helper method
+ *
+ * @param namedNode
+ * @return
+ */
+ private QName getQName(OMNamedNode namedNode) {
+ QName returnName;
+ OMNamespace ns = namedNode.getNamespace();
+ String localPart = namedNode.getLocalName();
+ if (ns != null) {
+ String prefix = ns.getPrefix();
+ String uri = ns.getName();
+ if (prefix==null || prefix.equals(""))
+ returnName = new QName(uri, localPart);
+ else
+ returnName = new QName(uri, localPart, prefix);
+ } else {
+ returnName = new QName(localPart);
+ }
+ return returnName;
+ }
+
+ /**
+ * @param elt
+ * @param index
+ * @return
+ */
+ private OMAttribute getAttribute(OMElement elt, int index) {
+ OMAttribute returnAttrib = null;
+ if (elt != null) {
+ returnAttrib = (OMAttribute) getItemFromIterator(elt.getAttributes(), index);
+ }
+ return returnAttrib;
+ }
+}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java?view=diff&rev=111921&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java&r1=111920&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java&r2=111921
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMElement.java Tue Dec 14 18:53:58 2004
@@ -4,6 +4,7 @@
import java.util.Iterator;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
/**
* Copyright 2001-2004 The Apache Software Foundation.
@@ -137,4 +138,13 @@
* @return
*/
public OMNode getFirstChild();
+
+ /**
+ * Returns the pull parser that will generate the pull
+ * events relevant to THIS element
+ * @param cacheOff
+ * @return
+ */
+
+ public XMLStreamReader getPullParser(boolean cacheOff);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java?view=diff&rev=111921&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java&r1=111920&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java&r2=111921
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java Tue Dec 14 18:53:58 2004
@@ -11,7 +11,7 @@
import org.apache.axis.AbstractTestCase;
import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
-import org.apache.axis.impl.llom.wrapper.OMStAXWrapper;
+import org.apache.axis.impl.llom.OMStAXWrapper;
import org.apache.axis.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
@@ -36,7 +36,6 @@
private SOAPEnvelope envelope = null;
private SimpleOMSerializer serilizer;
- private OMXMLParserWrapper builder;
private File tempFile;
private XMLStreamReader parser;
@@ -47,13 +46,12 @@
protected void setUp() throws Exception {
XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
- builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(), xmlStreamReader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(), xmlStreamReader);
envelope = (SOAPEnvelope) builder.getDocumentElement();
serilizer = new SimpleOMSerializer();
tempFile = File.createTempFile("temp", "xml");
- parser = new OMStAXWrapper(builder, envelope);
}
@@ -61,7 +59,7 @@
assertNotNull(envelope);
//this serializing will cause the OM to fully build!
serilizer.serialize(envelope, new FileOutputStream(tempFile));
-
+ parser = envelope.getPullParser(false);
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);
@@ -71,7 +69,7 @@
public void testWrapperHalfOM() throws Exception {
assertNotNull(envelope);
-
+ parser = envelope.getPullParser(false);
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);
@@ -80,9 +78,7 @@
public void testWrapperHalfOMWithCacheOff() throws Exception {
assertNotNull(envelope);
-
- parser = new OMStAXWrapper(builder, envelope, true);
-
+ parser = envelope.getPullParser(true);
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);
@@ -91,7 +87,7 @@
public void testWrapperElementEventGenerationWithHalfOMWithCacheOff() throws XMLStreamException {
assertNotNull(envelope);
- parser = new OMStAXWrapper(builder, envelope, true);
+ parser = envelope.getPullParser(true);
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);
@@ -107,7 +103,7 @@
public void testWrapperElementEventGenerationWithHalfOM() throws Exception {
assertNotNull(envelope);
-
+ parser = envelope.getPullParser(false);
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);