From 59bcaaf7c0e37e4de03a2f4c46171964a0c4fb14 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 13 Jan 2025 12:11:37 -0800 Subject: [PATCH] Polish --- .../org/springframework/boot/info/ProcessInfo.java | 12 ++++++------ .../boot/logging/logback/LogbackLoggingSystem.java | 3 +-- .../logging/logback/LogbackLoggingSystemTests.java | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/ProcessInfo.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/ProcessInfo.java index 792b9c1882..816f1af035 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/ProcessInfo.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/ProcessInfo.java @@ -111,6 +111,12 @@ public class ProcessInfo { } } + @SuppressWarnings("unchecked") + private T invokeMethod(Class mxbeanClass, Object mxbean, String name) throws ReflectiveOperationException { + Method method = mxbeanClass.getMethod(name); + return (T) method.invoke(mxbean); + } + public long getPid() { return this.pid; } @@ -123,12 +129,6 @@ public class ProcessInfo { return this.owner; } - @SuppressWarnings("unchecked") - private T invokeMethod(Class mxbeanClass, Object mxbean, String name) throws ReflectiveOperationException { - Method method = mxbeanClass.getMethod(name); - return (T) method.invoke(mxbean); - } - /** * Virtual threads information. * diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index ebb47f9a61..7fcc812cd8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -495,8 +495,7 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF FilteringStatusListener listener = new FilteringStatusListener(new OnErrorConsoleStatusListener(), Status.ERROR); listener.setContext(context); - boolean effectivelyAdded = context.getStatusManager().add(listener); - if (effectivelyAdded) { + if (context.getStatusManager().add(listener)) { listener.start(); } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java index 4b7e57bfe7..966b0f593b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java @@ -678,10 +678,12 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { assertThat(statusListener).hasFieldOrPropertyWithValue("levelThreshold", Status.ERROR); assertThat(statusListener).extracting("delegate").isInstanceOf(OnErrorConsoleStatusListener.class); AppenderBase appender = new AppenderBase<>() { + @Override protected void append(ILoggingEvent eventObject) { throw new IllegalStateException("Fail to append"); } + }; this.logger.addAppender(appender); appender.setContext(loggerContext);