Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:20:16 -0400 (Wed, 16 Sep 2009) New Revision: 10707 Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java common/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java Log: [JBWS-2763] Using StringBuilder instead of StringBuffer, misc optimizations Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-09-16 17:19:08 UTC (rev 10706) +++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-09-16 17:20:16 UTC (rev 10707) @@ -228,7 +228,7 @@ public static Element createElement(String localPart) { Document doc = getOwnerDocument(); - log.trace("createElement {}" + localPart); + if (log.isTraceEnabled()) log.trace("createElement {}" + localPart); return doc.createElement(localPart); } @@ -237,7 +237,7 @@ public static Element createElement(String localPart, String prefix) { Document doc = getOwnerDocument(); - log.trace("createElement {}" + prefix + ":" + localPart); + if (log.isTraceEnabled()) log.trace("createElement {}" + prefix + ":" + localPart); return doc.createElement(prefix + ":" + localPart); } @@ -248,12 +248,12 @@ Document doc = getOwnerDocument(); if (prefix == null || prefix.length() == 0) { - log.trace("createElement {" + uri + "}" + localPart); + if (log.isTraceEnabled()) log.trace("createElement {" + uri + "}" + localPart); return doc.createElementNS(uri, localPart); } else { - log.trace("createElement {" + uri + "}" + prefix + ":" + localPart); + if (log.isTraceEnabled()) log.trace("createElement {" + uri + "}" + prefix + ":" + localPart); return doc.createElementNS(uri, prefix + ":" + localPart); } } @@ -421,7 +421,8 @@ { Map attmap = new HashMap(); NamedNodeMap attribs = el.getAttributes(); - for (int i = 0; i < attribs.getLength(); i++) + int len = attribs.getLength(); + for (int i = 0; i < len; i++) { Attr attr = (Attr)attribs.item(i); String name = attr.getName(); @@ -437,7 +438,8 @@ public static void copyAttributes(Element destElement, Element srcElement) { NamedNodeMap attribs = srcElement.getAttributes(); - for (int i = 0; i < attribs.getLength(); i++) + int len = attribs.getLength(); + for (int i = 0; i < len; i++) { Attr attr = (Attr)attribs.item(i); String uri = attr.getNamespaceURI(); @@ -448,7 +450,7 @@ // change an object in a way which is incorrect with regard to namespaces. if (uri == null && qname.startsWith("xmlns")) { - log.trace("Ignore attribute: [uri=" + uri + ",qname=" + qname + ",value=" + value + "]"); + if (log.isTraceEnabled()) log.trace("Ignore attribute: [uri=" + uri + ",qname=" + qname + ",value=" + value + "]"); } else { @@ -462,10 +464,11 @@ public static boolean hasTextChildNodesOnly(Node node) { NodeList nodeList = node.getChildNodes(); - if (nodeList.getLength() == 0) + int len = nodeList.getLength(); + if (len == 0) return false; - for (int i = 0; i < nodeList.getLength(); i++) + for (int i = 0; i < len; i++) { Node acksToChildNode = nodeList.item(i); if (acksToChildNode.getNodeType() != Node.TEXT_NODE) @@ -480,7 +483,8 @@ public static boolean hasChildElements(Node node) { NodeList nlist = node.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) + int len = nlist.getLength(); + for (int i = 0; i < len; i++) { Node child = nlist.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) @@ -495,7 +499,8 @@ { List<Element> list = new LinkedList<Element>(); NodeList nlist = node.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) + int len = nlist.getLength(); + for (int i = 0; i < len; i++) { Node child = nlist.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) @@ -509,9 +514,10 @@ public static String getTextContent(Node node) { boolean hasTextContent = false; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); NodeList nlist = node.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) + int len = nlist.getLength(); + for (int i = 0; i < len; i++) { Node child = nlist.item(i); if (child.getNodeType() == Node.TEXT_NODE) @@ -629,7 +635,8 @@ List<Element> list = new LinkedList<Element>(); NodeList nlist = node.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) + int len = nlist.getLength(); + for (int i = 0; i < len; i++) { Node child = nlist.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) @@ -665,7 +672,8 @@ if (recursive) { NodeList nlist = baseElement.getChildNodes(); - for (int i = 0; i < nlist.getLength(); i++) + int len = nlist.getLength(); + for (int i = 0; i < len; i++) { Node child = nlist.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2009-09-16 17:19:08 UTC (rev 10706) +++ common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2009-09-16 17:20:16 UTC (rev 10707) @@ -267,7 +267,8 @@ case Node.DOCUMENT_NODE: { NodeList children = node.getChildNodes(); - for (int iChild = 0; iChild < children.getLength(); iChild++) + int len = children.getLength(); + for (int iChild = 0; iChild < len; iChild++) { printInternal(children.item(iChild), false); } @@ -577,9 +578,9 @@ /** Normalizes the given string. */ public static String normalize(String s, boolean canonical) { - StringBuffer str = new StringBuffer(); + int len = (s != null) ? s.length() : 0; + StringBuilder str = new StringBuilder(); - int len = (s != null) ? s.length() : 0; for (int i = 0; i < len; i++) { char ch = s.charAt(i); Modified: common/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java 2009-09-16 17:19:08 UTC (rev 10706) +++ common/trunk/src/main/java/org/jboss/wsf/common/IOUtils.java 2009-09-16 17:20:16 UTC (rev 10707) @@ -128,7 +128,7 @@ { int capacity = 1024; char[] charBuffer = new char[capacity]; - StringBuffer strBuffer = new StringBuffer(capacity); + StringBuilder strBuffer = new StringBuilder(capacity); int len = reader.read(charBuffer, 0, capacity); while (len > 0)