Polish

spring-projects · Jun 10, 2021 · 2835085 · 2835085
1 parent 28abcf8
commit 2835085
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/...ct/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java b/...ct/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,23 +164,14 @@ private Level getEffectiveLevel(Logger root) {
 
 	@Override
 	public Runnable getShutdownHandler() {
-		return new ShutdownHandler();
+		return () -> LogManager.getLogManager().reset();
 	}
 
 	@Override
 	public void cleanUp() {
 		this.configuredLoggers.clear();
 	}
 
-	private static final class ShutdownHandler implements Runnable {
-
-		@Override
-		public void run() {
-			LogManager.getLogManager().reset();
-		}
-
-	}
-
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link JavaLoggingSystem} if possible.
 	 */

diff --git a/...pring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/...pring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
@@ -301,7 +301,7 @@ private LoggerConfiguration convertLoggerConfig(String name, LoggerConfig logger
 
 	@Override
 	public Runnable getShutdownHandler() {
-		return new ShutdownHandler();
+		return () -> getLoggerContext().stop();
 	}
 
 	@Override
@@ -341,15 +341,6 @@ private void markAsUninitialized(LoggerContext loggerContext) {
 		loggerContext.setExternalContext(null);
 	}
 
-	private final class ShutdownHandler implements Runnable {
-
-		@Override
-		public void run() {
-			getLoggerContext().stop();
-		}
-
-	}
-
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link Log4J2LoggingSystem} if possible.
 	 */

diff --git a/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -281,7 +281,7 @@ public void setLogLevel(String loggerName, LogLevel level) {
 
 	@Override
 	public Runnable getShutdownHandler() {
-		return new ShutdownHandler();
+		return () -> getLoggerContext().stop();
 	}
 
 	private ch.qos.logback.classic.Logger getLogger(String name) {
@@ -328,15 +328,6 @@ private void markAsUninitialized(LoggerContext loggerContext) {
 		loggerContext.removeObject(LoggingSystem.class.getName());
 	}
 
-	private final class ShutdownHandler implements Runnable {
-
-		@Override
-		public void run() {
-			getLoggerContext().stop();
-		}
-
-	}
-
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link LogbackLoggingSystem} if possible.
 	 */