fix hash filters

edadma · Apr 28, 2018 · 211d166 · 211d166
1 parent 7dbc4d1
commit 211d166
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/scala/ExtraStringFilters.scala b/src/main/scala/ExtraStringFilters.scala
@@ -9,6 +9,8 @@ object ExtraStringFilters {
   val nonWordRegex = """[^\w]+"""r
   val camelRegex = """-\w"""r
 
+  def hash( s: String, dig: MessageDigest ) = dig.digest(io.Codec.toUTF8(s)) map (b => "%02x".format(b&0xFF)) mkString
+
   val map =
     List(
 
@@ -53,7 +55,7 @@ object ExtraStringFilters {
         override def parameters = List( List(StringType) )
 
         override val invoke = {
-          case List( s: String ) => io.Codec.fromUTF8( md5.digest(io.Codec.toUTF8(s)) )
+          case List( s: String ) => hash( s, md5 ) toUpperCase
         }
       },
 
@@ -63,7 +65,7 @@ object ExtraStringFilters {
         override def parameters = List( List(StringType) )
 
         override val invoke = {
-          case List( s: String ) => io.Codec.fromUTF8( sha1.digest(io.Codec.toUTF8(s)) )
+          case List( s: String ) => hash( s, sha1 )
         }
       },
 
@@ -73,7 +75,7 @@ object ExtraStringFilters {
         override def parameters = List( List(StringType) )
 
         override val invoke = {
-          case List( s: String ) => io.Codec.fromUTF8( sha256.digest(io.Codec.toUTF8(s)) )
+          case List( s: String ) => hash( s, sha256 )
         }
       }