Skip to content

Commit 8415abf

Browse files
committed
Changed ConfigurationBuilder#setLoggerContext(...) to return builder instead of void (apache#2791)
+ added @BaselineIgnore due to API change (but breaks no code)
1 parent fcc5d3e commit 8415abf

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.logging.log4j.core.config.builder.api;
1818

19+
import aQute.bnd.annotation.baseline.BaselineIgnore;
1920
import java.io.IOException;
2021
import java.io.OutputStream;
2122
import java.util.concurrent.TimeUnit;
@@ -509,7 +510,8 @@ <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(
509510
* Sets the logger context.
510511
* @param loggerContext the logger context.
511512
*/
512-
void setLoggerContext(@Nullable LoggerContext loggerContext);
513+
@BaselineIgnore("2.25.0")
514+
ConfigurationBuilder<T> setLoggerContext(@Nullable LoggerContext loggerContext);
513515

514516
/**
515517
* Sets the configuration's "monitorInterval" attribute.

log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.logging.log4j.core.config.builder.impl;
1818

19+
import aQute.bnd.annotation.baseline.BaselineIgnore;
1920
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2021
import java.io.IOException;
2122
import java.io.OutputStream;
@@ -698,8 +699,10 @@ public ConfigurationBuilder<T> setDestination(final @Nullable String destination
698699

699700
/** {@inheritDoc} */
700701
@Override
701-
public void setLoggerContext(final @Nullable LoggerContext loggerContext) {
702+
@BaselineIgnore("2.25.0")
703+
public ConfigurationBuilder<T> setLoggerContext(final @Nullable LoggerContext loggerContext) {
702704
this.loggerContext = loggerContext;
705+
return this;
703706
}
704707

705708
/**

log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ public PropertiesConfiguration build() {
187187
builder.add(createRootLogger(props));
188188
}
189189

190-
builder.setLoggerContext(loggerContext);
191-
192-
return builder.build(false);
190+
return builder.setLoggerContext(loggerContext).build(false);
193191
}
194192

195193
private ScriptComponentBuilder createScript(final Properties properties) {

0 commit comments

Comments
 (0)