From b9346ff57677f598e7d27ae741ae6a4612972288 Mon Sep 17 00:00:00 2001 From: Ryan Goulding Date: Tue, 17 Jan 2017 19:00:50 -0500 Subject: [PATCH] Just clean up some log messages and remove unnecessary code Change-Id: If67440d7bdd9993614cc9923060512edbc667c85 Signed-off-by: Ryan Goulding --- .../opendaylight/aaa/impl/shiro/ServiceProxy.java | 3 +-- .../aaa/impl/shiro/filters/AAAFilter.java | 14 +++++--------- .../aaa/impl/shiro/filters/AAAShiroFilter.java | 2 +- .../impl/shiro/filters/AuthenticationListener.java | 6 ++---- .../shiro/filters/ODLHttpAuthenticationFilter.java | 1 - .../aaa/impl/shiro/realm/ODLJndiLdapRealm.java | 4 +--- .../shiro/realm/ODLJndiLdapRealmAuthNOnly.java | 1 - .../aaa/impl/shiro/realm/TokenAuthRealm.java | 1 - 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/ServiceProxy.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/ServiceProxy.java index e4485d733..0f773c036 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/ServiceProxy.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/ServiceProxy.java @@ -71,8 +71,7 @@ public class ServiceProxy { */ public synchronized void setEnabled(final boolean enabled) { this.enabled = enabled; - final String SERVICE_ENABLED_INFO_MESSAGE = "Setting ServiceProxy enabled to " + enabled; - LOG.info(SERVICE_ENABLED_INFO_MESSAGE); + LOG.info("Setting ServiceProxy enabled to {}", enabled); // check for null because of non-determinism in bundle load if (filter != null) { filter.setEnabled(enabled); diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAFilter.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAFilter.java index 47dd95499..0e6de17b9 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAFilter.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAFilter.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; * delivering debug information; to enable these debug statements, please issue * the following in the karaf shell: * - * log:set debug org.opendaylight.aaa.shiro.filters.AAAFilter + * log:set DEBUG org.opendaylight.aaa.shiro.filters.AAAFilter * * @author Ryan Goulding (ryandgoulding@gmail.com) * @see javax.servlet.Filter @@ -29,9 +29,7 @@ public class AAAFilter extends ShiroFilter { private static final Logger LOG = LoggerFactory.getLogger(AAAFilter.class); public AAAFilter() { - super(); - final String DEBUG_MESSAGE = "Creating the AAAFilter"; - LOG.debug(DEBUG_MESSAGE); + LOG.debug("Creating the AAAFilter"); } /* @@ -46,8 +44,7 @@ public class AAAFilter extends ShiroFilter { @Override public void init() throws Exception { super.init(); - final String DEBUG_MESSAGE = "Initializing the AAAFilter"; - LOG.debug(DEBUG_MESSAGE); + LOG.debug("Initializing the AAAFilter"); // sets the filter to the startup value. Because of non-determinism in // bundle loading, this passes an instance of itself along so that if // the @@ -64,9 +61,8 @@ public class AAAFilter extends ShiroFilter { * org.apache.shiro.web.servlet.OncePerRequestFilter#setEnabled(boolean) */ @Override - public void setEnabled(boolean enabled) { + public void setEnabled(final boolean enabled) { super.setEnabled(enabled); - final String DEBUG_MESSAGE = "Setting AAAFilter enabled to " + enabled; - LOG.debug(DEBUG_MESSAGE); + LOG.debug("Setting AAAFilter enabled to {}", enabled); } } diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAShiroFilter.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAShiroFilter.java index 530acfac6..851da4020 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAShiroFilter.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AAAShiroFilter.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; * This class is also responsible for delivering debug information; to enable these * debug statements, please issue the following in the karaf shell: * - * log:set debug org.opendaylight.aaa.shiro.filters.AAAShiroFilter + * log:set DEBUG org.opendaylight.aaa.shiro.filters.AAAShiroFilter * * @author Ryan Goulding (ryandgoulding@gmail.com) * @see javax.servlet.Filter diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AuthenticationListener.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AuthenticationListener.java index 080ab1147..cd79efff5 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AuthenticationListener.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/AuthenticationListener.java @@ -31,16 +31,14 @@ public class AuthenticationListener implements org.apache.shiro.authc.Authentica @Override public void onSuccess(final AuthenticationToken authenticationToken, final AuthenticationInfo authenticationInfo) { if (LOG.isDebugEnabled()) { - final String successMessage = AuthenticationTokenUtils.generateSuccessfulAuthenticationMessage(authenticationToken); - LOG.debug(successMessage); + LOG.debug(AuthenticationTokenUtils.generateSuccessfulAuthenticationMessage(authenticationToken)); } } @Override public void onFailure(final AuthenticationToken authenticationToken, final AuthenticationException e) { if (LOG.isDebugEnabled()) { - final String failureMessage = AuthenticationTokenUtils.generateUnsuccessfulAuthenticationMessage(authenticationToken); - LOG.debug(failureMessage); + LOG.debug(AuthenticationTokenUtils.generateUnsuccessfulAuthenticationMessage(authenticationToken)); } } diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/ODLHttpAuthenticationFilter.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/ODLHttpAuthenticationFilter.java index 90b0101ed..305dd6ab2 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/ODLHttpAuthenticationFilter.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/filters/ODLHttpAuthenticationFilter.java @@ -42,7 +42,6 @@ public class ODLHttpAuthenticationFilter extends BasicHttpAuthenticationFilter { protected static final String OPTIONS_HEADER = "OPTIONS"; public ODLHttpAuthenticationFilter() { - super(); LOG.info("Creating the ODLHttpAuthenticationFilter"); } diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealm.java index f9d79228d..5710405d5 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealm.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealm.java @@ -116,9 +116,7 @@ public class ODLJndiLdapRealm extends JndiLdapRealm implements Nameable { * Adds debugging information surrounding creation of ODLJndiLdapRealm */ public ODLJndiLdapRealm() { - super(); - final String DEBUG_MESSAGE = "Creating ODLJndiLdapRealm"; - LOG.debug(DEBUG_MESSAGE); + LOG.debug("Creating ODLJndiLdapRealm"); } /* diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealmAuthNOnly.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealmAuthNOnly.java index 978266c55..d8621ad33 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealmAuthNOnly.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/ODLJndiLdapRealmAuthNOnly.java @@ -46,7 +46,6 @@ public class ODLJndiLdapRealmAuthNOnly extends JndiLdapRealm { * Adds debugging information surrounding creation of ODLJndiLdapRealm */ public ODLJndiLdapRealmAuthNOnly() { - super(); LOG.debug("Creating ODLJndiLdapRealmAuthNOnly"); } diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/TokenAuthRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/TokenAuthRealm.java index f9ae50516..a3bd2a68e 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/TokenAuthRealm.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/impl/shiro/realm/TokenAuthRealm.java @@ -74,7 +74,6 @@ public class TokenAuthRealm extends AuthorizingRealm { private static final Logger LOG = LoggerFactory.getLogger(TokenAuthRealm.class); public TokenAuthRealm() { - super(); super.setName(TOKEN_AUTH_REALM_DEFAULT_NAME); } -- 2.36.6