From d388a8fe892af322c56d7696bcea6836525b8e58 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Wed, 3 Dec 2014 10:52:25 -0800 Subject: [PATCH] Replace google-http-client imports with real guava imports. --- .../java/io/druid/indexer/HadoopDruidIndexerConfig.java | 2 +- .../src/main/java/io/druid/indexer/JobHelper.java | 2 +- .../io/druid/indexer/HadoopDruidIndexerConfigTest.java | 2 +- .../druid/indexing/common/actions/TaskActionToolbox.java | 2 +- .../io/druid/indexing/common/task/HadoopIndexTask.java | 2 +- .../indexing/firehose/IngestSegmentFirehoseFactory.java | 2 +- .../io/druid/indexing/overlord/HeapMemoryTaskStorage.java | 2 +- .../main/java/io/druid/indexing/overlord/TaskLockbox.java | 2 +- .../main/java/io/druid/indexing/overlord/TaskQueue.java | 2 +- .../io/druid/indexing/overlord/ThreadPoolTaskRunner.java | 2 +- .../overlord/autoscaling/ec2/GalaxyEC2UserData.java | 2 +- .../overlord/autoscaling/ec2/StringEC2UserData.java | 2 +- .../druid/indexing/worker/executor/ExecutorLifecycle.java | 2 +- .../io/druid/indexing/worker/http/WorkerResource.java | 3 +-- .../java/io/druid/indexing/common/task/IndexTaskTest.java | 2 +- .../io/druid/indexing/overlord/RemoteTaskRunnerTest.java | 2 +- .../io/druid/indexing/overlord/TaskLifecycleTest.java | 8 ++------ .../java/io/druid/client/BatchServerInventoryView.java | 2 +- .../java/io/druid/client/SingleServerInventoryView.java | 2 +- .../druid/client/selector/CustomTierSelectorStrategy.java | 2 +- .../client/selector/CustomTierSelectorStrategyConfig.java | 2 +- .../java/io/druid/guice/http/JettyHttpClientModule.java | 2 +- .../druid/metadata/SQLMetadataStorageActionHandler.java | 3 +-- .../indexing/granularity/ArbitraryGranularitySpec.java | 2 +- .../java/io/druid/segment/realtime/FireDepartment.java | 6 ------ .../main/java/io/druid/segment/realtime/FireHydrant.java | 2 +- .../realtime/firehose/CombiningFirehoseFactory.java | 4 ++-- .../segment/realtime/firehose/LocalFirehoseFactory.java | 2 +- .../io/druid/server/coordinator/CostBalancerStrategy.java | 2 +- .../java/io/druid/server/coordinator/rules/LoadRule.java | 2 +- .../src/main/java/io/druid/server/http/TiersResource.java | 4 ++-- .../io/druid/server/router/CoordinatorRuleManager.java | 2 +- .../timeline/partition/HashBasedNumberedShardSpec.java | 2 +- .../server/coordination/CostBalancerStrategyTest.java | 4 ++-- .../io/druid/server/coordinator/rules/LoadRuleTest.java | 4 ++-- .../java/io/druid/server/initialization/JettyTest.java | 4 ++-- .../main/java/io/druid/cli/CliInternalHadoopIndexer.java | 6 +++--- services/src/main/java/io/druid/cli/PullDependencies.java | 2 +- .../cli/convert/DataSegmentPusherDefaultConverter.java | 2 +- .../io/druid/cli/convert/DatabasePropertiesConverter.java | 2 +- .../src/main/java/io/druid/cli/convert/PrefixRename.java | 2 +- .../java/io/druid/cli/validate/DruidJsonValidator.java | 2 +- 42 files changed, 49 insertions(+), 61 deletions(-) diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java index e54803cee72..f7b168d0f3f 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.util.Maps; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -32,6 +31,7 @@ import com.google.common.base.Splitter; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Key; diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java index b20d31c44f1..b1ffabaa1f4 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java @@ -19,8 +19,8 @@ package io.druid.indexer; -import com.google.api.client.util.Sets; import com.google.common.base.Throwables; +import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; import com.google.common.io.Files; import com.google.common.io.OutputSupplier; diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java index 2500954e944..e3f294b47a0 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java @@ -20,10 +20,10 @@ package io.druid.indexer; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.util.Lists; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.metamx.common.Granularity; import io.druid.data.input.MapBasedInputRow; import io.druid.granularity.QueryGranularity; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java b/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java index 5b055b4ba90..a07c7b22821 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionToolbox.java @@ -19,7 +19,7 @@ package io.druid.indexing.common.actions; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.inject.Inject; diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java index 7087d0dbfcb..b797d772d83 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import com.google.api.client.util.Lists; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.inject.Injector; import com.metamx.common.logger.Logger; import io.druid.common.utils.JodaUtils; diff --git a/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java b/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java index 37af09d0f57..7555a392631 100644 --- a/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java +++ b/indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java @@ -22,9 +22,9 @@ package io.druid.indexing.firehose; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.repackaged.com.google.common.base.Throwables; import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java b/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java index 55c86af6210..63c04d3769b 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/HeapMemoryTaskStorage.java @@ -19,12 +19,12 @@ package io.druid.indexing.overlord; -import com.google.api.client.util.Lists; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java b/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java index 90962e55705..bc59bb09a45 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java @@ -19,10 +19,10 @@ package io.druid.indexing.overlord; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableList; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java b/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java index c309005616b..72225f243ee 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java @@ -19,7 +19,6 @@ package io.druid.indexing.overlord; -import com.google.api.client.util.Maps; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -27,6 +26,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java b/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java index 0b310aa401d..3961bd92a8e 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java @@ -19,7 +19,7 @@ package io.druid.indexing.overlord; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java index f3b238ca97a..1464324a053 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/GalaxyEC2UserData.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import io.druid.guice.annotations.Json; import org.apache.commons.codec.binary.Base64; diff --git a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java index a017c0aad5b..cbb43441ba0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java +++ b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java @@ -21,7 +21,7 @@ package io.druid.indexing.overlord.autoscaling.ec2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.util.Charsets; +import com.google.common.base.Charsets; import org.apache.commons.codec.binary.Base64; public class StringEC2UserData implements EC2UserData diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java index 17d889b5143..8ba0f64f632 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java +++ b/indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java @@ -20,8 +20,8 @@ package io.druid.indexing.worker.executor; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java b/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java index 38a5a52a1a9..1bf4936f8e0 100644 --- a/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java +++ b/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java @@ -19,13 +19,12 @@ package io.druid.indexing.worker.http; -import com.google.api.client.util.Lists; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.common.io.ByteSource; -import com.google.common.io.InputSupplier; import com.google.inject.Inject; import com.metamx.common.logger.Logger; import io.druid.indexing.overlord.ForkingTaskRunner; diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java index 06b161951da..5a486e1cedb 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java @@ -19,7 +19,7 @@ package io.druid.indexing.common.task; -import com.google.api.client.util.Lists; +import com.google.common.collect.Lists; import com.metamx.common.Granularity; import io.druid.data.input.impl.CSVParseSpec; import io.druid.data.input.impl.DimensionsSpec; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java index caecef4d5dd..a007c9f4cf2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java @@ -20,9 +20,9 @@ package io.druid.indexing.overlord; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Throwables; import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java index ecf1bd3c4e1..4ae49dc5531 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java @@ -19,8 +19,8 @@ package io.druid.indexing.overlord; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -42,8 +42,6 @@ import io.druid.data.input.FirehoseFactory; import io.druid.data.input.InputRow; import io.druid.data.input.MapBasedInputRow; import io.druid.data.input.impl.InputRowParser; -import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; -import io.druid.granularity.QueryGranularity; import io.druid.indexing.common.SegmentLoaderFactory; import io.druid.indexing.common.TaskLock; import io.druid.indexing.common.TaskStatus; @@ -64,7 +62,7 @@ import io.druid.indexing.common.task.Task; import io.druid.indexing.common.task.TaskResource; import io.druid.indexing.overlord.config.TaskQueueConfig; import io.druid.jackson.DefaultObjectMapper; -import io.druid.metadata.SQLMetadataConnector; +import io.druid.metadata.IndexerSQLMetadataStorageCoordinator; import io.druid.query.aggregation.AggregatorFactory; import io.druid.query.aggregation.DoubleSumAggregatorFactory; import io.druid.segment.indexing.DataSchema; @@ -88,8 +86,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.skife.jdbi.v2.DBI; -import org.skife.jdbi.v2.Handle; import java.io.File; import java.io.IOException; diff --git a/server/src/main/java/io/druid/client/BatchServerInventoryView.java b/server/src/main/java/io/druid/client/BatchServerInventoryView.java index e15e85e399a..647f73ba14b 100644 --- a/server/src/main/java/io/druid/client/BatchServerInventoryView.java +++ b/server/src/main/java/io/druid/client/BatchServerInventoryView.java @@ -21,7 +21,7 @@ package io.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; diff --git a/server/src/main/java/io/druid/client/SingleServerInventoryView.java b/server/src/main/java/io/druid/client/SingleServerInventoryView.java index 4f1d91bbf61..b4d71e55ed9 100644 --- a/server/src/main/java/io/druid/client/SingleServerInventoryView.java +++ b/server/src/main/java/io/druid/client/SingleServerInventoryView.java @@ -21,7 +21,7 @@ package io.druid.client; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.MapMaker; diff --git a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java b/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java index 36c3a730447..5eb14fdf6d6 100644 --- a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java +++ b/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategy.java @@ -2,7 +2,7 @@ package io.druid.client.selector; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; -import com.google.api.client.util.Maps; +import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import java.util.Comparator; diff --git a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java b/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java index d5bc0201c70..d5e9ee3fb4b 100644 --- a/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java +++ b/server/src/main/java/io/druid/client/selector/CustomTierSelectorStrategyConfig.java @@ -20,7 +20,7 @@ package io.druid.client.selector; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.util.Lists; +import com.google.common.collect.Lists; import java.util.List; diff --git a/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java b/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java index 4e77a198873..add7927bf42 100644 --- a/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java +++ b/server/src/main/java/io/druid/guice/http/JettyHttpClientModule.java @@ -19,7 +19,7 @@ package io.druid.guice.http; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.google.inject.Binder; import com.google.inject.Module; import com.metamx.common.lifecycle.Lifecycle; diff --git a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java index 605ef526476..2d1fc6b8a7c 100644 --- a/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java +++ b/server/src/main/java/io/druid/metadata/SQLMetadataStorageActionHandler.java @@ -21,13 +21,12 @@ package io.druid.metadata; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; -import com.google.api.client.util.Maps; import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Throwables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.metamx.common.Pair; import com.metamx.common.RetryUtils; import com.metamx.emitter.EmittingLogger; diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java b/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java index 36a30eea391..fd9ef5cfabd 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java +++ b/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java @@ -21,9 +21,9 @@ package io.druid.segment.indexing.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.util.Lists; import com.google.common.base.Optional; import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; import com.google.common.collect.Sets; import com.metamx.common.Granularity; diff --git a/server/src/main/java/io/druid/segment/realtime/FireDepartment.java b/server/src/main/java/io/druid/segment/realtime/FireDepartment.java index 446e518aa9a..af6d04a40de 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireDepartment.java +++ b/server/src/main/java/io/druid/segment/realtime/FireDepartment.java @@ -21,19 +21,13 @@ package io.druid.segment.realtime; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.util.Lists; import com.google.common.base.Preconditions; import io.druid.data.input.Firehose; -import io.druid.data.input.FirehoseFactory; import io.druid.segment.indexing.DataSchema; import io.druid.segment.indexing.IngestionSpec; import io.druid.segment.indexing.RealtimeIOConfig; import io.druid.segment.indexing.RealtimeTuningConfig; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; import io.druid.segment.realtime.plumber.Plumber; -import io.druid.segment.realtime.plumber.PlumberSchool; -import io.druid.segment.realtime.plumber.RealtimePlumberSchool; -import org.joda.time.Interval; import java.io.IOException; diff --git a/server/src/main/java/io/druid/segment/realtime/FireHydrant.java b/server/src/main/java/io/druid/segment/realtime/FireHydrant.java index 282ef63b624..2e68451d9a3 100644 --- a/server/src/main/java/io/druid/segment/realtime/FireHydrant.java +++ b/server/src/main/java/io/druid/segment/realtime/FireHydrant.java @@ -19,7 +19,7 @@ package io.druid.segment.realtime; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import io.druid.segment.IncrementalIndexSegment; import io.druid.segment.ReferenceCountingSegment; import io.druid.segment.Segment; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java b/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java index faea652273d..62332d2c25c 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java +++ b/server/src/main/java/io/druid/segment/realtime/firehose/CombiningFirehoseFactory.java @@ -21,8 +21,8 @@ package io.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; import com.metamx.emitter.EmittingLogger; import io.druid.data.input.Firehose; import io.druid.data.input.FirehoseFactory; diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java b/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java index d2dcf606ee1..8bffa62956f 100644 --- a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java +++ b/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java @@ -21,7 +21,7 @@ package io.druid.segment.realtime.firehose; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.metamx.common.ISE; import com.metamx.emitter.EmittingLogger; diff --git a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java b/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java index b4853de6d59..12961b4810c 100644 --- a/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java +++ b/server/src/main/java/io/druid/server/coordinator/CostBalancerStrategy.java @@ -19,7 +19,7 @@ package io.druid.server.coordinator; -import com.google.api.client.util.Lists; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java b/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java index ea917a1b438..fe42b95b129 100644 --- a/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java +++ b/server/src/main/java/io/druid/server/coordinator/rules/LoadRule.java @@ -19,8 +19,8 @@ package io.druid.server.coordinator.rules; -import com.google.api.client.util.Maps; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.MinMaxPriorityQueue; import com.metamx.emitter.EmittingLogger; import io.druid.server.coordinator.BalancerStrategy; diff --git a/server/src/main/java/io/druid/server/http/TiersResource.java b/server/src/main/java/io/druid/server/http/TiersResource.java index 541ca5674a1..97810a7cd70 100644 --- a/server/src/main/java/io/druid/server/http/TiersResource.java +++ b/server/src/main/java/io/druid/server/http/TiersResource.java @@ -19,11 +19,11 @@ package io.druid.server.http; -import com.google.api.client.util.Lists; -import com.google.api.client.util.Maps; import com.google.common.base.Function; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.collect.Table; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java b/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java index bcd5ba94176..7cceabe8651 100644 --- a/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java +++ b/server/src/main/java/io/druid/server/router/CoordinatorRuleManager.java @@ -21,7 +21,7 @@ package io.druid.server.router; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.util.Charsets; +import com.google.common.base.Charsets; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.inject.Inject; diff --git a/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java b/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java index 3d6fdaea13a..2c5aa0ae056 100644 --- a/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java +++ b/server/src/main/java/io/druid/timeline/partition/HashBasedNumberedShardSpec.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import io.druid.data.input.InputRow; diff --git a/server/src/test/java/io/druid/server/coordination/CostBalancerStrategyTest.java b/server/src/test/java/io/druid/server/coordination/CostBalancerStrategyTest.java index cd12eaf7317..7f917d8b4c8 100644 --- a/server/src/test/java/io/druid/server/coordination/CostBalancerStrategyTest.java +++ b/server/src/test/java/io/druid/server/coordination/CostBalancerStrategyTest.java @@ -19,7 +19,7 @@ package io.druid.server.coordination; -import com.google.api.client.util.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.druid.client.ImmutableDruidServer; import io.druid.server.coordinator.BalancerStrategy; @@ -27,11 +27,11 @@ import io.druid.server.coordinator.CostBalancerStrategy; import io.druid.server.coordinator.LoadQueuePeonTester; import io.druid.server.coordinator.ServerHolder; import io.druid.timeline.DataSegment; -import org.junit.Assert; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java b/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java index 8192cdd0eee..7ae926dee92 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java +++ b/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java @@ -19,9 +19,9 @@ package io.druid.server.coordinator.rules; -import com.google.api.client.util.Lists; -import com.google.api.client.util.Maps; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.MinMaxPriorityQueue; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; diff --git a/server/src/test/java/io/druid/server/initialization/JettyTest.java b/server/src/test/java/io/druid/server/initialization/JettyTest.java index a95e883b65d..710844d4d5d 100644 --- a/server/src/test/java/io/druid/server/initialization/JettyTest.java +++ b/server/src/test/java/io/druid/server/initialization/JettyTest.java @@ -19,7 +19,7 @@ package io.druid.server.initialization; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.Binder; @@ -33,12 +33,12 @@ import com.metamx.http.client.HttpClient; import com.metamx.http.client.response.InputStreamResponseHandler; import com.metamx.http.client.response.StatusResponseHandler; import com.metamx.http.client.response.StatusResponseHolder; +import io.druid.guice.GuiceInjectors; import io.druid.guice.Jerseys; import io.druid.guice.JsonConfigProvider; import io.druid.guice.LazySingleton; import io.druid.guice.LifecycleModule; import io.druid.guice.annotations.Global; -import io.druid.guice.GuiceInjectors; import io.druid.guice.annotations.Self; import io.druid.initialization.Initialization; import io.druid.server.DruidNode; diff --git a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java index 18a35da9743..9b310b35b08 100644 --- a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java +++ b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java @@ -19,11 +19,11 @@ package io.druid.cli; -import com.google.api.client.repackaged.com.google.common.base.Preconditions; -import com.google.api.client.repackaged.com.google.common.base.Throwables; -import com.google.api.client.util.Lists; +import com.google.common.base.Preconditions; import com.google.common.base.Supplier; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/io/druid/cli/PullDependencies.java index e48dd7658bc..c2efe844d5f 100644 --- a/services/src/main/java/io/druid/cli/PullDependencies.java +++ b/services/src/main/java/io/druid/cli/PullDependencies.java @@ -19,8 +19,8 @@ package io.druid.cli; -import com.google.api.client.util.Lists; import com.google.common.base.Throwables; +import com.google.common.collect.Lists; import com.google.inject.Inject; import io.airlift.command.Command; import io.airlift.command.Option; diff --git a/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java b/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java index 5484320b53d..4059e10b612 100644 --- a/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java +++ b/services/src/main/java/io/druid/cli/convert/DataSegmentPusherDefaultConverter.java @@ -19,8 +19,8 @@ package io.druid.cli.convert; -import com.google.api.client.util.Maps; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import java.util.Map; diff --git a/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java b/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java index a46d5cd6e88..cba415cc891 100644 --- a/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java +++ b/services/src/main/java/io/druid/cli/convert/DatabasePropertiesConverter.java @@ -19,9 +19,9 @@ package io.druid.cli.convert; -import com.google.api.client.util.Maps; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/io/druid/cli/convert/PrefixRename.java b/services/src/main/java/io/druid/cli/convert/PrefixRename.java index 3e8cd67c217..1d3b4f73818 100644 --- a/services/src/main/java/io/druid/cli/convert/PrefixRename.java +++ b/services/src/main/java/io/druid/cli/convert/PrefixRename.java @@ -19,8 +19,8 @@ package io.druid.cli.convert; -import com.google.api.client.util.Maps; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import java.util.Map; import java.util.Properties; diff --git a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java index 2784fe0c7a5..92c69a2efc2 100644 --- a/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java +++ b/services/src/main/java/io/druid/cli/validate/DruidJsonValidator.java @@ -20,7 +20,7 @@ package io.druid.cli.validate; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.repackaged.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import com.metamx.common.UOE; import io.airlift.command.Command; import io.airlift.command.Option;