Rename onBefore*() methods to before*() since we

already use 'before' and 'after' prefixes in
org.apache.logging.log4j.core.config.ReliabilityStrategy 

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

@@ -167,9 +167,9 @@ public final class FailoverAppender extends AbstractAppender implements Configur
         Appender appender = primary.getAppender();
         if (appender instanceof FailoverAware) {
             try {
-                ((FailoverAware) appender).onBeforeFailoverAppenderStop();
+                ((FailoverAware) appender).beforeFailoverAppenderStop();
             } catch (Exception e) {
-                List<LogEvent> events = ((FailoverAware) appender).onBeforeFailoverAppenderStopException(e);
+                List<LogEvent> events = ((FailoverAware) appender).beforeFailoverAppenderStopException(e);
                 if (!events.isEmpty()) {
                     failover(new FailoverContext(events, e));
                 }

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

@@ -37,13 +37,13 @@ public interface FailoverAware {
     /**
      * Invoked when the parent {@link FailoverAppender} is preparing to stop.  Nothing is actually stopped at this point.
      */
-    void onBeforeFailoverAppenderStop();
+    void beforeFailoverAppenderStop();
 
     /**
-     * Invoked if an error occurred when {@link #onBeforeFailoverAppenderStop()} was invoked.
-     * @param exception the exception thrown from {@link #onBeforeFailoverAppenderStop()}
+     * Invoked if an error occurred when {@link #beforeFailoverAppenderStop()} was invoked.
+     * @param exception the exception thrown from {@link #beforeFailoverAppenderStop()}
      * @return a {@link List} of {@link LogEvent}s to be passed to the secondary appenders
      */
-    List<LogEvent> onBeforeFailoverAppenderStopException(Exception exception);
+    List<LogEvent> beforeFailoverAppenderStopException(Exception exception);
     
 }

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

@@ -127,12 +127,12 @@ public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager
     }
 
     @Override
-    public void onBeforeFailoverAppenderStop() {
+    public void beforeFailoverAppenderStop() {
         manager.onBeforeFailoverAppenderStop();
     }
 
     @Override
-    public List<LogEvent> onBeforeFailoverAppenderStopException(Exception exception) {
+    public List<LogEvent> beforeFailoverAppenderStopException(Exception exception) {
         return manager.onBeforeFailoverAppenderStopException();
     }
     

log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAwareTest.java

@@ -81,8 +81,8 @@ public class FailoverAwareTest {
         
         failoverAppender.beforeStopConfiguration();
 
-        verify(primaryAppender).onBeforeFailoverAppenderStop();
-        verify(primaryAppender, never()).onBeforeFailoverAppenderStopException(any(Exception.class));
+        verify(primaryAppender).beforeFailoverAppenderStop();
+        verify(primaryAppender, never()).beforeFailoverAppenderStopException(any(Exception.class));
         verify(secondaryAppender, never()).append(any(LogEvent.class));
     }
 
@@ -91,13 +91,13 @@ public class FailoverAwareTest {
         
         RuntimeException exception = new RuntimeException("test");
         List<LogEvent> events = Collections.emptyList();
-        doThrow(exception).when(primaryAppender).onBeforeFailoverAppenderStop();
-        when(primaryAppender.onBeforeFailoverAppenderStopException(exception)).thenReturn(events);
+        doThrow(exception).when(primaryAppender).beforeFailoverAppenderStop();
+        when(primaryAppender.beforeFailoverAppenderStopException(exception)).thenReturn(events);
 
         failoverAppender.beforeStopConfiguration();
 
-        verify(primaryAppender).onBeforeFailoverAppenderStop();
-        verify(primaryAppender).onBeforeFailoverAppenderStopException(exception);
+        verify(primaryAppender).beforeFailoverAppenderStop();
+        verify(primaryAppender).beforeFailoverAppenderStopException(exception);
         verify(secondaryAppender, never()).append(any(LogEvent.class));
     }
 
@@ -109,13 +109,13 @@ public class FailoverAwareTest {
 
         RuntimeException exception = new RuntimeException("test");
         List<LogEvent> events = Arrays.asList(event1, event2);
-        doThrow(exception).when(primaryAppender).onBeforeFailoverAppenderStop();
-        when(primaryAppender.onBeforeFailoverAppenderStopException(exception)).thenReturn(events);
+        doThrow(exception).when(primaryAppender).beforeFailoverAppenderStop();
+        when(primaryAppender.beforeFailoverAppenderStopException(exception)).thenReturn(events);
 
         failoverAppender.beforeStopConfiguration();
 
-        verify(primaryAppender).onBeforeFailoverAppenderStop();
-        verify(primaryAppender).onBeforeFailoverAppenderStopException(exception);
+        verify(primaryAppender).beforeFailoverAppenderStop();
+        verify(primaryAppender).beforeFailoverAppenderStopException(exception);
         verify(secondaryAppender).append(event1);
         verify(secondaryAppender).append(event2);
     }

log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java

@@ -110,7 +110,7 @@ public class AbstractDatabaseAppenderTest {
     @Test
     public void testOnBeforeFailoverAppenderStop() throws Exception {
         setUp("name");
-        appender.onBeforeFailoverAppenderStop();
+        appender.beforeFailoverAppenderStop();
         verify(manager).onBeforeFailoverAppenderStop();
     }
     
@@ -118,7 +118,7 @@ public class AbstractDatabaseAppenderTest {
     public void testOnBeforeFailoverAppenderStopException() throws Exception {
         setUp("name");
         Exception exception = mock(Exception.class);
-        appender.onBeforeFailoverAppenderStopException(exception);
+        appender.beforeFailoverAppenderStopException(exception);
         verify(manager).onBeforeFailoverAppenderStopException();
     }