瀏覽代碼

checkstyle final catch parameters

Jason Rivard 5 年之前
父節點
當前提交
7c9b5ff0dd
共有 100 個文件被更改,包括 344 次插入337 次删除
  1. 6 2
      build/checkstyle.xml
  2. 3 3
      data-service/src/main/java/password/pwm/receiver/FtpDataIngestor.java
  3. 2 2
      data-service/src/main/java/password/pwm/receiver/PwmReceiverApp.java
  4. 1 1
      data-service/src/main/java/password/pwm/receiver/Storage.java
  5. 2 2
      data-service/src/main/java/password/pwm/receiver/TelemetryRestReceiver.java
  6. 5 5
      onejar/src/main/java/password/pwm/onejar/ArgumentParser.java
  7. 3 3
      onejar/src/main/java/password/pwm/onejar/OnejarMain.java
  8. 3 3
      onejar/src/main/java/password/pwm/onejar/TomcatOnejarRunner.java
  9. 6 6
      pwm-cr/src/main/java/password/pwm/cr/ChaiXmlResponseSetSerializer.java
  10. 1 0
      pwm-cr/src/main/java/password/pwm/cr/CrUtils.java
  11. 2 2
      pwm-cr/src/main/java/password/pwm/cr/hash/HashFactory.java
  12. 1 1
      pwm-cr/src/main/java/password/pwm/cr/hash/PBKDF2HashMachine.java
  13. 3 2
      pwm-cr/src/main/java/password/pwm/cr/hash/TypicalHashMachine.java
  14. 1 0
      pwm-cr/src/test/java/password/pwm/cr/ChaiXmlResponseSet1Test.java
  15. 1 1
      pwm-cr/src/test/java/password/pwm/cr/ChaiXmlResponseSetReaderTest.java
  16. 1 1
      rest-test-service/src/main/java/password/pwm/resttest/RestTestUtilities.java
  17. 2 2
      server/src/main/java/password/pwm/PwmAboutProperty.java
  18. 20 20
      server/src/main/java/password/pwm/PwmApplication.java
  19. 2 2
      server/src/main/java/password/pwm/PwmApplicationMode.java
  20. 2 2
      server/src/main/java/password/pwm/PwmConstants.java
  21. 6 6
      server/src/main/java/password/pwm/PwmEnvironment.java
  22. 3 3
      server/src/main/java/password/pwm/bean/UserIdentity.java
  23. 8 8
      server/src/main/java/password/pwm/config/Configuration.java
  24. 1 1
      server/src/main/java/password/pwm/config/PwmSettingXml.java
  25. 1 1
      server/src/main/java/password/pwm/config/function/AbstractUriCertImportFunction.java
  26. 1 1
      server/src/main/java/password/pwm/config/function/ActionCertImportFunction.java
  27. 1 1
      server/src/main/java/password/pwm/config/function/OAuthCertImportFunction.java
  28. 1 1
      server/src/main/java/password/pwm/config/function/RemoteWebServiceCertImportFunction.java
  29. 1 1
      server/src/main/java/password/pwm/config/function/SMSGatewayCertImportFunction.java
  30. 2 2
      server/src/main/java/password/pwm/config/function/SyslogCertImportFunction.java
  31. 2 2
      server/src/main/java/password/pwm/config/function/UserMatchViewerFunction.java
  32. 3 3
      server/src/main/java/password/pwm/config/profile/ChallengeProfile.java
  33. 1 1
      server/src/main/java/password/pwm/config/profile/LdapProfile.java
  34. 1 1
      server/src/main/java/password/pwm/config/profile/NewUserProfile.java
  35. 1 1
      server/src/main/java/password/pwm/config/profile/PwmPasswordPolicy.java
  36. 2 2
      server/src/main/java/password/pwm/config/profile/PwmPasswordRule.java
  37. 6 6
      server/src/main/java/password/pwm/config/stored/ConfigurationReader.java
  38. 1 1
      server/src/main/java/password/pwm/config/stored/StoredConfigurationUtil.java
  39. 2 2
      server/src/main/java/password/pwm/config/value/ValueFactory.java
  40. 4 4
      server/src/main/java/password/pwm/config/value/data/FormConfiguration.java
  41. 2 2
      server/src/main/java/password/pwm/config/value/data/ShortcutItem.java
  42. 2 2
      server/src/main/java/password/pwm/health/ApplianceStatusChecker.java
  43. 3 3
      server/src/main/java/password/pwm/health/CertificateChecker.java
  44. 5 5
      server/src/main/java/password/pwm/health/ConfigurationChecker.java
  45. 1 1
      server/src/main/java/password/pwm/health/DatabaseStatusChecker.java
  46. 4 4
      server/src/main/java/password/pwm/health/HealthMonitor.java
  47. 24 24
      server/src/main/java/password/pwm/health/LDAPHealthChecker.java
  48. 10 10
      server/src/main/java/password/pwm/http/ContextManager.java
  49. 7 7
      server/src/main/java/password/pwm/http/HttpEventManager.java
  50. 1 1
      server/src/main/java/password/pwm/http/IdleTimeoutCalculator.java
  51. 3 3
      server/src/main/java/password/pwm/http/JspUtility.java
  52. 3 3
      server/src/main/java/password/pwm/http/PwmHttpRequestWrapper.java
  53. 1 1
      server/src/main/java/password/pwm/http/PwmHttpResponseWrapper.java
  54. 2 2
      server/src/main/java/password/pwm/http/PwmRequest.java
  55. 3 3
      server/src/main/java/password/pwm/http/PwmResponse.java
  56. 3 3
      server/src/main/java/password/pwm/http/PwmSession.java
  57. 1 1
      server/src/main/java/password/pwm/http/PwmURL.java
  58. 3 3
      server/src/main/java/password/pwm/http/SessionManager.java
  59. 1 1
      server/src/main/java/password/pwm/http/auth/BasicFilterAuthenticationProvider.java
  60. 12 12
      server/src/main/java/password/pwm/http/auth/CASFilterAuthenticationProvider.java
  61. 3 3
      server/src/main/java/password/pwm/http/auth/HttpAuthenticationUtilities.java
  62. 1 1
      server/src/main/java/password/pwm/http/auth/SSOHeaderFilterAuthenticationProvider.java
  63. 2 2
      server/src/main/java/password/pwm/http/bean/SetupOtpBean.java
  64. 4 4
      server/src/main/java/password/pwm/http/filter/AbstractPwmFilter.java
  65. 2 2
      server/src/main/java/password/pwm/http/filter/ApplicationModeFilter.java
  66. 2 2
      server/src/main/java/password/pwm/http/filter/AuthenticationFilter.java
  67. 2 2
      server/src/main/java/password/pwm/http/filter/AuthorizationFilter.java
  68. 2 2
      server/src/main/java/password/pwm/http/filter/ConfigAccessFilter.java
  69. 2 2
      server/src/main/java/password/pwm/http/filter/CookieManagementFilter.java
  70. 2 2
      server/src/main/java/password/pwm/http/filter/GZIPFilter.java
  71. 9 9
      server/src/main/java/password/pwm/http/filter/RequestInitializationFilter.java
  72. 7 7
      server/src/main/java/password/pwm/http/filter/SessionFilter.java
  73. 9 9
      server/src/main/java/password/pwm/http/servlet/AbstractPwmServlet.java
  74. 4 4
      server/src/main/java/password/pwm/http/servlet/ClientApiServlet.java
  75. 4 4
      server/src/main/java/password/pwm/http/servlet/ControlledPwmServlet.java
  76. 2 2
      server/src/main/java/password/pwm/http/servlet/DeleteAccountServlet.java
  77. 2 2
      server/src/main/java/password/pwm/http/servlet/ForgottenUsernameServlet.java
  78. 9 9
      server/src/main/java/password/pwm/http/servlet/GuestRegistrationServlet.java
  79. 2 2
      server/src/main/java/password/pwm/http/servlet/LoginServlet.java
  80. 1 1
      server/src/main/java/password/pwm/http/servlet/LogoutServlet.java
  81. 1 1
      server/src/main/java/password/pwm/http/servlet/PwmServletDefinition.java
  82. 7 7
      server/src/main/java/password/pwm/http/servlet/SetupOtpServlet.java
  83. 6 6
      server/src/main/java/password/pwm/http/servlet/SetupResponsesServlet.java
  84. 1 1
      server/src/main/java/password/pwm/http/servlet/ShortcutServlet.java
  85. 1 1
      server/src/main/java/password/pwm/http/servlet/accountinfo/AccountInformationBean.java
  86. 1 1
      server/src/main/java/password/pwm/http/servlet/accountinfo/AccountInformationServlet.java
  87. 3 3
      server/src/main/java/password/pwm/http/servlet/activation/ActivateUserServlet.java
  88. 4 4
      server/src/main/java/password/pwm/http/servlet/activation/ActivateUserUtils.java
  89. 7 7
      server/src/main/java/password/pwm/http/servlet/admin/AdminServlet.java
  90. 2 2
      server/src/main/java/password/pwm/http/servlet/admin/AppDashboardData.java
  91. 2 2
      server/src/main/java/password/pwm/http/servlet/admin/UserDebugDataReader.java
  92. 4 4
      server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServlet.java
  93. 1 1
      server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServletUtil.java
  94. 1 1
      server/src/main/java/password/pwm/http/servlet/command/CommandServlet.java
  95. 4 4
      server/src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServlet.java
  96. 3 3
      server/src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServletUtils.java
  97. 1 1
      server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideForm.java
  98. 13 13
      server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideServlet.java
  99. 2 2
      server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideUtils.java
  100. 3 3
      server/src/main/java/password/pwm/http/servlet/configguide/GuideStep.java

+ 6 - 2
build/checkstyle.xml

@@ -269,12 +269,16 @@
         <module name="FallThrough"/>
         <module name="EqualsHashCode"/>
         <module name="ArrayTrailingCommaCheck"/>
-        <module name="FinalLocalVariable"/>
+        <module name="FinalLocalVariable">
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+        </module>
         <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
         <module name="MultipleVariableDeclarations"/>
         <module name="OneStatementPerLine"/>
-        <module name="FinalParameters"/>
+        <module name="FinalParameters">
+            <property name="tokens" value="METHOD_DEF,CTOR_DEF,LITERAL_CATCH"/>
+        </module>
         <module name="ParameterAssignment"/>
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>

+ 3 - 3
data-service/src/main/java/password/pwm/receiver/FtpDataIngestor.java

@@ -74,7 +74,7 @@ class FtpDataIngestor
                     {
                         readFile( ftpClient, fileName, storage );
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         app.getStatus().setLastFtpIngest( Instant.now() );
                         final String msg = "error while reading ftp file '" + fileName + "': " + e.getMessage();
@@ -93,7 +93,7 @@ class FtpDataIngestor
             app.getStatus().setLastFtpIngest( Instant.now() );
             app.getStatus().setLastFtpFilesRead( files.size() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             app.getStatus().setLastFtpIngest( Instant.now() );
             app.getStatus().setLastFtpStatus( "error during ftp scan: " + e.getMessage() );
@@ -130,7 +130,7 @@ class FtpDataIngestor
                 storage.store( bean );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String msg = "error reading ftp file '" + fileName + "', error: " + e.getMessage();
             LOGGER.info( msg );

+ 2 - 2
data-service/src/main/java/password/pwm/receiver/PwmReceiverApp.java

@@ -53,7 +53,7 @@ public class PwmReceiverApp
         {
             settings = Settings.readFromFile( propsFile );
         }
-        catch ( IOException e )
+        catch ( final IOException e )
         {
             final String errorMsg = "can't read configuration: " + JavaHelper.readHostileExceptionMessage( e );
             status.setErrorState( errorMsg );
@@ -65,7 +65,7 @@ public class PwmReceiverApp
         {
             storage = new Storage( settings );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "can't start storage system: " + JavaHelper.readHostileExceptionMessage( e );
             status.setErrorState( errorMsg );

+ 1 - 1
data-service/src/main/java/password/pwm/receiver/Storage.java

@@ -173,7 +173,7 @@ public class Storage
                 }
                 nextValue = string;
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 e.printStackTrace();
                 throw e;

+ 2 - 2
data-service/src/main/java/password/pwm/receiver/TelemetryRestReceiver.java

@@ -58,11 +58,11 @@ public class TelemetryRestReceiver extends HttpServlet
             stoage.store( telemetryPublishBean );
             resp.getWriter().print( RestResultBean.forSuccessMessage( null, null, null, Message.Success_Unknown ).toJson() );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             resp.getWriter().print( RestResultBean.fromError( e.getErrorInformation() ).toJson() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final RestResultBean restResultBean = RestResultBean.fromError( new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() ) );
             resp.getWriter().print( restResultBean.toJson() );

+ 5 - 5
onejar/src/main/java/password/pwm/onejar/ArgumentParser.java

@@ -58,7 +58,7 @@ public class ArgumentParser
             {
                 commandLine = new DefaultParser().parse( Argument.asOptions(), args );
             }
-            catch ( ParseException e )
+            catch ( final ParseException e )
             {
                 throw new ArgumentParserException( "unable to parse command line: " + e.getMessage() );
             }
@@ -100,7 +100,7 @@ public class ArgumentParser
                 {
                     onejarConfig = makeTomcatConfig( argumentMap );
                 }
-                catch ( IOException e )
+                catch ( final IOException e )
                 {
                     throw new ArgumentParserException( "error while reading input: " + e.getMessage() );
                 }
@@ -118,7 +118,7 @@ public class ArgumentParser
         {
             props.load( is );
         }
-        catch ( IOException e )
+        catch ( final IOException e )
         {
             throw new ArgumentParserException( "unable to read properties input file: " + e.getMessage() );
         }
@@ -204,7 +204,7 @@ public class ArgumentParser
                     port = Integer.parseInt( argumentMap.get( Argument.port ) );
                     onejarConfig.port( port );
                 }
-                catch ( NumberFormatException e )
+                catch ( final NumberFormatException e )
                 {
                     final String msg = Argument.port.name() + " argument must be numeric";
                     System.out.println( msg );
@@ -228,7 +228,7 @@ public class ArgumentParser
                 final ServerSocket socket = new ServerSocket( port, 100, InetAddress.getByName( localAddress ) );
                 socket.close();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 throw new ArgumentParserException( "port or address conflict: " + e.getMessage() );
             }

+ 3 - 3
onejar/src/main/java/password/pwm/onejar/OnejarMain.java

@@ -52,7 +52,7 @@ public class OnejarMain
         {
             onejarConfig = argumentParser.parseArguments( args );
         }
-        catch ( ArgumentParserException | OnejarException e )
+        catch ( final ArgumentParserException | OnejarException e )
         {
             output( "error parsing command line: " + e.getMessage() );
         }
@@ -91,7 +91,7 @@ public class OnejarMain
 
             mainMethod.invoke( null, ( Object ) arguments );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             e.printStackTrace( );
         }
@@ -111,7 +111,7 @@ public class OnejarMain
                 runner.startTomcat( onejarConfig );
 
             }
-            catch ( OnejarException | ServletException | IOException e )
+            catch ( final OnejarException | ServletException | IOException e )
             {
                 out( "error starting tomcat: " + e.getMessage() );
             }

+ 3 - 3
onejar/src/main/java/password/pwm/onejar/TomcatOnejarRunner.java

@@ -70,7 +70,7 @@ public class TomcatOnejarRunner
             tlsProperties = this.executeOnejarHelper( onejarConfig );
             out( "keystore generated" );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new OnejarException( "error generating keystore: " + e.getMessage() );
         }
@@ -113,7 +113,7 @@ public class TomcatOnejarRunner
             tomcat.start();
             out( "tomcat started in " + Duration.between( Instant.now(), startTime ).toString() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new OnejarException( "unable to start tomcat: " + e.getMessage() );
         }
@@ -199,7 +199,7 @@ public class TomcatOnejarRunner
             return attr.getValue( "Implementation-Version-Display" )
                     + "  [" + ServerInfo.getServerInfo() + "]";
         }
-        catch ( IOException e )
+        catch ( final IOException e )
         {
             throw new OnejarException( "error reading internal version info: " + e.getMessage() );
         }

+ 6 - 6
pwm-cr/src/main/java/password/pwm/cr/ChaiXmlResponseSetSerializer.java

@@ -142,7 +142,7 @@ public class ChaiXmlResponseSetSerializer
                     {
                         timestamp = CrUtils.parseDateString( timeStr );
                     }
-                    catch ( ParseException e )
+                    catch ( final ParseException e )
                     {
                         throw new IllegalArgumentException( "unexpected error attempting to parse timestamp: " + e.getMessage() );
                     }
@@ -173,14 +173,14 @@ public class ChaiXmlResponseSetSerializer
                                 break;
 
                             default:
-                                throw new IllegalStateException( "unknown response type '" + type + "'" );
+                                throw new IllegalStateException( "unknown response type '" + type + '\'' );
 
                         }
                     }
                 }
             }
         }
-        catch ( JDOMException | IOException | NullPointerException e )
+        catch ( final JDOMException | IOException | NullPointerException e )
         {
             throw new IllegalArgumentException( "error parsing stored response record: " + e.getMessage() );
         }
@@ -228,7 +228,7 @@ public class ChaiXmlResponseSetSerializer
                 return XML_NODE_HELPDESK_RESPONSE;
 
             default:
-                throw new IllegalArgumentException( "unknown type '" + type + "'" );
+                throw new IllegalArgumentException( "unknown type '" + type + '\'' );
         }
     }
 
@@ -279,7 +279,7 @@ public class ChaiXmlResponseSetSerializer
         {
             saltCount = Integer.parseInt( hashCount );
         }
-        catch ( NumberFormatException e )
+        catch ( final NumberFormatException e )
         {
             /* noop */
         }
@@ -306,7 +306,7 @@ public class ChaiXmlResponseSetSerializer
             final byte[] hashedBytes = md.digest( questionText.getBytes( StandardCharsets.UTF_8 ) );
             return net.iharder.Base64.encodeBytes( hashedBytes, Base64.URL_SAFE );
         }
-        catch ( NoSuchAlgorithmException | IOException e )
+        catch ( final NoSuchAlgorithmException | IOException e )
         {
             throw new IllegalStateException( "unable to load SHA1 message digest algorithm: " + e.getMessage() );
         }

+ 1 - 0
pwm-cr/src/main/java/password/pwm/cr/CrUtils.java

@@ -26,6 +26,7 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.TimeZone;
 
+@SuppressWarnings( "checkstyle:MultipleStringLiterals" )
 public class CrUtils
 {
     static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";

+ 2 - 2
pwm-cr/src/main/java/password/pwm/cr/hash/HashFactory.java

@@ -54,7 +54,7 @@ public class HashFactory
         {
             alg = ResponseHashAlgorithm.valueOf( algName );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             throw new IllegalArgumentException( "unknown format type '" + algName + "'" );
         }
@@ -64,7 +64,7 @@ public class HashFactory
         {
             responseHashMachine = ( ResponseHashMachineSpi ) algClass.newInstance();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new IllegalStateException( "unexpected error instantiating response hash machine spi class: " + e.getMessage() );
         }

+ 1 - 1
pwm-cr/src/main/java/password/pwm/cr/hash/PBKDF2HashMachine.java

@@ -115,7 +115,7 @@ class PBKDF2HashMachine extends AbstractHashMachine implements ResponseHashMachi
             final byte[] hash = skf.generateSecret( spec ).getEncoded();
             return Base64.encodeBytes( hash );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new IllegalStateException( "unable to perform PBKDF2 hashing operation: " + e.getMessage() );
         }

+ 3 - 2
pwm-cr/src/main/java/password/pwm/cr/hash/TypicalHashMachine.java

@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+@SuppressWarnings( "checkstyle:MultipleStringLiterals" )
 public class TypicalHashMachine extends AbstractHashMachine implements ResponseHashMachineSpi
 {
 
@@ -106,7 +107,7 @@ public class TypicalHashMachine extends AbstractHashMachine implements ResponseH
         {
             md = MessageDigest.getInstance( algorithm );
         }
-        catch ( NoSuchAlgorithmException e )
+        catch ( final NoSuchAlgorithmException e )
         {
             throw new IllegalStateException( "unable to load " + algorithm + " message digest algorithm: " + e.getMessage() );
         }
@@ -117,7 +118,7 @@ public class TypicalHashMachine extends AbstractHashMachine implements ResponseH
         {
             hashedBytes = input.getBytes( "UTF-8" );
         }
-        catch ( UnsupportedEncodingException e )
+        catch ( final UnsupportedEncodingException e )
         {
             throw new IllegalStateException( "unsupported UTF8 byte encoding: " + e.getMessage() );
         }

+ 1 - 0
pwm-cr/src/test/java/password/pwm/cr/ChaiXmlResponseSet1Test.java

@@ -33,6 +33,7 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
 
+@SuppressWarnings( "checkstyle:MultipleStringLiterals" )
 public class ChaiXmlResponseSet1Test
 {
 

+ 1 - 1
pwm-cr/src/test/java/password/pwm/cr/ChaiXmlResponseSetReaderTest.java

@@ -25,7 +25,7 @@ import password.pwm.cr.api.ChallengeItemPolicy;
 import password.pwm.cr.api.QuestionSource;
 import password.pwm.cr.api.ResponseLevel;
 
-
+@SuppressWarnings( "checkstyle:MultipleStringLiterals" )
 public class ChaiXmlResponseSetReaderTest
 {
 

+ 1 - 1
rest-test-service/src/main/java/password/pwm/resttest/RestTestUtilities.java

@@ -44,7 +44,7 @@ public class RestTestUtilities
         {
             IOUtils.copy( readerStream, stringWriter );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "error reading request body stream: " + e.getMessage();
             throw new IOException( errorMsg );

+ 2 - 2
server/src/main/java/password/pwm/PwmAboutProperty.java

@@ -140,7 +140,7 @@ public enum PwmAboutProperty
                     final String value = valueProvider.value( pwmApplication );
                     aboutMap.put( pwmAboutProperty.name(), value == null ? "" : value );
                 }
-                catch ( Throwable t )
+                catch ( final Throwable t )
                 {
                     aboutMap.put( pwmAboutProperty.name(), LocaleHelper.getLocalizedMessage( null, Display.Value_NotApplicable, null ) );
                     LOGGER.trace( () -> "error generating about value for '" + pwmAboutProperty.name() + "', error: " + t.getMessage() );
@@ -199,7 +199,7 @@ public enum PwmAboutProperty
         {
             return String.join( " ", SSLContext.getDefault().getSupportedSSLParameters().getProtocols() );
         }
-        catch ( NoSuchAlgorithmException e )
+        catch ( final NoSuchAlgorithmException e )
         {
             return "";
         }

+ 20 - 20
server/src/main/java/password/pwm/PwmApplication.java

@@ -179,7 +179,7 @@ public class PwmApplication
         {
             initialize();
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.fatal( e.getMessage() );
             throw e;
@@ -244,7 +244,7 @@ public class PwmApplication
             {
                 FileSystemUtility.deleteDirectoryContents( tempFileDirectory );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 throw new PwmUnrecoverableException( new ErrorInformation( PwmError.ERROR_STARTUP_ERROR,
                         "unable to clear temp file directory '" + tempFileDirectory.getAbsolutePath() + "', error: " + e.getMessage()
@@ -311,7 +311,7 @@ public class PwmApplication
         {
             outputConfigurationToLog( this );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.error( "error outputting log to debug: " + e.getMessage() );
         }
@@ -344,7 +344,7 @@ public class PwmApplication
             );
             getAuditManager().submit( auditRecord );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.warn( "unable to submit start alert event " + e.getMessage() );
         }
@@ -354,7 +354,7 @@ public class PwmApplication
             final Map<PwmAboutProperty, String> infoMap = PwmAboutProperty.makeInfoBean( this );
             LOGGER.trace( () ->  "application info: " + JsonUtil.serializeMap( infoMap ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error generating about application bean: " + e.getMessage(), e );
         }
@@ -363,7 +363,7 @@ public class PwmApplication
         {
             this.getIntruderManager().clear( RecordType.USERNAME, PwmConstants.CONFIGMANAGER_INTRUDER_USERNAME );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.warn( "error while clearing configmanager-intruder-username from intruder table: " + e.getMessage() );
         }
@@ -374,7 +374,7 @@ public class PwmApplication
             {
                 outputKeystore( this );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.debug( () -> "error while generating keystore output: " + e.getMessage() );
             }
@@ -383,7 +383,7 @@ public class PwmApplication
             {
                 outputTomcatConf( this );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.debug( () -> "error while generating tomcat conf output: " + e.getMessage() );
             }
@@ -395,7 +395,7 @@ public class PwmApplication
         {
             UserAgentUtils.initializeCache();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.debug( () -> "error initializing UserAgentUtils: " + e.getMessage() );
         }
@@ -543,7 +543,7 @@ public class PwmApplication
             final ChaiProvider proxiedProvider = getProxyChaiProvider( userIdentity.getLdapProfileID() );
             return proxiedProvider.getEntryFactory().newChaiUser( userIdentity.getUserDN() );
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             throw PwmUnrecoverableException.fromChaiException( e );
         }
@@ -698,7 +698,7 @@ public class PwmApplication
                     return Instant.ofEpochMilli( Long.parseLong( storedDateStr ) );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "error retrieving installation date from localDB: " + e.getMessage() );
             }
@@ -799,7 +799,7 @@ public class PwmApplication
         {
             smsQueue.addSmsToQueue( smsItemBean );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "unable to add sms to queue: " + e.getMessage() );
         }
@@ -823,7 +823,7 @@ public class PwmApplication
                     getAuditManager().submit( auditRecord );
                 }
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 LOGGER.warn( "unable to submit shutdown alert event " + e.getMessage() );
             }
@@ -839,7 +839,7 @@ public class PwmApplication
             {
                 localDBLogger.close();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "error closing localDBLogger: " + e.getMessage(), e );
             }
@@ -853,7 +853,7 @@ public class PwmApplication
                 LOGGER.trace( () -> "beginning close of LocalDB" );
                 localDB.close();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.fatal( "error closing localDB: " + e, e );
             }
@@ -892,7 +892,7 @@ public class PwmApplication
                 final String localDBLocationSetting = pwmApplication.getConfig().readAppProperty( AppProperty.LOCALDB_LOCATION );
                 databaseDirectory = FileSystemUtility.figureFilepath( localDBLocationSetting, pwmApplication.pwmEnvironment.getApplicationPath() );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 pwmApplication.lastLocalDBFailure = new ErrorInformation( PwmError.ERROR_LOCALDB_UNAVAILABLE, "error locating configured LocalDB directory: " + e.getMessage() );
                 LOGGER.warn( pwmApplication.lastLocalDBFailure.toDebugStr() );
@@ -907,7 +907,7 @@ public class PwmApplication
                 final boolean readOnly = pwmApplication.getApplicationMode() == PwmApplicationMode.READ_ONLY;
                 return LocalDBFactory.getInstance( databaseDirectory, readOnly, pwmApplication, pwmApplication.getConfig() );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 pwmApplication.lastLocalDBFailure = new ErrorInformation( PwmError.ERROR_LOCALDB_UNAVAILABLE, "unable to initialize LocalDB: " + e.getMessage() );
                 LOGGER.warn( pwmApplication.lastLocalDBFailure.toDebugStr() );
@@ -944,7 +944,7 @@ public class PwmApplication
             final String strValue = localDB.get( LocalDB.DB.PWM_META, appAttribute.getKey() );
             return JsonUtil.deserialize( strValue, returnClass );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error retrieving key '" + appAttribute.getKey() + "' value from localDB: " + e.getMessage() );
         }
@@ -976,14 +976,14 @@ public class PwmApplication
                 localDB.put( LocalDB.DB.PWM_META, appAttribute.getKey(), jsonValue );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error retrieving key '" + appAttribute.getKey() + "' installation date from localDB: " + e.getMessage() );
             try
             {
                 localDB.remove( LocalDB.DB.PWM_META, appAttribute.getKey() );
             }
-            catch ( Exception e2 )
+            catch ( final Exception e2 )
             {
                 LOGGER.error( "error removing bogus appAttribute value for key " + appAttribute.getKey() + ", error: " + localDB );
             }

+ 2 - 2
server/src/main/java/password/pwm/PwmApplicationMode.java

@@ -39,7 +39,7 @@ public enum PwmApplicationMode
         {
             contextManager = ContextManager.getContextManager( httpServletRequest.getServletContext() );
         }
-        catch ( Throwable t )
+        catch ( final Throwable t )
         {
             return ERROR;
         }
@@ -49,7 +49,7 @@ public enum PwmApplicationMode
         {
             pwmApplication = contextManager.getPwmApplication();
         }
-        catch ( Throwable t )
+        catch ( final Throwable t )
         {
             return ERROR;
         }

+ 2 - 2
server/src/main/java/password/pwm/PwmConstants.java

@@ -269,14 +269,14 @@ public abstract class PwmConstants
                             }
                         }
                     }
-                    catch ( Throwable t )
+                    catch ( final Throwable t )
                     {
                         System.out.println( t );
                     }
                 }
             }
         }
-        catch ( Throwable t )
+        catch ( final Throwable t )
         {
             System.out.println( t );
         }

+ 6 - 6
server/src/main/java/password/pwm/PwmEnvironment.java

@@ -373,7 +373,7 @@ public class PwmEnvironment
                 }
                 return Collections.unmodifiableList( returnFlags );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 //
             }
@@ -406,7 +406,7 @@ public class PwmEnvironment
             {
                 propValues.load( fileInputStream );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.warn( "error reading properties file '" + input + "' specified by environment setting "
                         + EnvironmentParameter.applicationParamFile.toString() + ", error: " + e.getMessage() );
@@ -430,7 +430,7 @@ public class PwmEnvironment
                 }
                 return Collections.unmodifiableMap( returnParams );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.warn( "unable to parse jason value of " + EnvironmentParameter.applicationParamFile.toString() + ", error: " + e.getMessage() );
             }
@@ -626,7 +626,7 @@ public class PwmEnvironment
                         LOGGER.debug( () -> "unable to obtain file lock on file " + lockfile.getAbsolutePath() );
                     }
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( "unable to obtain file lock on file " + lockfile.getAbsolutePath() + " due to error: " + e.getMessage() );
                 }
@@ -646,7 +646,7 @@ public class PwmEnvironment
                 props.store( stringWriter, comment );
                 file.write( stringWriter.getBuffer().toString().getBytes( PwmConstants.DEFAULT_CHARSET ) );
             }
-            catch ( IOException e )
+            catch ( final IOException e )
             {
                 LOGGER.error( "unable to write contents of application lock file: " + e.getMessage() );
             }
@@ -661,7 +661,7 @@ public class PwmEnvironment
                 {
                     lock.release();
                 }
-                catch ( IOException e )
+                catch ( final IOException e )
                 {
                     LOGGER.error( "error releasing file lock: " + e.getMessage() );
                 }

+ 3 - 3
server/src/main/java/password/pwm/bean/UserIdentity.java

@@ -112,7 +112,7 @@ public class UserIdentity implements Serializable, Comparable
             cacheService.put( cacheKey, CachePolicy.makePolicyWithExpiration( TimeDuration.DAY ), localValue );
             return localValue;
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new PwmUnrecoverableException( new ErrorInformation( PwmError.ERROR_INTERNAL, "unexpected error making obfuscated user key: " + e.getMessage() ) );
         }
@@ -146,7 +146,7 @@ public class UserIdentity implements Serializable, Comparable
             final String jsonValue = pwmApplication.getSecureService().decryptStringValue( input );
             return JsonUtil.deserialize( jsonValue, UserIdentity.class );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new PwmUnrecoverableException( new ErrorInformation( PwmError.ERROR_INTERNAL, "unexpected error reversing obfuscated user key: " + e.getMessage() ) );
         }
@@ -260,7 +260,7 @@ public class UserIdentity implements Serializable, Comparable
         {
             userDN = chaiUser.readCanonicalDN();
         }
-        catch ( ChaiException e )
+        catch ( final ChaiException e )
         {
             throw PwmUnrecoverableException.fromChaiException( e );
         }

+ 8 - 8
server/src/main/java/password/pwm/config/Configuration.java

@@ -444,14 +444,14 @@ public class Configuration implements SettingReader
                 {
                     return ( E ) enumClass.getMethod( "valueOf", String.class ).invoke( null, strValue );
                 }
-                catch ( InvocationTargetException e1 )
+                catch ( final InvocationTargetException e1 )
                 {
                     if ( e1.getCause() instanceof IllegalArgumentException )
                     {
                         LOGGER.error( "illegal setting value for option '" + strValue + "' for setting key '" + setting.getKey() + "' is not recognized, will use default" );
                     }
                 }
-                catch ( Exception e1 )
+                catch ( final Exception e1 )
                 {
                     LOGGER.error( "unexpected error", e1 );
                 }
@@ -475,14 +475,14 @@ public class Configuration implements SettingReader
                 {
                     returnSet.add( ( E ) enumClass.getMethod( "valueOf", String.class ).invoke( null, strValue ) );
                 }
-                catch ( InvocationTargetException e1 )
+                catch ( final InvocationTargetException e1 )
                 {
                     if ( e1.getCause() instanceof IllegalArgumentException )
                     {
                         LOGGER.error( "illegal setting value for option '" + strValue + "' is not recognized, will use default" );
                     }
                 }
-                catch ( Exception e1 )
+                catch ( final Exception e1 )
                 {
                     LOGGER.error( "unexpected error", e1 );
                 }
@@ -752,7 +752,7 @@ public class Configuration implements SettingReader
                 {
                     dataCache.pwmSecurityKey = new PwmSecurityKey( configValue.getStringValue() );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     final String errorMsg = "unexpected error generating Security Key crypto: " + e.getMessage();
                     final ErrorInformation errorInfo = new ErrorInformation( PwmError.ERROR_INVALID_SECURITY_KEY, errorMsg );
@@ -786,7 +786,7 @@ public class Configuration implements SettingReader
             {
                 storageMethods.add( DataStorageMethod.valueOf( rawValue ) );
             }
-            catch ( IllegalArgumentException e )
+            catch ( final IllegalArgumentException e )
             {
                 LOGGER.error( "unknown STORAGE_METHOD found: " + rawValue );
             }
@@ -875,7 +875,7 @@ public class Configuration implements SettingReader
         {
             return TokenStorageMethod.valueOf( readSettingAsString( PwmSetting.TOKEN_STORAGEMETHOD ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "unknown storage method specified: " + readSettingAsString( PwmSetting.TOKEN_STORAGEMETHOD );
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INVALID_CONFIG, errorMsg );
@@ -1092,7 +1092,7 @@ public class Configuration implements SettingReader
         {
             profileFactory = profileFactoryClass.getDeclaredConstructor().newInstance();
         }
-        catch ( InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
+        catch ( final InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
         {
             throw new IllegalStateException( "unable to create profile instance for " + profileDefinition );
         }

+ 1 - 1
server/src/main/java/password/pwm/config/PwmSettingXml.java

@@ -81,7 +81,7 @@ public class PwmSettingXml
             LOGGER.trace( () -> "parsed PwmSettingXml in " + parseDuration.asCompactString() + ", loads=" + LOAD_COUNTER.getAndIncrement() );
             return newDoc;
         }
-        catch ( IOException | PwmUnrecoverableException e )
+        catch ( final IOException | PwmUnrecoverableException e )
         {
             throw new IllegalStateException( "error parsing " + SETTING_XML_FILENAME + ": " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/config/function/AbstractUriCertImportFunction.java

@@ -68,7 +68,7 @@ abstract class AbstractUriCertImportFunction implements SettingUIFunction
                 certs = X509Utils.readRemoteCertificates( URI.create( urlString ), configuration );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             if ( e instanceof PwmException )
             {

+ 1 - 1
server/src/main/java/password/pwm/config/function/ActionCertImportFunction.java

@@ -73,7 +73,7 @@ public class ActionCertImportFunction extends AbstractUriCertImportFunction
         {
             URI.create( uriString );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation(
                     PwmError.CONFIG_FORMAT_ERROR, "Setting "

+ 1 - 1
server/src/main/java/password/pwm/config/function/OAuthCertImportFunction.java

@@ -70,7 +70,7 @@ public class OAuthCertImportFunction extends AbstractUriCertImportFunction
         {
             URI.create( uriString );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, "Setting " + menuDebugLocation + " has an invalid URL syntax" );
             throw new PwmOperationalException( errorInformation );

+ 1 - 1
server/src/main/java/password/pwm/config/function/RemoteWebServiceCertImportFunction.java

@@ -57,7 +57,7 @@ public class RemoteWebServiceCertImportFunction extends AbstractUriCertImportFun
         {
             URI.create( uriString );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR,
                     "Setting " + pwmSetting.toMenuLocationDebug( profile, null ) + " action " + serviceName + " has an invalid URL syntax" );

+ 1 - 1
server/src/main/java/password/pwm/config/function/SMSGatewayCertImportFunction.java

@@ -51,7 +51,7 @@ public class SMSGatewayCertImportFunction extends AbstractUriCertImportFunction
         {
             URI.create( uriString );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, "Setting " + menuDebugLocation + " has an invalid URL syntax" );
             throw new PwmOperationalException( errorInformation );

+ 2 - 2
server/src/main/java/password/pwm/config/function/SyslogCertImportFunction.java

@@ -65,7 +65,7 @@ public class SyslogCertImportFunction implements SettingUIFunction
         final List<String> syslogConfigStrs = ( List<String> ) modifier.newStoredConfiguration().readSetting( PwmSetting.AUDIT_SYSLOG_SERVERS, null ).toNativeObject();
         if ( syslogConfigStrs != null && !syslogConfigStrs.isEmpty() )
         {
-            for ( String entry : syslogConfigStrs )
+            for ( final String entry : syslogConfigStrs )
             {
                 if ( entry.toUpperCase().startsWith( "TLS" ) )
                 {
@@ -85,7 +85,7 @@ public class SyslogCertImportFunction implements SettingUIFunction
                                 error = false;
                             }
                         }
-                        catch ( Exception e )
+                        catch ( final Exception e )
                         {
                             error = true;
                             exeception = e;

+ 2 - 2
server/src/main/java/password/pwm/config/function/UserMatchViewerFunction.java

@@ -142,7 +142,7 @@ public class UserMatchViewerFunction implements SettingUIFunction
                 final ChaiProvider proxiedProvider = pwmApplication.getProxyChaiProvider( loopID );
                 chaiEntry = proxiedProvider.getEntryFactory().newChaiEntry( baseDN );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "error while testing entry DN for profile '" + profileID + "', error:" + profileID );
             }
@@ -154,7 +154,7 @@ public class UserMatchViewerFunction implements SettingUIFunction
                     throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_LDAP_DATA_ERROR, errorMsg ) );
                 }
             }
-            catch ( ChaiUnavailableException e )
+            catch ( final ChaiUnavailableException e )
             {
                 throw PwmUnrecoverableException.fromChaiException( e );
             }

+ 3 - 3
server/src/main/java/password/pwm/config/profile/ChallengeProfile.java

@@ -98,7 +98,7 @@ public class ChallengeProfile implements Profile, Serializable
                     minRandomRequired
             );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.trace( () -> "configured challengeSet for profile '" + profileID + "' is not valid: " + e.getMessage() );
         }
@@ -115,7 +115,7 @@ public class ChallengeProfile implements Profile, Serializable
                     1
             );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.trace( () -> "discarding configured helpdesk challengeSet for profile '" + profileID + "' issue: " + e.getMessage() );
         }
@@ -256,7 +256,7 @@ public class ChallengeProfile implements Profile, Serializable
         {
             return new ChaiChallengeSet( challenges, randoms, locale, PwmConstants.PWM_APP_NAME + "-defined " + PwmConstants.SERVLET_VERSION );
         }
-        catch ( ChaiValidationException e )
+        catch ( final ChaiValidationException e )
         {
             throw new PwmOperationalException( new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, "invalid challenge set configuration: " + e.getMessage() ) );
         }

+ 1 - 1
server/src/main/java/password/pwm/config/profile/LdapProfile.java

@@ -173,7 +173,7 @@ public class LdapProfile extends AbstractProfile implements Profile
                     LOGGER.trace( () -> "read and cached canonical ldap DN value for input '" + dnValue + "' as '" + finalCanonical + "'" );
                 }
             }
-            catch ( ChaiUnavailableException | ChaiOperationException e )
+            catch ( final ChaiUnavailableException | ChaiOperationException e )
             {
                 LOGGER.error( "error while reading canonicalDN for dn value '" + dnValue + "', error: " + e.getMessage() );
                 return dnValue;

+ 1 - 1
server/src/main/java/password/pwm/config/profile/NewUserProfile.java

@@ -135,7 +135,7 @@ public class NewUserProfile extends AbstractProfile implements Profile
                     final UserIdentity userIdentity = new UserIdentity( lookupDN, defaultLdapProfile.getIdentifier() );
                     thePolicy = PasswordUtility.readPasswordPolicyForUser( pwmApplication, null, userIdentity, chaiUser, userLocale );
                 }
-                catch ( ChaiUnavailableException e )
+                catch ( final ChaiUnavailableException e )
                 {
                     throw new PwmUnrecoverableException( PwmError.forChaiError( e.getErrorCode() ) );
                 }

+ 1 - 1
server/src/main/java/password/pwm/config/profile/PwmPasswordPolicy.java

@@ -111,7 +111,7 @@ public class PwmPasswordPolicy implements Profile, Serializable
             }
             newDefaultPolicy = createPwmPasswordPolicy( defaultPolicyMap, null );
         }
-        catch ( Throwable t )
+        catch ( final Throwable t )
         {
             LOGGER.fatal( "error initializing PwmPasswordPolicy class: " + t.getMessage(), t );
         }

+ 2 - 2
server/src/main/java/password/pwm/config/profile/PwmPasswordRule.java

@@ -403,7 +403,7 @@ public enum PwmPasswordRule
             }
             assert keys.size() == PwmSetting.values().length;
         }
-        catch ( Throwable t )
+        catch ( final Throwable t )
         {
             LOGGER.fatal( "error initializing PwmPasswordRule class: " + t.getMessage(), t );
         }
@@ -515,7 +515,7 @@ public enum PwmPasswordRule
         {
             return LocaleHelper.getLocalizedMessage( locale, key, config, Message.class );
         }
-        catch ( MissingResourceException e )
+        catch ( final MissingResourceException e )
         {
             return "MissingKey-" + key;
         }

+ 6 - 6
server/src/main/java/password/pwm/config/stored/ConfigurationReader.java

@@ -82,7 +82,7 @@ public class ConfigurationReader
             this.storedConfiguration = readStoredConfig();
             this.configFileError = null;
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             this.configFileError = e.getErrorInformation();
             LOGGER.warn( "error reading configuration file: " + e.getMessage() );
@@ -145,7 +145,7 @@ public class ConfigurationReader
 
             //System.out.println( new String( baos.toByteArray(), "UTF-8" )  );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             e.printStackTrace(  );
         }
@@ -156,7 +156,7 @@ public class ConfigurationReader
         {
             theFileData = Files.newInputStream( configFile.toPath() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "unable to read configuration file: " + e.getMessage();
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, null, new String[]
@@ -173,7 +173,7 @@ public class ConfigurationReader
         {
             storedConfiguration = StoredConfigurationFactory.fromXml( theFileData );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             final String errorMsg = "unable to parse configuration file: " + e.getMessage();
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, null, new String[]
@@ -249,7 +249,7 @@ public class ConfigurationReader
                 final BigInteger epochValue = storedEpochStrValue.map( BigInteger::new ).orElse( BigInteger.ZERO );
                 newEpochStrValue = epochValue.add( BigInteger.ONE ).toString();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( sessionLabel, "error trying to parse previous config epoch property: " + e.getMessage() );
             }
@@ -342,7 +342,7 @@ public class ConfigurationReader
         {
             Files.move( tempWriteFile.toPath(), configFile.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "unable to rename temporary save file from " + tempWriteFile.getAbsolutePath()
                     + " to " + configFile.getAbsolutePath() + "; error: " + e.getMessage();

+ 1 - 1
server/src/main/java/password/pwm/config/stored/StoredConfigurationUtil.java

@@ -203,7 +203,7 @@ public abstract class StoredConfigurationUtil
                         errorStrings.add( pwmSetting.toMenuLocationDebug( storedConfigItemKey.getProfileID(), PwmConstants.DEFAULT_LOCALE ) + " - " + loopError );
                     }
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( "unexpected error during validate value for "
                             + pwmSetting.toMenuLocationDebug( profileID, PwmConstants.DEFAULT_LOCALE ) + ", error: "

+ 2 - 2
server/src/main/java/password/pwm/config/value/ValueFactory.java

@@ -42,7 +42,7 @@ public class ValueFactory
             final StoredValue.StoredValueFactory factory = setting.getSyntax().getFactory();
             return factory.fromJson( input );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final StringBuilder errorMsg = new StringBuilder();
             errorMsg.append( "error parsing value stored configuration value: " ).append( e.getMessage() );
@@ -62,7 +62,7 @@ public class ValueFactory
             final StoredValue.StoredValueFactory factory = setting.getSyntax().getFactory();
             return factory.fromXmlElement( setting, settingElement, key );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final StringBuilder errorMsg = new StringBuilder();
             errorMsg.append( "error parsing stored configuration value: " ).append( e.getMessage() );

+ 4 - 4
server/src/main/java/password/pwm/config/value/data/FormConfiguration.java

@@ -159,7 +159,7 @@ public class FormConfiguration implements Serializable
             {
                 builder.type( Type.valueOf( typeStr.toLowerCase() ) );
             }
-            catch ( IllegalArgumentException e )
+            catch ( final IllegalArgumentException e )
             {
                 throw new PwmOperationalException( new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, null, new String[] {
                         "unknown type for form config: " + typeStr,
@@ -172,7 +172,7 @@ public class FormConfiguration implements Serializable
         {
             builder.minimumLength( Integer.parseInt( st.nextToken() ) );
         }
-        catch ( NumberFormatException e )
+        catch ( final NumberFormatException e )
         {
             throw new PwmOperationalException( new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, null, new String[] {
                     "invalid minimum length type for form config: " + e.getMessage(),
@@ -229,7 +229,7 @@ public class FormConfiguration implements Serializable
             {
                 Pattern.compile( this.getRegex() );
             }
-            catch ( PatternSyntaxException e )
+            catch ( final PatternSyntaxException e )
             {
                 throw new PwmOperationalException( new ErrorInformation( PwmError.CONFIG_FORMAT_ERROR, null, new String[] {
                         " regular expression for '" + this.getName() + " ' is not valid: " + e.getMessage(),
@@ -328,7 +328,7 @@ public class FormConfiguration implements Serializable
                     {
                         new BigInteger( value );
                     }
-                    catch ( NumberFormatException e )
+                    catch ( final NumberFormatException e )
                     {
                         final ErrorInformation error = new ErrorInformation( PwmError.ERROR_FIELD_NOT_A_NUMBER, null, new String[] {
                                 getLabel( locale ),

+ 2 - 2
server/src/main/java/password/pwm/config/value/data/ShortcutItem.java

@@ -61,7 +61,7 @@ public class ShortcutItem implements Serializable
                         splitSettings[ 3 ]
                 );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.warn( "malformed ShortcutItem configuration value of '" + input + "', " + e.getMessage() );
             }
@@ -84,7 +84,7 @@ public class ShortcutItem implements Serializable
                         splitSettings[ 2 ]
                 );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.warn( "malformed ShortcutItem configuration value of '" + input + "', " + e.getMessage() );
             }

+ 2 - 2
server/src/main/java/password/pwm/health/ApplianceStatusChecker.java

@@ -72,7 +72,7 @@ public class ApplianceStatusChecker implements HealthChecker
         {
             healthRecords.addAll( readApplianceHealthStatus( pwmApplication ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( SessionLabel.HEALTH_SESSION_LABEL, "error communicating with client " + e.getMessage() );
         }
@@ -174,7 +174,7 @@ public class ApplianceStatusChecker implements HealthChecker
             }
             return "";
         }
-        catch ( IOException e )
+        catch ( final IOException e )
         {
             final String msg = "unable to read contents of file '" + filename + "', error: " + e.getMessage();
             throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_INTERNAL, msg ), e );

+ 3 - 3
server/src/main/java/password/pwm/health/CertificateChecker.java

@@ -60,7 +60,7 @@ public class CertificateChecker implements HealthChecker
         {
             records.addAll( doActionHealthCheck( pwmApplication.getConfig() ) );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "error while checking action certificates: " + e.getMessage(), e );
         }
@@ -137,7 +137,7 @@ public class CertificateChecker implements HealthChecker
                     checkCertificate( certificate, warnDurationMs );
                     return Collections.emptyList();
                 }
-                catch ( PwmOperationalException e )
+                catch ( final PwmOperationalException e )
                 {
                     final String errorDetail = e.getErrorInformation().getDetailedErrorMsg();
                     final HealthRecord record = HealthRecord.forMessage( HealthMessage.Config_Certificate,
@@ -164,7 +164,7 @@ public class CertificateChecker implements HealthChecker
         {
             certificate.checkValidity();
         }
-        catch ( CertificateException e )
+        catch ( final CertificateException e )
         {
             final StringBuilder errorMsg = new StringBuilder();
             errorMsg.append( "certificate for subject " );

+ 5 - 5
server/src/main/java/password/pwm/health/ConfigurationChecker.java

@@ -86,7 +86,7 @@ public class ConfigurationChecker implements HealthChecker
                 {
                     newUserProfile.getNewUserPasswordPolicy( pwmApplication, PwmConstants.DEFAULT_LOCALE );
                 }
-                catch ( PwmUnrecoverableException e )
+                catch ( final PwmUnrecoverableException e )
                 {
                     records.add( new HealthRecord( HealthStatus.WARN, HealthTopic.Configuration, e.getMessage() ) );
                 }
@@ -123,7 +123,7 @@ public class ConfigurationChecker implements HealthChecker
                 healthCheckClass = clazz.getDeclaredConstructor().newInstance();
                 records.addAll( healthCheckClass.healthCheck( config, locale ) );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "unexpected error during health check operation for class " + clazz.toString() + ", error:" + e.getMessage(), e );
             }
@@ -205,7 +205,7 @@ public class ConfigurationChecker implements HealthChecker
                                 ) );
                             }
                         }
-                        catch ( URISyntaxException e )
+                        catch ( final URISyntaxException e )
                         {
                             records.add( HealthRecord.forMessage( HealthMessage.Config_ParseError,
                                     e.getMessage(),
@@ -258,7 +258,7 @@ public class ConfigurationChecker implements HealthChecker
                     }
                 }
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.error( "unexpected error examining password strength of configuration: " );
             }
@@ -371,7 +371,7 @@ public class ConfigurationChecker implements HealthChecker
                     final PwmPasswordPolicy pwmPasswordPolicy = config.getPasswordPolicy( profileID, locale );
                     records.addAll( pwmPasswordPolicy.health( locale ) );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( "unexpected error during password policy health check: " + e.getMessage(), e );
                 }

+ 1 - 1
server/src/main/java/password/pwm/health/DatabaseStatusChecker.java

@@ -62,7 +62,7 @@ public class DatabaseStatusChecker implements HealthChecker
             accessor.get( DatabaseTable.PWM_META, "test" );
             return runtimeInstance.getDatabaseService().healthCheck();
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.error( "error during healthcheck: " + e.getMessage() );
             e.printStackTrace();

+ 4 - 4
server/src/main/java/password/pwm/health/HealthMonitor.java

@@ -227,7 +227,7 @@ public class HealthMonitor implements PwmService
                     tempResults.addAll( loopResults );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 if ( status == STATUS.OPEN )
                 {
@@ -245,7 +245,7 @@ public class HealthMonitor implements PwmService
                     tempResults.addAll( loopResults );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 if ( status == STATUS.OPEN )
                 {
@@ -291,7 +291,7 @@ public class HealthMonitor implements PwmService
                 doHealthChecks();
                 LOGGER.trace( () -> "completed health check dredge " + TimeDuration.compactFromCurrent( startTime ) );
             }
-            catch ( Throwable e )
+            catch ( final Throwable e )
             {
                 LOGGER.error( "error during health check execution: " + e.getMessage(), e );
             }
@@ -341,7 +341,7 @@ public class HealthMonitor implements PwmService
             {
                 writeSupportZipToAppPath();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.debug( SessionLabel.HEALTH_SESSION_LABEL, () -> "error writing support zip to file system: " + e.getMessage() );
             }

+ 24 - 24
server/src/main/java/password/pwm/health/LDAPHealthChecker.java

@@ -179,7 +179,7 @@ public class LDAPHealthChecker implements HealthChecker
             testUserDN = ldapProfile.readCanonicalDN( pwmApplication, testUserDN );
             proxyUserDN = ldapProfile.readCanonicalDN( pwmApplication, proxyUserDN );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             final String msgString = e.getMessage();
             LOGGER.trace( SessionLabel.HEALTH_SESSION_LABEL, () -> "unexpected error while testing test user (during object creation): message="
@@ -220,7 +220,7 @@ public class LDAPHealthChecker implements HealthChecker
                 theUser = chaiProvider.getEntryFactory().newChaiUser( testUserDN );
 
             }
-            catch ( ChaiUnavailableException e )
+            catch ( final ChaiUnavailableException e )
             {
                 returnRecords.add( HealthRecord.forMessage( HealthMessage.LDAP_TestUserUnavailable,
                         PwmSetting.LDAP_TEST_USER_DN.toMenuLocationDebug( ldapProfile.getIdentifier(), PwmConstants.DEFAULT_LOCALE ),
@@ -228,7 +228,7 @@ public class LDAPHealthChecker implements HealthChecker
                 ) );
                 return returnRecords;
             }
-            catch ( Throwable e )
+            catch ( final Throwable e )
             {
                 final String msgString = e.getMessage();
                 LOGGER.trace(
@@ -247,7 +247,7 @@ public class LDAPHealthChecker implements HealthChecker
             {
                 theUser.readObjectClass();
             }
-            catch ( ChaiException e )
+            catch ( final ChaiException e )
             {
                 returnRecords.add( HealthRecord.forMessage( HealthMessage.LDAP_TestUserError,
                         PwmSetting.LDAP_TEST_USER_DN.toMenuLocationDebug( ldapProfile.getIdentifier(), PwmConstants.DEFAULT_LOCALE ),
@@ -272,7 +272,7 @@ public class LDAPHealthChecker implements HealthChecker
                     {
                         theUser.readPassword();
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         LOGGER.debug( SessionLabel.HEALTH_SESSION_LABEL, () -> "error reading user password from directory " + e.getMessage() );
                         returnRecords.add( HealthRecord.forMessage( HealthMessage.LDAP_TestUserReadPwError,
@@ -337,7 +337,7 @@ public class LDAPHealthChecker implements HealthChecker
                             theUser.setPassword( newPassword.getStringValue() );
                             LOGGER.debug( SessionLabel.HEALTH_SESSION_LABEL, () -> "set random password on test user " + userIdentity.toDisplayString() );
                         }
-                        catch ( ChaiException e )
+                        catch ( final ChaiException e )
                         {
                             returnRecords.add( HealthRecord.forMessage( HealthMessage.LDAP_TestUserWritePwError,
                                     PwmSetting.LDAP_TEST_USER_DN.toMenuLocationDebug( ldapProfile.getIdentifier(), PwmConstants.DEFAULT_LOCALE ),
@@ -349,7 +349,7 @@ public class LDAPHealthChecker implements HealthChecker
                     }
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 final String msg = "error setting test user password: " + JavaHelper.readHostileExceptionMessage( e );
                 LOGGER.error( SessionLabel.HEALTH_SESSION_LABEL, msg, e );
@@ -382,7 +382,7 @@ public class LDAPHealthChecker implements HealthChecker
                 userInfo.getUserEmailAddress();
                 userInfo.getUserSmsNumber();
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 returnRecords.add( new HealthRecord(
                         HealthStatus.WARN,
@@ -400,7 +400,7 @@ public class LDAPHealthChecker implements HealthChecker
                 {
                     chaiProvider.close();
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     // ignore
                 }
@@ -438,7 +438,7 @@ public class LDAPHealthChecker implements HealthChecker
                 final ChaiUser proxyUser = chaiProvider.getEntryFactory().newChaiUser( proxyDN );
                 proxyUser.exists();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 final String errorString = "error connecting to ldap server '" + loopURL + "': " + e.getMessage();
                 returnRecords.add( new HealthRecord(
@@ -454,7 +454,7 @@ public class LDAPHealthChecker implements HealthChecker
                     {
                         chaiProvider.close();
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         /* ignore */
                     }
@@ -512,7 +512,7 @@ public class LDAPHealthChecker implements HealthChecker
                 }
 
             }
-            catch ( ChaiException e )
+            catch ( final ChaiException e )
             {
                 final ChaiError chaiError = ChaiErrors.getErrorForMessage( e.getMessage() );
                 final PwmError pwmError = PwmError.forChaiError( chaiError );
@@ -538,7 +538,7 @@ public class LDAPHealthChecker implements HealthChecker
                         new ErrorInformation( PwmError.ERROR_DIRECTORY_UNAVAILABLE, errorString.toString() ) );
                 return returnRecords;
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 final HealthRecord record = HealthRecord.forMessage( HealthMessage.LDAP_No_Connection, e.getMessage() );
                 returnRecords.add( record );
@@ -567,7 +567,7 @@ public class LDAPHealthChecker implements HealthChecker
                             returnRecords.add( new HealthRecord( HealthStatus.WARN, makeLdapTopic( ldapProfile, config ), errorString ) );
                         }
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         final String errorString = "ldap root context '" + loopContext + "' is not valid: " + e.getMessage();
                         returnRecords.add( new HealthRecord( HealthStatus.WARN, makeLdapTopic( ldapProfile, config ), errorString ) );
@@ -583,7 +583,7 @@ public class LDAPHealthChecker implements HealthChecker
                 {
                     chaiProvider.close();
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     /* ignore */
                 }
@@ -619,7 +619,7 @@ public class LDAPHealthChecker implements HealthChecker
                     ) );
                 }
             }
-            catch ( MalformedURLException | UnknownHostException e )
+            catch ( final MalformedURLException | UnknownHostException e )
             {
                 returnList.add( HealthRecord.forMessage(
                         HealthMessage.Config_ParseError,
@@ -695,7 +695,7 @@ public class LDAPHealthChecker implements HealthChecker
                 }
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             errorReachingServer = true;
             LOGGER.error( SessionLabel.HEALTH_SESSION_LABEL, "error during replica vendor sameness check: " + e.getMessage() );
@@ -793,7 +793,7 @@ public class LDAPHealthChecker implements HealthChecker
                 }
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             errorReachingServer = true;
             LOGGER.error( SessionLabel.HEALTH_SESSION_LABEL,
@@ -826,7 +826,7 @@ public class LDAPHealthChecker implements HealthChecker
                         {
                             returnList.addAll( checkUserPermission( pwmApplication, userPermission, pwmSetting ) );
                         }
-                        catch ( PwmUnrecoverableException e )
+                        catch ( final PwmUnrecoverableException e )
                         {
                             LOGGER.error( "error checking configured permission settings:" + e.getMessage() );
                         }
@@ -884,7 +884,7 @@ public class LDAPHealthChecker implements HealthChecker
                 }
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "error while checking DN ldap syntax values: " + e.getMessage() );
         }
@@ -946,12 +946,12 @@ public class LDAPHealthChecker implements HealthChecker
                         );
                     }
                 }
-                catch ( ChaiUnavailableException e )
+                catch ( final ChaiUnavailableException e )
                 {
                     throw PwmUnrecoverableException.fromChaiException( e );
                 }
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.error( "error checking new user password policy user settings:" + e.getMessage() );
             }
@@ -1065,11 +1065,11 @@ public class LDAPHealthChecker implements HealthChecker
                 }
             }
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             throw PwmUnrecoverableException.fromChaiException( e );
         }
-        catch ( ChaiException e )
+        catch ( final ChaiException e )
         {
             LOGGER.error( "error while evaluating ldap DN '" + dnValue + "', error: " + e.getMessage() );
         }

+ 10 - 10
server/src/main/java/password/pwm/http/ContextManager.java

@@ -203,7 +203,7 @@ public class ContextManager implements Serializable
         {
             Locale.setDefault( PwmConstants.DEFAULT_LOCALE );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             outputError( "unable to set default locale as Java machine default locale: " + e.getMessage() );
         }
@@ -246,7 +246,7 @@ public class ContextManager implements Serializable
                 outputError( "Startup Error: " + ( startupErrorInformation == null ? "un-specified error" : startupErrorInformation.toDebugStr() ) );
             }
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             handleStartupError( "unable to initialize application due to configuration related error: ", e );
         }
@@ -276,7 +276,7 @@ public class ContextManager implements Serializable
                     .createPwmEnvironment();
             pwmApplication = new PwmApplication( pwmEnvironment );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             handleStartupError( "unable to initialize application: ", e );
         }
@@ -361,7 +361,7 @@ public class ContextManager implements Serializable
         {
             LOGGER.fatal( SESSION_LABEL, startupErrorInformation.getDetailedErrorMsg() );
         }
-        catch ( Exception e2 )
+        catch ( final Exception e2 )
         {
             // noop
         }
@@ -379,7 +379,7 @@ public class ContextManager implements Serializable
             {
                 pwmApplication.shutdown();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "unexpected error attempting to close application: " + e.getMessage() );
             }
@@ -445,7 +445,7 @@ public class ContextManager implements Serializable
                         requestPwmApplicationRestart();
                         success = true;
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         LOGGER.error( SESSION_LABEL, "error importing " + silentPropertiesFile.getAbsolutePath() + ", error: " + e.getMessage() );
                     }
@@ -459,7 +459,7 @@ public class ContextManager implements Serializable
                         Files.move( source, dest );
                         LOGGER.info( SESSION_LABEL, () -> "file " + source.toString() + " has been renamed to " + dest.toString() );
                     }
-                    catch ( IOException e )
+                    catch ( final IOException e )
                     {
                         LOGGER.error( SESSION_LABEL, "error renaming file " + source.toString() + " to " + dest.toString() + ", error: " + e.getMessage() );
                     }
@@ -517,12 +517,12 @@ public class ContextManager implements Serializable
 
                         oldPwmApplication.shutdown();
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         LOGGER.error( SESSION_LABEL, "unexpected error attempting to close application: " + e.getMessage() );
                     }
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.fatal( "unexpected error during shutdown: " + e.getMessage(), e );
                 }
@@ -726,7 +726,7 @@ public class ContextManager implements Serializable
             {
                 importLdapCert();
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( SESSION_LABEL, "error trying to auto-import certs: " + e.getMessage() );
             }

+ 7 - 7
server/src/main/java/password/pwm/http/HttpEventManager.java

@@ -73,7 +73,7 @@ public class HttpEventManager implements
 
             LOGGER.trace( () -> "new http session created" );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "error during sessionCreated event: " + e.getMessage() );
         }
@@ -107,7 +107,7 @@ public class HttpEventManager implements
                 LOGGER.trace( () -> "invalidated uninitialized session" );
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "error during httpSessionDestroyed: " + e.getMessage() );
         }
@@ -129,12 +129,12 @@ public class HttpEventManager implements
             newContextManager.initialize();
             servletContextEvent.getServletContext().setAttribute( PwmConstants.CONTEXT_ATTR_CONTEXT_MANAGER, newContextManager );
         }
-        catch ( OutOfMemoryError e )
+        catch ( final OutOfMemoryError e )
         {
             LOGGER.fatal( "JAVA OUT OF MEMORY ERROR!, please allocate more memory for java: " + e.getMessage(), e );
             throw e;
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.fatal( "error initializing context: " + e, e );
             System.err.println( "error initializing context: " + e );
@@ -150,7 +150,7 @@ public class HttpEventManager implements
             final ContextManager contextManager = ContextManager.getContextManager( servletContextEvent.getServletContext() );
             contextManager.shutdown();
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "unable to destroy context: " + e.getMessage() );
         }
@@ -164,7 +164,7 @@ public class HttpEventManager implements
             final PwmSession pwmSession = PwmSessionWrapper.readPwmSession( event.getSession() );
             LOGGER.trace( pwmSession.getLabel(), () -> "passivating session" );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "unable to passivate session: " + e.getMessage() );
         }
@@ -183,7 +183,7 @@ public class HttpEventManager implements
                 pwmApplication.getSessionTrackService().addSessionData( pwmSession );
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "unable to activate (de-passivate) session: " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/IdleTimeoutCalculator.java

@@ -243,7 +243,7 @@ public class IdleTimeoutCalculator
                     }
                 }
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.error( pwmSession, "error while figuring max idle timeout for session: " + e.getMessage() );
             }

+ 3 - 3
server/src/main/java/password/pwm/http/JspUtility.java

@@ -62,7 +62,7 @@ public abstract class JspUtility
         {
             return pwmRequest.getPwmApplication().getSessionStateService().getBean( pwmRequest, theClass );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "unable to load pwmRequest object during jsp execution: " + e.getMessage() );
         }
@@ -97,7 +97,7 @@ public abstract class JspUtility
                     ( HttpServletResponse ) pageContext.getResponse()
             );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "unable to load pwmRequest object during jsp execution: " + e.getMessage() );
             return;
@@ -133,7 +133,7 @@ public abstract class JspUtility
             {
                 return pwmRequest.getConfig().readSettingAsLong( pwmSetting );
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.warn( pwmRequest, "error reading number setting " + pwmSetting.getKey() + ", error: " + e.getMessage() );
             }

+ 3 - 3
server/src/main/java/password/pwm/http/PwmHttpRequestWrapper.java

@@ -270,7 +270,7 @@ public class PwmHttpRequestWrapper
         {
             return Integer.parseInt( strValue );
         }
-        catch ( NumberFormatException e )
+        catch ( final NumberFormatException e )
         {
             return defaultValue;
         }
@@ -416,7 +416,7 @@ public class PwmHttpRequestWrapper
         {
             decodedValue = new String( input.getBytes( "ISO-8859-1" ), PwmConstants.DEFAULT_CHARSET );
         }
-        catch ( UnsupportedEncodingException e )
+        catch ( final UnsupportedEncodingException e )
         {
             LOGGER.error( "error decoding request parameter: " + e.getMessage() );
         }
@@ -554,7 +554,7 @@ public class PwmHttpRequestWrapper
         {
             return JsonUtil.deserialize( json, classOfT );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             if ( e instanceof JsonParseException )
             {

+ 1 - 1
server/src/main/java/password/pwm/http/PwmHttpResponseWrapper.java

@@ -222,7 +222,7 @@ public class PwmHttpResponseWrapper
             final String value = pwmApplication.getConfig().readAppProperty( AppProperty.HTTP_COOKIE_SAMESITE_VALUE );
             CookieManagementFilter.addSameSiteCookieAttribute( httpServletResponse, value );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.trace( () -> "unable to load application configuration while checking samesite cookie attribute config", e );
         }

+ 2 - 2
server/src/main/java/password/pwm/http/PwmRequest.java

@@ -234,7 +234,7 @@ public class PwmRequest extends PwmHttpRequestWrapper
                 }
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error reading file upload: " + e.getMessage() );
         }
@@ -277,7 +277,7 @@ public class PwmRequest extends PwmHttpRequestWrapper
                 }
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error reading file upload: " + e.getMessage() );
         }

+ 3 - 3
server/src/main/java/password/pwm/http/PwmResponse.java

@@ -109,7 +109,7 @@ public class PwmResponse extends PwmHttpResponseWrapper
         {
             LOGGER.trace( pwmRequest, () -> "forwarding to " + url );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             /* noop, server may not be up enough to do the log output */
         }
@@ -149,7 +149,7 @@ public class PwmResponse extends PwmHttpResponseWrapper
         {
             forwardToJsp( JspUrl.SUCCESS );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "unexpected error sending user to success page: " + e.toString() );
         }
@@ -194,7 +194,7 @@ public class PwmResponse extends PwmHttpResponseWrapper
             {
                 forwardToJsp( JspUrl.ERROR );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.error( "unexpected error sending user to error page: " + e.toString() );
             }

+ 3 - 3
server/src/main/java/password/pwm/http/PwmSession.java

@@ -204,7 +204,7 @@ public class PwmSession implements Serializable
                     ? this.getUserInfo().getUsername()
                     : null;
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( "unexpected error reading username: " + e.getMessage(), e );
         }
@@ -254,7 +254,7 @@ public class PwmSession implements Serializable
             {
                 pwmRequest.getPwmApplication().getSessionStateService().clearLoginSession( pwmRequest );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 final String errorMsg = "unexpected error writing removing login cookie from response: " + e.getMessage();
                 final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, errorMsg );
@@ -295,7 +295,7 @@ public class PwmSession implements Serializable
             debugData.put( "locale", getSessionStateBean().getLocale() );
             debugData.put( "theme", getSessionStateBean().getTheme() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             return "exception generating PwmSession.toString(): " + e.getMessage();
         }

+ 1 - 1
server/src/main/java/password/pwm/http/PwmURL.java

@@ -465,7 +465,7 @@ public class PwmURL
                         LOGGER.trace( sessionLabel, () -> "negative URL match for regex pattern: " + strPattern );
                     }
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( sessionLabel, "error while testing URL match for regex pattern: '" + loopFragment + "', error: " + e.getMessage() );
                 }

+ 3 - 3
server/src/main/java/password/pwm/http/SessionManager.java

@@ -114,7 +114,7 @@ public class SessionManager
             final String userDN = userIdentity.getUserDN();
             chaiProvider.getEntryFactory().newChaiEntry( userDN ).exists();
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation(
                     PwmError.ERROR_DIRECTORY_UNAVAILABLE,
@@ -134,7 +134,7 @@ public class SessionManager
                 chaiProvider.close();
                 chaiProvider = null;
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( pwmSession, "error while closing user connection: " + e.getMessage() );
             }
@@ -182,7 +182,7 @@ public class SessionManager
             final ChaiProvider provider = this.getChaiProvider();
             return provider.getEntryFactory().newChaiUser( userIdentity.getUserDN() );
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             throw PwmUnrecoverableException.fromChaiException( e );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/auth/BasicFilterAuthenticationProvider.java

@@ -80,7 +80,7 @@ public class BasicFilterAuthenticationProvider implements PwmHttpFilterAuthentic
             pwmSession.getLoginInfoBean().setBasicAuth( basicAuthInfo );
 
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             if ( e.getError() == PwmError.ERROR_DIRECTORY_UNAVAILABLE )
             {

+ 12 - 12
server/src/main/java/password/pwm/http/auth/CASFilterAuthenticationProvider.java

@@ -105,15 +105,15 @@ public class CASFilterAuthenticationProvider implements PwmHttpFilterAuthenticat
                 }
             }
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             throw PwmUnrecoverableException.fromChaiException( e );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             throw new PwmUnrecoverableException( e.getErrorInformation() );
         }
-        catch ( UnsupportedEncodingException e )
+        catch ( final UnsupportedEncodingException e )
         {
             throw new PwmUnrecoverableException( new ErrorInformation( PwmError.ERROR_INTERNAL, "error during CAS authentication: " + e.getMessage() ) );
         }
@@ -188,7 +188,7 @@ public class CASFilterAuthenticationProvider implements PwmHttpFilterAuthenticat
                         new URL( clearPassRequestUrl ), new HttpsURLConnectionFactory(), "UTF-8" );
                 password = new PasswordData( XmlUtils.getTextForElement( response, "credentials" ) );
             }
-            catch ( MalformedURLException e )
+            catch ( final MalformedURLException e )
             {
                 LOGGER.error( pwmSession, "Invalid CAS clearPassUrl" );
             }
@@ -247,44 +247,44 @@ public class CASFilterAuthenticationProvider implements PwmHttpFilterAuthenticat
                     {
                         password = new PasswordData( new String( cipherData, PwmConstants.DEFAULT_CHARSET ) );
                     }
-                    catch ( PwmUnrecoverableException e )
+                    catch ( final PwmUnrecoverableException e )
                     {
                         LOGGER.error( "Decryption failed", e );
                         return password;
                     }
                 }
             }
-            catch ( NoSuchAlgorithmException e1 )
+            catch ( final NoSuchAlgorithmException e1 )
             {
                 LOGGER.error( "Decryption failed", e1 );
                 return password;
             }
-            catch ( InvalidKeySpecException e1 )
+            catch ( final InvalidKeySpecException e1 )
             {
                 LOGGER.error( "Decryption failed", e1 );
                 return password;
             }
-            catch ( NoSuchPaddingException e1 )
+            catch ( final NoSuchPaddingException e1 )
             {
                 LOGGER.error( "Decryption failed", e1 );
                 return password;
             }
-            catch ( IOException e1 )
+            catch ( final IOException e1 )
             {
                 LOGGER.error( "Decryption failed", e1 );
                 return password;
             }
-            catch ( InvalidKeyException e1 )
+            catch ( final InvalidKeyException e1 )
             {
                 LOGGER.error( "Decryption failed", e1 );
                 return password;
             }
-            catch ( IllegalBlockSizeException e )
+            catch ( final IllegalBlockSizeException e )
             {
                 LOGGER.error( "Decryption failed", e );
                 return password;
             }
-            catch ( BadPaddingException e )
+            catch ( final BadPaddingException e )
             {
                 LOGGER.error( "Decryption failed", e );
                 return password;

+ 3 - 3
server/src/main/java/password/pwm/http/auth/HttpAuthenticationUtilities.java

@@ -64,7 +64,7 @@ public abstract class HttpAuthenticationUtilities
                     final Object newInstance = clazz.newInstance();
                     filterAuthenticationProvider = ( PwmHttpFilterAuthenticationProvider ) newInstance;
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.trace( () -> "could not load authentication class '" + authenticationMethod + "', will ignore" );
                     IGNORED_AUTH_METHODS.add( authenticationMethod );
@@ -89,7 +89,7 @@ public abstract class HttpAuthenticationUtilities
                         }
 
                     }
-                    catch ( Exception e )
+                    catch ( final Exception e )
                     {
                         final ErrorInformation errorInformation;
                         if ( e instanceof PwmException )
@@ -149,7 +149,7 @@ public abstract class HttpAuthenticationUtilities
             pwmRequest.getPwmResponse().writeEncryptedCookie( cookieName, httpAuthRecord, cookieAgeSeconds, PwmHttpResponseWrapper.CookiePath.Application );
             LOGGER.debug( pwmRequest, () -> "wrote auth record cookie to user browser for use during forgotten password" );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( pwmRequest, "error while setting authentication record cookie: " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/auth/SSOHeaderFilterAuthenticationProvider.java

@@ -69,7 +69,7 @@ public class SSOHeaderFilterAuthenticationProvider implements PwmHttpFilterAuthe
             {
                 sessionAuthenticator.authUserWithUnknownPassword( headerValue, AuthenticationType.AUTH_WITHOUT_PASSWORD );
             }
-            catch ( PwmOperationalException e )
+            catch ( final PwmOperationalException e )
             {
                 throw new PwmUnrecoverableException( e.getErrorInformation() );
             }

+ 2 - 2
server/src/main/java/password/pwm/http/bean/SetupOtpBean.java

@@ -92,12 +92,12 @@ public class SetupOtpBean extends PwmSessionBean
             {
                 random = SecureRandom.getInstance( "SHA1PRNG", "SUN" );
             }
-            catch ( NoSuchAlgorithmException ex )
+            catch ( final NoSuchAlgorithmException ex )
             {
                 random = new SecureRandom();
                 LOGGER.error( ex.getMessage(), ex );
             }
-            catch ( NoSuchProviderException ex )
+            catch ( final NoSuchProviderException ex )
             {
                 random = new SecureRandom();
                 LOGGER.error( ex.getMessage(), ex );

+ 4 - 4
server/src/main/java/password/pwm/http/filter/AbstractPwmFilter.java

@@ -65,7 +65,7 @@ public abstract class AbstractPwmFilter implements Filter
             final PwmURL pwmURL = new PwmURL( req );
             interested = isInterested( mode, pwmURL );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "unexpected error processing filter chain during isInterested(): " + e.getMessage(), e );
             resp.sendError( 500, "unexpected error processing filter chain during isInterested" );
@@ -79,7 +79,7 @@ public abstract class AbstractPwmFilter implements Filter
             {
                 pwmRequest = PwmRequest.forRequest( req, resp );
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 final PwmURL pwmURL = new PwmURL( req );
                 if ( pwmURL.isResourceURL() )
@@ -96,11 +96,11 @@ public abstract class AbstractPwmFilter implements Filter
                 final PwmFilterChain pwmFilterChain = new PwmFilterChain( servletRequest, servletResponse, filterChain );
                 processFilter( mode, pwmRequest, pwmFilterChain );
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 LOGGER.error( pwmRequest, "unexpected error processing filter chain: " + e.getMessage(), e );
             }
-            catch ( IOException e )
+            catch ( final  IOException e )
             {
                 LOGGER.debug( pwmRequest, () -> "i/o error processing request: " + e.getMessage() );
             }

+ 2 - 2
server/src/main/java/password/pwm/http/filter/ApplicationModeFilter.java

@@ -61,7 +61,7 @@ public class ApplicationModeFilter extends AbstractPwmFilter
                     return;
                 }
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 if ( e.getError() == PwmError.ERROR_INTERNAL )
                 {
@@ -69,7 +69,7 @@ public class ApplicationModeFilter extends AbstractPwmFilter
                     {
                         LOGGER.error( e.getMessage() );
                     }
-                    catch ( Exception ignore )
+                    catch ( final Exception ignore )
                     {
                         /* noop */
                     }

+ 2 - 2
server/src/main/java/password/pwm/http/filter/AuthenticationFilter.java

@@ -111,7 +111,7 @@ public class AuthenticationFilter extends AbstractPwmFilter
                 this.processUnAuthenticatedSession( pwmRequest, chain );
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( e.getErrorInformation() );
             pwmRequest.respondWithError( e.getErrorInformation(), true );
@@ -197,7 +197,7 @@ public class AuthenticationFilter extends AbstractPwmFilter
                     LoginServlet.redirectToLoginServlet( pwmRequest );
                     return;
                 }
-                catch ( Throwable e1 )
+                catch ( final Throwable e1 )
                 {
                     LOGGER.error( "error while marking pre-login url:" + e1.getMessage() );
                 }

+ 2 - 2
server/src/main/java/password/pwm/http/filter/AuthorizationFilter.java

@@ -72,7 +72,7 @@ public class AuthorizationFilter extends AbstractPwmFilter
         {
             hasPermission = pwmSession.getSessionManager().checkPermission( pwmApplication, Permission.PWMADMIN );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.warn( pwmRequest, "error during authorization check: " + e.getMessage() );
         }
@@ -85,7 +85,7 @@ public class AuthorizationFilter extends AbstractPwmFilter
                 return;
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.warn( pwmRequest, "unexpected error executing filter chain: " + e.getMessage() );
             return;

+ 2 - 2
server/src/main/java/password/pwm/http/filter/ConfigAccessFilter.java

@@ -64,7 +64,7 @@ public class ConfigAccessFilter extends AbstractPwmFilter
             {
                 UserAgentUtils.checkIfPreIE11( pwmRequest );
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 pwmRequest.respondWithError( e.getErrorInformation() );
                 return;
@@ -79,7 +79,7 @@ public class ConfigAccessFilter extends AbstractPwmFilter
                 filterChain.doFilter();
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             pwmRequest.respondWithError( e.getErrorInformation() );
         }

+ 2 - 2
server/src/main/java/password/pwm/http/filter/CookieManagementFilter.java

@@ -58,7 +58,7 @@ public class CookieManagementFilter implements Filter
             pwmApplication = ContextManager.getPwmApplication( filterConfig.getServletContext() );
             value = pwmApplication.getConfig().readAppProperty( AppProperty.HTTP_COOKIE_SAMESITE_VALUE );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.trace( () -> "unable to load application configuration while checking samesite cookie attribute config", e );
         }
@@ -94,7 +94,7 @@ public class CookieManagementFilter implements Filter
             {
                 pwmSession = PwmSessionWrapper.readPwmSession( httpSession );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.trace( () -> "unable to load session while checking samesite cookie attribute config", e );
             }

+ 2 - 2
server/src/main/java/password/pwm/http/filter/GZIPFilter.java

@@ -57,7 +57,7 @@ public class GZIPFilter implements Filter
             pwmApplication = ContextManager.getPwmApplication( filterConfig.getServletContext() );
             enabled = Boolean.parseBoolean( pwmApplication.getConfig().readAppProperty( AppProperty.HTTP_ENABLE_GZIP ) );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( "unable to load application configuration, defaulting to disabled" );
         }
@@ -96,7 +96,7 @@ public class GZIPFilter implements Filter
                 return false;
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "unable to parse request url, defaulting to non-gzip: " + e.getMessage() );
         }

+ 9 - 9
server/src/main/java/password/pwm/http/filter/RequestInitializationFilter.java

@@ -106,7 +106,7 @@ public class RequestInitializationFilter implements Filter
         {
             localPwmApplication = ContextManager.getPwmApplication( req );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.trace( () -> "unable to load pwmApplication: " + e.getMessage() );
         }
@@ -142,7 +142,7 @@ public class RequestInitializationFilter implements Filter
                     servletRequest.setAttribute( PwmRequestAttribute.PwmErrorInfo.toString(), startupError );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 if ( pwmURL.isResourceURL() )
                 {
@@ -183,7 +183,7 @@ public class RequestInitializationFilter implements Filter
             checkAndInitSessionState( req );
             PwmRequest.forRequest( req, resp );
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             LOGGER.error( "can't load application: " + e.getMessage(), e );
             if ( !( new PwmURL( req ).isResourceURL() ) )
@@ -210,7 +210,7 @@ public class RequestInitializationFilter implements Filter
             {
                 handleRequestSecurityChecks( pwmRequest );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.error( pwmRequest, e.getErrorInformation() );
                 pwmRequest.respondWithError( e.getErrorInformation() );
@@ -222,7 +222,7 @@ public class RequestInitializationFilter implements Filter
             }
 
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             final String logMsg = "can't init request: " + e.getMessage();
             if ( e instanceof PwmException && ( ( PwmException ) e ).getError() != PwmError.ERROR_INTERNAL )
@@ -256,7 +256,7 @@ public class RequestInitializationFilter implements Filter
                 errorInformation = contextManager.getStartupErrorInformation();
             }
         }
-        catch ( PwmUnrecoverableException e2 )
+        catch ( final PwmUnrecoverableException e2 )
         {
             LOGGER.error( "error reading session context from servlet container: " + e2.getMessage() );
         }
@@ -441,7 +441,7 @@ public class RequestInitializationFilter implements Filter
         {
             return InetAddress.getByName( userIPAddress ).getCanonicalHostName();
         }
-        catch ( UnknownHostException e )
+        catch ( final UnknownHostException e )
         {
             LOGGER.trace( () -> "unknown host while trying to compute hostname for src request: " + e.getMessage() );
         }
@@ -690,12 +690,12 @@ public class RequestInitializationFilter implements Filter
                             match = true;
                         }
                     }
-                    catch ( IPMatcher.IPMatcherException e )
+                    catch ( final IPMatcher.IPMatcherException e )
                     {
                         LOGGER.error( "error while attempting to match permitted address range '" + ipMatchString + "', error: " + e );
                     }
                 }
-                catch ( IPMatcher.IPMatcherException e )
+                catch ( final IPMatcher.IPMatcherException e )
                 {
                     LOGGER.error( "error parsing permitted address range '" + ipMatchString + "', error: " + e );
                 }

+ 7 - 7
server/src/main/java/password/pwm/http/filter/SessionFilter.java

@@ -109,12 +109,12 @@ public class SessionFilter extends AbstractPwmFilter
         {
             chain.doFilter();
         }
-        catch ( IOException e )
+        catch ( final IOException e )
         {
             LOGGER.trace( pwmRequest, () -> "IO exception during servlet processing: " + e.getMessage() );
             throw new ServletException( e );
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             if ( e instanceof ServletException
                     && e.getCause() != null
@@ -165,7 +165,7 @@ public class SessionFilter extends AbstractPwmFilter
         {
             pwmApplication.getSessionStateService().readLoginSessionState( pwmRequest );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.warn( pwmRequest, "error while reading login session state: " + e.getMessage() );
         }
@@ -225,7 +225,7 @@ public class SessionFilter extends AbstractPwmFilter
                 {
                     checkUrlAgainstWhitelist( pwmApplication, pwmRequest.getSessionLabel(), forwardURL );
                 }
-                catch ( PwmOperationalException e )
+                catch ( final PwmOperationalException e )
                 {
                     LOGGER.error( pwmRequest, e.getErrorInformation() );
                     pwmRequest.respondWithError( e.getErrorInformation() );
@@ -245,7 +245,7 @@ public class SessionFilter extends AbstractPwmFilter
                 {
                     checkUrlAgainstWhitelist( pwmApplication, pwmRequest.getSessionLabel(), logoutURL );
                 }
-                catch ( PwmOperationalException e )
+                catch ( final PwmOperationalException e )
                 {
                     LOGGER.error( pwmRequest, e.getErrorInformation() );
                     pwmRequest.respondWithError( e.getErrorInformation() );
@@ -543,7 +543,7 @@ public class SessionFilter extends AbstractPwmFilter
         {
             inputURI = URI.create( inputURL );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             LOGGER.error( sessionLabel, "unable to parse requested redirect url '" + inputURL + "', error: " + e.getMessage() );
             // dont put input uri in error response
@@ -573,7 +573,7 @@ public class SessionFilter extends AbstractPwmFilter
                     throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_REDIRECT_ILLEGAL, errorMsg ) );
                 }
             }
-            catch ( UnknownHostException e )
+            catch ( final UnknownHostException e )
             {
                 /* noop */
             }

+ 9 - 9
server/src/main/java/password/pwm/http/servlet/AbstractPwmServlet.java

@@ -92,7 +92,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
                 {
                     Validator.validatePwmRequestCounter( pwmRequest );
                 }
-                catch ( PwmOperationalException e )
+                catch ( final PwmOperationalException e )
                 {
                     if ( e.getError() == PwmError.ERROR_INCORRECT_REQ_SEQUENCE )
                     {
@@ -122,14 +122,14 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
 
             this.processAction( pwmRequest );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final PwmRequest pwmRequest;
             try
             {
                 pwmRequest = PwmRequest.forRequest( req, resp );
             }
-            catch ( Exception e2 )
+            catch ( final Exception e2 )
             {
                 try
                 {
@@ -137,7 +137,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
                             "exception occurred, but exception handler unable to load request instance; error=" + e.getMessage(),
                             e );
                 }
-                catch ( Exception e3 )
+                catch ( final Exception e3 )
                 {
                     e3.printStackTrace();
                 }
@@ -165,7 +165,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
             {
                 pwmRequest.getPwmApplication().getSessionStateService().clearBean( pwmRequest, theClass );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.debug( pwmRequest, () -> "error while clearing module bean during after module error output: " + e.getMessage() );
             }
@@ -205,7 +205,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
         {
             stackTraceHash = SecureEngine.hash( stackTraceText, PwmHashAlgorithm.SHA1 );
         }
-        catch ( PwmUnrecoverableException e1 )
+        catch ( final PwmUnrecoverableException e1 )
         {
             /* */
         }
@@ -233,7 +233,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
                 {
                     pwmApplication.getStatisticsManager().incrementValue( Statistic.LDAP_UNAVAILABLE_COUNT );
                 }
-                catch ( Throwable e1 )
+                catch ( final Throwable e1 )
                 {
                     //noop
                 }
@@ -250,7 +250,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
                     LoginServlet.redirectToLoginServlet( PwmRequest.forRequest( req, resp ) );
                     return true;
                 }
-                catch ( Throwable e1 )
+                catch ( final Throwable e1 )
                 {
                     LOGGER.error( "error while marking pre-login url:" + e1.getMessage() );
                 }
@@ -268,7 +268,7 @@ public abstract class AbstractPwmServlet extends HttpServlet implements PwmServl
                         pwmApplication.getStatisticsManager().incrementValue( Statistic.PWM_UNKNOWN_ERRORS );
                     }
                 }
-                catch ( Throwable e1 )
+                catch ( final Throwable e1 )
                 {
                     //noop
                 }

+ 4 - 4
server/src/main/java/password/pwm/http/servlet/ClientApiServlet.java

@@ -198,7 +198,7 @@ public class ClientApiServlet extends ControlledPwmServlet
             final RestResultBean restResultBean = RestResultBean.withData( displayData );
             pwmRequest.outputJsonResult( restResultBean );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMSg = "error during rest /strings call for bundle " + bundleName + ", error: " + e.getMessage();
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, errorMSg );
@@ -222,7 +222,7 @@ public class ClientApiServlet extends ControlledPwmServlet
             final RestResultBean restResultBean = RestResultBean.withData( jsonOutput );
             pwmRequest.outputJsonResult( restResultBean );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMessage = "unexpected error executing web service: " + e.getMessage();
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, errorMessage );
@@ -331,7 +331,7 @@ public class ClientApiServlet extends ControlledPwmServlet
                     final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmURL, pwmApplication, pwmSession );
                     idleSeconds = maxIdleTime.as( TimeDuration.Unit.SECONDS );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( pwmSession, "error determining idle timeout time for request: " + e.getMessage() );
                 }
@@ -437,7 +437,7 @@ public class ClientApiServlet extends ControlledPwmServlet
                 displayStrings.put( key, displayValue );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( pwmSession, "error expanding macro display value: " + e.getMessage() );
         }

+ 4 - 4
server/src/main/java/password/pwm/http/servlet/ControlledPwmServlet.java

@@ -92,7 +92,7 @@ public abstract class ControlledPwmServlet extends AbstractPwmServlet implements
             final Enum answer = JavaHelper.readEnumFromString( processStatusClass, null, inputParameter );
             return ( ProcessAction ) answer;
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error", e );
         }
@@ -119,7 +119,7 @@ public abstract class ControlledPwmServlet extends AbstractPwmServlet implements
                 return ( ProcessStatus ) interestedMethod.invoke( this, pwmRequest );
             }
         }
-        catch ( InvocationTargetException e )
+        catch ( final InvocationTargetException e )
         {
             final Throwable cause = e.getCause();
             if ( cause != null )
@@ -136,7 +136,7 @@ public abstract class ControlledPwmServlet extends AbstractPwmServlet implements
             }
             LOGGER.error( "uncased invocation error: " + e.getMessage(), e );
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             final String msg = "unexpected error invoking action handler for '" + action + "', error: " + e.getMessage();
             LOGGER.error( msg, e );
@@ -215,7 +215,7 @@ public abstract class ControlledPwmServlet extends AbstractPwmServlet implements
     {
         final Map<String, Method> map = new HashMap<>();
         final Collection<Method> methods = JavaHelper.getAllMethodsForClass( this.getClass() );
-        for ( Method method : methods )
+        for ( final Method method : methods )
         {
             if ( method.getAnnotation( ActionHandler.class ) != null )
             {

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/DeleteAccountServlet.java

@@ -217,7 +217,7 @@ public class DeleteAccountServlet extends ControlledPwmServlet
                 {
                     actionExecutor.executeActions( actions, pwmRequest.getSessionLabel() );
                 }
-                catch ( PwmOperationalException e )
+                catch ( final PwmOperationalException e )
                 {
                     LOGGER.error( "error during user delete action execution: " + e.getMessage() );
                     throw new PwmUnrecoverableException( e.getErrorInformation(), e.getCause() );
@@ -248,7 +248,7 @@ public class DeleteAccountServlet extends ControlledPwmServlet
             {
                 chaiUser.getChaiProvider().deleteEntry( chaiUser.getEntryDN() );
             }
-            catch ( ChaiException e )
+            catch ( final ChaiException e )
             {
                 final PwmUnrecoverableException pwmException = PwmUnrecoverableException.fromChaiException( e );
                 LOGGER.error( "error during user delete", pwmException );

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/ForgottenUsernameServlet.java

@@ -89,7 +89,7 @@ public class ForgottenUsernameServlet extends AbstractPwmServlet
         {
             return ForgottenUsernameAction.valueOf( request.readParameterAsString( PwmConstants.PARAM_ACTION_REQUEST ) );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             return null;
         }
@@ -221,7 +221,7 @@ public class ForgottenUsernameServlet extends AbstractPwmServlet
             return;
 
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             final ErrorInformation errorInfo;
             errorInfo = e.getError() == PwmError.ERROR_INTERNAL

+ 9 - 9
server/src/main/java/password/pwm/http/servlet/GuestRegistrationServlet.java

@@ -125,7 +125,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
         {
             return GuestRegistrationAction.valueOf( request.readParameterAsString( PwmConstants.PARAM_ACTION_REQUEST ) );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             return null;
         }
@@ -197,7 +197,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
         {
             guestRegistrationBean.setCurrentPage( Page.valueOf( requestedPage ) );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             LOGGER.error( pwmRequest, "unknown page select request: " + requestedPage );
         }
@@ -268,12 +268,12 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
             pwmRequest.getPwmResponse().forwardToSuccessPage( Message.Success_UpdateGuest );
             return;
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.error( pwmSession, e.getErrorInformation().toDebugStr() );
             setLastError( pwmRequest, e.getErrorInformation() );
         }
-        catch ( ChaiOperationException e )
+        catch ( final ChaiOperationException e )
         {
             final ErrorInformation info = new ErrorInformation( PwmError.ERROR_INTERNAL, "unexpected error writing to ldap: " + e.getMessage() );
             LOGGER.error( pwmSession, info );
@@ -390,12 +390,12 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
                 this.forwardToUpdateJSP( pwmRequest, guestRegistrationBean );
                 return;
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.warn( pwmSession, "error reading current attributes for user: " + e.getMessage() );
             }
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             final ErrorInformation error = e.getErrorInformation();
             setLastError( pwmRequest, error );
@@ -509,14 +509,14 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
 
             pwmRequest.getPwmResponse().forwardToSuccessPage( Message.Success_CreateGuest );
         }
-        catch ( ChaiOperationException e )
+        catch ( final ChaiOperationException e )
         {
             final ErrorInformation info = new ErrorInformation( PwmError.ERROR_NEW_USER_FAILURE, "error creating user: " + e.getMessage() );
             setLastError( pwmRequest, info );
             LOGGER.warn( pwmSession, info );
             this.forwardToJSP( pwmRequest, guestRegistrationBean );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.error( pwmSession, e.getErrorInformation().toDebugStr() );
             setLastError( pwmRequest, e.getErrorInformation() );
@@ -546,7 +546,7 @@ public class GuestRegistrationServlet extends AbstractPwmServlet
         {
             expirationDate = new SimpleDateFormat( "yyyy-MM-dd" ).parse( expirationDateStr );
         }
-        catch ( ParseException e )
+        catch ( final ParseException e )
         {
             final String errorMsg = "unable to read expiration date value: " + e.getMessage();
             throw new PwmOperationalException( new ErrorInformation( PwmError.ERROR_FIELD_REQUIRED, errorMsg, new String[]

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/LoginServlet.java

@@ -134,7 +134,7 @@ public class LoginServlet extends ControlledPwmServlet
         {
             handleLoginRequest( pwmRequest, valueMap, passwordOnly );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             setLastError( pwmRequest, e.getErrorInformation() );
             forwardToJSP( pwmRequest, passwordOnly );
@@ -164,7 +164,7 @@ public class LoginServlet extends ControlledPwmServlet
         {
             handleLoginRequest( pwmRequest, valueMap, passwordOnly );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             final ErrorInformation errorInformation = e.getErrorInformation();
             LOGGER.trace( pwmRequest, () -> "returning rest login error to client: " + errorInformation.toDebugStr() );

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/LogoutServlet.java

@@ -255,7 +255,7 @@ public class LogoutServlet extends ControlledPwmServlet
 
 
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.debug( () -> "error parsing client specified url parameter: " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/PwmServletDefinition.java

@@ -129,7 +129,7 @@ public enum PwmServletDefinition
         {
             this.patterns = getWebServletAnnotation( pwmServletClass ).urlPatterns();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             throw new IllegalStateException( "error initializing PwmServletInfo value " + this.toString() + ", error: " + e.getMessage() );
         }

+ 7 - 7
server/src/main/java/password/pwm/http/servlet/SetupOtpServlet.java

@@ -202,7 +202,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
                     pwmApplication.getStatisticsManager().incrementValue( Statistic.SETUP_OTP_SECRET );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 final ErrorInformation errorInformation;
                 if ( e instanceof PwmException )
@@ -303,7 +303,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
             LOGGER.trace( pwmSession, () -> "returning result for restValidateCode: " + JsonUtil.serialize( restResultBean ) );
             pwmRequest.outputJsonResult( restResultBean );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
 
             final String errorMsg = "error during otp code validation: " + e.getMessage();
@@ -330,7 +330,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
         {
             service.clearOTPUserConfiguration( pwmSession, theUser, pwmSession.getSessionManager().getActor( pwmApplication ) );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             setLastError( pwmRequest, e.getErrorInformation() );
             LOGGER.error( pwmRequest, e.getErrorInformation() );
@@ -382,7 +382,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
                     setLastError( pwmRequest, new ErrorInformation( PwmError.ERROR_TOKEN_INCORRECT ) );
                 }
             }
-            catch ( PwmOperationalException e )
+            catch ( final PwmOperationalException e )
             {
                 LOGGER.error( pwmRequest, "error validating otp token: " + e.getMessage() );
                 setLastError( pwmRequest, e.getErrorInformation() );
@@ -419,7 +419,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
             {
                 existingUserRecord = service.readOTPUserConfiguration( pwmRequest.getSessionLabel(), theUser );
             }
-            catch ( ChaiUnavailableException e )
+            catch ( final ChaiUnavailableException e )
             {
                 throw PwmUnrecoverableException.fromChaiException( e );
             }
@@ -456,7 +456,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
                     LOGGER.trace( pwmRequest, () -> "newly generated otp record: " + JsonUtil.serialize( otpUserRecord ) );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 final String errorMsg = "error setting up new OTP secret: " + e.getMessage();
                 LOGGER.error( pwmSession, errorMsg );
@@ -505,7 +505,7 @@ public class SetupOtpServlet extends ControlledPwmServlet
                     .stream()
                     .toByteArray();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "error generating qrcode image: " + e.getMessage() + ", payload length=" + qrCodeContent.length();
             LOGGER.error( pwmRequest, errorMsg, e );

+ 6 - 6
server/src/main/java/password/pwm/http/servlet/SetupResponsesServlet.java

@@ -225,7 +225,7 @@ public class SetupResponsesServlet extends ControlledPwmServlet
 
             pwmRequest.sendRedirect( PwmServletDefinition.SetupResponses );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.debug( pwmSession, e.getErrorInformation() );
             setLastError( pwmRequest, e.getErrorInformation() );
@@ -279,7 +279,7 @@ public class SetupResponsesServlet extends ControlledPwmServlet
             pwmApplication.getCrService().validateResponses( setupData.getChallengeSet(), responseMap, minRandomRequiredSetup );
             generateResponseInfoBean( pwmRequest, setupData.getChallengeSet(), responseMap, Collections.emptyMap() );
         }
-        catch ( PwmDataValidationException e )
+        catch ( final PwmDataValidationException e )
         {
             success = false;
             userMessage = e.getErrorInformation().toUserStr( pwmSession, pwmApplication );
@@ -372,12 +372,12 @@ public class SetupResponsesServlet extends ControlledPwmServlet
             pwmRequest.getPwmApplication().getSessionStateService().clearBean( pwmRequest, SetupResponsesBean.class );
             pwmRequest.getPwmResponse().forwardToSuccessPage( Message.Success_SetupResponse );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.error( pwmRequest.getSessionLabel(), e.getErrorInformation() );
             pwmRequest.respondWithError( e.getErrorInformation() );
         }
-        catch ( ChaiValidationException e )
+        catch ( final ChaiValidationException e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_MISSING_RANDOM_RESPONSE, e.getMessage() );
             LOGGER.error( pwmRequest.getSessionLabel(), errorInformation );
@@ -406,7 +406,7 @@ public class SetupResponsesServlet extends ControlledPwmServlet
             final int minRandomRequiredSetup = setupData.getMinRandomSetup();
             pwmRequest.getPwmApplication().getCrService().validateResponses( challengeSet, responseMap, minRandomRequiredSetup );
         }
-        catch ( PwmDataValidationException e )
+        catch ( final PwmDataValidationException e )
         {
             LOGGER.debug( pwmRequest, () -> "error with new " + ( helpdeskMode ? "helpdesk" : "user" ) + " responses: " + e.getErrorInformation().toDebugStr() );
             setLastError( pwmRequest, e.getErrorInformation() );
@@ -565,7 +565,7 @@ public class SetupResponsesServlet extends ControlledPwmServlet
 
             return responseInfoBean;
         }
-        catch ( ChaiValidationException e )
+        catch ( final ChaiValidationException e )
         {
             final ErrorInformation errorInfo = convertChaiValidationException( e );
             throw new PwmDataValidationException( errorInfo );

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/ShortcutServlet.java

@@ -80,7 +80,7 @@ public class ShortcutServlet extends AbstractPwmServlet
         {
             return ShortcutAction.valueOf( request.readParameterAsString( PwmConstants.PARAM_ACTION_REQUEST ) );
         }
-        catch ( IllegalArgumentException e )
+        catch ( final IllegalArgumentException e )
         {
             return null;
         }

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/accountinfo/AccountInformationBean.java

@@ -126,7 +126,7 @@ public class AccountInformationBean implements Serializable
         {
             auditRecords.addAll( pwmApplication.getAuditManager().readUserHistory( userInfo ) );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.debug( sessionLabel, () -> "error reading audit data for user: " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/accountinfo/AccountInformationServlet.java

@@ -90,7 +90,7 @@ public class AccountInformationServlet extends ControlledPwmServlet
             );
             pwmRequest.setAttribute( PwmRequestAttribute.AccountInfo, accountInformationBean );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.error( pwmRequest, "error reading user form data: " + e.getMessage() );
         }

+ 3 - 3
server/src/main/java/password/pwm/http/servlet/activation/ActivateUserServlet.java

@@ -275,7 +275,7 @@ public class ActivateUserServlet extends ControlledPwmServlet
             pwmApplication.getIntruderManager().convenience().clearAttributes( formValues );
             pwmApplication.getIntruderManager().convenience().clearAddressAndSession( pwmSession );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             pwmApplication.getIntruderManager().convenience().markAttributes( formValues, pwmRequest.getSessionLabel() );
             pwmApplication.getIntruderManager().convenience().markAddressAndSession( pwmSession );
@@ -351,7 +351,7 @@ public class ActivateUserServlet extends ControlledPwmServlet
                 return ProcessStatus.Halt;
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.debug( pwmRequest, () -> "error while checking entered token: " );
             errorInformation = e.getErrorInformation();
@@ -474,7 +474,7 @@ public class ActivateUserServlet extends ControlledPwmServlet
             ActivateUserUtils.activateUser( pwmRequest, activateUserBean.getUserIdentity() );
             pwmRequest.getPwmResponse().forwardToSuccessPage( Message.Success_ActivateUser );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.debug( pwmRequest, e.getErrorInformation() );
             pwmApplication.getIntruderManager().convenience().markUserIdentity( activateUserBean.getUserIdentity(), pwmSession );

+ 4 - 4
server/src/main/java/password/pwm/http/servlet/activation/ActivateUserUtils.java

@@ -93,7 +93,7 @@ class ActivateUserUtils
             {
                 theUser.unlockPassword();
             }
-            catch ( ChaiOperationException e )
+            catch ( final ChaiOperationException e )
             {
                 final String errorMsg = "error unlocking user " + userIdentity + ": " + e.getMessage();
                 final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_ACTIVATION_FAILURE, errorMsg );
@@ -139,7 +139,7 @@ class ActivateUserUtils
             // send email or sms
             sendPostActivationNotice( pwmRequest );
         }
-        catch ( ImpossiblePasswordPolicyException e )
+        catch ( final ImpossiblePasswordPolicyException e )
         {
             final ErrorInformation info = new ErrorInformation( PwmError.ERROR_INTERNAL, "unexpected ImpossiblePasswordPolicyException error while activating user" );
             LOGGER.warn( pwmSession, info, e );
@@ -187,7 +187,7 @@ class ActivateUserUtils
                     }
                     LOGGER.trace( pwmSession, () -> "successful validation of ldap value for '" + attrName + "'" );
                 }
-                catch ( ChaiOperationException e )
+                catch ( final ChaiOperationException e )
                 {
                     LOGGER.error( pwmSession.getLabel(), "error during param validation of '" + attrName + "', error: " + e.getMessage() );
                     throw new PwmDataValidationException( new ErrorInformation(
@@ -274,7 +274,7 @@ class ActivateUserUtils
         {
             toSmsNumber = userInfo.readStringAttribute( ldapProfile.readSettingAsString( PwmSetting.SMS_USER_PHONE_ATTRIBUTE ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.debug( pwmSession, () -> "error reading SMS attribute from user '" + pwmSession.getUserInfo().getUserIdentity() + "': " + e.getMessage() );
             return false;

+ 7 - 7
server/src/main/java/password/pwm/http/servlet/admin/AdminServlet.java

@@ -207,7 +207,7 @@ public class AdminServlet extends ControlledPwmServlet
         {
             pwmApplication.getAuditManager().outputVaultToCsv( outputStream, pwmRequest.getLocale(), true );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.respondWithError( errorInformation );
@@ -238,7 +238,7 @@ public class AdminServlet extends ControlledPwmServlet
             final ReportCsvUtility reportCsvUtility = new ReportCsvUtility( pwmApplication );
             reportCsvUtility.outputToCsv( outputStream, true, pwmRequest.getLocale() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.respondWithError( errorInformation );
@@ -269,7 +269,7 @@ public class AdminServlet extends ControlledPwmServlet
             final ReportCsvUtility reportCsvUtility = new ReportCsvUtility( pwmApplication );
             reportCsvUtility.outputSummaryToCsv( outputStream, pwmRequest.getLocale() );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.respondWithError( errorInformation );
@@ -298,7 +298,7 @@ public class AdminServlet extends ControlledPwmServlet
             final StatisticsManager statsManager = pwmApplication.getStatisticsManager();
             statsManager.outputStatsToCsv( outputStream, pwmRequest.getLocale(), true );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.respondWithError( errorInformation );
@@ -326,7 +326,7 @@ public class AdminServlet extends ControlledPwmServlet
         {
             pwmApplication.getSessionTrackService().outputToCsv( pwmRequest.getLocale(), pwmRequest.getConfig(), outputStream );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.respondWithError( errorInformation );
@@ -529,7 +529,7 @@ public class AdminServlet extends ControlledPwmServlet
                 returnData.put( recordType.toString(), pwmRequest.getPwmApplication().getIntruderManager().getRecords( recordType, max ) );
             }
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             final ErrorInformation errorInfo = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             LOGGER.debug( pwmRequest, errorInfo );
@@ -558,7 +558,7 @@ public class AdminServlet extends ControlledPwmServlet
             final AdminBean adminBean = pwmRequest.getPwmApplication().getSessionStateService().getBean( pwmRequest, AdminBean.class );
             adminBean.setLastUserDebug( userIdentity );
         }
-        catch ( PwmUnrecoverableException | PwmOperationalException e )
+        catch ( final PwmUnrecoverableException | PwmOperationalException e )
         {
             setLastError( pwmRequest, e.getErrorInformation() );
             return;

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/admin/AppDashboardData.java

@@ -413,7 +413,7 @@ public class AppDashboardData implements Serializable
                 returnData.put( db, numberFormat.format( localDB.size( db ) ) );
             }
         }
-        catch ( LocalDBException e )
+        catch ( final LocalDBException e )
         {
             LOGGER.error( "error making localDB size bean: " + e.getMessage() );
         }
@@ -547,7 +547,7 @@ public class AppDashboardData implements Serializable
                 ) );
             }
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.trace( () -> "error building AppDashboardData node-state: " + e.getMessage() );
         }

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/admin/UserDebugDataReader.java

@@ -83,7 +83,7 @@ public class UserDebugDataReader
         {
             readablePassword = null != LdapOperationsHelper.readLdapPassword( pwmApplication, sessionLabel, userIdentity );
         }
-        catch ( ChaiUnavailableException e )
+        catch ( final ChaiUnavailableException e )
         {
             /* disregard */
         }
@@ -174,7 +174,7 @@ public class UserDebugDataReader
                     return value.get();
                 }
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 LOGGER.debug( () -> "error reading user pwNotify status: " + e.getMessage() );
             }

+ 4 - 4
server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServlet.java

@@ -194,7 +194,7 @@ public abstract class ChangePasswordServlet extends ControlledPwmServlet
             final PasswordData oldPassword = pwmRequest.getPwmSession().getLoginInfoBean().getUserCurrentPassword();
             pwmPasswordRuleValidator.testPassword( password1, oldPassword, userInfo, theUser );
         }
-        catch ( PwmDataValidationException e )
+        catch ( final PwmDataValidationException e )
         {
             setLastError( pwmRequest, e.getErrorInformation() );
             LOGGER.debug( pwmRequest, () -> "failed password validation check: " + e.getErrorInformation().toDebugStr() );
@@ -216,7 +216,7 @@ public abstract class ChangePasswordServlet extends ControlledPwmServlet
         {
             ChangePasswordServletUtil.executeChangePassword( pwmRequest, password1 );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.debug( () -> e.getErrorInformation().toDebugStr() );
             setLastError( pwmRequest, e.getErrorInformation() );
@@ -299,7 +299,7 @@ public abstract class ChangePasswordServlet extends ControlledPwmServlet
 
             cpb.setFormPassed( true );
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             pwmRequest.getPwmApplication().getIntruderManager().convenience().markAddressAndSession( pwmRequest.getPwmSession() );
             pwmRequest.getPwmApplication().getIntruderManager().convenience().markUserIdentity( userInfo.getUserIdentity(), pwmRequest.getSessionLabel() );
@@ -366,7 +366,7 @@ public abstract class ChangePasswordServlet extends ControlledPwmServlet
                     pwmRequest.getPwmApplication().getStatisticsManager().updateAverageValue( AvgStatistic.AVG_PASSWORD_SYNC_TIME, totalTime.asMillis() );
                     LOGGER.trace( pwmRequest, () -> "password sync process marked completed (" + totalTime.asCompactString() + ")" );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     LOGGER.error( pwmRequest, "unable to update average password sync time statistic: " + e.getMessage() );
                 }

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/changepw/ChangePasswordServletUtil.java

@@ -125,7 +125,7 @@ public class ChangePasswordServletUtil
                 }
                 LOGGER.trace( pwmSession, () -> "successful validation of ldap value for '" + attrName + "'" );
             }
-            catch ( ChaiOperationException e )
+            catch ( final ChaiOperationException e )
             {
                 LOGGER.error( pwmSession, "error during param validation of '" + attrName + "', error: " + e.getMessage() );
                 throw new PwmDataValidationException( new ErrorInformation(

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/command/CommandServlet.java

@@ -107,7 +107,7 @@ public abstract class CommandServlet extends ControlledPwmServlet
             final Map<String, Object> map = JsonUtil.deserializeStringObjectMap( body );
             LOGGER.trace( () -> "CSP Report: " + JsonUtil.serializeMap( map, JsonUtil.Flag.PrettyPrint ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error processing csp report: " + e.getMessage() + ", body=" + body );
         }

+ 4 - 4
server/src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServlet.java

@@ -220,7 +220,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
             final RestResultBean restResultBean = RestResultBean.forSuccessMessage( result, pwmRequest, Message.Success_Unknown );
             pwmRequest.outputJsonResult( restResultBean );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final RestResultBean restResultBean;
             if ( e instanceof PwmException )
@@ -732,7 +732,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
                 returnRecords.add( new HealthRecord( HealthStatus.INFO, HealthTopic.SMS, "message sent" ) );
                 returnRecords.add( new HealthRecord( HealthStatus.INFO, HealthTopic.SMS, "response body: \n" + StringUtil.escapeHtml( responseBody ) ) );
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 returnRecords.add( new HealthRecord( HealthStatus.WARN, HealthTopic.SMS, "unable to send message: " + e.getMessage() ) );
             }
@@ -1001,7 +1001,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
             final String output = macroMachine.expandMacros( input );
             pwmRequest.outputJsonResult( RestResultBean.withData( output ) );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             LOGGER.error( pwmRequest, e.getErrorInformation() );
             pwmRequest.respondWithError( e.getErrorInformation() );
@@ -1029,7 +1029,7 @@ public class ConfigEditorServlet extends ControlledPwmServlet
         {
             result = ldapBrowser.doBrowse( profile, dn );
         }
-        catch ( PwmUnrecoverableException e )
+        catch ( final PwmUnrecoverableException e )
         {
             // Probably was given a bad dn, better just browse without a DN than error out completely
             result = ldapBrowser.doBrowse( profile, "" );

+ 3 - 3
server/src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServletUtils.java

@@ -66,13 +66,13 @@ public class ConfigEditorServletUtils
         {
             fileUploads = pwmRequest.readFileUploads( maxFileSize, 1 );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             pwmRequest.outputJsonResult( RestResultBean.fromError( e.getErrorInformation(), pwmRequest ) );
             LOGGER.error( pwmRequest, "error during file upload: " + e.getErrorInformation().toDebugStr() );
             return null;
         }
-        catch ( Throwable e )
+        catch ( final Throwable e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, "error during file upload: " + e.getMessage() );
             pwmRequest.outputJsonResult( RestResultBean.fromError( errorInformation, pwmRequest ) );
@@ -157,7 +157,7 @@ public class ConfigEditorServletUtils
                     .records( password.pwm.ws.server.rest.bean.HealthRecord.fromHealthRecords( healthRecords, locale, config ) )
                     .build();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( pwmRequest, "error generating health records: " + e.getMessage() );
         }

+ 1 - 1
server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideForm.java

@@ -246,7 +246,7 @@ public class ConfigGuideForm
             final URI uri = new URI( uriString );
             return uri.getHost();
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "error calculating ldap hostname example: " + e.getMessage() );
         }

+ 13 - 13
server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideServlet.java

@@ -194,7 +194,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
                     configGuideBean.setCertsTrustedbyKeystore( false );
                 }
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( "error reading/testing ldap server certificates: " + e.getMessage() );
             }
@@ -252,7 +252,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
                     ConfigGuideUtils.checkLdapServer( configGuideBean );
                     records.add( password.pwm.health.HealthRecord.forMessage( HealthMessage.LDAP_OK ) );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     records.add( new HealthRecord( HealthStatus.WARN, HealthTopic.LDAP, "Can not connect to remote server: " + e.getMessage() ) );
                 }
@@ -302,11 +302,11 @@ public class ConfigGuideServlet extends ControlledPwmServlet
                         records.add( new HealthRecord( HealthStatus.GOOD, HealthTopic.LDAP, "Admin group validated" ) );
                     }
                 }
-                catch ( PwmException e )
+                catch ( final PwmException e )
                 {
                     records.add( new HealthRecord( HealthStatus.WARN, HealthTopic.LDAP, "Error during admin group validation: " + e.getErrorInformation().toDebugStr() ) );
                 }
-                catch ( Exception e )
+                catch ( final Exception e )
                 {
                     records.add( new HealthRecord( HealthStatus.WARN, HealthTopic.LDAP, "Error during admin group validation: " + e.getMessage() ) );
                 }
@@ -364,12 +364,12 @@ public class ConfigGuideServlet extends ControlledPwmServlet
             final Serializable output = userMatchViewerFunction.provideFunction( pwmRequest, modifier, PwmSetting.QUERY_MATCH_PWM_ADMIN, null, null );
             pwmRequest.outputJsonResult( RestResultBean.withData( output ) );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             LOGGER.error( pwmRequest, e.getErrorInformation() );
             pwmRequest.respondWithError( e.getErrorInformation(), false );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, "error while testing matches = " + e.getMessage() );
             LOGGER.error( pwmRequest, errorInformation );
@@ -453,7 +453,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
             {
                 step = GuideStep.valueOf( requestedStep );
             }
-            catch ( IllegalArgumentException e )
+            catch ( final IllegalArgumentException e )
             {
                 final String errorMsg = "unknown goto step request: " + requestedStep;
                 LOGGER.error( pwmRequest, errorMsg );
@@ -490,13 +490,13 @@ public class ConfigGuideServlet extends ControlledPwmServlet
                 ConfigGuideUtils.writeConfig( contextManager, configGuideBean );
                 pwmRequest.getPwmSession().getSessionStateBean().setTheme( null );
             }
-            catch ( PwmException e )
+            catch ( final PwmException e )
             {
                 final RestResultBean restResultBean = RestResultBean.fromError( e.getErrorInformation(), pwmRequest );
                 pwmRequest.outputJsonResult( restResultBean );
                 return ProcessStatus.Halt;
             }
-            catch ( Exception e )
+            catch ( final Exception e )
             {
                 LOGGER.error( pwmRequest, "error during save: " + e.getMessage(), e );
                 final RestResultBean restResultBean = RestResultBean.fromError( new ErrorInformation(
@@ -536,7 +536,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
             final SchemaOperationResult schemaOperationResult = ConfigGuideUtils.extendSchema( pwmRequest.getPwmApplication(), configGuideBean, true );
             pwmRequest.outputJsonResult( RestResultBean.withData( schemaOperationResult.getOperationLog() ) );
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_INTERNAL, e.getMessage() );
             pwmRequest.outputJsonResult( RestResultBean.fromError( errorInformation, pwmRequest ) );
@@ -559,7 +559,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
             final RestResultBean restResultBean = RestResultBean.forSuccessMessage( pwmRequest, Message.Success_Unknown );
             pwmRequest.getPwmResponse().outputJsonResult( restResultBean );
         }
-        catch ( PwmException e )
+        catch ( final PwmException e )
         {
             final RestResultBean restResultBean = RestResultBean.fromError( e.getErrorInformation(), pwmRequest );
             pwmRequest.getPwmResponse().outputJsonResult( restResultBean );
@@ -584,7 +584,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
             pwmRequest.outputJsonResult( RestResultBean.forSuccessMessage( pwmRequest, Message.Success_Unknown ) );
             pwmRequest.invalidateSession();
         }
-        catch ( PwmOperationalException e )
+        catch ( final PwmOperationalException e )
         {
             LOGGER.error( "error during skip config guide: " + e.getMessage(), e );
         }
@@ -644,7 +644,7 @@ public class ConfigGuideServlet extends ControlledPwmServlet
                 configGuideBean.getFormData().put( ConfigGuideFormField.CHALLENGE_RESPONSE_DATA, JsonUtil.serialize( (Serializable) storedValue.toNativeObject() ) );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             final String errorMsg = "error writing default value for setting " + setting.toString() + ", error: " + e.getMessage();
             LOGGER.error( errorMsg, e );

+ 2 - 2
server/src/main/java/password/pwm/http/servlet/configguide/ConfigGuideUtils.java

@@ -154,7 +154,7 @@ public class ConfigGuideUtils
                 return SchemaManager.checkExistingSchema( chaiProvider );
             }
         }
-        catch ( Exception e )
+        catch ( final Exception e )
         {
             LOGGER.error( "unable to create schema extender object: " + e.getMessage() );
             return null;
@@ -250,7 +250,7 @@ public class ConfigGuideUtils
                     pwmRequest.getPwmResponse().outputJsonResult( restResultBean );
                     req.getSession().invalidate();
                 }
-                catch ( PwmException e )
+                catch ( final PwmException e )
                 {
                     final RestResultBean restResultBean = RestResultBean.fromError( e.getErrorInformation(), pwmRequest );
                     pwmRequest.getPwmResponse().outputJsonResult( restResultBean );

+ 3 - 3
server/src/main/java/password/pwm/http/servlet/configguide/GuideStep.java

@@ -107,7 +107,7 @@ public enum GuideStep
                 visibilityCheckImpl = visibilityCheckClass.newInstance();
                 return visibilityCheckImpl.visible( configGuideBean );
             }
-            catch ( ReflectiveOperationException e )
+            catch ( final ReflectiveOperationException e )
             {
                 LOGGER.error( "unexpected error during step visibility check: " + e.getMessage(), e );
             }
@@ -130,7 +130,7 @@ public enum GuideStep
                 final Set<PwmSettingTemplate> templates = ConfigGuideForm.generateStoredConfig( configGuideBean ).getTemplateSet().getTemplates();
                 return templates.contains( PwmSettingTemplate.LDAP );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 return true;
             }
@@ -146,7 +146,7 @@ public enum GuideStep
                 final Set<PwmSettingTemplate> templates = ConfigGuideForm.generateStoredConfig( configGuideBean ).getTemplateSet().getTemplates();
                 return templates.contains( PwmSettingTemplate.DB );
             }
-            catch ( PwmUnrecoverableException e )
+            catch ( final PwmUnrecoverableException e )
             {
                 return true;
             }

Some files were not shown because too many files changed in this diff