[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyS...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 31 14:06:30 2014
New Revision: 650

URL: http://svn.shibboleth.net/view/utilities?rev=650&view=rev
Log:
IDP-456: Logging fixes

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/LoggingErrorHandler.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java?rev=650&r1=649&r2=650&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java Thu Jul 31 14:06:30 2014
@@ -222,7 +222,7 @@
             updateDefaultKey();
     
         } catch (final KeyException e) {
-            log.error("Error loading default key from base name '" + keyAlias + "'", e);
+            log.error("Error loading default key from base name '{}'", keyAlias, e);
             throw new ComponentInitializationException("Exception loading the default key", e);
         }
 
@@ -294,7 +294,7 @@
             return (SecretKey) loadedKey;
         } catch (final KeyStoreException | NoSuchAlgorithmException | CertificateException
                     | IOException | UnrecoverableKeyException e) {
-            log.error("Error loading key named '" + name + "'", e);
+            log.error("Error loading key named '{}'", name, e);
             throw new KeyException(e);
         }
     }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java?rev=650&r1=649&r2=650&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java Thu Jul 31 14:06:30 2014
@@ -47,7 +47,7 @@
         ReloadableService<T>, UnmodifiableComponent {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractReloadableService.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractReloadableService.class);
 
     /**
      * Number of milliseconds between one reload check and another. A value of 0 or less indicates that no reloading
@@ -56,25 +56,25 @@
     @Duration private long reloadCheckDelay = 300000;
 
     /** Timer used to schedule configuration reload tasks. */
-    private Timer reloadTaskTimer;
+    @Nullable private Timer reloadTaskTimer;
 
     /** Watcher that monitors the set of configuration resources for this service for changes. */
-    private ServiceReloadTask reloadTask;
+    @Nullable private ServiceReloadTask reloadTask;
 
     /** The last time time the service was reloaded, whether successful or not. */
-    private DateTime lastReloadInstant;
+    @Nullable private DateTime lastReloadInstant;
 
     /** The last time the service was reloaded successfully. */
-    private DateTime lastSuccessfulReleaseIntant;
+    @Nullable private DateTime lastSuccessfulReleaseIntant;
 
     /** The cause of the last reload failure, if the last reload failed. */
-    private Throwable reloadFailureCause;
+    @Nullable private Throwable reloadFailureCause;
 
     /** Do we fail immediately if the config is bogus? */
     private boolean failFast;
 
     /** The log prefix. */
-    private String logPrefix;
+    @Nullable private String logPrefix;
 
     /**
      * Gets the number of milliseconds between one reload check and another. A value of 0 or less indicates that no
@@ -94,7 +94,7 @@
      * 
      * @param delay number of milliseconds between one reload check and another
      */
-    public void setReloadCheckDelay(@Duration long delay) {
+    public void setReloadCheckDelay(@Duration final long delay) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         reloadCheckDelay = delay;
@@ -151,7 +151,7 @@
      * 
      * @param value what to set.
      */
-    public void setFailFast(boolean value) {
+    public void setFailFast(final boolean value) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         failFast = value;
     }

[... 223 lines stripped ...]