First commit

Author: bigcatzeng

src/test/java/com/trxs/pulse/ObjectStack.java renamed to src/main/java/com/trxs/commons/util/ObjectStack.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.util;
 
 public class ObjectStack<E>
 {
@@ -23,7 +23,7 @@ public int capacity()
         return elements == null ? 0 : elements.length;
     }
 
-    public boolean isEmpty()
+    public boolean isNotEmpty()
     {
         return index >= 0 ;
     }
@@ -35,7 +35,7 @@ public E push( E e)
             elements[++index] = e;
             return e;
         }
-        throw new RuntimeException("The stack is full!");
+        throw new RuntimeException("The stack was overflow!");
     }
 
     public E pop()

src/test/java/com/trxs/pulse/Analyser.java renamed to src/main/java/com/trxs/commons/xml/Analyser.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ public class Analyser
         maxIndex = defaultCapacity - 1;
     }
 
-    Analyser(BufferedReader bufferedReader, int capacity)
+    public Analyser(BufferedReader bufferedReader, int capacity)
     {
         index = 0;
         reader = bufferedReader;
@@ -144,7 +144,7 @@ public Element createElement(final Element parent)
                             if ( c == '/' )
                             {
                                 int lastChar = reader.read(); // 吃掉 '>'
-                                if ( lastChar == '>' ) return element;
+                                if ( lastChar == '>' ) return element.setNoBody(true);
                             }
                             else
                             {

src/test/java/com/trxs/pulse/Attribute.java renamed to src/main/java/com/trxs/commons/xml/Attribute.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 public class Attribute
 {

src/test/java/com/trxs/pulse/Element.java renamed to src/main/java/com/trxs/commons/xml/Element.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,12 +8,20 @@ public class Element extends Node
     private String name;
     private List<Attribute> attributes = new ArrayList<>();
     private List<Node> contents = new ArrayList<>();
+    private boolean isNoBody = false;
 
     public Element(char []chars, int length, Node parent)
     {
         super(NodeType.ELEMENT, parent);
-
-        name = chars[1] == '/' ? new String(chars,2, length-1) : new String(chars,1, length-1);
+        if ( chars[0] == 'x' && chars[1] == 'm' && chars[2] == 'l')
+        {
+            name = new String(chars,0, length);
+        }
+        else
+        {
+            name = chars[0] == '/' ? new String(chars,1, length-1) : new String(chars,0, length);
+            setHeader(chars[0] != '/');
+        }
     }
 
     public String getName()
@@ -40,4 +48,15 @@ public void addContent(Node content)
     {
         contents.add(content);
     }
+
+    public boolean isNoBody()
+    {
+        return isNoBody;
+    }
+
+    public Element setNoBody(boolean noBody)
+    {
+        isNoBody = noBody;
+        return this;
+    }
 }

src/test/java/com/trxs/pulse/Node.java renamed to src/main/java/com/trxs/commons/xml/Node.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 public class Node
 {

src/test/java/com/trxs/pulse/NodeType.java renamed to src/main/java/com/trxs/commons/xml/NodeType.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 public enum NodeType
 {

src/test/java/com/trxs/pulse/TagAnalyser.java renamed to src/main/java/com/trxs/commons/xml/TagAnalyser.java

@@ -1,4 +1,4 @@
-package com.trxs.pulse;
+package com.trxs.commons.xml;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

src/test/java/com/trxs/pulse/XMLDemo1.java

@@ -53,6 +53,7 @@ public static void main(String []args) throws Throwable
              */
             //1
             //org.dom4j.xxxx
+
             SAXReader reader = new SAXReader();
 
             //2
@@ -73,7 +74,10 @@ public static void main(String []args) throws Throwable
              * Document对象中。
              * Document对象可以描述当前xml文档
              */
+            long t0 = System.nanoTime();
             Document doc = reader.read(inputStream);
+            long t1 = System.nanoTime();
+
 
             //3
             Element root = doc.getRootElement();
@@ -111,6 +115,7 @@ public static void main(String []args) throws Throwable
 
             elements.forEach( element -> scanElement(element) );
 
+            logger.debug("dt={}", (t1-t0)/1000);
         }
         catch(Exception e)
         {

src/test/java/com/trxs/pulse/XmlTests.java

@@ -1,6 +1,8 @@
 package com.trxs.pulse;
 
 import com.trxs.commons.io.FileTools;
+import com.trxs.commons.util.ObjectStack;
+import com.trxs.commons.xml.*;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,20 +48,14 @@ public void test() throws IOException {
     public void test1()
     {
         FileTools fileTools = FileTools.getInstance();
-
-        IntegerStack sStack = new IntegerStack(1024);
-        ObjectStack<Element> eStack = new ObjectStack<>(1024);
+        ObjectStack<Element> stack = new ObjectStack<>(128);
 
         BufferedReader bufferedReader = getBufferedReaderBySource("/sql/pulse.xml");
 
-        sStack.push(Integer.valueOf(0));
-
         Analyser analyser = new Analyser(bufferedReader, 1024);
 
         Element version = analyser.getVersion(null);
 
-        ObjectStack<Element> stack = new ObjectStack<>(128);
-
         long t0 = System.nanoTime();
         TagAnalyser tempTag;
         TagAnalyser tag = new TagAnalyser();
@@ -69,34 +65,54 @@ public void test1()
         do
         {
             tempTag = analyser.advance(tag);
-            if ( tempTag == null ) break;
+            if ( tempTag == null )
+            {
+                parent = stack.pop();
+                continue;
+            }
 
             if ( tag.getType() == NodeType.ELEMENT )
             {
                 element = tag.createElement(parent);
+                if ( parent == null && element.isHeader() )
+                {
+                    parent = element;
+                    stack.push(parent);
+                    continue;
+                }
+                else if ( parent == null )
+                {
+                    throw new RuntimeException("Xml格式不对, 没有根节点!!!");
+                }
+
                 if ( element.isHeader() )
                 {
+                    parent.addContent(element);
                     stack.push(element);
                     parent = element;
                 }
+                else if ( element.isNoBody() ) // 没有内容节点 <include refid="sql_questionnaireTemplate_item"/>
+                {
+                    parent.addContent(element);
+                }
+                else if ( stack.isNotEmpty() )
+                {
+                    stack.pop(); parent = stack.peek();
+                }
                 else
                 {
-                    Element e = stack.pop();
-
-                    parent = e;
+                    throw new RuntimeException("Xml格式不对!!!");
                 }
             }
             else
             {
                 XmlText xmlText = new XmlText(tag.getContent(), parent);
-                parent.addContent(xmlText);
+                if ( parent != null ) parent.addContent(xmlText);
             }
         }while (tempTag != null);
         long t1 = System.nanoTime();
 
         logger.debug("dt={}", (t1-t0)/1000);
         return;
     }
-
-
 }

src/test/java/com/trxs/pulse/XmlText.java

@@ -1,6 +1,7 @@
 package com.trxs.pulse;
 
-import org.junit.Test;
+import com.trxs.commons.xml.Node;
+import com.trxs.commons.xml.NodeType;
 
 public class XmlText extends Node
 {