Merge pull request #110 from KingBuzzer/master

Add support for customer loggers.

Author: mariobodemann

src/main/java/com/contentful/java/cda/CDAClient.java

@@ -56,6 +56,7 @@ private CDAService createService(Builder clientBuilder) {
         .setRequestInterceptor(new Interceptor(token));
 
     setLogLevel(restBuilder, clientBuilder);
+    setLog(restBuilder, clientBuilder);
     setClient(restBuilder, clientBuilder);
     return restBuilder.build().create(CDAService.class);
   }
@@ -72,6 +73,12 @@ private void setLogLevel(RestAdapter.Builder restBuilder, Builder clientBuilder)
     }
   }
 
+  private void setLog(RestAdapter.Builder restBuilder, Builder clientBuilder) {
+    if (clientBuilder.log != null) {
+      restBuilder.setLog(clientBuilder.log);
+    }
+  }
+
   /**
    * Returns a {@link FetchQuery} for a given {@code type}, which can be used to fulfill the
    * request synchronously or asynchronously when a callback is provided.
@@ -224,6 +231,7 @@ private Builder() {
     String token;
     String endpoint;
     LogLevel logLevel;
+    RestAdapter.Log log;
     Client client;
 
     /** Sets the space ID. */
@@ -250,6 +258,12 @@ public Builder setLogLevel(LogLevel logLevel) {
       return this;
     }
 
+    /** Sets a custom logger. */
+    public Builder setLog(RestAdapter.Log log) {
+      this.log = log;
+      return this;
+    }
+
     /** Sets the endpoint to point the Preview API. */
     public Builder preview() {
       return this.setEndpoint(Constants.ENDPOINT_PREVIEW);

src/test/java/com/contentful/java/cda/ClientTest.java

@@ -4,6 +4,7 @@
 import com.squareup.okhttp.mockwebserver.RecordedRequest;
 import org.junit.Test;
 import org.mockito.Mockito;
+import retrofit.RestAdapter;
 import retrofit.RetrofitError;
 import retrofit.client.Client;
 import retrofit.client.Request;
@@ -23,6 +24,22 @@ public void customClient() throws Exception {
     }
   }
 
+  @Test(expected = RetrofitError.class)
+  public void customLogging() throws Exception {
+    Client client = Mockito.mock(Client.class);
+    RestAdapter.Log mock = Mockito.mock(RestAdapter.Log.class);
+
+    CDAClient cli = CDAClient.builder().setSpace("foo").setToken("bar").setClient(client)
+            .setLogLevel(RestAdapter.LogLevel.BASIC)
+            .setLog(mock).build();
+    try {
+      cli.fetchSpace();
+    } catch (RetrofitError e) {
+      Mockito.verify(mock, Mockito.atLeast(1)).log(Mockito.any(String.class));
+      throw e;
+    }
+  }
+
   @Test(expected = NullPointerException.class)
   public void clientWithNoSpaceThrows() throws Exception {
     try {