X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2FDigestUtils.java;h=ce018007c6c637dce08d0c563e80d27a16c575cc;hb=72788789268d2ac01dcb817d134c057307ba6de8;hp=d2092aee02b030ab799e1915fa82db6fe4587f17;hpb=6aed5eeea13c97b4780dac0338e50857359526fc;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/util/DigestUtils.java b/org.argeo.util/src/org/argeo/util/DigestUtils.java
index d2092aee0..ce018007c 100644
--- a/org.argeo.util/src/org/argeo/util/DigestUtils.java
+++ b/org.argeo.util/src/org/argeo/util/DigestUtils.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.util;
 
 import java.io.File;
@@ -35,7 +20,7 @@ public class DigestUtils {
 	public final static String SHA512 = "SHA-512";
 
 	private static Boolean debug = false;
-	// TODO: make it writable
+	// TODO: make it configurable
 	private final static Integer byteBufferCapacity = 100 * 1024;// 100 KB
 
 	public static byte[] sha1(byte[] bytes) {
@@ -44,8 +29,8 @@ public class DigestUtils {
 			digest.update(bytes);
 			byte[] checksum = digest.digest();
 			return checksum;
-		} catch (Exception e) {
-			throw new UtilsException("Cannot SHA1 digest", e);
+		} catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException(e);
 		}
 	}
 
@@ -56,8 +41,8 @@ public class DigestUtils {
 			byte[] checksum = digest.digest();
 			String res = encodeHexString(checksum);
 			return res;
-		} catch (Exception e) {
-			throw new UtilsException("Cannot digest with algorithm " + algorithm, e);
+		} catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("Cannot digest with algorithm " + algorithm, e);
 		}
 	}
 
@@ -77,8 +62,10 @@ public class DigestUtils {
 			byte[] checksum = digest.digest();
 			String res = encodeHexString(checksum);
 			return res;
-		} catch (Exception e) {
-			throw new UtilsException("Cannot digest with algorithm " + algorithm, e);
+		} catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("Cannot digest with algorithm " + algorithm, e);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
 		} finally {
 			StreamUtils.closeQuietly(in);
 		}
@@ -96,7 +83,7 @@ public class DigestUtils {
 			ByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz);
 			return digest(algorithm, bb);
 		} catch (IOException e) {
-			throw new UtilsException("Cannot digest " + file + " with algorithm " + algorithm, e);
+			throw new IllegalArgumentException("Cannot digest " + file + " with algorithm " + algorithm, e);
 		} finally {
 			StreamUtils.closeQuietly(fis);
 			if (fc.isOpen())
@@ -120,7 +107,7 @@ public class DigestUtils {
 				System.out.println((end - begin) + " ms / " + ((end - begin) / 1000) + " s");
 			return res;
 		} catch (NoSuchAlgorithmException e) {
-			throw new UtilsException("Cannot digest with algorithm " + algorithm, e);
+			throw new IllegalArgumentException("Cannot digest with algorithm " + algorithm, e);
 		}
 	}
 
@@ -161,8 +148,10 @@ public class DigestUtils {
 			if (debug)
 				System.out.println((end - begin) + " ms / " + ((end - begin) / 1000) + " s");
 			return md.digest();
-		} catch (Exception e) {
-			throw new UtilsException("Cannot digest " + file + "  with algorithm " + algorithm, e);
+		} catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("Cannot digest " + file + "  with algorithm " + algorithm, e);
+		} catch (IOException e) {
+			throw new RuntimeException("Cannot digest " + file + "  with algorithm " + algorithm, e);
 		}
 	}