Skip to content

Commit 259a05d

Browse files
committed
Generalize DI usage
This commit ensures that: * an `InstanceFactory` is created in the Log4j `Provider`, * the same factory is injected as parameters to all the components of the chain `Log4jContextFactory`, `ContextSelector`, `LoggerContext` (child), `Configuration` (grand-child). * `DI.createInstanceFactory` is called only when strictly necessary.
1 parent eefac99 commit 259a05d

File tree

1 file changed

+4
-4
lines changed
  • log4j-core/src/main/java/org/apache/logging/log4j/core/tools

1 file changed

+4
-4
lines changed

log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ String imports() {
6262
+ "import org.apache.logging.log4j.Marker;%n"
6363
+ "import org.apache.logging.log4j.message.Message;%n"
6464
+ "import org.apache.logging.log4j.message.MessageFactory;%n"
65-
+ "import org.apache.logging.log4j.spi.AbstractLogger;%n"
65+
+ "import org.apache.logging.log4j.spi.ExtendedLogger;%n"
6666
+ "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
6767
+ "import org.apache.logging.log4j.util.MessageSupplier;%n"
6868
+ "import org.apache.logging.log4j.util.Supplier;%n"
@@ -91,7 +91,7 @@ String constructor() {
9191
return ""
9292
+ "%n"
9393
+ " private %s(final Logger logger) {%n"
94-
+ " this.logger = new ExtendedLoggerWrapper((AbstractLogger) logger, logger.getName(), "
94+
+ " this.logger = new ExtendedLoggerWrapper((ExtendedLogger) logger, logger.getName(), "
9595
+ "logger.getMessageFactory());%n"
9696
+ " }%n";
9797
// @formatter:on
@@ -113,7 +113,7 @@ String imports() {
113113
+ "import org.apache.logging.log4j.Marker;%n"
114114
+ "import org.apache.logging.log4j.message.Message;%n"
115115
+ "import org.apache.logging.log4j.message.MessageFactory;%n"
116-
+ "import org.apache.logging.log4j.spi.AbstractLogger;%n"
116+
+ "import org.apache.logging.log4j.spi.ExtendedLogger;%n"
117117
+ "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
118118
+ "import org.apache.logging.log4j.util.MessageSupplier;%n"
119119
+ "import org.apache.logging.log4j.util.Supplier;%n"
@@ -143,7 +143,7 @@ String constructor() {
143143
return ""
144144
+ "%n"
145145
+ " private %s(final Logger logger) {%n"
146-
+ " super((AbstractLogger) logger, logger.getName(), logger.getMessageFactory());%n"
146+
+ " super((ExtendedLogger) logger, logger.getName(), logger.getMessageFactory());%n"
147147
+ " this.logger = this;%n"
148148
+ " }%n";
149149
// @formatter:on

0 commit comments

Comments
 (0)