From fff05fc46b2df15f758111898bdfcda58435b632 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Thu, 12 Dec 2024 23:07:45 +0000 Subject: [PATCH] Excavator: Migrate to the logsafe SafeLogger API --- gradle-consistent-versions-idea-plugin/build.gradle | 1 + .../gradle/versions/intellij/CompletionRefreshUtil.java | 6 +++--- .../versions/intellij/LoadCacheOnGradleProjectRefresh.java | 6 +++--- .../palantir/gradle/versions/intellij/RepositoryLoader.java | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle-consistent-versions-idea-plugin/build.gradle b/gradle-consistent-versions-idea-plugin/build.gradle index 42aabb00..84093577 100644 --- a/gradle-consistent-versions-idea-plugin/build.gradle +++ b/gradle-consistent-versions-idea-plugin/build.gradle @@ -31,6 +31,7 @@ dependencies { compileOnly 'org.immutables:value::annotations' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.assertj:assertj-core' + implementation 'com.palantir.safe-logging:logger' } grammarKit { diff --git a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/CompletionRefreshUtil.java b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/CompletionRefreshUtil.java index 53f89d12..6e7e24b4 100644 --- a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/CompletionRefreshUtil.java +++ b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/CompletionRefreshUtil.java @@ -21,13 +21,13 @@ import com.intellij.codeInsight.completion.CompletionProcess; import com.intellij.codeInsight.completion.CompletionService; import com.intellij.openapi.application.ApplicationManager; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.lang.reflect.InvocationTargetException; import java.util.function.Supplier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class CompletionRefreshUtil { - private static final Logger log = LoggerFactory.getLogger(CompletionRefreshUtil.class); + private static final SafeLogger log = SafeLoggerFactory.get(CompletionRefreshUtil.class); public static Supplier refreshOnceSupplier() { return Suppliers.memoize(() -> { diff --git a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/LoadCacheOnGradleProjectRefresh.java b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/LoadCacheOnGradleProjectRefresh.java index f2390b4e..cbe6fc60 100644 --- a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/LoadCacheOnGradleProjectRefresh.java +++ b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/LoadCacheOnGradleProjectRefresh.java @@ -20,12 +20,12 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationEvent; import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListener; import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import org.jetbrains.plugins.gradle.util.GradleConstants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class LoadCacheOnGradleProjectRefresh implements ExternalSystemTaskNotificationListener { - private static final Logger log = LoggerFactory.getLogger(LoadCacheOnGradleProjectRefresh.class); + private static final SafeLogger log = SafeLoggerFactory.get(LoadCacheOnGradleProjectRefresh.class); @Override public final void onSuccess(ExternalSystemTaskId id) { diff --git a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/RepositoryLoader.java b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/RepositoryLoader.java index 7d6e4713..18278fe0 100644 --- a/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/RepositoryLoader.java +++ b/gradle-consistent-versions-idea-plugin/src/main/java/com/palantir/gradle/versions/intellij/RepositoryLoader.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.intellij.openapi.project.Project; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.io.File; import java.io.IOException; import java.util.Comparator; @@ -35,11 +37,9 @@ import java.util.Set; import java.util.stream.Collectors; import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class RepositoryLoader { - private static final Logger log = LoggerFactory.getLogger(RepositoryLoader.class); + private static final SafeLogger log = SafeLoggerFactory.get(RepositoryLoader.class); private static final ObjectMapper XML_MAPPER = new XmlMapper().registerModule(new GuavaModule()); private static final String MAVEN_REPOSITORIES_FILE_NAME = ".idea/gcv-maven-repositories.xml";