You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/03/19 15:19:47 UTC
groovy git commit: Trivial refactoring: use `StringBuilder` and
`HashMap` in `XmlSlurper`
Repository: groovy
Updated Branches:
refs/heads/master 8ff04301a -> 5d2737f7a
Trivial refactoring: use `StringBuilder` and `HashMap` in `XmlSlurper`
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5d2737f7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5d2737f7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5d2737f7
Branch: refs/heads/master
Commit: 5d2737f7af4a0cfc1d427b60b82716e6043ab83b
Parents: 8ff0430
Author: danielsun1106 <re...@hotmail.com>
Authored: Mon Mar 19 23:19:02 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Mon Mar 19 23:19:02 2018 +0800
----------------------------------------------------------------------
.../src/main/java/groovy/util/XmlSlurper.java | 5 ++--
.../src/main/java/groovy/xml/SAXBuilder.java | 26 ++++++++++----------
2 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5d2737f7/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
index 852bd3f..2d23537 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
@@ -47,7 +47,6 @@ import java.io.Reader;
import java.io.StringReader;
import java.net.URL;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Stack;
@@ -84,8 +83,8 @@ public class XmlSlurper extends DefaultHandler {
private final XMLReader reader;
private Node currentNode = null;
private final Stack<Node> stack = new Stack<Node>();
- private final StringBuffer charBuffer = new StringBuffer();
- private final Map<String, String> namespaceTagHints = new Hashtable<String, String>();
+ private final StringBuilder charBuffer = new StringBuilder();
+ private final Map<String, String> namespaceTagHints = new HashMap<String, String>();
private boolean keepIgnorableWhitespace = false;
private boolean namespaceAware = false;
http://git-wip-us.apache.org/repos/asf/groovy/blob/5d2737f7/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
index 270e603..037b8a0 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
@@ -76,10 +76,10 @@ public class SAXBuilder extends BuilderSupport {
Object key = entry.getKey();
Object value = entry.getValue();
- Tuple3<String, String, String> elementInfo = getElementInfo(key);
- String uri = elementInfo.getFirst();
- String localName = elementInfo.getSecond();
- String qualifiedName = elementInfo.getThird();
+ Tuple3<String, String, String> nameInfo = getNameInfo(key);
+ String uri = nameInfo.getFirst();
+ String localName = nameInfo.getSecond();
+ String qualifiedName = nameInfo.getThird();
String valueText = (value != null) ? value.toString() : "";
attributes.addAttribute(uri, localName, qualifiedName, "CDATA", valueText);
@@ -92,10 +92,10 @@ public class SAXBuilder extends BuilderSupport {
}
protected void doStartElement(Object name, Attributes attributes) {
- Tuple3<String, String, String> elementInfo = getElementInfo(name);
- String uri = elementInfo.getFirst();
- String localName = elementInfo.getSecond();
- String qualifiedName = elementInfo.getThird();
+ Tuple3<String, String, String> nameInfo = getNameInfo(name);
+ String uri = nameInfo.getFirst();
+ String localName = nameInfo.getSecond();
+ String qualifiedName = nameInfo.getThird();
try {
handler.startElement(uri, localName, qualifiedName, attributes);
@@ -106,10 +106,10 @@ public class SAXBuilder extends BuilderSupport {
}
protected void nodeCompleted(Object parent, Object name) {
- Tuple3<String, String, String> elementInfo = getElementInfo(name);
- String uri = elementInfo.getFirst();
- String localName = elementInfo.getSecond();
- String qualifiedName = elementInfo.getThird();
+ Tuple3<String, String, String> nameInfo = getNameInfo(name);
+ String uri = nameInfo.getFirst();
+ String localName = nameInfo.getSecond();
+ String qualifiedName = nameInfo.getThird();
try {
handler.endElement(uri, localName, qualifiedName);
@@ -131,7 +131,7 @@ public class SAXBuilder extends BuilderSupport {
}
- private Tuple3<String, String, String> getElementInfo(Object name) {
+ private Tuple3<String, String, String> getNameInfo(Object name) {
String uri;
String localName;
String qualifiedName;