Upgrade to OkHttp 3.0.0-RC1 (used in Graylog 2.0.0-SNAPSHOT)

Jochen Schalanda · Jochen Schalanda · commit 6ba1e3f3733c · 2016-01-11T16:25:48.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -70,6 +70,12 @@
             <version>${graylog.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.0.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-smile</artifactId>
@@ -111,9 +117,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>2.5.0</version>
+            <version>3.0.0-RC1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsClusterPeriodical.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsClusterPeriodical.java
@@ -18,8 +18,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.EvictingQueue;
-import com.squareup.okhttp.HttpUrl;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import org.graylog.plugins.usagestatistics.providers.CompressingHttpClient;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapper;
 import org.graylog2.plugin.ServerStatus;
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsConstants.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsConstants.java
@@ -15,7 +15,7 @@
  */
 package org.graylog.plugins.usagestatistics;
 
-import com.squareup.okhttp.MediaType;
+import okhttp3.MediaType;
 import org.graylog2.plugin.Version;
 
 public class UsageStatsConstants {
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsModule.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsModule.java
@@ -16,7 +16,7 @@
 package org.graylog.plugins.usagestatistics;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.OkHttpClient;
 import org.graylog.plugins.usagestatistics.collectors.ClusterCollector;
 import org.graylog.plugins.usagestatistics.collectors.CollectorCollector;
 import org.graylog.plugins.usagestatistics.collectors.ElasticsearchCollector;
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsNodePeriodical.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsNodePeriodical.java
@@ -18,8 +18,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.EvictingQueue;
-import com.squareup.okhttp.HttpUrl;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
 import org.graylog.plugins.usagestatistics.providers.CompressingHttpClient;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapper;
 import org.graylog2.plugin.ServerStatus;
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsOptOutService.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsOptOutService.java
@@ -18,13 +18,13 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import com.squareup.okhttp.Callback;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.HttpUrl;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+import okhttp3.Callback;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapper;
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.cluster.ClusterId;
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsPeriodical.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsPeriodical.java
@@ -20,11 +20,11 @@
 import com.google.common.collect.Lists;
 import com.google.common.net.HttpHeaders;
 import com.google.common.primitives.Ints;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.periodical.Periodical;
 import org.joda.time.DateTime;
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsRequest.java b/src/main/java/org/graylog/plugins/usagestatistics/UsageStatsRequest.java
@@ -16,7 +16,7 @@
 package org.graylog.plugins.usagestatistics;
 
 import com.google.auto.value.AutoValue;
-import com.squareup.okhttp.Headers;
+import okhttp3.Headers;
 
 @AutoValue
 public abstract class UsageStatsRequest {
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/okhttp/GzipRequestInterceptor.java b/src/main/java/org/graylog/plugins/usagestatistics/okhttp/GzipRequestInterceptor.java
@@ -16,19 +16,19 @@
 package org.graylog.plugins.usagestatistics.okhttp;
 
 import com.google.common.net.HttpHeaders;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import okio.BufferedSink;
 import okio.GzipSink;
 import okio.Okio;
 
 import java.io.IOException;
 
 /**
- * This {@link com.squareup.okhttp.Interceptor} compresses the HTTP request body with gzip.
+ * This {@link okhttp3.Interceptor} compresses the HTTP request body with gzip.
  * <p>
  * Many web servers can't handle this but we know that the statistics collector is able to do this.
  * </p>
diff --git a/src/main/java/org/graylog/plugins/usagestatistics/providers/CompressingOkHttpClientProvider.java b/src/main/java/org/graylog/plugins/usagestatistics/providers/CompressingOkHttpClientProvider.java
@@ -15,7 +15,7 @@
  */
 package org.graylog.plugins.usagestatistics.providers;
 
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.OkHttpClient;
 import org.graylog.plugins.usagestatistics.okhttp.GzipRequestInterceptor;
 import org.graylog2.shared.bindings.providers.OkHttpClientProvider;
 
@@ -29,11 +29,13 @@ public class CompressingOkHttpClientProvider implements Provider<OkHttpClient> {
     @Inject
     public CompressingOkHttpClientProvider(OkHttpClientProvider okHttpClientProvider,
                                            @Named("usage_statistics_gzip_enabled") boolean gzipEnabled) {
-        client = okHttpClientProvider.get().clone();
+        final OkHttpClient.Builder clientBuilder = okHttpClientProvider.get().newBuilder();
 
         if (gzipEnabled) {
-            client.interceptors().add(new GzipRequestInterceptor());
+            clientBuilder.addInterceptor(new GzipRequestInterceptor());
         }
+
+        client = clientBuilder.build();
     }
 
     @Override
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/TestClusterConfigService.java b/src/test/java/org/graylog/plugins/usagestatistics/TestClusterConfigService.java
@@ -41,8 +41,8 @@ public <T> void write(T payload) {
         data.put(AutoValueUtils.getCanonicalName(payload.getClass()), payload);
     }
 
-    public <T> void remove(Class<T> type) {
-        data.remove(type.getCanonicalName());
+    public <T> int remove(Class<T> type) {
+        return data.remove(type.getCanonicalName()) == null ? 0 : 1;
     }
 
     public void clear() {
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsClusterPeriodicalTest.java b/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsClusterPeriodicalTest.java
@@ -16,28 +16,33 @@
 package org.graylog.plugins.usagestatistics;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.mockwebserver.MockWebServer;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapperProvider;
 import org.graylog2.plugin.ServerStatus;
 import org.graylog2.plugin.cluster.ClusterId;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import java.io.IOException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UsageStatsClusterPeriodicalTest {
+    private final MockWebServer mockWebServer = new MockWebServer();
     @Mock
     private UsageStatsClusterService clusterService;
     @Mock
     private ServerStatus serverStatus;
     private UsageStatsConfiguration configuration;
-    @Mock
     private OkHttpClient httpClient;
 
     private TestClusterConfigService clusterConfigService;
@@ -46,10 +51,18 @@ public class UsageStatsClusterPeriodicalTest {
 
     @Before
     public void setUp() throws Exception {
+        mockWebServer.start();
         configuration = spy(new UsageStatsConfiguration());
 
         clusterConfigService = new TestClusterConfigService();
         objectMapper = new SmileObjectMapperProvider().get();
+        httpClient = new OkHttpClient.Builder()
+                .addInterceptor(chain -> {
+                    final Request request = chain.request().newBuilder()
+                            .url(mockWebServer.url("/cluster/test-cluster-id"))
+                            .build();
+                    return chain.proceed(request);
+                }).build();
         periodical = new UsageStatsClusterPeriodical(
                 clusterService,
                 serverStatus,
@@ -62,6 +75,11 @@ public void setUp() throws Exception {
         clusterConfigService.write(ClusterId.create("test-cluster-id"));
     }
 
+    @After
+    public void tearDown() throws IOException {
+        mockWebServer.shutdown();
+    }
+
     @Test
     public void testGetUrl() {
         assertThat(periodical.getUrl().toString())
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsNodePeriodicalTest.java b/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsNodePeriodicalTest.java
@@ -16,31 +16,36 @@
 package org.graylog.plugins.usagestatistics;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.mockwebserver.MockWebServer;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapperProvider;
 import org.graylog2.plugin.ServerStatus;
 import org.graylog2.plugin.cluster.ClusterId;
 import org.graylog2.plugin.system.NodeId;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import java.io.IOException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UsageStatsNodePeriodicalTest {
+    private final MockWebServer mockWebServer = new MockWebServer();
     @Mock
     private UsageStatsNodeService nodeService;
     @Mock
     private NodeId nodeId;
     @Mock
     private ServerStatus serverStatus;
     private UsageStatsConfiguration configuration;
-    @Mock
     private OkHttpClient httpClient;
 
     private TestClusterConfigService clusterConfigService;
@@ -49,11 +54,20 @@ public class UsageStatsNodePeriodicalTest {
 
     @Before
     public void setUp() throws Exception {
+        mockWebServer.start();
+
         when(nodeId.anonymize()).thenReturn("test-node-id");
         configuration = spy(new UsageStatsConfiguration());
 
         clusterConfigService = new TestClusterConfigService();
         objectMapper = new SmileObjectMapperProvider().get();
+        httpClient = new OkHttpClient.Builder()
+                .addInterceptor(chain -> {
+                    final Request request = chain.request().newBuilder()
+                            .url(mockWebServer.url("/cluster/test-cluster-id/node/test-node-id"))
+                            .build();
+                    return chain.proceed(request);
+                }).build();
         periodical = new UsageStatsNodePeriodical(
                 nodeService,
                 nodeId,
@@ -67,6 +81,11 @@ public void setUp() throws Exception {
         clusterConfigService.write(ClusterId.create("test-cluster-id"));
     }
 
+    @After
+    public void tearDown() throws IOException {
+        mockWebServer.shutdown();
+    }
+
     @Test
     public void testGetUrl() {
         assertThat(periodical.getUrl().toString())
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsOptOutServiceTest.java b/src/test/java/org/graylog/plugins/usagestatistics/UsageStatsOptOutServiceTest.java
@@ -19,11 +19,11 @@
 import com.github.joschi.jadconfig.util.Duration;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.squareup.okhttp.Dispatcher;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.Dispatcher;
+import okhttp3.OkHttpClient;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
 import org.graylog.plugins.usagestatistics.providers.SmileObjectMapperProvider;
 import org.graylog2.plugin.cluster.ClusterId;
 import org.graylog2.shared.bindings.providers.OkHttpClientProvider;
@@ -60,10 +60,10 @@ public class UsageStatsOptOutServiceTest {
 
     @Before
     public void setUp() throws Exception {
-        final OkHttpClient httpClient = clientProvider.get();
-
         // Use a direct executor for the Dispatcher to avoid async calls during tests.
-        httpClient.setDispatcher(new Dispatcher(MoreExecutors.newDirectExecutorService()));
+        final OkHttpClient httpClient = clientProvider.get().newBuilder()
+                .dispatcher(new Dispatcher(MoreExecutors.newDirectExecutorService()))
+                .build();
 
         webserver.start();
 
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/okhttp/GzipRequestInterceptorTest.java b/src/test/java/org/graylog/plugins/usagestatistics/okhttp/GzipRequestInterceptorTest.java
@@ -17,14 +17,14 @@
 
 import com.github.joschi.jadconfig.util.Duration;
 import com.google.common.net.HttpHeaders;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
 import okio.BufferedSource;
 import okio.GzipSource;
 import okio.Okio;
diff --git a/src/test/java/org/graylog/plugins/usagestatistics/providers/CompressingOkHttpClientProviderTest.java b/src/test/java/org/graylog/plugins/usagestatistics/providers/CompressingOkHttpClientProviderTest.java
@@ -16,8 +16,8 @@
 package org.graylog.plugins.usagestatistics.providers;
 
 import com.github.joschi.jadconfig.util.Duration;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
 import org.graylog.plugins.usagestatistics.okhttp.GzipRequestInterceptor;
 import org.graylog2.shared.bindings.providers.OkHttpClientProvider;
 import org.junit.Test;
