Work in Progress: Removed Guava dependency

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

@@ -21,14 +21,12 @@
  */
 
 import javax.annotation.Nullable;
+import java.util.ServiceLoader;
 import java.util.function.Predicate;
 
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static java.util.ServiceLoader.load;
-
 interface LogbookFactory {
 
-    LogbookFactory INSTANCE = getOnlyElement(load(LogbookFactory.class));
+    LogbookFactory INSTANCE = ServiceLoader.load(LogbookFactory.class).iterator().next();
 
     Logbook create(
             @Nullable final Predicate<RawHttpRequest> condition,

logbook-core/src/main/java/org/zalando/logbook/Bytes.java

@@ -0,0 +1,51 @@
+package org.zalando.logbook;
+
+/*
+ * #%L
+ * Logbook: Core
+ * %%
+ * Copyright (C) 2015 - 2016 Zalando SE
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public final class Bytes {
+
+    Bytes() {
+        // package private so we can trick code coverage
+    }
+
+    public static byte[] toByteArray(final InputStream stream) throws IOException {
+        final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        copy(stream, output);
+        return output.toByteArray();
+    }
+
+    public static void copy(final InputStream input, final OutputStream output) throws IOException {
+        final byte[] buffer = new byte[4096];
+        while (true) {
+            final int read = input.read(buffer);
+            if (read == -1) {
+                break;
+            }
+            output.write(buffer, 0, read);
+        }
+    }
+
+}

logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogFormatter.java

@@ -20,9 +20,8 @@
  * #L%
  */
 
-import com.google.common.collect.Lists;
-
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -59,7 +58,8 @@ private String formatStatusLine(final HttpResponse response) {
     private <H extends HttpMessage> String format(final H message, final String type, final String correlationId,
             final Function<H, String> lineCreator)
             throws IOException {
-        final List<String> lines = Lists.newArrayListWithExpectedSize(4);
+
+        final List<String> lines = new ArrayList<>();
 
         lines.add(direction(message) + " " + type + ": " + correlationId);
         lines.add(lineCreator.apply(message));

logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogWriter.java

@@ -20,7 +20,6 @@
  * #L%
  */
 
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +80,6 @@ private static BiConsumer<Logger, String> chooseConsumer(final Level level) {
         }
     }
 
-    @VisibleForTesting
     Logger getLogger() {
         return logger;
     }

logbook-core/src/main/java/org/zalando/logbook/DefaultLogbook.java

@@ -20,8 +20,6 @@
  * #L%
  */
 
-import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
@@ -70,7 +68,6 @@ public Optional<Correlator> write(final RawHttpRequest rawHttpRequest) throws IO
         }
     }
 
-    @VisibleForTesting
     static class SimplePrecorrelation<I> implements Precorrelation<I> {
 
         private final String id;
@@ -93,7 +90,6 @@ public I getRequest() {
 
     }
 
-    @VisibleForTesting
     static class SimpleCorrelation<I, O> implements Correlation<I, O> {
 
         private final String id;

logbook-core/src/main/java/org/zalando/logbook/DefaultLogbookFactory.java

@@ -22,12 +22,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Optional;
 import java.util.function.Predicate;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
-import static org.zalando.logbook.Obfuscators.accessToken;
-import static org.zalando.logbook.Obfuscators.authorization;
-
 public final class DefaultLogbookFactory implements LogbookFactory {
 
     @Override
@@ -42,15 +39,15 @@ public Logbook create(
             @Nullable final HttpLogWriter writer) {
 
 
-        final HeaderObfuscator header = firstNonNull(headerObfuscator, authorization());
-        final BodyObfuscator body = firstNonNull(bodyObfuscator, BodyObfuscator.none());
+        final HeaderObfuscator header = Optional.ofNullable(headerObfuscator).orElseGet(Obfuscators::authorization);
+        final BodyObfuscator body = Optional.ofNullable(bodyObfuscator).orElseGet(BodyObfuscator::none);
 
         return new DefaultLogbook(
-                firstNonNull(condition, $ -> true),
+                Optional.ofNullable(condition).orElse($ -> true),
                 combine(queryObfuscator, header, body, requestObfuscator),
                 combine(header, body, responseObfuscator),
-                firstNonNull(formatter, new DefaultHttpLogFormatter()),
-                firstNonNull(writer, new DefaultHttpLogWriter())
+                Optional.ofNullable(formatter).orElseGet(DefaultHttpLogFormatter::new),
+                Optional.ofNullable(writer).orElseGet(DefaultHttpLogWriter::new)
         );
     }
 
@@ -61,10 +58,10 @@ private RequestObfuscator combine(
             final BodyObfuscator bodyObfuscator,
             @Nullable final RequestObfuscator requestObfuscator) {
 
-        final QueryObfuscator query = firstNonNull(queryObfuscator, accessToken());
+        final QueryObfuscator query = Optional.ofNullable(queryObfuscator).orElseGet(Obfuscators::accessToken);
 
         return RequestObfuscator.merge(
-                firstNonNull(requestObfuscator, RequestObfuscator.none()),
+                Optional.ofNullable(requestObfuscator).orElseGet(RequestObfuscator::none),
                 request -> new ObfuscatedHttpRequest(request, query, headerObfuscator, bodyObfuscator));
     }
 
@@ -75,7 +72,7 @@ private ResponseObfuscator combine(
             @Nullable final ResponseObfuscator responseObfuscator) {
 
         return ResponseObfuscator.merge(
-                firstNonNull(responseObfuscator, ResponseObfuscator.none()),
+                Optional.ofNullable(responseObfuscator).orElseGet(ResponseObfuscator::none),
                 response -> new ObfuscatedHttpResponse(response, headerObfuscator, bodyObfuscator));
     }
 

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

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

logbook-core/src/main/java/org/zalando/logbook/JsonHttpLogFormatter.java

@@ -26,22 +26,20 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.CharMatcher;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.net.MediaType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 
 public final class JsonHttpLogFormatter implements HttpLogFormatter {
 
-    private static final MediaType APPLICATION_JSON = MediaType.create("application", "json");
-    private static final CharMatcher PRETTY_PRINT = CharMatcher.anyOf("\n\t");
+    private static final Pattern PRETTY_PRINT = Pattern.compile("[\n\t]");
     private static final Logger LOG = LoggerFactory.getLogger(JsonHttpLogFormatter.class);
 
     private final ObjectMapper mapper;
@@ -59,63 +57,59 @@ public String format(final Precorrelation<HttpRequest> precorrelation) throws IO
         final String correlationId = precorrelation.getId();
         final HttpRequest request = precorrelation.getRequest();
 
-        final ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder();
+        final Map<String, Object> map = new LinkedHashMap<>();
 
-        builder.put("origin", translate(request.getOrigin()));
-        builder.put("type", "request");
-        builder.put("correlation", correlationId);
-        builder.put("protocol", request.getProtocolVersion());
-        builder.put("remote", request.getRemote());
-        builder.put("method", request.getMethod());
-        builder.put("uri", request.getRequestUri());
+        map.put("origin", translate(request.getOrigin()));
+        map.put("type", "request");
+        map.put("correlation", correlationId);
+        map.put("protocol", request.getProtocolVersion());
+        map.put("remote", request.getRemote());
+        map.put("method", request.getMethod());
+        map.put("uri", request.getRequestUri());
 
-        addUnless(builder, "headers", request.getHeaders().asMap(), Map::isEmpty);
-        addBody(request, builder);
+        addUnless(map, "headers", request.getHeaders().asMap(), Map::isEmpty);
+        addBody(request, map);
 
-        final ImmutableMap<String, Object> content = builder.build();
-
-        return mapper.writeValueAsString(content);
+        return mapper.writeValueAsString(map);
     }
 
     @Override
     public String format(final Correlation<HttpRequest, HttpResponse> correlation) throws IOException {
         final String correlationId = correlation.getId();
         final HttpResponse response = correlation.getResponse();
 
-        final ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder();
-
-        builder.put("origin", translate(response.getOrigin()));
-        builder.put("type", "response");
-        builder.put("correlation", correlationId);
-        builder.put("protocol", response.getProtocolVersion());
-        builder.put("status", response.getStatus());
-        addUnless(builder, "headers", response.getHeaders().asMap(), Map::isEmpty);
-        addBody(response, builder);
+        final Map<String, Object> map = new LinkedHashMap<>();
 
-        final ImmutableMap<String, Object> content = builder.build();
+        map.put("origin", translate(response.getOrigin()));
+        map.put("type", "response");
+        map.put("correlation", correlationId);
+        map.put("protocol", response.getProtocolVersion());
+        map.put("status", response.getStatus());
+        addUnless(map, "headers", response.getHeaders().asMap(), Map::isEmpty);
+        addBody(response, map);
 
-        return mapper.writeValueAsString(content);
+        return mapper.writeValueAsString(map);
     }
 
     private static String translate(final Origin origin) {
         return origin.name().toLowerCase(Locale.ROOT);
     }
 
-    private static <T> void addUnless(final ImmutableMap.Builder<String, Object> target, final String key,
-                                      final T element, final Predicate<T> predicate) {
+    private static <T> void addUnless(final Map<String, Object> target, final String key,
+            final T element, final Predicate<T> predicate) {
 
         if (!predicate.test(element)) {
             target.put(key, element);
         }
     }
 
-    private void addBody(final HttpMessage request, final ImmutableMap.Builder<String, Object> builder) throws IOException {
+    private void addBody(final HttpMessage request, final Map<String, Object> target) throws IOException {
         final String body = request.getBodyAsString();
 
         if (isJson(request.getContentType())) {
-            builder.put("body", tryParseBodyAsJson(body));
+            target.put("body", tryParseBodyAsJson(body));
         } else {
-            addUnless(builder, "body", body, String::isEmpty);
+            addUnless(target, "body", body, String::isEmpty);
         }
     }
 
@@ -138,12 +132,10 @@ private boolean isJson(final String contentType) {
             return false;
         }
 
-        final MediaType mediaType = MediaType.parse(contentType);
-
-        final boolean isJson = mediaType.is(APPLICATION_JSON);
+        final boolean isJson = "application/json".equals(contentType);
 
-        final boolean isApplication = mediaType.is(MediaType.ANY_APPLICATION_TYPE);
-        final boolean isCustomJson = mediaType.subtype().endsWith("+json");
+        final boolean isApplication = contentType.startsWith("application/");
+        final boolean isCustomJson = contentType.endsWith("+json") || contentType.contains("+json;");
 
         return isJson || isApplication && isCustomJson;
     }
@@ -174,7 +166,7 @@ private String compactJson(final String json) throws IOException {
 
     // this wouldn't catch spaces in json, but that's ok for our use case here
     private boolean isAlreadyCompacted(final String json) {
-        return PRETTY_PRINT.matchesNoneOf(json);
+        return !PRETTY_PRINT.matcher(json).find();
     }
 
     private static final class JsonBody {