gh-47 fix web.xml parsing

Unknow0 · Jul 6, 2024 · d6d267d · d6d267d
1 parent b390c2f
commit d6d267d
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 76 deletions.
diff --git a/unknow-server-bench/src/main/java/unknow/server/bench/BenchJaxb.java b/unknow-server-bench/src/main/java/unknow/server/bench/BenchJaxb.java
@@ -1,26 +1,13 @@
 package unknow.server.bench;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.openjdk.jmh.annotations.Benchmark;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
@@ -79,29 +66,6 @@ public void moxy() throws JAXBException, IOException {
 		bench(MOXY);
 	}
 
-	@Benchmark
-	public void xmlBean() throws XmlException, IOException {
-		XmlObject o;
-		try (Reader r = new StringReader(XML)) {
-			o = XmlObject.Factory.parse(r);
-		}
-
-		o.save(DUMP);
-	}
-
-	private static final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-	private static final TransformerFactory tranformer = TransformerFactory.newInstance();
-
-	@Benchmark
-	public void document() throws SAXException, IOException, ParserConfigurationException, TransformerConfigurationException, TransformerException {
-		Document o;
-		try (InputStream r = new ByteArrayInputStream(XML.getBytes())) {
-			o = docFactory.newDocumentBuilder().parse(r);
-		}
-
-		tranformer.newTransformer().transform(new DOMSource(o), new StreamResult(DUMP));
-	}
-
 	private static final OutputStream DUMP = new OutputStream() {
 		@Override
 		public void write(int b) throws IOException { // OK

diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/WebXml.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/WebXml.java
@@ -22,6 +22,56 @@ private WebXml() {
 	}
 
 	public static void parse(ModelLoader loader, Descriptor descriptor, XMLStreamReader r) throws XMLStreamException {
+		while (r.hasNext()) {
+			int n = r.next();
+			if (n == XMLStreamConstants.END_ELEMENT)
+				return;
+			if (n != XMLStreamConstants.START_ELEMENT)
+				continue;
+
+			switch (r.getLocalName()) {
+				case "web-app":
+					parseWebApp(loader, descriptor, r);
+					break;
+				default:
+					skipTag(r);
+			}
+		}
+	}
+
+	private static void skipTag(XMLStreamReader r) throws XMLStreamException {
+		int d = 1;
+		while (r.hasNext()) {
+			int n = r.next();
+			if (n == XMLStreamConstants.END_ELEMENT && --d == 0)
+				break;
+			if (n == XMLStreamConstants.START_ELEMENT)
+				d++;
+		}
+	}
+
+	private static String parseContent(XMLStreamReader r) throws XMLStreamException {
+		StringBuilder sb = new StringBuilder();
+		char[] buf = new char[1024];
+		while (r.hasNext()) {
+			int n = r.next();
+			if (n == XMLStreamConstants.END_ELEMENT)
+				break;
+			if (n != XMLStreamConstants.CHARACTERS)
+				continue;
+
+			int len = r.getTextLength();
+			int off = 0;
+			while (off < len) {
+				int l = r.getTextCharacters(off, buf, 0, buf.length);
+				sb.append(buf, 0, l);
+				off += l;
+			}
+		}
+		return sb.toString();
+	}
+
+	private static void parseWebApp(ModelLoader loader, Descriptor descriptor, XMLStreamReader r) throws XMLStreamException {
 		while (r.hasNext()) {
 			int n = r.next();
 			if (n == XMLStreamConstants.END_ELEMENT)
@@ -70,38 +120,6 @@ public static void parse(ModelLoader loader, Descriptor descriptor, XMLStreamRea
 		}
 	}
 
-	private static void skipTag(XMLStreamReader r) throws XMLStreamException {
-		int d = 1;
-		while (r.hasNext()) {
-			int n = r.next();
-			if (n == XMLStreamConstants.END_ELEMENT && --d == 0)
-				break;
-			if (n == XMLStreamConstants.START_ELEMENT)
-				d++;
-		}
-	}
-
-	private static String parseContent(XMLStreamReader r) throws XMLStreamException {
-		StringBuilder sb = new StringBuilder();
-		char[] buf = new char[1024];
-		while (r.hasNext()) {
-			int n = r.next();
-			if (n == XMLStreamConstants.END_ELEMENT)
-				break;
-			if (n != XMLStreamConstants.CHARACTERS)
-				continue;
-
-			int len = r.getTextLength();
-			int off = 0;
-			while (off < len) {
-				int l = r.getTextCharacters(off, buf, 0, buf.length);
-				sb.append(buf, 0, l);
-				off += l;
-			}
-		}
-		return sb.toString();
-	}
-
 	private static void parseParam(WithParams descriptor, XMLStreamReader r) throws XMLStreamException {
 		String key = null;
 		String value = null;
@@ -204,6 +222,7 @@ private static void parseFilterMapping(Descriptor descriptor, XMLStreamReader r)
 				filter.pattern.addAll(urls);
 				filter.dispatcher.addAll(dispatchers);
 				filter.servletNames.addAll(servletNames);
+				return;
 			}
 			if (n != XMLStreamConstants.START_ELEMENT)
 				continue;

diff --git a/unknow-server-util/src/main/java/unknow/server/util/io/BuffersInputStream.java b/unknow-server-util/src/main/java/unknow/server/util/io/BuffersInputStream.java
@@ -61,10 +61,8 @@ public void close() throws IOException {
 
 	@Override
 	public int read() throws IOException {
-		if (close)
-			return -1;
 		try {
-			int b = buffers.read(wait);
+			int b = buffers.read(close ? false : wait);
 			if (b > 0) {
 				read++;
 				if (mark != null)
@@ -79,17 +77,13 @@ public int read() throws IOException {
 
 	@Override
 	public int read(byte[] b) throws IOException {
-		if (close)
-			return -1;
 		return read(b, 0, b.length);
 	}
 
 	@Override
 	public int read(byte[] b, int off, int len) throws IOException {
-		if (close)
-			return -1;
 		try {
-			len = buffers.read(b, off, len, wait);
+			len = buffers.read(b, off, len, close ? false : wait);
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			throw new IOException(e);