added hex and base64 representation for hash result

Author: codejanovic

src/main/java/com/github/zrdj/java/primitives/bytes/Bytes.java

@@ -6,16 +6,45 @@
 import com.github.zrdj.java.primitives.hashing.HashingAlgorithm;
 
 import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 
 
 public interface Bytes {
     Bytes empty = new Bytes.Of();
 
+    final class Of extends AbstractBytes {
+
+        public Of(final String value, Charset charset) {
+            this(value.getBytes(charset));
+        }
+
+        public Of(final String value) {
+            this(value.getBytes());
+        }
+
+        public Of(final byte[] value) {
+            super(value);
+        }
+
+        public Of() {
+            super(new byte[0]);
+        }
+    }
+
     static Bytes of(final byte[] value) {
         return new Bytes.Of(value);
     }
+
+    static Bytes empty() {
+        return empty;
+    }
+
+    static Bytes of(String value, Charset charset) {
+        return new Bytes.Of(value, charset);
+    }
+
+
     byte[] bytes();
 
     default long length() {
@@ -42,8 +71,8 @@ default Bytes decode(final Codec codec) {
         return Bytes.of(codec.decode(this.bytes()));
     }
 
-    default Bytes hash(final HashingAlgorithm algorithm) {
-        return Bytes.of(algorithm.hash(this.bytes()));
+    static Bytes of(String value) {
+        return new Bytes.Of(value);
     }
 
     default Bytes encryptAES(final Bytes key, final Bytes salt) {
@@ -96,19 +125,8 @@ public int hashCode() {
         }
     }
 
-    final class Of extends AbstractBytes {
-
-        public Of(final String value) {
-            this(value.getBytes(StandardCharsets.UTF_8));
-        }
-
-        public Of(final byte[] value) {
-            super(value);
-        }
-
-        public Of() {
-            super(new byte[0]);
-        }
+    default Bytes hash(final HashingAlgorithm algorithm) {
+        return Bytes.of(algorithm.hash(this.bytes()).value());
     }
 
 }

src/main/java/com/github/zrdj/java/primitives/codec/Codec.java

@@ -3,5 +3,6 @@
 public interface Codec {
     byte[] encode(byte[] value);
 
+    String encodeToString(byte[] value);
     byte[] decode(byte[] value);
 }

src/main/java/com/github/zrdj/java/primitives/codec/Codecs.java

@@ -20,6 +20,11 @@ public byte[] encode(final byte[] value) {
         return _codec.encode(value);
     }
 
+    @Override
+    public String encodeToString(final byte[] value) {
+        return _codec.encodeToString(value);
+    }
+
     @Override
     public byte[] decode(final byte[] value) {
         return _codec.decode(value);

src/main/java/com/github/zrdj/java/primitives/codec/base64/Base64BaseCodec.java

@@ -13,6 +13,11 @@ abstract class Base64BaseCodec implements Codec {
         _encoder = encoder;
     }
 
+    @Override
+    public String encodeToString(final byte[] value) {
+        return _encoder.encodeToString(value);
+    }
+
     @Override
     public final byte[] encode(final byte[] value) {
         return _encoder.encode(value);

src/main/java/com/github/zrdj/java/primitives/codec/hex/HexCodec.java

@@ -26,6 +26,12 @@ public byte[] encode(final byte[] value) {
         return result;
     }
 
+    @Override
+    public String encodeToString(final byte[] value) {
+        final StringBuilder builder = internalEncode(value);
+        return builder.toString();
+    }
+
     @Override
     public byte[] decode(final byte[] value) {
         if (value.length % 2 != 0) {

src/main/java/com/github/zrdj/java/primitives/hashing/Hash.java

@@ -1,51 +1,41 @@
 package com.github.zrdj.java.primitives.hashing;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public enum Hash implements HashingAlgorithm {
-    SHA("SHA"),
-    SHA_224("SHA-224"),
-    SHA_256("SHA-256"),
-    SHA_384("SHA-384"),
-    SHA_512("SHA-512"),
-    SHA_512_224("SHA-512/224"),
-    SHA_512_256("SHA-512/256"),
-    SHA3_224("SHA3-224"),
-    SHA3_256("SHA3-256"),
-    SHA3_384("SHA3-384"),
-    SHA3_512("SHA3-512"),
-    MD2("MD2"),
-    MD5("MD5"),
-    ;
-    private final String _algorithm;
-    private MessageDigest _digest = null;
-    private NoSuchAlgorithmException _error = null;
-
-    Hash(final String algorithm) {
-        _algorithm = algorithm;
-        try {
-            _digest = MessageDigest.getInstance(algorithm);
-        } catch (NoSuchAlgorithmException e) {
-            _error = e;
+import com.github.zrdj.java.primitives.codec.Codecs;
+
+public interface Hash {
+    final class Of implements Hash {
+        private final byte[] _value;
+        private final HashAlgorithms _algorithm;
+
+        public Of(final byte[] value, final HashAlgorithms algorithm) {
+            _value = value;
+            _algorithm = algorithm;
+        }
+
+        public byte[] value() {
+            return _value;
+        }
+
+        @Override
+        public HashingAlgorithm algorithm() {
+            return _algorithm;
         }
     }
 
-    @Override
-    public String algorithm() {
-        return _algorithm;
+    byte[] value();
+
+    HashingAlgorithm algorithm();
+
+    default String toHex() {
+        return Codecs.Hex.encodeToString(value());
     }
 
-    @Override
-    public boolean isAvailable() {
-        return _error == null;
+    default String toBase64() {
+        return Codecs.Base64.encodeToString(value());
     }
 
-    @Override
-    public byte[] hash(final byte[] input) {
-        if (!isAvailable()) {
-            throw new NoSuchHashAlgorithmException(_algorithm, _error);
-        }
-        return _digest.digest(input);
+    default String toBase64Url() {
+        return Codecs.Base64Url.encodeToString(value());
     }
+
 }

src/main/java/com/github/zrdj/java/primitives/hashing/HashAlgorithms.java

@@ -0,0 +1,51 @@
+package com.github.zrdj.java.primitives.hashing;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public enum HashAlgorithms implements HashingAlgorithm {
+    SHA("SHA"),
+    SHA_224("SHA-224"),
+    SHA_256("SHA-256"),
+    SHA_384("SHA-384"),
+    SHA_512("SHA-512"),
+    SHA_512_224("SHA-512/224"),
+    SHA_512_256("SHA-512/256"),
+    SHA3_224("SHA3-224"),
+    SHA3_256("SHA3-256"),
+    SHA3_384("SHA3-384"),
+    SHA3_512("SHA3-512"),
+    MD2("MD2"),
+    MD5("MD5"),
+    ;
+    private final String _algorithm;
+    private MessageDigest _digest = null;
+    private NoSuchAlgorithmException _error = null;
+
+    HashAlgorithms(final String algorithm) {
+        _algorithm = algorithm;
+        try {
+            _digest = MessageDigest.getInstance(algorithm);
+        } catch (NoSuchAlgorithmException e) {
+            _error = e;
+        }
+    }
+
+    @Override
+    public String algorithm() {
+        return _algorithm;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return _error == null;
+    }
+
+    @Override
+    public Hash hash(final byte[] input) {
+        if (!isAvailable()) {
+            throw new NoSuchHashAlgorithmException(_algorithm, _error);
+        }
+        return new Hash.Of(_digest.digest(input), this);
+    }
+}

src/main/java/com/github/zrdj/java/primitives/hashing/HashingAlgorithm.java

@@ -5,5 +5,5 @@ public interface HashingAlgorithm {
 
     boolean isAvailable();
 
-    byte[] hash(byte[] input);
+    Hash hash(byte[] input);
 }