Standardize use of Logger (#94)

Author: eric-maynard

extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java

@@ -81,7 +81,7 @@
  * Polaris metadata from/to the configured database systems.
  */
 public class PolarisEclipseLinkMetaStoreSessionImpl implements PolarisMetaStoreSession {
-  private static final Logger LOG =
+  private static final Logger LOGGER =
       LoggerFactory.getLogger(PolarisEclipseLinkMetaStoreSessionImpl.class);
 
   // Cache to hold the EntityManagerFactory for each realm. Each realm needs a separate
@@ -108,7 +108,7 @@ public PolarisEclipseLinkMetaStoreSessionImpl(
       @NotNull RealmContext realmContext,
       @Nullable String confFile,
       @Nullable String persistenceUnitName) {
-    LOG.debug("Create EclipseLink Meta Store Session for {}", realmContext.getRealmIdentifier());
+    LOGGER.debug("Create EclipseLink Meta Store Session for {}", realmContext.getRealmIdentifier());
     emf = createEntityManagerFactory(realmContext, confFile, persistenceUnitName);
 
     // init store
@@ -150,14 +150,14 @@ private EntityManagerFactory createEntityManagerFactory(
           prefixUrl = new File(jarPrefixPath).toURI().toURL();
         }
 
-        LOG.info(
+        LOGGER.info(
             "Created a new ClassLoader with the jar {} in classpath to load the config file",
             prefixUrl);
 
         URLClassLoader currentClassLoader =
             new URLClassLoader(new URL[] {prefixUrl}, this.getClass().getClassLoader());
 
-        LOG.debug("Update ClassLoader in current thread temporarily");
+        LOGGER.debug("Update ClassLoader in current thread temporarily");
         Thread.currentThread().setContextClassLoader(currentClassLoader);
       }
 
@@ -215,7 +215,7 @@ private Map<String, String> loadProperties(
           String.format(
               "Cannot find or parse the configuration file %s for persistence-unit %s",
               confFile, persistenceUnitName);
-      LOG.error(str, e);
+      LOGGER.error(str, e);
       throw new IOException(str);
     }
   }
@@ -237,13 +237,13 @@ public <T> T runInTransaction(
         // Commit when it's not rolled back by the client
         if (session.getTransaction().isActive()) {
           tr.commit();
-          LOG.debug("transaction committed");
+          LOGGER.debug("transaction committed");
         }
 
         return result;
       } catch (Exception e) {
         tr.rollback();
-        LOG.debug("transaction rolled back", e);
+        LOGGER.debug("transaction rolled back", e);
 
         if (e instanceof OptimisticLockException
             || e.getCause() instanceof OptimisticLockException) {
@@ -274,11 +274,11 @@ public void runActionInTransaction(
         // Commit when it's not rolled back by the client
         if (session.getTransaction().isActive()) {
           tr.commit();
-          LOG.debug("transaction committed");
+          LOGGER.debug("transaction committed");
         }
       } catch (Exception e) {
         tr.rollback();
-        LOG.debug("transaction rolled back", e);
+        LOGGER.debug("transaction rolled back", e);
 
         if (e instanceof OptimisticLockException
             || e.getCause() instanceof OptimisticLockException) {

extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java

@@ -45,7 +45,7 @@
  * with EclipseLink support
  */
 public class PolarisEclipseLinkStore {
-  private static final Logger LOG = LoggerFactory.getLogger(PolarisEclipseLinkStore.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisEclipseLinkStore.class);
 
   // diagnostic services
   private final PolarisDiagnostics diagnosticServices;
@@ -195,7 +195,7 @@ void deleteAll(EntityManager session) {
     session.createQuery("DELETE from ModelGrantRecord").executeUpdate();
     session.createQuery("DELETE from ModelPrincipalSecrets").executeUpdate();
 
-    LOG.debug("All entities deleted.");
+    LOGGER.debug("All entities deleted.");
   }
 
   ModelEntity lookupEntity(EntityManager session, long catalogId, long entityId) {

polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizer.java

@@ -114,7 +114,7 @@
  * which translates into a cross-catalog permission.
  */
 public class PolarisAuthorizer {
-  private static final Logger LOG = LoggerFactory.getLogger(PolarisAuthorizer.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisAuthorizer.class);
 
   private static final SetMultimap<PolarisPrivilege, PolarisPrivilege> SUPER_PRIVILEGES =
       HashMultimap.create();
@@ -605,7 +605,7 @@ public boolean hasTransitivePrivilege(
             desiredPrivilege, PolarisPrivilege.fromCode(grantRecord.getPrivilegeCode()))) {
           // Found a potential candidate for satisfying our authz goal.
           if (activatedGranteeIds.contains(grantRecord.getGranteeId())) {
-            LOG.debug(
+            LOGGER.debug(
                 "Satisfied privilege {} with grantRecord {} from securable {} for "
                     + "principalName {} and activatedIds {}",
                 desiredPrivilege,
@@ -619,7 +619,7 @@ public boolean hasTransitivePrivilege(
       }
     }
 
-    LOG.debug(
+    LOGGER.debug(
         "Failed to satisfy privilege {} for principalName {} on resolvedPath {}",
         desiredPrivilege,
         authenticatedPolarisPrincipal.getName(),

polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java

@@ -51,7 +51,7 @@ public abstract class LocalPolarisMetaStoreManagerFactory<StoreType>
 
   protected PolarisStorageIntegrationProvider storageIntegration;
 
-  private final Logger logger =
+  private final Logger LOGGER =
       org.slf4j.LoggerFactory.getLogger(LocalPolarisMetaStoreManagerFactory.class);
 
   protected abstract StoreType createBackingStore(@NotNull PolarisDiagnostics diagnostics);
@@ -197,7 +197,7 @@ private void checkPolarisServiceBootstrappedForRealm(
             PolarisEntityConstants.getRootPrincipalName());
 
     if (!rootPrincipalLookup.isSuccess()) {
-      logger.error(
+      LOGGER.error(
           "\n\n Realm {} is not bootstrapped, could not load root principal. Please run Bootstrap command. \n\n",
           realmContext.getRealmIdentifier());
       throw new IllegalStateException(

polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifest.java

@@ -48,7 +48,7 @@
  * function as a lookup manifest for downstream callers.
  */
 public class PolarisResolutionManifest implements PolarisResolutionManifestCatalogView {
-  private static final Logger LOG = LoggerFactory.getLogger(PolarisResolutionManifest.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisResolutionManifest.class);
 
   private final PolarisEntityManager entityManager;
   private final CallContext callContext;
@@ -195,14 +195,14 @@ public PolarisResolvedPathWrapper getPassthroughResolvedPath(Object key) {
     ResolverStatus status = passthroughResolver.resolveAll();
 
     if (status.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
-      LOG.debug("Returning null for key {} due to resolver status {}", key, status.getStatus());
+      LOGGER.debug("Returning null for key {} due to resolver status {}", key, status.getStatus());
       return null;
     }
 
     List<EntityCacheEntry> resolvedPath = passthroughResolver.getResolvedPath();
     if (requestedPath.isOptional()) {
       if (resolvedPath.size() != requestedPath.getEntityNames().size()) {
-        LOG.debug(
+        LOGGER.debug(
             "Returning null for key {} due to size mismatch from getPassthroughResolvedPath "
                 + "resolvedPath: {}, requestedPath.getEntityNames(): {}",
             key,
@@ -216,7 +216,8 @@ public PolarisResolvedPathWrapper getPassthroughResolvedPath(Object key) {
     resolvedEntities.add(
         new ResolvedPolarisEntity(passthroughResolver.getResolvedReferenceCatalog()));
     resolvedPath.forEach(cacheEntry -> resolvedEntities.add(new ResolvedPolarisEntity(cacheEntry)));
-    LOG.debug("Returning resolvedEntities from getPassthroughResolvedPath: {}", resolvedEntities);
+    LOGGER.debug(
+        "Returning resolvedEntities from getPassthroughResolvedPath: {}", resolvedEntities);
     return new PolarisResolvedPathWrapper(resolvedEntities);
   }
 
@@ -276,7 +277,7 @@ private ResolvedPolarisEntity getResolvedRootContainerEntity() {
         primaryResolver.getResolvedEntity(
             PolarisEntityType.ROOT, PolarisEntityConstants.getRootContainerName());
     if (resolvedCacheEntry == null) {
-      LOG.debug("Failed to find rootContainer, so using simulated rootContainer instead.");
+      LOGGER.debug("Failed to find rootContainer, so using simulated rootContainer instead.");
       return simulatedResolvedRootContainerEntity;
     }
     return new ResolvedPolarisEntity(resolvedCacheEntry);

polaris-core/src/test/java/io/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java

@@ -61,7 +61,7 @@
 
 public class AzureCredentialStorageIntegrationTest {
 
-  private final Logger LOGGER =
+  private static final Logger LOGGER =
       LoggerFactory.getLogger(AzureCredentialStorageIntegrationTest.class);
 
   private final String clientId = System.getenv("AZURE_CLIENT_ID");

polaris-service/src/main/java/io/polaris/service/IcebergExceptionMapper.java

@@ -44,13 +44,13 @@
 import org.slf4j.LoggerFactory;
 
 public class IcebergExceptionMapper implements ExceptionMapper<RuntimeException> {
-  private static final Logger LOG = LoggerFactory.getLogger(IcebergExceptionMapper.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(IcebergExceptionMapper.class);
 
   public IcebergExceptionMapper() {}
 
   @Override
   public Response toResponse(RuntimeException runtimeException) {
-    LOG.info("Handling runtimeException {}", runtimeException.getMessage());
+    LOGGER.info("Handling runtimeException {}", runtimeException.getMessage());
     int responseCode =
         switch (runtimeException) {
           case NoSuchNamespaceException e -> Response.Status.NOT_FOUND.getStatusCode();
@@ -80,7 +80,7 @@ public Response toResponse(RuntimeException runtimeException) {
           default -> Response.Status.INTERNAL_SERVER_ERROR.getStatusCode();
         };
     if (responseCode == Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()) {
-      LOG.error("Unhandled exception returning INTERNAL_SERVER_ERROR", runtimeException);
+      LOGGER.error("Unhandled exception returning INTERNAL_SERVER_ERROR", runtimeException);
     }
 
     ErrorResponse icebergErrorResponse =
@@ -94,7 +94,7 @@ public Response toResponse(RuntimeException runtimeException) {
             .entity(icebergErrorResponse)
             .type(MediaType.APPLICATION_JSON_TYPE)
             .build();
-    LOG.debug("Mapped exception to errorResp: {}", errorResp);
+    LOGGER.debug("Mapped exception to errorResp: {}", errorResp);
     return errorResp;
   }
 }

polaris-service/src/main/java/io/polaris/service/admin/PolarisAdminService.java

@@ -93,7 +93,7 @@
  * the persistence layer.
  */
 public class PolarisAdminService {
-  private static final Logger LOG = LoggerFactory.getLogger(PolarisAdminService.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisAdminService.class);
   public static final String CLEANUP_ON_CATALOG_DROP = "CLEANUP_ON_CATALOG_DROP";
 
   private final CallContext callContext;
@@ -187,7 +187,8 @@ private void authorizeBasicTopLevelEntityOperationOrThrow(
             == authenticatedPrincipal.getPrincipalEntity().getId()
         && (op.equals(PolarisAuthorizableOperation.ROTATE_CREDENTIALS)
             || op.equals(PolarisAuthorizableOperation.RESET_CREDENTIALS))) {
-      LOG.atDebug()
+      LOGGER
+          .atDebug()
           .addKeyValue("principalName", topLevelEntityName)
           .log("Allowing rotate own credentials");
       return;