cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r726749 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/
Date Mon, 15 Dec 2008 18:04:52 GMT
Author: dkulp
Date: Mon Dec 15 10:04:50 2008
New Revision: 726749

URL: http://svn.apache.org/viewvc?rev=726749&view=rev
Log:
Merged revisions 726631 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r726631 | dkulp | 2008-12-15 02:20:22 -0500 (Mon, 15 Dec 2008) | 2 lines
  
  Performance change to streamreader to not use indexes for next nodes for DOM, use getNextSibling.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
    cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 10:04:50 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java?rev=726749&r1=726748&r2=726749&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Mon Dec 15 10:04:50 2008
@@ -28,7 +28,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.w3c.dom.Document;
 
 /**
  * Abstract logic for creating XMLStreamReader from DOM documents. Its works
@@ -37,45 +36,47 @@
  * @see ElementAdapter }
  * @author <a href="mailto:tsztelak@gmail.com">Tomasz Sztelak</a>
  */
-public abstract class AbstractDOMStreamReader implements XMLStreamReader {
+public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
     protected int currentEvent = XMLStreamConstants.START_DOCUMENT;
 
     private Map properties = new HashMap();
 
-    private FastStack<ElementFrame> frames = new FastStack<ElementFrame>();
+    private FastStack<ElementFrame<T, I>> frames = new FastStack<ElementFrame<T,
I>>();
 
-    private ElementFrame frame;
+    private ElementFrame<T, I> frame;
 
     
     /**
      *     
      */
-    public static class ElementFrame {
-        Object element;
+    public static class ElementFrame<T, I> {
+        T element;
+        I currentChild;
 
         boolean started;
-
         boolean ended;
-
-        int currentChild = -1;
-
+        
         int currentAttribute = -1;
-
         int currentNamespace = -1;
 
-        int currentElement = -1;
         List<String> uris;
         List<String> prefixes;
         List<Object> attributes;
         List<Object> allAttributes;
 
-        final ElementFrame parent;
+        final ElementFrame<T, I> parent;
+        
+        public ElementFrame(T element, ElementFrame<T, I> parent) {
+            this.element = element;
+            this.parent = parent;
+        }
         
-        public ElementFrame(Object element, ElementFrame parent) {
+        public ElementFrame(T element, ElementFrame<T, I> parent, I ch) {
             this.element = element;
             this.parent = parent;
+            this.currentChild = ch;
         }
-        public ElementFrame(Document doc) {
+        public ElementFrame(T doc) {
             this.element = doc;
             parent = null;
             started = true;
@@ -85,22 +86,28 @@
             allAttributes = Collections.emptyList();
         }
         
-        public Object getElement() {
+        public T getElement() {
             return element;
         }
 
+        public I getCurrentChild() {
+            return currentChild;
+        }
+        public void setCurrentChild(I o) {
+            currentChild = o;
+        }
 
     }
 
     /**
      * @param element
      */
-    public AbstractDOMStreamReader(ElementFrame frame) {
+    public AbstractDOMStreamReader(ElementFrame<T, I> frame) {
         this.frame = frame;
         frames.push(this.frame);
     }
 
-    protected ElementFrame getCurrentFrame() {
+    protected ElementFrame<T, I> getCurrentFrame() {
         return frame;
     }
 
@@ -122,7 +129,7 @@
         if (frame.ended) {
             frames.pop();
             if (!frames.empty()) {
-                frame = (ElementFrame)frames.peek();
+                frame = frames.peek();
             } else {
                 currentEvent = END_DOCUMENT;
                 return currentEvent;
@@ -138,13 +145,11 @@
         } else if (frame.currentNamespace < getNamespaceCount() - 1) {
             frame.currentNamespace++;
             currentEvent = NAMESPACE;
-        } else if (frame.currentChild < getChildCount() - 1) {
-            frame.currentChild++;
-
-            currentEvent = moveToChild(frame.currentChild);
+        } else if (hasMoreChildren()) {
+            currentEvent = nextChild();
 
             if (currentEvent == START_ELEMENT) {
-                ElementFrame newFrame = getChildFrame(frame.currentChild);
+                ElementFrame<T, I> newFrame = getChildFrame();
                 newFrame.started = true;
                 frame = newFrame;
                 frames.push(this.frame);
@@ -160,17 +165,15 @@
         return currentEvent;
     }
 
-    protected void newFrame(ElementFrame newFrame) {
+    protected void newFrame(ElementFrame<T, I> newFrame) {
     }
 
     protected void endElement() {
     }
 
-    protected abstract int moveToChild(int currentChild);
-
-    protected abstract ElementFrame getChildFrame(int currentChild);
-
-    protected abstract int getChildCount();
+    protected abstract boolean hasMoreChildren();
+    protected abstract int nextChild();
+    protected abstract ElementFrame<T, I> getChildFrame();
 
     /*
      * (non-Javadoc)

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=726749&r1=726748&r2=726749&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Mon Dec 15 10:04:50 2008
@@ -36,7 +36,7 @@
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.staxutils.AbstractDOMStreamReader.ElementFrame;
 
-public class W3CDOMStreamReader extends AbstractDOMStreamReader {
+public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
     private Node content;
 
     private Document document;
@@ -47,13 +47,13 @@
      * @param element
      */
     public W3CDOMStreamReader(Element element) {
-        super(new ElementFrame(element, null));
+        super(new ElementFrame<Node, Node>(element, null));
         newFrame(getCurrentFrame());
                 
         this.document = element.getOwnerDocument();
     }
     public W3CDOMStreamReader(Document doc) {
-        super(new ElementFrame(doc));
+        super(new ElementFrame<Node, Node>(doc));
         this.document = doc;
     }
 
@@ -71,7 +71,7 @@
      * collection.
      */
     @Override
-    protected final void newFrame(ElementFrame frame) {
+    protected final void newFrame(ElementFrame<Node, Node> frame) {
         Node element = getCurrentNode();
         frame.uris = new ArrayList<String>();
         frame.prefixes = new ArrayList<String>();
@@ -133,22 +133,29 @@
     }
 
     @Override
-    protected ElementFrame getChildFrame(int currentChild) {
-        return new ElementFrame(getCurrentNode().getChildNodes().item(currentChild), getCurrentFrame());
+    protected ElementFrame<Node, Node> getChildFrame() {
+        return new ElementFrame<Node, Node>(getCurrentFrame().currentChild, 
+                                getCurrentFrame());
     }
 
     @Override
-    protected int getChildCount() {
-        return getCurrentNode().getChildNodes().getLength();
+    protected boolean hasMoreChildren() {
+        if (getCurrentFrame().currentChild == null) {
+            return getCurrentNode().getFirstChild() != null;            
+        }
+        return ((Node)getCurrentFrame().currentChild).getNextSibling() != null;
     }
 
     @Override
-    protected int moveToChild(int currentChild) {
-        content = getCurrentNode().getFirstChild();
-        while (currentChild > 0 && content != null) {
-            content = content.getNextSibling();
-            --currentChild;
+    protected int nextChild() {
+        ElementFrame<Node, Node> frame = getCurrentFrame();
+        if (frame.currentChild == null) {
+            content = getCurrentNode().getFirstChild();            
+        } else {
+            content = ((Node)frame.currentChild).getNextSibling();
         }
+        
+        frame.currentChild = content;
         switch (content.getNodeType()) {
         case Node.ELEMENT_NODE:
             return START_ELEMENT;
@@ -169,7 +176,7 @@
     public String getElementText() throws XMLStreamException {
         String result = DOMUtils.getContent(content);
 
-        ElementFrame frame = getCurrentFrame();
+        ElementFrame<Node, Node> frame = getCurrentFrame();
         frame.ended = true;
         currentEvent = END_ELEMENT;
         endElement();
@@ -180,7 +187,7 @@
 
     @Override
     public String getNamespaceURI(String prefix) {
-        ElementFrame frame = getCurrentFrame();
+        ElementFrame<Node, Node> frame = getCurrentFrame();
 
         while (null != frame) {
             int index = frame.prefixes.indexOf(prefix);

Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java?rev=726749&r1=726748&r2=726749&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
Mon Dec 15 10:04:50 2008
@@ -45,7 +45,7 @@
  * 
  * @author <a href="mailto:tsztelak@gmail.com">Tomasz Sztelak</a>
  */
-public class JDOMStreamReader extends AbstractDOMStreamReader {
+public class JDOMStreamReader extends AbstractDOMStreamReader<Element, Integer> {
 
     private Content content;
 
@@ -62,7 +62,7 @@
      * @param element
      */
     public JDOMStreamReader(Element element) {
-        super(new ElementFrame(element, null));
+        super(new ElementFrame<Element, Integer>(element, null, -1));
 
         namespaceContext = new JDOMNamespaceContext();
         setupNamespaces(element);
@@ -182,21 +182,28 @@
     }
 
     public Element getCurrentElement() {
-        return (Element)getCurrentFrame().getElement();
+        return getCurrentFrame().getElement();
     }
 
     @Override
-    protected ElementFrame getChildFrame(int currentChild) {
-        return new ElementFrame(getCurrentElement().getContent(currentChild), getCurrentFrame());
+    protected ElementFrame<Element, Integer> getChildFrame() {
+        int currentChild = getCurrentFrame().getCurrentChild();
+        return new ElementFrame<Element, Integer>((Element)getCurrentElement().getContent(currentChild),
+                                                  getCurrentFrame(),
+                                                  -1);
     }
 
     @Override
-    protected int getChildCount() {
-        return getCurrentElement().getContentSize();
+    protected boolean hasMoreChildren() {
+        int currentChild = getCurrentFrame().getCurrentChild();
+        return currentChild < (getCurrentElement().getContentSize() - 1);
     }
 
     @Override
-    protected int moveToChild(int currentChild) {
+    protected int nextChild() {
+        int currentChild = getCurrentFrame().getCurrentChild();
+        currentChild++;
+        getCurrentFrame().setCurrentChild(currentChild);
         this.content = getCurrentElement().getContent(currentChild);
 
         if (content instanceof Text) {



Mime
View raw message