From 0359aa6225f929d365a8e649a438d88582512b42 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 21 Jan 2022 15:23:40 -0800 Subject: [PATCH] GUACAMOLE-641: Follow widely-accepted `public static final Logger` idiom. From https://github.com/apache/guacamole-client/pull/336#discussion_r241549475: > > SLF4J formerly recommended that instance variables be used > (non-static), but no longer takes either stance: > https://www.slf4j.org/faq.html#declared_static > > If we have to pick something to be the standard going forward, I'd > say let's stick with the accepted idiom of `private static final` > loggers, with the exception being where it's actually necessary to > not be `static` (dependency injection). > --- .../guacamole/auth/vault/secret/CachedVaultSecretService.java | 2 +- .../org/apache/guacamole/auth/vault/user/VaultUserContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java b/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java index 63e95ce6d..e3f26bdd3 100644 --- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java +++ b/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java @@ -40,7 +40,7 @@ public abstract class CachedVaultSecretService implements VaultSecretService { /** * Logger for this class. */ - private final Logger logger = LoggerFactory.getLogger(CachedVaultSecretService.class); + private static final Logger logger = LoggerFactory.getLogger(CachedVaultSecretService.class); /** * The cached value of a secret. diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java b/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java index 5e8e6276d..9986dc32a 100644 --- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java +++ b/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java @@ -49,7 +49,7 @@ public class VaultUserContext extends TokenInjectingUserContext { /** * Logger for this class. */ - private final Logger logger = LoggerFactory.getLogger(VaultUserContext.class); + private static final Logger logger = LoggerFactory.getLogger(VaultUserContext.class); /** * The name of the token which will be replaced with the username of the