Inline EventRoute methods

Author: ppkarwasz

log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java

@@ -173,7 +173,17 @@ public void append(final LogEvent logEvent) {
                 } else {
                     // delegate to the event router (which may discard, enqueue and block, or log in current thread)
                     final EventRoute route = asyncQueueFullPolicy.getRoute(dispatcher.getId(), memento.getLevel());
-                    route.logMessage(this, memento);
+                    switch (route) {
+                        case DISCARD:
+                            break;
+                        case ENQUEUE:
+                            logMessageInBackgroundThread(memento);
+                            break;
+                        case SYNCHRONOUS:
+                            logMessageInCurrentThread(memento);
+                            break;
+                        default:
+                    }
                 }
             } else {
                 error("Appender " + getName() + " is unable to write primary appenders. queue is full");

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java

@@ -175,7 +175,17 @@ private void handleQueueFull(final LogEvent event) {
         } else {
             // otherwise, we leave it to the user preference
             final EventRoute eventRoute = delegate.getEventRoute(event.getLevel());
-            eventRoute.logMessage(this, event);
+            switch (eventRoute) {
+                case DISCARD:
+                    break;
+                case ENQUEUE:
+                    logInBackgroundThread(event);
+                    break;
+                case SYNCHRONOUS:
+                    logToAsyncLoggerConfigsOnCurrentThread(event);
+                    break;
+                default:
+            }
         }
     }
 

log4j-core/src/main/java/org/apache/logging/log4j/core/async/EventRoute.java

@@ -16,12 +16,6 @@
  */
 package org.apache.logging.log4j.core.async;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.AsyncAppender;
-import org.apache.logging.log4j.message.Message;
-
 /**
  * Enumeration over the different destinations where a log event can be sent.
  *
@@ -35,86 +29,15 @@ public enum EventRoute {
     /**
      * Enqueues the event for asynchronous logging in the background thread.
      */
-    ENQUEUE {
-        @Override
-        public void logMessage(
-                final AsyncLogger asyncLogger,
-                final String fqcn,
-                final Level level,
-                final Marker marker,
-                final Message message,
-                final Throwable thrown) {}
-
-        @Override
-        public void logMessage(final AsyncLoggerConfig asyncLoggerConfig, final LogEvent event) {
-            asyncLoggerConfig.logInBackgroundThread(event);
-        }
-
-        @Override
-        public void logMessage(final AsyncAppender asyncAppender, final LogEvent logEvent) {
-            asyncAppender.logMessageInBackgroundThread(logEvent);
-        }
-    },
+    ENQUEUE,
     /**
      * Logs the event synchronously: sends the event directly to the appender (in the current thread).
      * WARNING: This may result in lines logged out of order as synchronous events may be persisted before
      * earlier events, even from the same thread, which wait in the queue.
      */
-    SYNCHRONOUS {
-        @Override
-        public void logMessage(
-                final AsyncLogger asyncLogger,
-                final String fqcn,
-                final Level level,
-                final Marker marker,
-                final Message message,
-                final Throwable thrown) {}
-
-        @Override
-        public void logMessage(final AsyncLoggerConfig asyncLoggerConfig, final LogEvent event) {
-            asyncLoggerConfig.logToAsyncLoggerConfigsOnCurrentThread(event);
-        }
-
-        @Override
-        public void logMessage(final AsyncAppender asyncAppender, final LogEvent logEvent) {
-            asyncAppender.logMessageInCurrentThread(logEvent);
-        }
-    },
+    SYNCHRONOUS,
     /**
      * Discards the event (so it is not logged at all).
      */
-    DISCARD {
-        @Override
-        public void logMessage(
-                final AsyncLogger asyncLogger,
-                final String fqcn,
-                final Level level,
-                final Marker marker,
-                final Message message,
-                final Throwable thrown) {
-            // do nothing: drop the event
-        }
-
-        @Override
-        public void logMessage(final AsyncLoggerConfig asyncLoggerConfig, final LogEvent event) {
-            // do nothing: drop the event
-        }
-
-        @Override
-        public void logMessage(final AsyncAppender asyncAppender, final LogEvent coreEvent) {
-            // do nothing: drop the event
-        }
-    };
-
-    public abstract void logMessage(
-            final AsyncLogger asyncLogger,
-            final String fqcn,
-            final Level level,
-            final Marker marker,
-            final Message message,
-            final Throwable thrown);
-
-    public abstract void logMessage(final AsyncLoggerConfig asyncLoggerConfig, final LogEvent event);
-
-    public abstract void logMessage(final AsyncAppender asyncAppender, final LogEvent coreEvent);
+    DISCARD;
 }