2.x Redesign

logbook-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>logbook-parent</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>logbook-api</artifactId>
     <name>Logbook: API</name>

logbook-api/src/main/java/org/zalando/logbook/BodyReplacer.java

@@ -10,13 +10,13 @@
 
 @API(status = STABLE)
 @FunctionalInterface
-public interface BodyReplacer<T extends BaseHttpMessage> {
+public interface BodyReplacer<T extends HttpMessage> {
 
     @Nullable
     String replace(final T message);
 
     @SafeVarargs
-    static <T extends BaseHttpMessage> BodyReplacer<T> compound(final BodyReplacer<T>... replacers) {
+    static <T extends HttpMessage> BodyReplacer<T> compound(final BodyReplacer<T>... replacers) {
         return message -> Arrays.stream(replacers)
                 .map(replacer -> replacer.replace(message))
                 .filter(Objects::nonNull)

logbook-api/src/main/java/org/zalando/logbook/Correlation.java

@@ -7,18 +7,14 @@
 import static org.apiguardian.api.API.Status.STABLE;
 
 @API(status = STABLE)
-public interface Correlation<I, O> {
+public interface Correlation extends Precorrelation {
 
     String getId();
 
     Duration getDuration();
 
-    I getRequest();
-
-    O getResponse();
-
-    HttpRequest getOriginalRequest();
-
-    HttpResponse getOriginalResponse();
-
+    @Override
+    default Correlation correlate() {
+        return this;
+    }
 }

logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java

@@ -3,15 +3,42 @@
 import org.apiguardian.api.API;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Map;
 
 import static org.apiguardian.api.API.Status.STABLE;
 
 @API(status = STABLE)
-public interface ForwardingHttpMessage extends ForwardingBaseHttpMessage, HttpMessage {
+public interface ForwardingHttpMessage extends HttpMessage {
 
-    @Override
     HttpMessage delegate();
 
+    @Override
+    default String getProtocolVersion() {
+        return delegate().getProtocolVersion();
+    }
+
+    @Override
+    default Origin getOrigin() {
+        return delegate().getOrigin();
+    }
+
+    @Override
+    default Map<String, List<String>> getHeaders() {
+        return delegate().getHeaders();
+    }
+
+    @Override
+    default String getContentType() {
+        return delegate().getContentType();
+    }
+
+    @Override
+    default Charset getCharset() {
+        return delegate().getCharset();
+    }
+
     @Override
     default byte[] getBody() throws IOException {
         return delegate().getBody();