Move to Druid 0.12.1 dependency. Adjust mockserver dependency version to not conflict with netty package used by Druid.

Author: kskalski

pom.xml

@@ -32,10 +32,10 @@
   <properties>
     <java.version>1.8</java.version>
     <lombok.version>1.16.18</lombok.version>
-    <druid.version>0.10.1</druid.version>
+    <druid.version>0.12.1</druid.version>
     <bedrock.version>2018.04.04</bedrock.version>
     <junit.version>4.12</junit.version>
-    <mockserver.version>3.10.8</mockserver.version>
+    <mockserver.version>3.10.4</mockserver.version>
   </properties>
 
   <organization>

src/main/java/com/simplaex/clients/druid/DruidClient.java

@@ -1,8 +1,9 @@
 package com.simplaex.clients.druid;
 
-import com.metamx.emitter.core.Emitter;
-import com.metamx.emitter.core.Event;
 import com.simplaex.bedrock.Promise;
+
+import io.druid.java.util.emitter.core.Emitter;
+import io.druid.java.util.emitter.core.Event;
 import io.druid.query.Query;
 import io.druid.query.QueryPlus;
 

src/main/java/com/simplaex/clients/druid/DruidClientImpl.java

@@ -2,20 +2,19 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Supplier;
-import com.metamx.common.lifecycle.Lifecycle;
-import com.metamx.emitter.core.Emitter;
-import com.metamx.emitter.service.ServiceEmitter;
-import com.metamx.http.client.HttpClient;
-import com.metamx.http.client.HttpClientConfig;
-import com.metamx.http.client.HttpClientInit;
 import com.simplaex.bedrock.Promise;
 import io.druid.client.DirectDruidClient;
 import io.druid.collections.BlockingPool;
 import io.druid.collections.DefaultBlockingPool;
 import io.druid.collections.NonBlockingPool;
 import io.druid.collections.StupidPool;
-import io.druid.jackson.DefaultObjectMapper;
 import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.lifecycle.Lifecycle;
+import io.druid.java.util.emitter.core.Emitter;
+import io.druid.java.util.emitter.service.ServiceEmitter;
+import io.druid.java.util.http.client.HttpClient;
+import io.druid.java.util.http.client.HttpClientConfig;
+import io.druid.java.util.http.client.HttpClientInit;
 import io.druid.query.*;
 import io.druid.query.datasourcemetadata.DataSourceMetadataQuery;
 import io.druid.query.datasourcemetadata.DataSourceQueryQueryToolChest;
@@ -27,8 +26,8 @@
 import io.druid.query.metadata.SegmentMetadataQueryQueryToolChest;
 import io.druid.query.metadata.metadata.SegmentMetadataQuery;
 import io.druid.query.search.SearchQueryQueryToolChest;
-import io.druid.query.search.search.SearchQuery;
-import io.druid.query.search.search.SearchQueryConfig;
+import io.druid.query.search.SearchQuery;
+import io.druid.query.search.SearchQueryConfig;
 import io.druid.query.select.SelectQuery;
 import io.druid.query.select.SelectQueryConfig;
 import io.druid.query.select.SelectQueryQueryToolChest;
@@ -86,8 +85,8 @@ private static DirectDruidClient createDruidClient(
       queryWatcher,
       objectMapper,
       createHttpClient(),
-      host,
-      serviceEmitter
+      "http",
+      host, serviceEmitter
     );
   }
 
@@ -192,7 +191,6 @@ public String getFormatString() {
 
     chestMap.put(GroupByQuery.class, groupByQueryQueryToolChest);
 
-
     // search queries
 
     final SearchQueryConfig searchQueryConfig =
@@ -230,8 +228,7 @@ public String getFormatString() {
       new SelectQueryQueryToolChest(
         objectMapper,
         intervalChunkingQueryRunnerDecorator,
-        selectQueryConfigSupplier,
-        genericQueryMetricsFactory
+        selectQueryConfigSupplier
       );
 
     chestMap.put(SelectQuery.class, selectQueryQueryToolChest);

src/test/java/com/simplaex/clients/druid/DruidClientTest.java

@@ -10,6 +10,7 @@
 import io.druid.query.select.PagingSpec;
 import io.druid.query.select.SelectQuery;
 import io.druid.query.select.SelectResultValue;
+import io.druid.query.spec.MultipleIntervalSegmentSpec;
 import org.bouncycastle.util.io.Streams;
 import org.joda.time.Interval;
 import org.junit.*;
@@ -137,7 +138,7 @@ public void shouldExecuteASelectQuery() throws IOException {
     final SelectQuery query = new Druids.SelectQueryBuilder()
         .dataSource("player_explorer_s3")
         .dimensions(Collections.singletonList("deviceType"))
-        .intervals(Collections.singletonList(new Interval(from, to)))
+        .intervals(new MultipleIntervalSegmentSpec(Collections.singletonList(new Interval(from, to))))
         .pagingSpec(new PagingSpec(Collections.emptyMap(), 100))
         .build();