svn commit: r1386951 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java

[rbaxter85]

Author: rbaxter85
Date: Tue Sep 18 01:39:37 2012
New Revision: 1386951

URL: http://svn.apache.org/viewvc?rev=1386951&view=rev
Log:
Reverting SHINDIG-1867

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java?rev=1386951&r1=1386950&r2=1386951&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
 Tue Sep 18 01:39:37 2012
@@ -18,9 +18,6 @@
  */
 package org.apache.shindig.gadgets.uri;
 
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.util.HashUtil;
 import org.apache.shindig.gadgets.features.FeatureRegistry;
@@ -50,17 +47,11 @@ public class AllJsIframeVersioner implem
 
   @Inject
   public AllJsIframeVersioner(FeatureRegistry registry) {
-    Charset charset = Charset.defaultCharset();
-    MessageDigest digest = HashUtil.getMessageDigest();
-    digest.reset();
+    StringBuilder jsBuf = new StringBuilder();
     for (FeatureResource resource : registry.getAllFeatures().getResources()) {
-      // Emulate StringBuilder append of content
-      String content = resource.getContent();
-      digest.update((content == null ? "null" : content).getBytes(charset));
-      content = resource.getDebugContent();
-      digest.update((content == null ? "null" : content).getBytes(charset));
+      jsBuf.append(resource.getContent()).append(resource.getDebugContent());
     }
-    allJsChecksum = HashUtil.bytesToHex(digest.digest());
+    allJsChecksum = HashUtil.checksum(jsBuf.toString().getBytes());
   }
 
   public String version(Uri gadgetUri, String container) {

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java?rev=1386951&r1=1386950&r2=1386951&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/AllJsIframeVersionerTest.java
 Tue Sep 18 01:39:37 2012
@@ -35,8 +35,6 @@ import org.junit.Test;
 
 import com.google.common.collect.Lists;
 
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
 import java.util.List;
 
 public class AllJsIframeVersionerTest {
@@ -51,11 +49,7 @@ public class AllJsIframeVersionerTest {
   public void setUp() {
     String featureContent = "THE_FEATURE_CONTENT";
     String debugContent = "FEATURE_DEBUG_CONTENT";
-    Charset charset = Charset.defaultCharset();
-    MessageDigest digest = HashUtil.getMessageDigest();
-    digest.update(featureContent.getBytes(charset));
-    digest.update(debugContent.getBytes(charset));
-    featureChecksum = HashUtil.bytesToHex(digest.digest());
+    featureChecksum = HashUtil.checksum((featureContent + 
debugContent).getBytes());
     FeatureRegistry registry = createMock(FeatureRegistry.class);
     FeatureResource resource = new FeatureResource.Simple(featureContent, 
debugContent, "js");
     List<FeatureResource> allResources = Lists.newArrayList(resource);