mirror of https://github.com/qos-ch/slf4j
Update EventRecodingLogger name to EventRecordingLogger (SLF4J-549)
Signed-off-by: Spencer Thomas <srt4@uw.edu>
This commit is contained in:
parent
ac854c79ea
commit
98728180ac
|
|
@ -16,7 +16,7 @@ import org.slf4j.helpers.SubstituteLogger;
|
|||
* @author Wessel van Norel
|
||||
*
|
||||
*/
|
||||
public class EventRecodingLogger extends LegacyAbstractLogger {
|
||||
public class EventRecordingLogger extends LegacyAbstractLogger {
|
||||
|
||||
private static final long serialVersionUID = -176083308134819629L;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ public class EventRecodingLogger extends LegacyAbstractLogger {
|
|||
// as an event recording logger we have no choice but to record all events
|
||||
final static boolean RECORD_ALL_EVENTS = true;
|
||||
|
||||
public EventRecodingLogger(SubstituteLogger logger, Queue<SubstituteLoggingEvent> eventQueue) {
|
||||
public EventRecordingLogger(SubstituteLogger logger, Queue<SubstituteLoggingEvent> eventQueue) {
|
||||
this.logger = logger;
|
||||
this.name = logger.getName();
|
||||
this.eventQueue = eventQueue;
|
||||
|
|
@ -30,7 +30,7 @@ import java.util.Queue;
|
|||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.Marker;
|
||||
import org.slf4j.event.EventRecodingLogger;
|
||||
import org.slf4j.event.EventRecordingLogger;
|
||||
import org.slf4j.event.Level;
|
||||
import org.slf4j.event.LoggingEvent;
|
||||
import org.slf4j.event.SubstituteLoggingEvent;
|
||||
|
|
@ -52,7 +52,7 @@ public class SubstituteLogger implements Logger {
|
|||
private volatile Logger _delegate;
|
||||
private Boolean delegateEventAware;
|
||||
private Method logMethodCache;
|
||||
private EventRecodingLogger eventRecodingLogger;
|
||||
private EventRecordingLogger eventRecodingLogger;
|
||||
private final Queue<SubstituteLoggingEvent> eventQueue;
|
||||
|
||||
public final boolean createdPostInitialization;
|
||||
|
|
@ -446,7 +446,7 @@ public class SubstituteLogger implements Logger {
|
|||
|
||||
private Logger getEventRecordingLogger() {
|
||||
if (eventRecodingLogger == null) {
|
||||
eventRecodingLogger = new EventRecodingLogger(this, eventQueue);
|
||||
eventRecodingLogger = new EventRecordingLogger(this, eventQueue);
|
||||
}
|
||||
return eventRecodingLogger;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import org.junit.After;
|
|||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Marker;
|
||||
import org.slf4j.event.EventRecodingLogger;
|
||||
import org.slf4j.event.EventRecordingLogger;
|
||||
import org.slf4j.event.Level;
|
||||
import org.slf4j.event.SubstituteLoggingEvent;
|
||||
import org.slf4j.helpers.BasicMarkerFactory;
|
||||
|
|
@ -15,9 +15,9 @@ import java.util.concurrent.LinkedBlockingQueue;
|
|||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class EventRecodingLoggerTest {
|
||||
public class EventRecordingLoggerTest {
|
||||
private Queue<SubstituteLoggingEvent> queue;
|
||||
private EventRecodingLogger logger;
|
||||
private EventRecordingLogger logger;
|
||||
private String message;
|
||||
private Object param1;
|
||||
private Object param2;
|
||||
|
|
@ -31,7 +31,7 @@ public class EventRecodingLoggerTest {
|
|||
@Before
|
||||
public void setUp() {
|
||||
queue = new LinkedBlockingQueue<>();
|
||||
logger = new EventRecodingLogger(new SubstituteLogger("testLogger", queue, true), queue);
|
||||
logger = new EventRecordingLogger(new SubstituteLogger("testLogger", queue, true), queue);
|
||||
message = "Test message with 3 parameters {} {} {} {}";
|
||||
param1 = 1;
|
||||
param2 = 2;
|
||||
|
|
@ -37,7 +37,7 @@ import java.util.Set;
|
|||
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.event.EventRecodingLogger;
|
||||
import org.slf4j.event.EventRecordingLogger;
|
||||
|
||||
/**
|
||||
* @author Chetan Mehrotra
|
||||
|
|
@ -60,7 +60,7 @@ public class SubstitutableLoggerTest {
|
|||
@Test
|
||||
public void delegateIsInvokedTest() throws Exception {
|
||||
SubstituteLogger substituteLogger = new SubstituteLogger("foo", null, false);
|
||||
assertTrue(substituteLogger.delegate() instanceof EventRecodingLogger);
|
||||
assertTrue(substituteLogger.delegate() instanceof EventRecordingLogger);
|
||||
|
||||
Set<String> expectedMethodSignatures = determineMethodSignatures(Logger.class);
|
||||
LoggerInvocationHandler loggerInvocationHandler = new LoggerInvocationHandler();
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import org.junit.Test;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerAccessingThread;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.slf4j.event.EventRecodingLogger;
|
||||
import org.slf4j.event.EventRecordingLogger;
|
||||
import org.slf4j.helpers.SubstituteLogger;
|
||||
|
||||
abstract public class MultithreadedInitializationTest {
|
||||
|
|
@ -54,7 +54,7 @@ abstract public class MultithreadedInitializationTest {
|
|||
for (Logger logger : createdLoggers) {
|
||||
if (logger instanceof SubstituteLogger) {
|
||||
SubstituteLogger substLogger = (SubstituteLogger) logger;
|
||||
if (substLogger.delegate() instanceof EventRecodingLogger)
|
||||
if (substLogger.delegate() instanceof EventRecordingLogger)
|
||||
fail("substLogger " + substLogger.getName() + " has a delegate of type EventRecodingLogger");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue