You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/08/16 10:02:13 UTC

svn commit: r985821 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/render/ main/java/org/apache/shindig/gadgets/rewrite/ test/java/org/apache/shindig/gadgets/features/ test/java/org/apache/shindig/gadgets/parse/ test/java/or...

Author: lindner
Date: Mon Aug 16 08:02:13 2010
New Revision: 985821

URL: http://svn.apache.org/viewvc?rev=985821&view=rev
Log:
best-practice: use replace() instead of replaceAll()

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Mon Aug 16 08:02:13 2010
@@ -230,7 +230,7 @@ public class RenderingGadgetRewriter imp
     if (!externForcedLibs.isEmpty()) {
       String jsUrl = jsUriManager.makeExternJsUri(gadget, externForcedLibs).toString();
       Element libsTag = headTag.getOwnerDocument().createElement("script");
-      libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
+      libsTag.setAttribute("src", jsUrl.replace("&", "&"));
       headTag.insertBefore(libsTag, firstHeadChild);
     }
 
@@ -272,7 +272,7 @@ public class RenderingGadgetRewriter imp
       if (!externGadgetLibs.isEmpty()) {
         String jsUrl = jsUriManager.makeExternJsUri(gadget, externGadgetLibs).toString();
         Element libsTag = headTag.getOwnerDocument().createElement("script");
-        libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
+        libsTag.setAttribute("src", jsUrl.replace("&", "&"));
         headTag.insertBefore(libsTag, firstHeadChild);
       }
     } else {
@@ -317,7 +317,7 @@ public class RenderingGadgetRewriter imp
           inlineJs.setLength(0);
         }
         Element referenceTag = headTag.getOwnerDocument().createElement("script");
-        referenceTag.setAttribute("src", StringUtils.replace(theContent, "&", "&"));
+        referenceTag.setAttribute("src", theContent.replace("&", "&"));
         headTag.insertBefore(referenceTag, firstHeadChild);
       } else {
         inlineJs.append(theContent).append(";\n");

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java Mon Aug 16 08:02:13 2010
@@ -144,7 +144,7 @@ public class ConcatVisitor implements Do
       // with new (concat) URI, immediately ahead of the first elem.
       Element firstElem = sourceBatch.get(0);
       Element elemConcat = (Element)firstElem.cloneNode(true);
-      elemConcat.setAttribute(type.getSrcAttrib(), StringUtils.replace(concatUri.getUri().toString(), "&", "&"));
+      elemConcat.setAttribute(type.getSrcAttrib(), concatUri.getUri().toString().replace("&", "&"));
       firstElem.getParentNode().insertBefore(elemConcat, firstElem);
       
       // Now for all Elements, either A) remove them or B) replace each

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java Mon Aug 16 08:02:13 2010
@@ -724,11 +724,11 @@ public class FeatureRegistryTest {
     for (Map.Entry<String, String> entry : resourceAttribs.entrySet()) {
       sbRes.append(entry.getKey()).append("=\"").append(entry.getValue()).append("\" ");
     }
-    return tpl.replaceAll("%type%", type)
-        .replaceAll("%uri%", uri != null ? "src=\"" + uri + '\"' : "")
-        .replaceAll("%content%", content != null ? content : "")
-        .replaceAll("%type_attribs%", sb.toString())
-        .replaceAll("%res_attribs%", sbRes.toString());
+    return tpl.replace("%type%", type)
+        .replace("%uri%", uri != null ? "src=\"" + uri + '\"' : "")
+        .replace("%content%", content != null ? content : "")
+        .replace("%type_attribs%", sb.toString())
+        .replace("%res_attribs%", sbRes.toString());
   }
   
   private static Uri makeFile(String content) throws Exception {

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java Mon Aug 16 08:02:13 2010
@@ -52,7 +52,7 @@ public abstract class AbstractParsingTes
   protected void parseAndCompareBalanced(String content, String expected, GadgetHtmlParser parser)
       throws Exception {
     Document document = parser.parseDom(content);
-    expected = StringUtils.replace(expected, EOL, "\n");
+    expected = expected.replace(EOL, "\n");
     String serialized = HtmlSerialization.serialize(document);
     assertHtmlEquals(expected, serialized);
   }

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Mon Aug 16 08:02:13 2010
@@ -27,7 +27,6 @@ import com.google.common.collect.Immutab
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.uri.UriBuilder;
 import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
@@ -236,7 +235,7 @@ public class ConcatVisitorTest extends D
     // Should be left with a single JS node child to parent.
     assertEquals(1, parent.getChildNodes().getLength());
     Element concatNode = (Element)parent.getChildNodes().item(0);
-    Uri concatUri = Uri.parse(StringUtils.replace(concatNode.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri = Uri.parse(concatNode.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -260,7 +259,7 @@ public class ConcatVisitorTest extends D
     // Should be left with a single JS node child to parent.
     assertEquals(1, parent.getChildNodes().getLength());
     Element concatNode = (Element)parent.getChildNodes().item(0);
-    Uri concatUri = Uri.parse(StringUtils.replace(concatNode.getAttribute("href"), "&amp;", "&"));
+    Uri concatUri = Uri.parse(concatNode.getAttribute("href").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -287,7 +286,7 @@ public class ConcatVisitorTest extends D
     // Should have been independently concatenated.
     assertEquals(1, parent1.getChildNodes().getLength());
     Element cn1 = (Element)parent1.getChildNodes().item(0);
-    Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri1 = Uri.parse(cn1.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -297,7 +296,7 @@ public class ConcatVisitorTest extends D
     
     assertEquals(1, parent2.getChildNodes().getLength());
     Element cn2 = (Element)parent2.getChildNodes().item(0);
-    Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri2 = Uri.parse(cn2.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -324,7 +323,7 @@ public class ConcatVisitorTest extends D
     // Should have been independently concatenated.
     assertEquals(1, parent1.getChildNodes().getLength());
     Element cn1 = (Element)parent1.getChildNodes().item(0);
-    Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("href"), "&amp;", "&"));
+    Uri concatUri1 = Uri.parse(cn1.getAttribute("href").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -334,7 +333,7 @@ public class ConcatVisitorTest extends D
     
     assertEquals(3, parent2.getChildNodes().getLength());
     Element cn2 = (Element)parent2.getChildNodes().item(0);
-    Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("href"), "&amp;", "&"));
+    Uri concatUri2 = Uri.parse(cn2.getAttribute("href").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -345,7 +344,7 @@ public class ConcatVisitorTest extends D
     assertEquals("", cn2.getAttribute("media"));
     
     Element cn3 = (Element)parent2.getChildNodes().item(1);
-    Uri concatUri3 = Uri.parse(StringUtils.replace(cn3.getAttribute("href"), "&amp;", "&"));
+    Uri concatUri3 = Uri.parse(cn3.getAttribute("href").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri3.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri3.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri3.getPath());
@@ -355,7 +354,7 @@ public class ConcatVisitorTest extends D
     assertEquals("print", cn3.getAttribute("media"));
   
     Element cn4 = (Element)parent2.getChildNodes().item(2);
-    Uri concatUri4 = Uri.parse(StringUtils.replace(cn4.getAttribute("href"), "&amp;", "&"));
+    Uri concatUri4 = Uri.parse(cn4.getAttribute("href").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri4.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri4.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri4.getPath());
@@ -387,7 +386,7 @@ public class ConcatVisitorTest extends D
     // Should have been independently concatenated. Batches #1 and #2 are OK. Middle skipped.
     assertEquals(1, parent1.getChildNodes().getLength());
     Element cn1 = (Element)parent1.getChildNodes().item(0);
-    Uri concatUri1 = Uri.parse(StringUtils.replace(cn1.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri1 = Uri.parse(cn1.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -400,7 +399,7 @@ public class ConcatVisitorTest extends D
     
     assertEquals(1, parent2.getChildNodes().getLength());
     Element cn2 = (Element)parent2.getChildNodes().item(0);
-    Uri concatUri2 = Uri.parse(StringUtils.replace(cn2.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri2 = Uri.parse(cn2.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -423,7 +422,7 @@ public class ConcatVisitorTest extends D
     assertEquals(3, parent.getChildNodes().getLength());
     Element jsConcat = (Element)parent.getChildNodes().item(0);
     assertEquals("script", jsConcat.getTagName());
-    Uri concatUri = Uri.parse(StringUtils.replace(jsConcat.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -465,7 +464,7 @@ public class ConcatVisitorTest extends D
     assertEquals(7, parent.getChildNodes().getLength());
     Element jsConcat = (Element)parent.getChildNodes().item(1);
     assertEquals("script", jsConcat.getTagName());
-    Uri concatUri = Uri.parse(StringUtils.replace(jsConcat.getAttribute("src"), "&amp;", "&"));
+    Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replace("&amp;", "&"));
     assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
     assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
     assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java Mon Aug 16 08:02:13 2010
@@ -101,7 +101,7 @@ public class CssResponseRewriterTest ext
         getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
     String expected = IOUtils.toString(this.getClass().getClassLoader().
         getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
-    expected = expected.replaceAll("refresh=3600", "refresh=86400");
+    expected = expected.replace("refresh=3600", "refresh=86400");
     HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
     request.setMethod("GET");
     request.setGadget(SPEC_URL);
@@ -120,7 +120,7 @@ public class CssResponseRewriterTest ext
         getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
     String expected = IOUtils.toString(this.getClass().getClassLoader().
         getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
-    expected = expected.replaceAll("fp=1150739864", "fp=1150739864&nocache=1");
+    expected = expected.replace("fp=1150739864", "fp=1150739864&nocache=1");
     HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
     request.setMethod("GET");
     request.setGadget(SPEC_URL);

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java?rev=985821&r1=985820&r2=985821&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java Mon Aug 16 08:02:13 2010
@@ -106,6 +106,6 @@ public class UserPrefTest extends Assert
         + "<EnumValue value=\"0\" display_value=\"__MSG_dv__\"/>"
         + "</UserPref>";
     UserPref userPref = new UserPref(XmlUtil.parse(xml));
-    assertEquals(xml, userPref.toString().replaceAll("\n", ""));
+    assertEquals(xml, userPref.toString().replace("\n", ""));
   }
 }