ForwardingLogger: extend ForwardingObject

mfulton26 · Feb 9, 2015 · 3735534 · 3735534
1 parent ae6d5f4
commit 3735534
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 68 deletions.
diff --git a/src/main/java/io/github/mfulton26/ctrl4testng/CTRL4TestNG.java b/src/main/java/io/github/mfulton26/ctrl4testng/CTRL4TestNG.java
@@ -31,7 +31,7 @@ private CTRL4TestNG() {
         new TestResultToLoggerNameFunction();
 
     @Override
-    protected Logger getLogger() {
+    protected Logger delegate() {
         Logger logger;
         ITestResult testResult = Reporter.getCurrentTestResult();
         Object attributeValue = testResult.getAttribute(LOGGER_ATTRIBUTE_NAME);

diff --git a/src/main/java/io/github/mfulton26/ctrl4testng/ForwardingLogger.java b/src/main/java/io/github/mfulton26/ctrl4testng/ForwardingLogger.java
@@ -1,5 +1,6 @@
 package io.github.mfulton26.ctrl4testng;
 
+import com.google.common.collect.ForwardingObject;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 
@@ -10,255 +11,256 @@
  *
  * @author Mark Fulton
  */
-abstract class ForwardingLogger implements Logger {
+abstract class ForwardingLogger extends ForwardingObject implements Logger {
 
     protected ForwardingLogger() {
     }
 
-    protected abstract Logger getLogger();
+    @Override
+    protected abstract Logger delegate();
 
     public String getName() {
-        return getLogger().getName();
+        return delegate().getName();
     }
 
     public void error(Marker marker, String format, Object... arguments) {
-        getLogger().error(marker, format, arguments);
+        delegate().error(marker, format, arguments);
     }
 
     public void info(String msg) {
-        getLogger().info(msg);
+        delegate().info(msg);
     }
 
     public void error(String format, Object... arguments) {
-        getLogger().error(format, arguments);
+        delegate().error(format, arguments);
     }
 
     public void error(String msg, Throwable t) {
-        getLogger().error(msg, t);
+        delegate().error(msg, t);
     }
 
     public boolean isErrorEnabled(Marker marker) {
-        return getLogger().isErrorEnabled(marker);
+        return delegate().isErrorEnabled(marker);
     }
 
     public void debug(Marker marker, String format, Object... arguments) {
-        getLogger().debug(marker, format, arguments);
+        delegate().debug(marker, format, arguments);
     }
 
     public void error(Marker marker, String format, Object arg1, Object arg2) {
-        getLogger().error(marker, format, arg1, arg2);
+        delegate().error(marker, format, arg1, arg2);
     }
 
     public void info(String format, Object arg1, Object arg2) {
-        getLogger().info(format, arg1, arg2);
+        delegate().info(format, arg1, arg2);
     }
 
     public void trace(Marker marker, String msg) {
-        getLogger().trace(marker, msg);
+        delegate().trace(marker, msg);
     }
 
     public void debug(Marker marker, String format, Object arg1, Object arg2) {
-        getLogger().debug(marker, format, arg1, arg2);
+        delegate().debug(marker, format, arg1, arg2);
     }
 
     public void info(Marker marker, String format, Object arg) {
-        getLogger().info(marker, format, arg);
+        delegate().info(marker, format, arg);
     }
 
     public void trace(Marker marker, String format, Object arg1, Object arg2) {
-        getLogger().trace(marker, format, arg1, arg2);
+        delegate().trace(marker, format, arg1, arg2);
     }
 
     public boolean isErrorEnabled() {
-        return getLogger().isErrorEnabled();
+        return delegate().isErrorEnabled();
     }
 
     public void info(String format, Object... arguments) {
-        getLogger().info(format, arguments);
+        delegate().info(format, arguments);
     }
 
     public void info(Marker marker, String format, Object... arguments) {
-        getLogger().info(marker, format, arguments);
+        delegate().info(marker, format, arguments);
     }
 
     public void warn(Marker marker, String format, Object... arguments) {
-        getLogger().warn(marker, format, arguments);
+        delegate().warn(marker, format, arguments);
     }
 
     public void info(Marker marker, String msg) {
-        getLogger().info(marker, msg);
+        delegate().info(marker, msg);
     }
 
     public boolean isWarnEnabled() {
-        return getLogger().isWarnEnabled();
+        return delegate().isWarnEnabled();
     }
 
     public void trace(String format, Object... arguments) {
-        getLogger().trace(format, arguments);
+        delegate().trace(format, arguments);
     }
 
     public void trace(Marker marker, String format, Object... argArray) {
-        getLogger().trace(marker, format, argArray);
+        delegate().trace(marker, format, argArray);
     }
 
     public void error(Marker marker, String format, Object arg) {
-        getLogger().error(marker, format, arg);
+        delegate().error(marker, format, arg);
     }
 
     public void debug(Marker marker, String msg, Throwable t) {
-        getLogger().debug(marker, msg, t);
+        delegate().debug(marker, msg, t);
     }
 
     public void error(String msg) {
-        getLogger().error(msg);
+        delegate().error(msg);
     }
 
     public void error(String format, Object arg) {
-        getLogger().error(format, arg);
+        delegate().error(format, arg);
     }
 
     public void error(Marker marker, String msg) {
-        getLogger().error(marker, msg);
+        delegate().error(marker, msg);
     }
 
     public void warn(Marker marker, String msg, Throwable t) {
-        getLogger().warn(marker, msg, t);
+        delegate().warn(marker, msg, t);
     }
 
     public void trace(String msg) {
-        getLogger().trace(msg);
+        delegate().trace(msg);
     }
 
     public void trace(Marker marker, String msg, Throwable t) {
-        getLogger().trace(marker, msg, t);
+        delegate().trace(marker, msg, t);
     }
 
     public void debug(String format, Object... arguments) {
-        getLogger().debug(format, arguments);
+        delegate().debug(format, arguments);
     }
 
     public void debug(String format, Object arg1, Object arg2) {
-        getLogger().debug(format, arg1, arg2);
+        delegate().debug(format, arg1, arg2);
     }
 
     public void trace(String msg, Throwable t) {
-        getLogger().trace(msg, t);
+        delegate().trace(msg, t);
     }
 
     public void debug(Marker marker, String msg) {
-        getLogger().debug(marker, msg);
+        delegate().debug(marker, msg);
     }
 
     public void debug(String msg) {
-        getLogger().debug(msg);
+        delegate().debug(msg);
     }
 
     public boolean isTraceEnabled() {
-        return getLogger().isTraceEnabled();
+        return delegate().isTraceEnabled();
     }
 
     public void debug(Marker marker, String format, Object arg) {
-        getLogger().debug(marker, format, arg);
+        delegate().debug(marker, format, arg);
     }
 
     public void warn(String msg) {
-        getLogger().warn(msg);
+        delegate().warn(msg);
     }
 
     public boolean isWarnEnabled(Marker marker) {
-        return getLogger().isWarnEnabled(marker);
+        return delegate().isWarnEnabled(marker);
     }
 
     public void warn(Marker marker, String format, Object arg1, Object arg2) {
-        getLogger().warn(marker, format, arg1, arg2);
+        delegate().warn(marker, format, arg1, arg2);
     }
 
     public void trace(Marker marker, String format, Object arg) {
-        getLogger().trace(marker, format, arg);
+        delegate().trace(marker, format, arg);
     }
 
     public void warn(Marker marker, String format, Object arg) {
-        getLogger().warn(marker, format, arg);
+        delegate().warn(marker, format, arg);
     }
 
     public boolean isTraceEnabled(Marker marker) {
-        return getLogger().isTraceEnabled(marker);
+        return delegate().isTraceEnabled(marker);
     }
 
     public void error(String format, Object arg1, Object arg2) {
-        getLogger().error(format, arg1, arg2);
+        delegate().error(format, arg1, arg2);
     }
 
     public void trace(String format, Object arg) {
-        getLogger().trace(format, arg);
+        delegate().trace(format, arg);
     }
 
     public void warn(String format, Object arg) {
-        getLogger().warn(format, arg);
+        delegate().warn(format, arg);
     }
 
     public void warn(String msg, Throwable t) {
-        getLogger().warn(msg, t);
+        delegate().warn(msg, t);
     }
 
     public boolean isInfoEnabled() {
-        return getLogger().isInfoEnabled();
+        return delegate().isInfoEnabled();
     }
 
     public boolean isDebugEnabled(Marker marker) {
-        return getLogger().isDebugEnabled(marker);
+        return delegate().isDebugEnabled(marker);
     }
 
     public void warn(String format, Object... arguments) {
-        getLogger().warn(format, arguments);
+        delegate().warn(format, arguments);
     }
 
     public void info(Marker marker, String format, Object arg1, Object arg2) {
-        getLogger().info(marker, format, arg1, arg2);
+        delegate().info(marker, format, arg1, arg2);
     }
 
     public void debug(String msg, Throwable t) {
-        getLogger().debug(msg, t);
+        delegate().debug(msg, t);
     }
 
     public void debug(String format, Object arg) {
-        getLogger().debug(format, arg);
+        delegate().debug(format, arg);
     }
 
     public void info(Marker marker, String msg, Throwable t) {
-        getLogger().info(marker, msg, t);
+        delegate().info(marker, msg, t);
     }
 
     public void warn(String format, Object arg1, Object arg2) {
-        getLogger().warn(format, arg1, arg2);
+        delegate().warn(format, arg1, arg2);
     }
 
     public void info(String format, Object arg) {
-        getLogger().info(format, arg);
+        delegate().info(format, arg);
     }
 
     public void error(Marker marker, String msg, Throwable t) {
-        getLogger().error(marker, msg, t);
+        delegate().error(marker, msg, t);
     }
 
     public void warn(Marker marker, String msg) {
-        getLogger().warn(marker, msg);
+        delegate().warn(marker, msg);
     }
 
     public void trace(String format, Object arg1, Object arg2) {
-        getLogger().trace(format, arg1, arg2);
+        delegate().trace(format, arg1, arg2);
     }
 
     public boolean isInfoEnabled(Marker marker) {
-        return getLogger().isInfoEnabled(marker);
+        return delegate().isInfoEnabled(marker);
     }
 
     public boolean isDebugEnabled() {
-        return getLogger().isDebugEnabled();
+        return delegate().isDebugEnabled();
     }
 
     public void info(String msg, Throwable t) {
-        getLogger().info(msg, t);
+        delegate().info(msg, t);
     }
 
 }
diff --git a/src/test/java/io/github/mfulton26/ctrl4testng/CTRL4TestNGTest.java b/src/test/java/io/github/mfulton26/ctrl4testng/CTRL4TestNGTest.java
@@ -45,7 +45,7 @@ public Iterator<Object[]> idsForUniqueLoggers() {
     public void getLogger(String id) throws InterruptedException {
         try {
             LOGGER.info("checking for unique logger for current parallel test");
-            Logger logger = CTRL4TESTNG_LOGGER.getLogger();
+            Logger logger = CTRL4TESTNG_LOGGER.delegate();
             ASSERT.that(loggers.add(logger)).isTrue();
             ASSERT.that(logger.getName()).contains(id);
         }
@@ -58,7 +58,7 @@ public void getLogger(String id) throws InterruptedException {
 
     @Test
     public void getSameLogger() {
-        ASSERT.that(CTRL4TESTNG_LOGGER.getLogger()).isSameAs(CTRL4TESTNG_LOGGER.getLogger());
+        ASSERT.that(CTRL4TESTNG_LOGGER.delegate()).isSameAs(CTRL4TESTNG_LOGGER.delegate());
     }
 
     private static Iterator<Object[]> testDataForIdsFrom(Range<Integer> range) {

diff --git a/src/test/java/io/github/mfulton26/ctrl4testng/ForwardingLoggerTest.java b/src/test/java/io/github/mfulton26/ctrl4testng/ForwardingLoggerTest.java
@@ -7,7 +7,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
-import io.github.mfulton26.ctrl4testng.ForwardingLogger;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
@@ -41,7 +40,7 @@ public Object[] apply(Method method) {
     private final Logger mockedLogger = mock(Logger.class);
     private final Logger forwardingLogger = new ForwardingLogger() {
         @Override
-        protected Logger getLogger() {
+        protected Logger delegate() {
             return mockedLogger;
         }
     };