Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix test failures on Java 9+

Browse Source 
See gh-14453
This commit is contained in:
Phillip Webb
2018-09-12 18:31:50 -07:00
parent cef635d86c
commit d4b11c8fa6
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,8 @@ package org.springframework.boot.devtools.logger;
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 @@ import org.springframework.data.domain.AbstractPageRequest;
*/
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 @@ public final class DevToolsLogFactory {
@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();
}
}

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

@@ -192,9 +192,7 @@ public class DeferredLog implements Log {
* @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 class DeferredLog implements Log {
* @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);