Attempt to fix test failures on Java 9+

See gh-14453

Author: philwebb

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/logger/DevToolsLogFactory.java

@@ -19,6 +19,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+
 import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.boot.logging.DeferredLog;
 import org.springframework.context.ApplicationListener;
@@ -32,21 +34,21 @@
  */
 public final class DevToolsLogFactory {
 
-	private static final Map<DeferredLog, Class<?>> logs = new LinkedHashMap<>();
+	private static final Map<Log, Class<?>> logs = new LinkedHashMap<>();
 
 	private DevToolsLogFactory() {
 	}
 
 	/**
-	 * Get a {@link DeferredLog} instance for the specified source that will be
-	 * automatically {@link DeferredLog#switchTo(Class) switched} then the
-	 * {@link AbstractPageRequest context is prepared}.
+	 * Get a {@link Log} instance for the specified source that will be automatically
+	 * {@link DeferredLog#switchTo(Class) switched} then the {@link AbstractPageRequest
+	 * context is prepared}.
 	 * @param source the source for logging
 	 * @return a {@link DeferredLog} instance
 	 */
-	public static DeferredLog getLog(Class<?> source) {
+	public static Log getLog(Class<?> source) {
 		synchronized (logs) {
-			DeferredLog log = new DeferredLog();
+			Log log = new DeferredLog();
 			logs.put(log, source);
 			return log;
 		}
@@ -60,7 +62,11 @@ static class Listener implements ApplicationListener<ApplicationPreparedEvent> {
 		@Override
 		public void onApplicationEvent(ApplicationPreparedEvent event) {
 			synchronized (logs) {
-				logs.forEach((log, source) -> log.switchTo(source));
+				logs.forEach((log, source) -> {
+					if (log instanceof DeferredLog) {
+						((DeferredLog) log).switchTo(source);
+					}
+				});
 				logs.clear();
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java

@@ -192,9 +192,7 @@ public void replayTo(Log destination) {
 	 * @param source the source logger
 	 * @param destination the destination logger class
 	 * @return the destination
-	 * @deprecated since 2.1.0 in favor of {@link #switchTo(Class)}
 	 */
-	@Deprecated
 	public static Log replay(Log source, Class<?> destination) {
 		return replay(source, LogFactory.getLog(destination));
 	}
@@ -204,9 +202,7 @@ public static Log replay(Log source, Class<?> destination) {
 	 * @param source the source logger
 	 * @param destination the destination logger
 	 * @return the destination
-	 * @deprecated since 2.1.0 in favor of {@link #switchTo(Log)}
 	 */
-	@Deprecated
 	public static Log replay(Log source, Log destination) {
 		if (source instanceof DeferredLog) {
 			((DeferredLog) source).replayTo(destination);