Revert LogEventWrapper changes

Author: ppkarwasz

log4j-1.2-api/src/main/java/org/apache/log4j/Category.java

@@ -237,7 +237,7 @@ public void assertLog(final boolean assertion, final String msg) {
      */
     public void callAppenders(final LoggingEvent event) {
         if (LogManager.isLog4jCorePresent()) {
-            CategoryUtil.log(logger, LogEventWrapper.adapt(event));
+            CategoryUtil.log(logger, new LogEventWrapper(event));
             return;
         }
         int writes = 0;

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java

@@ -85,7 +85,7 @@ protected Adapter(
 
         @Override
         public void append(final LogEvent event) {
-            appender.doAppend(LogEventAdapter.adapt(event));
+            appender.doAppend(new LogEventAdapter(event));
         }
 
         @Override

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java

@@ -41,10 +41,6 @@ public class LogEventAdapter extends LoggingEvent {
 
     private final LogEvent event;
 
-    public static LoggingEvent adapt(final LogEvent event) {
-        return event instanceof final LogEventWrapper wrapper ? wrapper.getLoggingEvent() : new LogEventAdapter(event);
-    }
-
     public LogEventAdapter(final LogEvent event) {
         this.event = event;
     }
@@ -217,13 +213,4 @@ public Set getPropertyKeySet() {
     public Map getProperties() {
         return event.getContextData().toMap();
     }
-
-    public LoggingEvent toImmutable() {
-        final LogEvent immutable = event.toImmutable();
-        return event == immutable ? this : adapt(immutable);
-    }
-
-    LogEvent getLogEvent() {
-        return event;
-    }
 }

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java

@@ -49,10 +49,6 @@ public class LogEventWrapper implements LogEvent {
     private final MutableThreadContextStack contextStack;
     private Thread thread;
 
-    public static LogEvent adapt(final LoggingEvent event) {
-        return event instanceof final LogEventAdapter adapter ? adapter.getLogEvent() : new LogEventWrapper(event);
-    }
-
     public LogEventWrapper(final LoggingEvent event) {
         this.event = event;
         this.contextData = new ContextDataMap(event.getProperties());
@@ -186,10 +182,6 @@ public long getNanoTime() {
         return 0;
     }
 
-    LoggingEvent getLoggingEvent() {
-        return event;
-    }
-
     private static class ContextDataMap extends HashMap<String, String> implements ReadOnlyStringMap {
 
         ContextDataMap(final Map<String, String> map) {

log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.log4j;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -335,43 +334,25 @@ private <M extends Message> void testMessageImplementation(
     public void testAddAppender() {
         try {
             final Logger rootLogger = LogManager.getRootLogger();
-            version1Appender.clear();
+            int count = version1Appender.getEvents().size();
             rootLogger.addAppender(version1Appender);
             final Logger logger = LogManager.getLogger(CategoryTest.class);
             final org.apache.log4j.ListAppender appender = new org.apache.log4j.ListAppender();
             appender.setName("appender2");
             logger.addAppender(appender);
             // Root logger
             rootLogger.info("testAddLogger");
-            assertThat(version1Appender.getEvents())
-                    .as("check root logger events")
-                    .extracting(LoggingEvent::getRenderedMessage)
-                    .containsExactly("testAddLogger");
-            assertThat(appender.getEvents())
-                    .as("check logger '%s' events", logger.getName())
-                    .isEmpty();
+            assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
+            assertEquals(0, appender.getEvents().size(), "adding at child works");
             // Another logger
             logger.info("testAddLogger2");
-            assertThat(version1Appender.getEvents())
-                    .as("check root logger events")
-                    .extracting(LoggingEvent::getRenderedMessage)
-                    .containsExactly("testAddLogger", "testAddLogger2");
-            assertThat(appender.getEvents())
-                    .as("check logger '%s' events", logger.getName())
-                    .extracting(LoggingEvent::getRenderedMessage)
-                    .containsExactly("testAddLogger2");
+            assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
+            assertEquals(1, appender.getEvents().size(), "adding at child works");
             // Call appenders
-            version1Appender.clear();
-            appender.clear();
-            class MyCustomEvent extends LoggingEvent {}
-            final LoggingEvent event = new MyCustomEvent();
+            final LoggingEvent event = new LoggingEvent();
             logger.callAppenders(event);
-            assertThat(version1Appender.getEvents())
-                    .as("check root logger events")
-                    .containsExactly(event);
-            assertThat(appender.getEvents())
-                    .as("check logger '%s' events", logger.getName())
-                    .containsExactly(event);
+            assertEquals(++count, version1Appender.getEvents().size(), "callAppenders");
+            assertEquals(2, appender.getEvents().size(), "callAppenders");
         } finally {
             LogManager.resetConfiguration();
         }

log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java

@@ -22,7 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import org.apache.log4j.bridge.LogEventAdapter;
 import org.apache.log4j.spi.LoggingEvent;
 
 /**
@@ -46,17 +45,13 @@ protected void append(final LoggingEvent event) {
                 messages.add(result);
             }
         } else {
-            events.add(event instanceof final LogEventAdapter adapter ? adapter.toImmutable() : event);
+            events.add(event);
         }
     }
 
     @Override
     public void close() {}
 
-    public void clear() {
-        events.clear();
-    }
-
     @Override
     public boolean requiresLayout() {
         return false;