Skip to content

Commit 77bd350

Browse files
committed
Minor changes to comments and tests
1 parent c8db2fd commit 77bd350

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerMessageFactoryDefaultsTlaDisabledTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
import org.apache.logging.log4j.message.MessageFactory;
2424
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.TestInfo;
2627
import org.junitpioneer.jupiter.SetSystemProperty;
2728

2829
class LoggerMessageFactoryDefaultsTlaDisabledTest {
2930

3031
@Test
3132
@SetSystemProperty(key = "log4j2.enableThreadLocals", value = "false")
32-
void defaults_should_match_when_thread_locals_disabled() {
33+
void defaults_should_match_when_thread_locals_disabled(TestInfo testInfo) {
3334
assertThat(Constants.ENABLE_THREADLOCALS).isFalse();
34-
final LoggerContext loggerContext =
35-
new LoggerContext(LoggerMessageFactoryDefaultsTlaDisabledTest.class.getSimpleName());
36-
final Logger logger =
37-
new Logger(loggerContext, "defaults_should_match_when_thread_locals_disabled", null, null);
38-
assertThat((MessageFactory) logger.getMessageFactory()).isSameAs(ParameterizedMessageFactory.INSTANCE);
39-
assertThat(logger.getFlowMessageFactory()).isSameAs(DefaultFlowMessageFactory.INSTANCE);
35+
try (LoggerContext loggerContext =
36+
new LoggerContext(LoggerMessageFactoryDefaultsTlaDisabledTest.class.getSimpleName())) {
37+
final Logger logger = loggerContext.getLogger(testInfo.getDisplayName());
38+
assertThat((MessageFactory) logger.getMessageFactory()).isSameAs(ParameterizedMessageFactory.INSTANCE);
39+
assertThat(logger.getFlowMessageFactory()).isSameAs(DefaultFlowMessageFactory.INSTANCE);
40+
}
4041
}
4142
}

log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerMessageFactoryDefaultsTlaEnabledTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,19 @@
2323
import org.apache.logging.log4j.message.MessageFactory;
2424
import org.apache.logging.log4j.message.ReusableMessageFactory;
2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.TestInfo;
2627
import org.junitpioneer.jupiter.SetSystemProperty;
2728

2829
class LoggerMessageFactoryDefaultsTlaEnabledTest {
2930

3031
@Test
3132
@SetSystemProperty(key = "log4j2.isWebapp", value = "false")
3233
@SetSystemProperty(key = "log4j2.enableThreadlocals", value = "true")
33-
void defaults_should_match_when_thread_locals_enabled() {
34+
void defaults_should_match_when_thread_locals_enabled(TestInfo testInfo) {
3435
assertThat(Constants.ENABLE_THREADLOCALS).isTrue();
3536
try (LoggerContext loggerContext =
3637
new LoggerContext(LoggerMessageFactoryDefaultsTlaEnabledTest.class.getSimpleName())) {
37-
Logger logger = loggerContext.getLogger("defaults_should_match_when_thread_locals_enabled");
38+
Logger logger = loggerContext.getLogger(testInfo.getDisplayName());
3839
assertThat((MessageFactory) logger.getMessageFactory()).isSameAs(ReusableMessageFactory.INSTANCE);
3940
assertThat(logger.getFlowMessageFactory()).isSameAs(DefaultFlowMessageFactory.INSTANCE);
4041
}

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@
6363
* and they will flush to disk at the end of each batch. This means that even with immediateFlush=false, there will
6464
* never be any items left in the buffer; all log events will all be written to disk in a very efficient manner.
6565
*/
66-
// This constructor is effectively package-private, since {@link AsyncLoggerDisruptor} is package-private.
66+
// We changed the constructor from `public` to package-private.
67+
// The constructor was effectively package-private, since the {@link AsyncLoggerDisruptor} class in its signature is
68+
// package-private, without any public implementation.
6769
@BaselineIgnore("2.24.3")
6870
public class AsyncLogger extends Logger implements EventTranslatorVararg<RingBufferLogEvent> {
6971
// Implementation note: many methods in this class are tuned for performance. MODIFY WITH CARE!

0 commit comments

Comments
 (0)