Replace funky imports with standard ones.

1) Lots of Guava imports were not coming from the actual Guava
2) junit.framework.Assert should be org.junit.Assert

common/src/test/java/io/druid/collections/OrderedMergeIteratorTest.java

@@ -19,7 +19,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;

common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java

@@ -27,7 +27,7 @@
 import com.metamx.common.guava.Yielder;
 import com.metamx.common.guava.YieldingAccumulator;
 import com.metamx.common.guava.nary.BinaryFn;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

common/src/test/java/io/druid/guice/LifecycleScopeTest.java

@@ -24,7 +24,7 @@
 import com.metamx.common.lifecycle.Lifecycle;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

extensions/s3-extensions/src/test/java/io/druid/firehose/s3/StaticS3FirehoseFactoryTest.java

@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.druid.jackson.DefaultObjectMapper;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.net.URI;

indexing-hadoop/src/main/java/io/druid/indexer/path/MultiplePathSpec.java

@@ -20,7 +20,7 @@
 package io.druid.indexer.path;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import io.druid.indexer.HadoopDruidIndexerConfig;
 import org.apache.hadoop.mapreduce.Job;
 
@@ -50,7 +50,7 @@ public Job addInputPaths(
       HadoopDruidIndexerConfig config, Job job
   ) throws IOException
   {
-    for(PathSpec spec : children) {
+    for (PathSpec spec : children) {
       spec.addInputPaths(config, job);
     }
     return job;

indexing-hadoop/src/test/java/io/druid/indexer/IndexGeneratorJobTest.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.google.api.client.util.Charsets;
+import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -243,7 +243,8 @@ public static Collection<Object[]> constructFeed()
     );
   }
 
-  public final @Rule TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @Rule
+  public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   private ObjectMapper mapper;
   private HadoopDruidIndexerConfig config;

indexing-service/src/main/java/io/druid/indexing/common/task/HadoopTask.java

@@ -19,8 +19,8 @@
 
 package io.druid.indexing.common.task;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
 import com.google.common.base.Joiner;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.inject.Injector;

indexing-service/src/main/java/io/druid/indexing/hadoop/OverlordActionBasedUsedSegmentLister.java

@@ -19,7 +19,7 @@
 
 package io.druid.indexing.hadoop;
 
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 import io.druid.indexer.path.UsedSegmentLister;
 import io.druid.indexing.common.TaskToolbox;

indexing-service/src/main/java/io/druid/indexing/overlord/setup/JavaScriptWorkerSelectStrategy.java

@@ -21,14 +21,14 @@
 
 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.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import io.druid.indexing.common.task.Task;
 import io.druid.indexing.overlord.ImmutableZkWorker;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
-import java.util.Map;
+
 import javax.script.Compilable;
 import javax.script.Invocable;
 import javax.script.ScriptEngine;

indexing-service/src/test/java/io/druid/indexing/common/RetryPolicyTest.java

@@ -17,9 +17,9 @@
 
 package io.druid.indexing.common;
 
-import junit.framework.Assert;
 import org.joda.time.Duration;
 import org.joda.time.Period;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTest.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.databind.introspect.GuiceAnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.GuiceInjectableValues;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

indexing-service/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java

@@ -20,12 +20,12 @@
 package io.druid.indexing.firehose;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
-import com.google.api.client.util.Sets;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import com.google.inject.Binder;
 import com.google.inject.Guice;

indexing-service/src/test/java/io/druid/indexing/overlord/autoscaling/SimpleResourceManagementStrategyTest.java

@@ -39,11 +39,11 @@
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.IndexSpec;
 import io.druid.timeline.DataSegment;
-import junit.framework.Assert;
 import org.easymock.EasyMock;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.Period;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java

@@ -24,7 +24,7 @@
 import io.druid.indexing.overlord.ImmutableZkWorker;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
 import io.druid.indexing.worker.Worker;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class EqualDistributionWorkerSelectStrategyTest

indexing-service/src/test/java/io/druid/indexing/overlord/setup/FillCapacityWithAffinityWorkerSelectStrategyTest.java

@@ -24,7 +24,7 @@
 import io.druid.indexing.overlord.ImmutableZkWorker;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
 import io.druid.indexing.worker.Worker;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

indexing-service/src/test/java/io/druid/indexing/overlord/setup/WorkerBehaviorConfigTest.java

@@ -27,7 +27,7 @@
 import io.druid.indexing.overlord.autoscaling.ec2.EC2NodeData;
 import io.druid.indexing.overlord.autoscaling.ec2.StringEC2UserData;
 import io.druid.jackson.DefaultObjectMapper;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java

@@ -32,7 +32,7 @@
 import io.druid.segment.realtime.firehose.LocalFirehoseFactory;
 import io.druid.segment.realtime.plumber.Plumber;
 import io.druid.segment.realtime.plumber.PlumberSchool;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.File;

indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java

@@ -17,7 +17,6 @@
 
 package io.druid.indexing.worker;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.google.common.base.Joiner;
@@ -36,22 +35,21 @@
 import io.druid.indexing.overlord.ThreadPoolTaskRunner;
 import io.druid.indexing.worker.config.WorkerConfig;
 import io.druid.jackson.DefaultObjectMapper;
-import io.druid.segment.loading.SegmentLoaderLocalCacheManager;
 import io.druid.segment.loading.SegmentLoaderConfig;
+import io.druid.segment.loading.SegmentLoaderLocalCacheManager;
 import io.druid.segment.loading.StorageLocationConfig;
 import io.druid.server.initialization.IndexerZkConfig;
 import io.druid.server.initialization.ZkPathsConfig;
-import junit.framework.Assert;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.test.TestingCluster;
 import org.joda.time.Period;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
 import java.util.List;
 
 /**

indexing-service/src/test/java/io/druid/indexing/worker/http/WorkerResourceTest.java

@@ -25,12 +25,12 @@
 import io.druid.jackson.DefaultObjectMapper;
 import io.druid.server.initialization.IndexerZkConfig;
 import io.druid.server.initialization.ZkPathsConfig;
-import junit.framework.Assert;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.test.TestingCluster;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java

@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.jaxrs.smile.SmileMediaTypes;
-import com.google.api.client.util.Charsets;
+import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.metamx.common.ISE;
 import com.metamx.http.client.HttpClient;

integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java

@@ -17,8 +17,8 @@
 
 package org.testng;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
-import com.google.api.client.util.Charsets;
+import com.google.common.base.Charsets;
+import com.google.common.base.Throwables;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.metamx.common.lifecycle.Lifecycle;

integration-tests/src/test/java/io/druid/tests/indexer/ITIndexerTest.java

@@ -17,7 +17,7 @@
 
 package io.druid.tests.indexer;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import io.druid.testing.IntegrationTestingConfig;

integration-tests/src/test/java/io/druid/tests/indexer/ITRealtimeIndexTaskTest.java

@@ -17,7 +17,7 @@
 
 package io.druid.tests.indexer;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import com.metamx.http.client.HttpClient;

integration-tests/src/test/java/io/druid/tests/indexer/ITUnionQueryTest.java

@@ -18,7 +18,7 @@
 package io.druid.tests.indexer;
 
 import com.beust.jcommander.internal.Lists;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import com.metamx.http.client.HttpClient;

processing/src/test/java/io/druid/jackson/DefaultObjectMapperTest.java

@@ -18,8 +18,8 @@
 package io.druid.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

processing/src/test/java/io/druid/query/PrioritizedExecutorServiceTest.java

@@ -20,7 +20,7 @@
 import com.google.common.collect.ImmutableList;
 import com.metamx.common.concurrent.ExecutorServiceConfig;
 import com.metamx.common.lifecycle.Lifecycle;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

processing/src/test/java/io/druid/query/QueriesTest.java

@@ -24,7 +24,7 @@
 import io.druid.query.aggregation.post.ArithmeticPostAggregator;
 import io.druid.query.aggregation.post.ConstantPostAggregator;
 import io.druid.query.aggregation.post.FieldAccessPostAggregator;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java

@@ -17,7 +17,7 @@
 
 package io.druid.query.aggregation.hyperloglog;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class HyperUniquesAggregatorFactoryTest

processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java

@@ -32,7 +32,7 @@
 import io.druid.segment.Segment;
 import io.druid.segment.TestIndex;
 import io.druid.segment.column.ValueType;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;

processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java

@@ -23,8 +23,8 @@
 import io.druid.query.search.search.LexicographicSearchSortSpec;
 import io.druid.query.search.search.SearchHit;
 import io.druid.query.search.search.StrlenSearchSortSpec;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Iterator;

processing/src/test/java/io/druid/query/select/SelectBinaryFnTest.java

@@ -22,8 +22,8 @@
 import com.metamx.common.ISE;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.Result;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java

@@ -41,9 +41,9 @@
 import io.druid.query.timeseries.TimeseriesResultBuilder;
 import io.druid.query.timeseries.TimeseriesResultValue;
 import io.druid.segment.SegmentMissingException;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

processing/src/test/java/io/druid/query/timeseries/TimeseriesBinaryFnTest.java

@@ -23,8 +23,8 @@
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.query.aggregation.LongSumAggregatorFactory;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

processing/src/test/java/io/druid/query/timeseries/TimeseriesQueryRunnerBonusTest.java

@@ -36,9 +36,9 @@
 import io.druid.segment.Segment;
 import io.druid.segment.incremental.IncrementalIndex;
 import io.druid.segment.incremental.OnheapIncrementalIndex;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;

processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java

@@ -30,8 +30,8 @@
 import io.druid.query.aggregation.post.ConstantPostAggregator;
 import io.druid.query.aggregation.post.FieldAccessPostAggregator;
 import io.druid.query.dimension.DefaultDimensionSpec;
-import junit.framework.Assert;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;