You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2013/04/02 15:01:36 UTC
[2/5] git commit: Use utilities from commons-codec
Use utilities from commons-codec
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/398f6bdb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/398f6bdb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/398f6bdb
Branch: refs/heads/master
Commit: 398f6bdb314d6bff59580bdad9a960bea1f24351
Parents: 557a745
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Apr 2 05:32:28 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Apr 2 06:01:18 2013 -0700
----------------------------------------------------------------------
.../assets/AssetChecksumGeneratorImpl.java | 40 +-------------
1 files changed, 3 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/398f6bdb/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java
index 5fcbaf0..3f3054a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java
@@ -15,9 +15,9 @@
package org.apache.tapestry5.internal.services.assets;
import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.tapestry5.ioc.Resource;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.services.assets.AssetChecksumGenerator;
import org.apache.tapestry5.services.assets.StreamableResource;
import org.apache.tapestry5.services.assets.StreamableResourceProcessing;
@@ -25,12 +25,10 @@ import org.apache.tapestry5.services.assets.StreamableResourceSource;
import java.io.IOException;
import java.io.InputStream;
-import java.security.MessageDigest;
import java.util.Map;
public class AssetChecksumGeneratorImpl implements AssetChecksumGenerator
{
- private final static int BUFFER_SIZE = 4096;
private final StreamableResourceSource streamableResourceSource;
@@ -71,41 +69,9 @@ public class AssetChecksumGeneratorImpl implements AssetChecksumGenerator
private String toChecksum(InputStream is) throws IOException
{
- try
- {
- MessageDigest digest = MessageDigest.getInstance("MD5");
-
- digestStream(digest, is);
-
- is.close();
-
- byte[] bytes = digest.digest();
- char[] encoded = Hex.encodeHex(bytes);
+ byte[] digest = DigestUtils.md5(is);
- return new String(encoded);
- } catch (Exception ex)
- {
- throw new RuntimeException(ex);
- } finally
- {
- InternalUtils.close(is);
- }
+ return Hex.encodeHexString(digest);
}
- private void digestStream(MessageDigest digest, InputStream stream) throws IOException
- {
- byte[] buffer = new byte[BUFFER_SIZE];
-
- while (true)
- {
- int length = stream.read(buffer);
-
- if (length < 0)
- {
- return;
- }
-
- digest.update(buffer, 0, length);
- }
- }
}