diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java b/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java index 6ab0ac69e3..bb239a648f 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java +++ b/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java @@ -34,6 +34,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The common implementation of Configuration interface for configuring the {@link @@ -51,8 +52,8 @@ public abstract class LocalPolarisMetaStoreManagerFactory protected PolarisStorageIntegrationProvider storageIntegration; - private final Logger LOGGER = - org.slf4j.LoggerFactory.getLogger(LocalPolarisMetaStoreManagerFactory.class); + private static final Logger LOGGER = + LoggerFactory.getLogger(LocalPolarisMetaStoreManagerFactory.class); protected abstract StoreType createBackingStore(@NotNull PolarisDiagnostics diagnostics); diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java index cd618bf685..83a4d53baf 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java +++ b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java @@ -35,6 +35,8 @@ /** A mapper to serialize/deserialize polaris objects. */ public class PolarisObjectMapperUtil { + private static final Logger LOGGER = LoggerFactory.getLogger(PolarisObjectMapperUtil.class); + /** mapper, allows to serialize/deserialize properties to/from JSON */ private static final ObjectMapper MAPPER = configureMapper(); @@ -174,8 +176,7 @@ public int getAttemptCount() { } return new TaskExecutionState(executorId, lastAttemptStartTime, attemptCount); } catch (IOException e) { - Logger logger = LoggerFactory.getLogger(PolarisObjectMapperUtil.class); - logger + LOGGER .atWarn() .addKeyValue("json", entity.getProperties()) .addKeyValue("error", e.getMessage()) diff --git a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java b/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java index 2a7e518b19..d29686da46 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java @@ -54,7 +54,8 @@ public class AzureCredentialsStorageIntegration extends InMemoryStorageIntegration { - private final Logger LOGGER = LoggerFactory.getLogger(AzureCredentialsStorageIntegration.class); + private static final Logger LOGGER = + LoggerFactory.getLogger(AzureCredentialsStorageIntegration.class); final DefaultAzureCredential defaultAzureCredential; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java b/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java index f76a88b158..d7a4abfd3b 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java @@ -49,7 +49,8 @@ */ public class GcpCredentialsStorageIntegration extends InMemoryStorageIntegration { - private final Logger LOGGER = LoggerFactory.getLogger(GcpCredentialsStorageIntegration.class); + private static final Logger LOGGER = + LoggerFactory.getLogger(GcpCredentialsStorageIntegration.class); private final GoogleCredentials sourceCredentials; private final HttpTransportFactory transportFactory; diff --git a/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java b/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java index 11056985be..577efa3312 100644 --- a/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java +++ b/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java @@ -63,7 +63,8 @@ class GcpCredentialsStorageIntegrationTest { private final String gcsServiceKeyJsonFileLocation = System.getenv("GOOGLE_APPLICATION_CREDENTIALS"); - private final Logger LOGGER = LoggerFactory.getLogger(GcpCredentialsStorageIntegrationTest.class); + private static final Logger LOGGER = + LoggerFactory.getLogger(GcpCredentialsStorageIntegrationTest.class); @ParameterizedTest @ValueSource(booleans = {true, false}) diff --git a/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java b/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java index c4c9969a1e..cbfaafe1e3 100644 --- a/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java +++ b/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java @@ -27,6 +27,7 @@ import java.util.Map; import net.sourceforge.argparse4j.inf.Namespace; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Command for bootstrapping root level service principals for each realm. This command will invoke @@ -34,7 +35,7 @@ * printed out to the log and standard output (stdout). */ public class BootstrapRealmsCommand extends ConfiguredCommand { - private Logger LOGGER = org.slf4j.LoggerFactory.getLogger(BootstrapRealmsCommand.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BootstrapRealmsCommand.class); public BootstrapRealmsCommand() { super("bootstrap", "bootstraps principal credentials for all realms and prints them to log"); diff --git a/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java b/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java index ed26f5a9fd..487783ad36 100644 --- a/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java +++ b/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java @@ -25,10 +25,11 @@ import io.polaris.service.context.CallContextResolver; import net.sourceforge.argparse4j.inf.Namespace; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Command for purging all metadata associated with a realm */ public class PurgeRealmsCommand extends ConfiguredCommand { - private Logger LOGGER = org.slf4j.LoggerFactory.getLogger(PurgeRealmsCommand.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PurgeRealmsCommand.class); public PurgeRealmsCommand() { super("purge", "purge principal credentials for all realms and prints them to log"); diff --git a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java b/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java index aef9a9cae0..7eb63ee73d 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java +++ b/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java @@ -79,7 +79,7 @@ protected Optional getPrincipal(DecodedToken toke PolarisEntitySubType.NULL_SUBTYPE, tokenInfo.getSub())); } catch (Exception e) { - LoggerFactory.getLogger(BasePolarisAuthenticator.class) + LOGGER .atError() .addKeyValue("errMsg", e.getMessage()) .addKeyValue("stackTrace", ExceptionUtils.getStackTrace(e)) diff --git a/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java b/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java index 7b112c4f57..9f5e25f92e 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java +++ b/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java @@ -42,7 +42,7 @@ * cleanup tasks are scheduled in a batch so tasks should be stored atomically. */ public class TableCleanupTaskHandler implements TaskHandler { - private final Logger LOGGER = LoggerFactory.getLogger(TableCleanupTaskHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TableCleanupTaskHandler.class); private final TaskExecutor taskExecutor; private final MetaStoreManagerFactory metaStoreManagerFactory; private final Function fileIOSupplier; diff --git a/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java b/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java index ec3728984f..836ac61c24 100644 --- a/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java +++ b/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java @@ -35,11 +35,13 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolutionException; import org.junit.jupiter.api.extension.ParameterResolver; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class SnowmanCredentialsExtension implements BeforeAllCallback, AfterAllCallback, ParameterResolver { + private static final Logger LOGGER = LoggerFactory.getLogger(SnowmanCredentialsExtension.class); private SnowmanCredentials snowmanCredentials; public record SnowmanCredentials(String clientId, String clientSecret) {} @@ -53,7 +55,7 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception { .get(REALM_PROPERTY_KEY, String.class); if (adminSecrets == null) { - LoggerFactory.getLogger(SnowmanCredentialsExtension.class) + LOGGER .atError() .log( "No admin secrets configured - you must also configure your test with PolarisConnectionExtension"); @@ -159,7 +161,7 @@ public void afterAll(ExtensionContext extensionContext) throws Exception { .get(REALM_PROPERTY_KEY, String.class); if (adminSecrets == null) { - LoggerFactory.getLogger(SnowmanCredentialsExtension.class) + LOGGER .atError() .log( "No admin secrets configured - you must also configure your test with PolarisConnectionExtension");