diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java index 77643204302..71cba0ffc8f 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java @@ -100,7 +100,7 @@ void testSingleFilterInvocation() { .withLoggerName(FQCN) .withConfig(configuration) .withLevel(Level.INFO) - .withFilter(filter) + .setFilter(filter) .build(); final Appender appender = mock(Appender.class); when(appender.isStarted()).thenReturn(true); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java index d9893b7bc53..eb7ad4c298e 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java @@ -63,20 +63,26 @@ void testConfig(final LoggerContext ctx) { .withConfiguration(config) .build(); final FileAppender appender = FileAppender.newBuilder() - .withFileName(logFile.toString()) - .withAppend(false) - .setName("File") + .setBufferedIo(false) .setIgnoreExceptions(false) - .withBufferedIo(false) + .setName("File") .setLayout(layout) + .withAppend(false) + .withFileName(logFile.toString()) .build(); appender.start(); config.addAppender(appender); final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null); final AppenderRef[] refs = new AppenderRef[] {ref}; - final LoggerConfig loggerConfig = LoggerConfig.createLogger( - false, Level.INFO, "org.apache.logging.log4j", "true", refs, null, config, null); + final LoggerConfig loggerConfig = LoggerConfig.newBuilder() + .withConfig(config) + .withAdditivity(false) + .withIncludeLocation("true") + .withLevel(Level.INFO) + .withLoggerName("org.apache.logging.log4j") + .withRefs(refs) + .build(); loggerConfig.addAppender(appender, null, null); config.addLogger("org.apache.logging.log4j", loggerConfig); ctx.updateLoggers(); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java index 5098c34ccb3..728c18ffa7d 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java @@ -44,11 +44,16 @@ class LoggerConfigTest { private static final String FQCN = LoggerConfigTest.class.getName(); private static LoggerConfig createForProperties(final Property[] properties) { - return LoggerConfig.createLogger( - true, Level.INFO, "name", "false", new AppenderRef[0], properties, new NullConfiguration(), null); + return LoggerConfig.newBuilder() + .withConfig(new NullConfiguration()) + .withAdditivity(true) + .withLevel(Level.INFO) + .withLoggerName("name") + .withIncludeLocation("false") + .withProperties(properties) + .build(); } - @SuppressWarnings({"deprecation"}) @Test void testPropertiesWithoutSubstitution() { assertNull(createForProperties(null).getPropertyList(), "null propertiesList"); @@ -126,7 +131,7 @@ void testSingleFilterInvocation() { .withLoggerName(FQCN) .withConfig(configuration) .withLevel(Level.INFO) - .withFilter(filter) + .setFilter(filter) .build(); final Appender appender = mock(Appender.class); when(appender.isStarted()).thenReturn(true); diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/package-info.java index 6eed83a54e9..abf19fcd6f4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/package-info.java @@ -18,7 +18,7 @@ * Provides Asynchronous Logger classes and interfaces for low-latency logging. */ @Export -@Version("2.24.1") +@Version("2.25.0") package org.apache.logging.log4j.core.async; import org.osgi.annotation.bundle.Export; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java index 797b12be896..fc9c0f87d3c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java @@ -214,15 +214,20 @@ public Filter getFilter() { } /** - * @deprecated Use {@link #withFilter(Filter)} instead + * @deprecated Use {@link #setFilter(Filter)} instead */ @Deprecated public B withtFilter(final Filter filter) { - this.filter = filter; - return asBuilder(); + return setFilter(filter); } + /** @deprecated Use {@link #setFilter(Filter)} instead. */ + @Deprecated public B withFilter(final Filter filter) { + return setFilter(filter); + } + + public B setFilter(final Filter filter) { this.filter = filter; return asBuilder(); } @@ -945,7 +950,15 @@ public Filter getFilter() { return filter; } + /** + * @deprecated Use {@link #setFilter(Filter)} instead + */ + @Deprecated public B withtFilter(final Filter filter) { + return setFilter(filter); + } + + public B setFilter(final Filter filter) { this.filter = filter; return asBuilder(); } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java index 111d1644f68..3db1c7abd6b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java @@ -18,7 +18,7 @@ * Configuration of Log4j 2. */ @Export -@Version("2.24.1") +@Version("2.25.0") package org.apache.logging.log4j.core.config; import org.osgi.annotation.bundle.Export; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java index 00552976b76..171f9c7e78d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java @@ -18,7 +18,7 @@ * Implementation of Log4j 2. */ @Export -@Version("2.24.2") +@Version("2.25.0") package org.apache.logging.log4j.core; import org.osgi.annotation.bundle.Export; diff --git a/src/changelog/.2.x.x/3369_fix_typo_in_RootLogger_Builder_method.xml b/src/changelog/.2.x.x/3369_fix_typo_in_RootLogger_Builder_method.xml new file mode 100644 index 00000000000..2d0a8dd3494 --- /dev/null +++ b/src/changelog/.2.x.x/3369_fix_typo_in_RootLogger_Builder_method.xml @@ -0,0 +1,11 @@ + + + + + Fixed typo in "LoggerConfig.RootLogger.Builder#withtFilter(...)" method. + Created new corrected 'withFilter()' method and deprecated old method. + +