This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f64394d5f445bd50e2260067af5692d2c9703864 Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Nov 30 16:07:22 2023 +0100 Formatting fixes --- .../core/pattern/DatePatternConverterTestBase.java | 23 ++++++++++------------ .../logging/log4j/core/async/AsyncLogger.java | 2 ++ .../logging/log4j/core/impl/Log4jLogEvent.java | 2 ++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java index 881d0968bd..6bcf5242f9 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java @@ -16,6 +16,13 @@ */ package org.apache.logging.log4j.core.pattern; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; import org.apache.logging.log4j.core.AbstractLogEvent; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.time.Instant; @@ -26,14 +33,6 @@ import org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedTimeZone import org.apache.logging.log4j.util.Strings; import org.junit.jupiter.api.Test; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.TimeZone; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - abstract class DatePatternConverterTestBase { private static final class MyLogEvent extends AbstractLogEvent { @@ -78,7 +77,7 @@ abstract class DatePatternConverterTestBase { FixedDateFormat.FixedFormat.ISO8601_OFFSET_DATE_TIME_HHCMM.name(); private static final String[] ISO8601_FORMAT_OPTIONS = {ISO8601}; - + private final boolean threadLocalsEnabled; DatePatternConverterTestBase(final boolean threadLocalsEnabled) { @@ -437,10 +436,8 @@ abstract class DatePatternConverterTestBase { milliBuilder.length() - timeZoneFormat.getLength(), milliBuilder.length()) : Strings.EMPTY; milliBuilder.setLength(milliBuilder.length() - truncateLen); // truncate millis - final String expected = milliBuilder - .append("987123456", 0, i) - .append(tz) - .toString(); + final String expected = + milliBuilder.append("987123456", 0, i).append(tz).toString(); assertEquals( expected, diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java index d60d4ecb13..0378d010cc 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java @@ -69,8 +69,10 @@ public class AsyncLogger extends Logger implements EventTranslatorVararg<RingBuf // immediate inlining instead of waiting until they are designated "hot enough". private static final StatusLogger LOGGER = StatusLogger.getLogger(); + @SuppressWarnings("FieldMayBeFinal") // enable mutation for tests private static Clock CLOCK = ClockFactory.getClock(); // not reconfigurable + private static final ContextDataInjector CONTEXT_DATA_INJECTOR = ContextDataInjectorFactory.createInjector(); private static final ThreadNameCachingStrategy THREAD_NAME_CACHING_STRATEGY = ThreadNameCachingStrategy.create(); diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java index beaccf37e0..2c7c571fd6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java @@ -55,8 +55,10 @@ import org.apache.logging.log4j.util.Strings; public class Log4jLogEvent implements LogEvent { private static final long serialVersionUID = -8393305700508709443L; + @SuppressWarnings("FieldMayBeFinal") // enable mutation for tests private static Clock CLOCK = ClockFactory.getClock(); + private static volatile NanoClock nanoClock = new DummyNanoClock(); private static final ContextDataInjector CONTEXT_DATA_INJECTOR = ContextDataInjectorFactory.createInjector();
