Remove DefaultLogEventFactory (#2163)

Author: vy

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

@@ -32,9 +32,9 @@
 import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
 import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
 import org.apache.logging.log4j.core.filter.AbstractFilterable;
-import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.core.impl.LogEventFactory;
+import org.apache.logging.log4j.core.impl.ReusableLogEventFactory;
 import org.apache.logging.log4j.core.lookup.StrSubstitutor;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.plugins.Configurable;
@@ -44,6 +44,7 @@
 import org.apache.logging.log4j.plugins.PluginBuilderAttribute;
 import org.apache.logging.log4j.plugins.PluginElement;
 import org.apache.logging.log4j.plugins.PluginFactory;
+import org.apache.logging.log4j.plugins.di.DI;
 import org.apache.logging.log4j.plugins.validation.constraints.Required;
 import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.apache.logging.log4j.util.StackLocatorUtil;
@@ -218,7 +219,7 @@ public B asBuilder() {
      * Default constructor.
      */
     public LoggerConfig() {
-        this.logEventFactory = DefaultLogEventFactory.newInstance();
+        this.logEventFactory = DI.createInitializedFactory().getInstance(ReusableLogEventFactory.class);
         this.level = Level.ERROR;
         this.name = Strings.EMPTY;
         this.properties = null;
@@ -235,7 +236,7 @@ public LoggerConfig() {
      * @param additive true if the Logger is additive, false otherwise.
      */
     public LoggerConfig(final String name, final Level level, final boolean additive) {
-        this.logEventFactory = DefaultLogEventFactory.newInstance();
+        this.logEventFactory = DI.createInitializedFactory().getInstance(ReusableLogEventFactory.class);
         this.name = name;
         this.level = level;
         this.additive = additive;
@@ -256,7 +257,9 @@ protected LoggerConfig(
             final boolean includeLocation,
             final LogEventFactory logEventFactory) {
         super(filter, null);
-        this.logEventFactory = logEventFactory != null ? logEventFactory : DefaultLogEventFactory.newInstance();
+        this.logEventFactory = logEventFactory != null
+                ? logEventFactory
+                : DI.createInitializedFactory().getInstance(ReusableLogEventFactory.class);
         this.name = name;
         this.appenderRefs = appenders;
         this.level = level;

log4j-core/src/main/java/org/apache/logging/log4j/core/impl/DefaultLogEventFactory.java

@@ -30,7 +30,7 @@
 import org.apache.logging.log4j.core.appender.routing.Routes;
 import org.apache.logging.log4j.core.appender.routing.RoutingAppender;
 import org.apache.logging.log4j.core.config.AppenderControl;
-import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.apache.logging.log4j.core.test.categories.Scripts;
 import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
@@ -143,7 +143,7 @@ public void testRoutingAppenderRoutes() {
         Assert.assertNotNull(routes);
         Assert.assertNotNull(routes.getPatternScript());
         final LogEvent logEvent =
-                DefaultLogEventFactory.newInstance().createEvent("", null, "", Level.ERROR, null, null, null);
+                Log4jLogEvent.newBuilder().setLevel(Level.ERROR).build();
         assertEquals("Service2", routes.getPattern(logEvent, new ConcurrentHashMap<>()));
     }
 

log4j-script/src/test/java/org/apache/logging/log4j/script/appender/routing/RoutesScriptAppenderTest.java

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
+       type="removed">
+  <description format="asciidoc">
+    Remove `DefaultLogEventFactory`
+  </description>
+</entry>

src/changelog/.3.x.x/remove_DefaultLogEventFactory.xml

@@ -47,6 +47,7 @@ This release contains...
 [#release-notes-3-x-x-removed]
 === Removed
 
+* Remove `DefaultLogEventFactory`
 * Remove `org.apache.logging.log4j.core.parser` and related packages. (https://github.com/apache/logging-log4j2/pull/2154[2154])
 * Remove `log4j2.enable.threadlocals` property (https://github.com/apache/logging-log4j2/issues/2105[2105])