[jspwiki] 04/21: no need of catching UnsupportedEncodingException

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit efd65125b91d19004baba78079ee81eb0f1405e5
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Sat Nov 3 17:05:53 2018 +0100

    no need of catching UnsupportedEncodingException
---
 .../org/apache/wiki/auth/user/AbstractUserDatabase.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
 
b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
index fbdf620..596eac5 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
@@ -18,7 +18,6 @@
  */
 package org.apache.wiki.auth.user;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -260,10 +259,6 @@ public abstract class AbstractUserDatabase implements 
UserDatabase
         {
             log.error( "Unsupported algorithm: " + e.getMessage() );
         }
-        catch( UnsupportedEncodingException e )
-        {
-            log.fatal( "You do not have UTF-8!?!" );
-        }
         catch( WikiSecurityException e )
         {
             log.error( "Could not upgrade SHA password to SSHA because profile 
could not be saved. Reason: " + e.getMessage(), e );
@@ -312,17 +307,13 @@ public abstract class AbstractUserDatabase implements 
UserDatabase
         String hash = null;
         try
         {
-            hash = CryptoUtil.getSaltedPassword( text.getBytes("UTF-8") );
+            hash = CryptoUtil.getSaltedPassword( 
text.getBytes(StandardCharsets.UTF_8) );
         }
         catch( NoSuchAlgorithmException e )
         {
             log.error( "Error creating salted SHA password hash:" + 
e.getMessage() );
             hash = text;
         }
-        catch( UnsupportedEncodingException e )
-        {
-            log.fatal("You do not have UTF-8!?!");
-        }
         return hash;
     }
 
@@ -339,7 +330,7 @@ public abstract class AbstractUserDatabase implements 
UserDatabase
         try
         {
             MessageDigest md = MessageDigest.getInstance( "SHA" );
-            md.update( text.getBytes("UTF-8") );
+            md.update( text.getBytes(StandardCharsets.UTF_8) );
             byte[] digestedBytes = md.digest();
             hash = ByteUtils.bytes2hex( digestedBytes );
         }
@@ -348,10 +339,6 @@ public abstract class AbstractUserDatabase implements 
UserDatabase
             log.error( "Error creating SHA password hash:" + e.getMessage() );
             hash = text;
         }
-        catch (UnsupportedEncodingException e)
-        {
-            log.fatal("UTF-8 not supported!?!");
-        }
         return hash;
     }