[jbossws-commits] JBossWS SVN: r11269 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-12-10 05:15:22 -0500 (Thu, 10 Dec 2009)
New Revision: 11269

Modified:
   stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
   stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
Log:
[JBPAPP-3241] Using new normalizer


Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java	2009-12-10 10:14:42 UTC (rev 11268)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java	2009-12-10 10:15:22 UTC (rev 11269)
@@ -32,6 +32,7 @@
 import org.jboss.util.NotImplementedException;
 import org.jboss.ws.Constants;
 import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.wsf.common.Normalizer;
 import org.jboss.xb.binding.NamespaceRegistry;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -137,7 +138,9 @@
       else
       {
          if (normalize)
-            valueStr = normalize(valueStr);
+         {
+            valueStr = Normalizer.normalize(valueStr);
+         }
          
          xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
       }
@@ -150,54 +153,4 @@
       throw new NotImplementedException();
    }
 
-   private String normalize(String valueStr)
-   {
-      // We assume most strings will not contain characters that need "escaping",
-      // and optimize for this case.
-      boolean found = false;
-      int i = 0;
-
-      outer: for (; i < valueStr.length(); i++)
-      {
-         switch (valueStr.charAt(i))
-         {
-            case '<':
-            case '>':
-            case '&':
-            case '"':
-               found = true;
-               break outer;
-         }
-      }
-
-      if (!found)
-         return valueStr;
-
-      // Resume where we left off
-      StringBuilder builder = new StringBuilder();
-      builder.append(valueStr.substring(0, i));
-      for (; i < valueStr.length(); i++)
-      {
-         char c = valueStr.charAt(i);
-         switch (c)
-         {
-            case '<':
-               builder.append("&lt;");
-               break;
-            case '>':
-               builder.append("&gt;");
-               break;
-            case '&':
-               builder.append("&amp;");
-               break;
-            case '"':
-               builder.append("&quot;");
-               break;
-            default:
-               builder.append(c);
-         }
-      }
-
-      return builder.toString();
-   }
 }

Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java	2009-12-10 10:14:42 UTC (rev 11268)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java	2009-12-10 10:15:22 UTC (rev 11269)
@@ -41,6 +41,7 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.common.Normalizer;
 import org.w3c.dom.Element;
 
 /**
@@ -166,7 +167,7 @@
    private void consumeCharacters() throws SOAPException
    {
 
-      String text = normalize(reader.getText());
+      String text = Normalizer.normalize(reader.getText());
 
       if (!atPartMargin() && !reader.isWhiteSpace())
       {
@@ -416,57 +417,6 @@
       return previousPart != currentPart;
    }
 
-   private static String normalize(String valueStr)
-   {
-      // We assume most strings will not contain characters that need "escaping",
-      // and optimize for this case.
-      boolean found = false;
-      int i = 0;
-
-      outer: for (; i < valueStr.length(); i++)
-      {
-         switch (valueStr.charAt(i))
-         {
-            case '<':
-            case '>':
-            case '&':
-            case '"':
-               found = true;
-               break outer;
-         }
-      }
-
-      if (!found)
-         return valueStr;
-
-      // Resume where we left off
-      StringBuilder builder = new StringBuilder();
-      builder.append(valueStr.substring(0, i));
-      for (; i < valueStr.length(); i++)
-      {
-         char c = valueStr.charAt(i);
-         switch (c)
-         {
-            case '<':
-               builder.append("&lt;");
-               break;
-            case '>':
-               builder.append("&gt;");
-               break;
-            case '&':
-               builder.append("&amp;");
-               break;
-            case '"':
-               builder.append("&quot;");
-               break;
-            default:
-               builder.append(c);
-         }
-      }
-
-      return builder.toString();
-   }
-
    public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
    {
       throw new NotImplementedException();