Removed ForwardingObject

zalando · May 13, 2016 · 9c5e80a · 9c5e80a
1 parent de1e942
commit 9c5e80a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/logbook-core/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java b/logbook-core/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java
@@ -20,15 +20,13 @@
  * #L%
  */
 
-import com.google.common.collect.ForwardingObject;
 import com.google.common.collect.ListMultimap;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 
-public abstract class ForwardingHttpMessage extends ForwardingObject implements HttpMessage {
+public abstract class ForwardingHttpMessage implements HttpMessage {
 
-    @Override
     protected abstract HttpMessage delegate();
 
     @Override

diff --git a/logbook-core/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java b/logbook-core/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java
@@ -20,15 +20,13 @@
  * #L%
  */
 
-import com.google.common.collect.ForwardingObject;
 import com.google.common.collect.ListMultimap;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 
-public abstract class ForwardingRawHttpRequest extends ForwardingObject implements RawHttpRequest {
+public abstract class ForwardingRawHttpRequest implements RawHttpRequest {
 
-    @Override
     protected abstract RawHttpRequest delegate();
 
     @Override

diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java
@@ -20,7 +20,6 @@
  * #L%
  */
 
-import com.google.common.collect.ForwardingObject;
 import org.zalando.logbook.Correlation;
 import org.zalando.logbook.HttpLogFormatter;
 import org.zalando.logbook.HttpRequest;
@@ -30,15 +29,14 @@
 import java.io.IOException;
 
 // non final so we can wrap a spy around it
-class ForwardingHttpLogFormatter extends ForwardingObject implements HttpLogFormatter {
+class ForwardingHttpLogFormatter implements HttpLogFormatter {
 
     private final HttpLogFormatter formatter;
 
     protected ForwardingHttpLogFormatter(final HttpLogFormatter formatter) {
         this.formatter = formatter;
     }
 
-    @Override
     protected HttpLogFormatter delegate() {
         return formatter;
     }