Author: adietish Date: 2011-01-12 12:46:06 -0500 (Wed, 12 Jan 2011) New Revision: 28138 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java Log: added string-stripping (to remove \n,\t, " ", etc.) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:22:45 UTC (rev 28137) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:46:06 UTC (rev 28138) @@ -14,6 +14,8 @@ import java.io.IOException; import java.io.InputStream; import java.text.MessageFormat; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -33,6 +35,8 @@ */ public abstract class AbstractDOMUnmarshaller<DELTACLOUDOBJECT> { + private Pattern STRIP_REGEXP = Pattern.compile("[^\n \t]+"); + private Class<DELTACLOUDOBJECT> type; private String tagName; @@ -116,4 +120,15 @@ return null; } + protected String stripText(String textContent) { + if (textContent == null || textContent.length() == 0) { + return textContent; + } + Matcher matcher = STRIP_REGEXP.matcher(textContent); + if (!matcher.matches()) { + return null; + } + return matcher.group(); + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:22:45 UTC (rev 28137) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:46:06 UTC (rev 28138) @@ -55,7 +55,10 @@ for (int i = 0; i < addressList.getLength(); i++) { Node addressNode = addressList.item(i); if (addressNode != null) { - addresses.add(addressNode.getTextContent()); + String address = stripText(addressNode.getTextContent()); + if (address != null) { + addresses.add(address); + } } } return new AddressList(addresses); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 17:22:45 UTC (rev 28137) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 17:46:06 UTC (rev 28138) @@ -94,7 +94,7 @@ public static String toString(InputStream inputStream) throws IOException { StringBuilder builder = new StringBuilder(); for(int character = -1; (character = inputStream.read()) != -1; ) { - builder.append(character); + builder.append((char) character); } return builder.toString(); }