From f7d7d16ecd51e12a82cdf9a1651748e04763ad79 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 30 Sep 2024 11:44:28 -0700 Subject: [PATCH] Polish logger naming --- .../boot/build/bom/bomr/MoveToSnapshots.java | 6 +++--- .../build/bom/bomr/MultithreadedLibraryUpdateResolver.java | 4 ++-- .../boot/build/bom/bomr/StandardLibraryUpdateResolver.java | 6 +++--- .../springframework/boot/build/mavenplugin/MavenExec.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java index 9e0f319d4f0..6fee7146189 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java @@ -43,7 +43,7 @@ import org.springframework.boot.build.properties.BuildProperties; */ public abstract class MoveToSnapshots extends UpgradeDependencies { - private static final Logger log = LoggerFactory.getLogger(MoveToSnapshots.class); + private static final Logger logger = LoggerFactory.getLogger(MoveToSnapshots.class); @Inject public MoveToSnapshots(BomExtension bom) { @@ -100,8 +100,8 @@ public abstract class MoveToSnapshots extends UpgradeDependencies { List releases = scheduledReleases.get(library.getCalendarName()); boolean match = (releases != null) && releases.stream().anyMatch((release) -> candidate.isSnapshotFor(release.getVersion())); - if (log.isInfoEnabled() && !match) { - log.info("Ignoring {}. No release of {} scheduled before {}", candidate, library.getName(), + if (logger.isInfoEnabled() && !match) { + logger.info("Ignoring {}. No release of {} scheduled before {}", candidate, library.getName(), milestone.getDueOn()); } return match; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MultithreadedLibraryUpdateResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MultithreadedLibraryUpdateResolver.java index 032ad59b1fb..10edc7e644f 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MultithreadedLibraryUpdateResolver.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MultithreadedLibraryUpdateResolver.java @@ -41,7 +41,7 @@ import org.springframework.boot.build.bom.Library; */ class MultithreadedLibraryUpdateResolver implements LibraryUpdateResolver { - private static final Logger LOGGER = LoggerFactory.getLogger(MultithreadedLibraryUpdateResolver.class); + private static final Logger logger = LoggerFactory.getLogger(MultithreadedLibraryUpdateResolver.class); private final int threads; @@ -55,7 +55,7 @@ class MultithreadedLibraryUpdateResolver implements LibraryUpdateResolver { @Override public List findLibraryUpdates(Collection librariesToUpgrade, Map librariesByName) { - LOGGER.info("Looking for updates using {} threads", this.threads); + logger.info("Looking for updates using {} threads", this.threads); ExecutorService executorService = Executors.newFixedThreadPool(this.threads); try { return librariesToUpgrade.stream().map((library) -> { diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java index f5ffd02cac4..78fde9f147b 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java @@ -42,7 +42,7 @@ import org.springframework.boot.build.bom.bomr.version.DependencyVersion; */ class StandardLibraryUpdateResolver implements LibraryUpdateResolver { - private static final Logger LOGGER = LoggerFactory.getLogger(StandardLibraryUpdateResolver.class); + private static final Logger logger = LoggerFactory.getLogger(StandardLibraryUpdateResolver.class); private final VersionResolver versionResolver; @@ -63,11 +63,11 @@ class StandardLibraryUpdateResolver implements LibraryUpdateResolver { if (isLibraryExcluded(library)) { continue; } - LOGGER.info("Looking for updates for {}", library.getName()); + logger.info("Looking for updates for {}", library.getName()); long start = System.nanoTime(); List versionOptions = getVersionOptions(library); result.add(new LibraryWithVersionOptions(library, versionOptions)); - LOGGER.info("Found {} updates for {}, took {}", versionOptions.size(), library.getName(), + logger.info("Found {} updates for {}, took {}", versionOptions.size(), library.getName(), Duration.ofNanos(System.nanoTime() - start)); } return result; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java index 73ef436429a..d8ffb743beb 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; */ public abstract class MavenExec extends JavaExec { - private final Logger log = LoggerFactory.getLogger(MavenExec.class); + private final Logger logger = LoggerFactory.getLogger(MavenExec.class); public MavenExec() { setClasspath(mavenConfiguration(getProject())); @@ -69,8 +69,8 @@ public abstract class MavenExec extends JavaExec { try { args("--log-file", logFile.toFile().getAbsolutePath()); super.exec(); - if (this.log.isInfoEnabled()) { - Files.readAllLines(logFile).forEach(this.log::info); + if (this.logger.isInfoEnabled()) { + Files.readAllLines(logFile).forEach(this.logger::info); } } catch (ExecException ex) {