Merge pull request #1956 from metamx/remove-unused-imports

Cleanup + remove unused imports

aws-common/src/main/java/io/druid/common/aws/FileSessionCredentialsProvider.java

@@ -20,7 +20,6 @@ package io.druid.common.aws;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSSessionCredentials;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.druid.concurrent.Execs;
 
 import java.io.File;
@@ -28,7 +27,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 

benchmarks/src/main/java/io/druid/benchmark/CompressedVSizeIndexedBenchmark.java

@@ -38,10 +38,6 @@ import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
-import org.openjdk.jmh.runner.Runner;
-import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.Options;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

benchmarks/src/main/java/io/druid/benchmark/MergeSequenceBenchmark.java

@@ -7,11 +7,6 @@ import com.metamx.common.guava.Accumulator;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -22,6 +17,12 @@ import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
 @State(Scope.Benchmark)
 public class MergeSequenceBenchmark
 {

benchmarks/src/main/java/io/druid/benchmark/StupidPoolConcurrencyBenchmark.java

@@ -20,7 +20,6 @@
 package io.druid.benchmark;
 
 import com.google.common.base.Supplier;
-import com.google.common.io.Closer;
 import com.metamx.common.logger.Logger;
 import io.druid.collections.ResourceHolder;
 import io.druid.collections.StupidPool;
@@ -28,13 +27,11 @@ import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OperationsPerInvocation;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
-import org.openjdk.jmh.annotations.Threads;
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.io.IOException;

common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java

@@ -25,7 +25,6 @@ import com.metamx.common.logger.Logger;
 import io.druid.timeline.partition.ImmutablePartitionHolder;
 import io.druid.timeline.partition.PartitionChunk;
 import io.druid.timeline.partition.PartitionHolder;
-import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
 import java.util.ArrayList;

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

@@ -19,16 +19,18 @@
 
 package io.druid.collections;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import com.google.common.collect.Iterables;
-
 import com.google.common.collect.Sets;
 import org.junit.Assert;
 import org.junit.Test;
 
-
+import java.util.ArrayList;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class CombiningIterableTest
 {

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

@@ -20,13 +20,11 @@
 package io.druid.collections;
 
 import com.google.common.collect.PeekingIterator;
-
 import com.metamx.common.guava.nary.BinaryFn;
-
+import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.easymock.EasyMock;
 import org.junit.Test;
 
 import java.util.Comparator;

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

@@ -20,7 +20,6 @@
 package io.druid.collections;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

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

@@ -17,11 +17,11 @@
 
 package io.druid.collections;
 
-import java.nio.IntBuffer;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.nio.IntBuffer;
+
 /**
  */
 public class IntListTest

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

@@ -21,10 +21,8 @@ package io.druid.collections;
 
 import com.google.common.base.Supplier;
 import com.metamx.common.ISE;
-
 import org.easymock.EasyMock;
 import org.hamcrest.core.IsInstanceOf;
-import org.hamcrest.core.IsNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

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

@@ -19,9 +19,7 @@
 
 package io.druid.collections;
 
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;

common/src/test/java/io/druid/common/utils/JodaUtilsTest.java

@@ -17,7 +17,6 @@
 
 package io.druid.common.utils;
 
-import org.joda.time.DateTimeConstants;
 import org.joda.time.Duration;
 import org.joda.time.Interval;
 import org.joda.time.Period;
@@ -26,7 +25,6 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
 /**

common/src/test/java/io/druid/common/utils/PropUtilsTest.java

@@ -19,14 +19,10 @@
 
 package io.druid.common.utils;
 
+import com.metamx.common.ISE;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.metamx.common.ISE;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 public class PropUtilsTest

common/src/test/java/io/druid/common/utils/SerializerUtilsTest.java

@@ -19,6 +19,7 @@
 
 package io.druid.common.utils;
 
+import io.druid.collections.IntList;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -33,8 +34,6 @@ import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
 
-import io.druid.collections.IntList;
-
 public class SerializerUtilsTest
 {
   private SerializerUtils serializerUtils;

common/src/test/java/io/druid/common/utils/SocketUtilTest.java

@@ -19,12 +19,11 @@
 
 package io.druid.common.utils;
 
+import com.metamx.common.ISE;
+import org.hamcrest.number.OrderingComparison;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.hamcrest.number.OrderingComparison;
-import com.metamx.common.ISE;
-
 public class SocketUtilTest
 {
   private final int MAX_PORT = 0xffff;

common/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java

@@ -19,11 +19,10 @@
 
 package io.druid.metadata;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class DefaultPasswordProviderTest
 {
   private static final String pwd = "nothing";

common/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java

@@ -19,11 +19,10 @@
 
 package io.druid.metadata;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class MetadataStorageConnectorConfigTest {
 
   private static final ObjectMapper jsonMapper = new ObjectMapper();

common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java

@@ -21,7 +21,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.metamx.common.Pair;

extensions/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java

@@ -19,13 +19,13 @@ package io.druid.storage.azure;
 
 import com.google.common.io.ByteSource;
 import com.google.inject.Inject;
+import com.metamx.common.CompressionUtils;
 import com.metamx.common.ISE;
 import com.metamx.common.MapUtils;
 import com.metamx.common.logger.Logger;
 import io.druid.segment.loading.DataSegmentPuller;
 import io.druid.segment.loading.SegmentLoadingException;
 import io.druid.timeline.DataSegment;
-import com.metamx.common.CompressionUtils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

extensions/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java

@@ -30,7 +30,6 @@ import io.druid.firehose.azure.StaticAzureBlobStoreFirehoseFactory;
 import io.druid.guice.Binders;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
-import io.druid.guice.annotations.Json;
 import io.druid.initialization.DruidModule;
 
 import java.net.URISyntaxException;

extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java

@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
 
 public class AzureByteSourceTest extends EasyMockSupport
 {

extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java

@@ -32,7 +32,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
 
 public class AzureDataSegmentKillerTest extends EasyMockSupport
 {

extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java

@@ -35,7 +35,7 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java

@@ -34,10 +34,10 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Map;
 
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
 import static org.junit.Assert.assertEquals;
 
-import static org.easymock.EasyMock.*;
-
 public class AzureDataSegmentPusherTest extends EasyMockSupport
 {
   private static final String containerName = "container";

extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java

@@ -32,12 +32,10 @@ import io.druid.segment.loading.SegmentLoadingException;
 import io.druid.segment.loading.URIDataPuller;
 import io.druid.timeline.DataSegment;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.LocatedFileStatus;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.fs.RemoteIterator;
 
 import javax.tools.FileObject;
@@ -50,7 +48,6 @@ import java.io.Writer;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
-import java.util.regex.Pattern;
 
 /**
  */

extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java

@@ -22,14 +22,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
-import com.metamx.common.ISE;
-import io.druid.segment.loading.DataSegmentPuller;
 import io.druid.segment.loading.LoadSpec;
 import io.druid.segment.loading.SegmentLoadingException;
 import org.apache.hadoop.fs.Path;
 
 import java.io.File;
-import java.util.Map;
 
 /**
  *

extensions/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java

@@ -30,8 +30,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import java.io.File;
-
 /**
  */
 public class ApproximateHistogramAggregationTest

extensions/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java

@@ -48,7 +48,6 @@ import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 /**

extensions/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java

@@ -27,8 +27,8 @@ import io.druid.query.QueryRunnerTestHelper;
 import io.druid.query.Result;
 import io.druid.query.TestQueryRunners;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.DoubleMinAggregatorFactory;
 import io.druid.query.aggregation.DoubleMaxAggregatorFactory;
+import io.druid.query.aggregation.DoubleMinAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.topn.TopNQuery;
 import io.druid.query.topn.TopNQueryBuilder;
@@ -45,7 +45,6 @@ import org.junit.runners.Parameterized;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

extensions/kafka-eight-simpleConsumer/src/main/java/io/druid/firehose/kafka/KafkaEightSimpleConsumerFirehoseFactory.java

@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.io.Closeables;
-import com.metamx.common.logger.Logger;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.data.input.ByteBufferInputRowParser;
 import io.druid.data.input.Committer;
@@ -38,7 +37,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;

extensions/kafka-extraction-namespace/src/test/java/io/druid/query/extraction/namespace/TestKafkaExtractionCluster.java

@@ -31,9 +31,6 @@ import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
-import com.google.inject.multibindings.MapBinder;
-import com.google.inject.multibindings.Multibinder;
-import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.metamx.common.ISE;
 import com.metamx.common.StringUtils;
@@ -58,10 +55,6 @@ import kafka.utils.ZKStringSerializer$;
 import org.I0Itec.zkclient.ZkClient;
 import org.apache.commons.io.FileUtils;
 import org.apache.curator.test.TestingServer;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.PatternLayout;
 import org.apache.zookeeper.CreateMode;
 import org.joda.time.DateTime;
 import org.junit.AfterClass;

extensions/namespace-lookup/src/main/java/io/druid/query/extraction/NamespacedExtractor.java

@@ -25,11 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.inject.name.Named;
 import com.metamx.common.StringUtils;
 
-import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 import java.nio.ByteBuffer;
 

extensions/namespace-lookup/src/main/java/io/druid/query/extraction/namespace/ExtractionNamespaceFunctionFactory.java

@@ -23,7 +23,6 @@ import com.google.common.base.Function;
 
 import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
 
 /**
  *

extensions/namespace-lookup/src/main/java/io/druid/server/initialization/NamespaceLookupStaticConfig.java

@@ -20,7 +20,6 @@
 package io.druid.server.initialization;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import io.druid.query.extraction.namespace.ExtractionNamespace;
 
 import java.util.Arrays;

extensions/namespace-lookup/src/test/java/io/druid/query/extraction/namespace/URIExtractionNamespaceTest.java

@@ -21,13 +21,13 @@ package io.druid.query.extraction.namespace;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import io.druid.guice.GuiceAnnotationIntrospector;
-import io.druid.guice.GuiceInjectableValues;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Module;
+import io.druid.guice.GuiceAnnotationIntrospector;
+import io.druid.guice.GuiceInjectableValues;
 import io.druid.guice.annotations.Json;
 import io.druid.jackson.DefaultObjectMapper;
 import org.junit.Assert;

extensions/namespace-lookup/src/test/java/io/druid/server/namespace/NamespacedExtractorModuleTest.java

@@ -46,7 +46,6 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.OutputStreamWriter;
-import java.net.URI;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;

extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java

@@ -19,8 +19,8 @@ package io.druid.firehose.rabbitmq;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.common.logger.Logger;
 import com.metamx.common.StringUtils;
+import com.metamx.common.logger.Logger;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;

extensions/s3-extensions/src/main/java/io/druid/firehose/s3/StaticS3FirehoseFactory.java

@@ -45,7 +45,6 @@ import java.net.URI;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.zip.GZIPInputStream;
 
 /**
  * Builds firehoses that read from a predefined list of S3 objects and then dry up.

extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3LoadSpec.java

@@ -17,43 +17,15 @@
 
 package io.druid.storage.s3;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.services.elasticbeanstalk.model.S3LocationNotInServiceRegionException;
-import com.amazonaws.services.s3.AmazonS3URI;
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
-import com.metamx.common.CompressionUtils;
-import com.metamx.common.FileUtils;
-import com.metamx.common.IAE;
-import com.metamx.common.ISE;
-import com.metamx.common.RetryUtils;
-import com.metamx.common.StreamUtils;
-import com.metamx.common.logger.Logger;
-import io.druid.segment.loading.DataSegmentPuller;
 import io.druid.segment.loading.LoadSpec;
 import io.druid.segment.loading.SegmentLoadingException;
-import org.jets3t.service.S3ServiceException;
-import org.jets3t.service.ServiceException;
 
-import javax.swing.text.Segment;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  *

extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java

@@ -19,7 +19,6 @@ package io.druid.storage.s3;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
-import com.metamx.common.FileUtils;
 import com.metamx.common.RetryUtils;
 import io.druid.segment.loading.DataSegmentPusherUtil;
 import io.druid.timeline.DataSegment;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMapper.java

@@ -17,30 +17,17 @@
 
 package io.druid.indexer;
 
+import com.metamx.common.RE;
 import com.metamx.common.logger.Logger;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.InputRowParser;
-import io.druid.data.input.impl.MapInputRowParser;
 import io.druid.data.input.impl.StringInputRowParser;
 import io.druid.segment.indexing.granularity.GranularitySpec;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.hadoop.io.BytesWritable;
-import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.io.FloatWritable;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.MapWritable;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.joda.time.DateTime;
 
-import com.metamx.common.RE;
+import java.io.IOException;
 
 public abstract class HadoopDruidIndexerMapper<KEYOUT, VALUEOUT> extends Mapper<Object, Object, KEYOUT, VALUEOUT>
 {

indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java

@@ -34,6 +34,21 @@ import io.druid.indexer.updater.HadoopDruidConverterConfig;
 import io.druid.segment.ProgressIndicator;
 import io.druid.segment.SegmentUtils;
 import io.druid.timeline.DataSegment;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocalFileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.retry.RetryPolicies;
+import org.apache.hadoop.io.retry.RetryProxy;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
+import org.apache.hadoop.util.Progressable;
+import org.joda.time.DateTime;
+import org.joda.time.Interval;
+import org.joda.time.format.ISODateTimeFormat;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,20 +68,6 @@ import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.LocalFileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.retry.RetryPolicies;
-import org.apache.hadoop.io.retry.RetryProxy;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
-import org.apache.hadoop.util.Progressable;
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-import org.joda.time.format.ISODateTimeFormat;
 
 /**
  */

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

@@ -30,10 +30,6 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.InputFormat;
 import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.lib.input.CombineTextInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.MultipleInputs;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.format.DateTimeFormat;

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

@@ -20,7 +20,7 @@
 package io.druid.indexer;
 
 import com.google.common.primitives.Bytes;
-
+import com.metamx.common.Pair;
 import org.hamcrest.number.OrderingComparison;
 import org.joda.time.DateTime;
 import org.junit.After;
@@ -28,10 +28,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.metamx.common.Pair;
-
-import java.nio.ByteBuffer;
-
 public class BucketTest
 {
   Bucket bucket;

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

@@ -21,6 +21,7 @@ package io.druid.indexer;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Files;
 import com.metamx.common.Granularity;
 import io.druid.data.input.impl.DelimitedParseSpec;
 import io.druid.data.input.impl.DimensionsSpec;
@@ -36,13 +37,11 @@ import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.junit.Assert;
 import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import com.google.common.io.Files;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

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

@@ -20,16 +20,15 @@
 package io.druid.indexer;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapred.JobContext;
 import org.apache.hadoop.fs.Path;
-
+import org.apache.hadoop.mapred.JobContext;
+import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.easymock.EasyMock;
 
 import java.io.IOException;
 public class HadoopIOPeonTest

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

@@ -19,8 +19,6 @@
 
 package io.druid.indexer;
 
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;

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

@@ -25,20 +25,6 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.metamx.common.StringUtils;
 import io.druid.common.utils.UUIDUtils;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import junit.framework.Assert;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
@@ -55,6 +41,20 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 public class HdfsClasspathSetupTest
 {
   private static MiniDFSCluster miniCluster;

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

@@ -29,7 +29,6 @@ import org.apache.hadoop.mapred.JobContext;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.easymock.EasyMock;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

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

@@ -20,18 +20,14 @@
 package io.druid.indexer;
 
 import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
-
 import com.google.common.io.ByteStreams;
 import com.metamx.common.ISE;
-
+import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobContext;
-
 import org.easymock.EasyMock;
 import org.hamcrest.core.Is;
 import org.junit.After;
@@ -42,8 +38,8 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;

indexing-hadoop/src/test/java/io/druid/indexer/partitions/HashedPartitionsSpecTest.java

@@ -17,10 +17,9 @@
 
 package io.druid.indexer.partitions;
 
-import io.druid.jackson.DefaultObjectMapper;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
+import io.druid.jackson.DefaultObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 

indexing-hadoop/src/test/java/io/druid/indexer/path/GranularityPathSpecTest.java

@@ -19,11 +19,9 @@
 
 package io.druid.indexer.path;
 
-import io.druid.jackson.DefaultObjectMapper;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.metamx.common.Granularity;
-
+import io.druid.jackson.DefaultObjectMapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 import org.junit.After;
 import org.junit.Assert;

indexing-hadoop/src/test/java/io/druid/indexer/path/StaticPathSpecTest.java

@@ -19,14 +19,12 @@
 
 package io.druid.indexer.path;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.druid.jackson.DefaultObjectMapper;
-
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class StaticPathSpecTest
 {
   private final ObjectMapper jsonMapper = new DefaultObjectMapper();

indexing-hadoop/src/test/java/io/druid/indexer/updater/MetadataStorageUpdaterJobSpecTest.java

@@ -19,11 +19,10 @@
 
 package io.druid.indexer.updater;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class MetadataStorageUpdaterJobSpecTest
 {
   private static final ObjectMapper jsonMapper = new ObjectMapper();

indexing-service/src/main/java/io/druid/indexing/common/SegmentLoaderFactory.java

@@ -18,9 +18,9 @@
 package io.druid.indexing.common;
 
 import com.google.inject.Inject;
-import io.druid.segment.loading.SegmentLoaderLocalCacheManager;
 import io.druid.segment.loading.SegmentLoader;
 import io.druid.segment.loading.SegmentLoaderConfig;
+import io.druid.segment.loading.SegmentLoaderLocalCacheManager;
 import io.druid.segment.loading.StorageLocationConfig;
 
 import java.io.File;

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

@@ -22,9 +22,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import io.druid.indexing.common.actions.LockTryAcquireAction;
 import io.druid.indexing.common.actions.TaskActionClient;
-import java.util.Map;
 import org.joda.time.Interval;
 
+import java.util.Map;
+
 public abstract class AbstractFixedIntervalTask extends AbstractTask
 {
   @JsonIgnore

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

@@ -28,11 +28,11 @@ import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.LockListAction;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
-import java.util.Map;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
 import java.io.IOException;
+import java.util.Map;
 
 public abstract class AbstractTask implements Task
 {

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

@@ -28,10 +28,10 @@ import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.SegmentListUnusedAction;
 import io.druid.indexing.common.actions.SegmentMetadataUpdateAction;
 import io.druid.timeline.DataSegment;
-import java.util.Map;
 import org.joda.time.Interval;
 
 import java.util.List;
+import java.util.Map;
 
 public class ArchiveTask extends AbstractFixedIntervalTask
 {

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

@@ -43,11 +43,11 @@ import io.druid.indexing.common.actions.LockTryAcquireAction;
 import io.druid.indexing.common.actions.TaskActionClient;
 import io.druid.indexing.hadoop.OverlordActionBasedUsedSegmentLister;
 import io.druid.timeline.DataSegment;
-import java.util.Map;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
 import java.util.List;
+import java.util.Map;
 import java.util.SortedSet;
 
 public class HadoopIndexTask extends HadoopTask

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

@@ -29,10 +29,10 @@ import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.SegmentListUnusedAction;
 import io.druid.indexing.common.actions.SegmentNukeAction;
 import io.druid.timeline.DataSegment;
-import java.util.Map;
 import org.joda.time.Interval;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  */

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

@@ -26,9 +26,9 @@ import io.druid.data.input.FirehoseFactory;
 import io.druid.indexing.common.TaskStatus;
 import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.TaskActionClient;
-import java.util.Map;
 import org.joda.time.DateTime;
 
+import java.util.Map;
 import java.util.UUID;
 
 /**

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

@@ -29,10 +29,10 @@ import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.SegmentListUnusedAction;
 import io.druid.indexing.common.actions.SegmentMetadataUpdateAction;
 import io.druid.timeline.DataSegment;
-import java.util.Map;
 import org.joda.time.Interval;
 
 import java.util.List;
+import java.util.Map;
 
 public class RestoreTask extends AbstractFixedIntervalTask
 {

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

@@ -24,6 +24,7 @@ import io.druid.indexing.common.TaskToolbox;
 import io.druid.indexing.common.actions.TaskActionClient;
 import io.druid.query.Query;
 import io.druid.query.QueryRunner;
+
 import java.util.Map;
 
 /**

indexing-service/src/main/java/io/druid/indexing/overlord/MetadataTaskStorage.java

@@ -30,16 +30,16 @@ import com.metamx.common.Pair;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.indexing.common.TaskLock;
 import io.druid.indexing.common.TaskStatus;
+import io.druid.indexing.common.actions.TaskAction;
+import io.druid.indexing.common.config.TaskStorageConfig;
+import io.druid.indexing.common.task.Task;
 import io.druid.metadata.EntryExistsException;
 import io.druid.metadata.MetadataStorageActionHandler;
 import io.druid.metadata.MetadataStorageActionHandlerFactory;
 import io.druid.metadata.MetadataStorageActionHandlerTypes;
 import io.druid.metadata.MetadataStorageConnector;
-import io.druid.indexing.common.TaskLock;
-import io.druid.indexing.common.actions.TaskAction;
-import io.druid.indexing.common.config.TaskStorageConfig;
-import io.druid.indexing.common.task.Task;
 import io.druid.metadata.MetadataStorageTablesConfig;
 import org.joda.time.DateTime;
 

indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java

@@ -38,6 +38,10 @@ import com.metamx.emitter.EmittingLogger;
 import io.druid.common.utils.JodaUtils;
 import io.druid.indexing.common.TaskLock;
 import io.druid.indexing.common.task.Task;
+import org.joda.time.DateTime;
+import org.joda.time.Interval;
+
+import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -47,9 +51,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Nullable;
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
 
 /**
  * Remembers which activeTasks have locked which intervals. Tasks are permitted to lock an interval if no other task

indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java

@@ -32,9 +32,9 @@ import io.druid.guice.annotations.Self;
 import io.druid.indexing.common.actions.TaskActionClient;
 import io.druid.indexing.common.actions.TaskActionClientFactory;
 import io.druid.indexing.common.task.Task;
-import io.druid.indexing.overlord.config.TaskQueueConfig;
 import io.druid.indexing.overlord.autoscaling.ResourceManagementScheduler;
 import io.druid.indexing.overlord.autoscaling.ResourceManagementSchedulerFactory;
+import io.druid.indexing.overlord.config.TaskQueueConfig;
 import io.druid.server.DruidNode;
 import io.druid.server.initialization.IndexerZkConfig;
 import org.apache.curator.framework.CuratorFramework;

indexing-service/src/main/java/io/druid/indexing/overlord/TaskQueue.java

@@ -24,7 +24,6 @@ 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.MapDifference;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.FutureCallback;
@@ -46,7 +45,6 @@ import io.druid.metadata.EntryExistsException;
 import io.druid.query.DruidMetrics;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,7 +54,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Nullable;
 
 /**
  * Interface between task producers and the task runner.

indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java

@@ -17,7 +17,6 @@
 
 package io.druid.indexing.overlord;
 
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
@@ -42,7 +41,6 @@ import io.druid.query.QueryRunner;
 import io.druid.query.QueryRunnerFactoryConglomerate;
 import io.druid.query.QuerySegmentWalker;
 import io.druid.query.SegmentDescriptor;
-import io.druid.query.UnionQueryRunner;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.Interval;
 

indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ResourceManagementScheduler.java

@@ -23,7 +23,6 @@ import com.metamx.common.lifecycle.LifecycleStop;
 import com.metamx.common.logger.Logger;
 import io.druid.granularity.PeriodGranularity;
 import io.druid.indexing.overlord.RemoteTaskRunner;
-import io.druid.indexing.overlord.TaskRunner;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.joda.time.Period;

indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ResourceManagementStrategy.java

@@ -18,10 +18,6 @@
 package io.druid.indexing.overlord.autoscaling;
 
 import io.druid.indexing.overlord.RemoteTaskRunner;
-import io.druid.indexing.overlord.RemoteTaskRunnerWorkItem;
-import io.druid.indexing.overlord.ZkWorker;
-
-import java.util.Collection;
 
 /**
  * The ResourceManagementStrategy decides if worker nodes should be provisioned or determined

indexing-service/src/main/java/io/druid/indexing/overlord/http/OverlordRedirectInfo.java

@@ -19,7 +19,6 @@ package io.druid.indexing.overlord.http;
 
 import com.google.common.base.Throwables;
 import com.google.inject.Inject;
-import com.metamx.common.IAE;
 import io.druid.indexing.overlord.TaskMaster;
 import io.druid.server.http.RedirectInfo;
 

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

@@ -19,12 +19,11 @@
 
 package io.druid.indexing.common;
 
+import org.joda.time.Duration;
 import org.joda.time.Period;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.joda.time.Duration;
-
 public class RetryPolicyFactoryTest
 {
   @Test

indexing-service/src/test/java/io/druid/indexing/common/config/TaskStorageConfigTest.java

@@ -19,14 +19,12 @@
 
 package io.druid.indexing.common.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.druid.jackson.DefaultObjectMapper;
 import org.joda.time.Period;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.druid.jackson.DefaultObjectMapper;
-
 public class TaskStorageConfigTest
 {
   private final ObjectMapper jsonMapper = new DefaultObjectMapper();

indexing-service/src/test/java/io/druid/indexing/common/tasklogs/FileTaskLogsTest.java

@@ -27,11 +27,11 @@ import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
-import org.junit.rules.TemporaryFolder;
 
 public class FileTaskLogsTest
 {

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

@@ -19,8 +19,6 @@ package io.druid.indexing.firehose;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import io.druid.guice.GuiceAnnotationIntrospector;
-import io.druid.guice.GuiceInjectableValues;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -45,6 +43,8 @@ import io.druid.data.input.impl.MapInputRowParser;
 import io.druid.data.input.impl.SpatialDimensionSchema;
 import io.druid.data.input.impl.TimestampSpec;
 import io.druid.granularity.QueryGranularity;
+import io.druid.guice.GuiceAnnotationIntrospector;
+import io.druid.guice.GuiceInjectableValues;
 import io.druid.guice.GuiceInjectors;
 import io.druid.indexing.common.SegmentLoaderFactory;
 import io.druid.indexing.common.TaskToolboxFactory;

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

@@ -25,10 +25,7 @@ import com.amazonaws.services.ec2.model.Reservation;
 import com.amazonaws.services.ec2.model.RunInstancesRequest;
 import com.amazonaws.services.ec2.model.RunInstancesResult;
 import com.amazonaws.services.ec2.model.TerminateInstancesRequest;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
-import com.google.common.io.BaseEncoding;
 import io.druid.indexing.overlord.autoscaling.ec2.EC2AutoScaler;
 import io.druid.indexing.overlord.autoscaling.ec2.EC2EnvironmentConfig;
 import io.druid.indexing.overlord.autoscaling.ec2.EC2NodeData;

integration-tests/src/main/java/io/druid/testing/ConfigFileConfigProvider.java

@@ -21,17 +21,14 @@ package io.druid.testing;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.IOException;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.util.Map;
 import com.metamx.common.logger.Logger;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
 public class ConfigFileConfigProvider implements IntegrationTestingConfigProvider
 {
   private final static Logger LOG = new Logger(ConfigFileConfigProvider.class);

integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java

@@ -25,12 +25,12 @@ import com.google.inject.Provides;
 import com.metamx.emitter.core.LoggingEmitter;
 import com.metamx.emitter.core.LoggingEmitterConfig;
 import com.metamx.emitter.service.ServiceEmitter;
+import io.druid.curator.CuratorConfig;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.ManageLifecycle;
 import io.druid.testing.IntegrationTestingConfig;
 import io.druid.testing.IntegrationTestingConfigProvider;
-import io.druid.curator.CuratorConfig;
 import io.druid.testing.IntegrationTestingCuratorConfig;
 
 /**

integration-tests/src/main/java/io/druid/testing/utils/TestQueryHelper.java

@@ -24,8 +24,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import io.druid.testing.clients.QueryResourceTestClient;
 import io.druid.testing.IntegrationTestingConfig;
+import io.druid.testing.clients.QueryResourceTestClient;
 
 import java.util.List;
 import java.util.Map;

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

@@ -23,8 +23,8 @@ import io.druid.guice.annotations.Json;
 import io.druid.guice.annotations.Smile;
 import io.druid.testing.clients.CoordinatorResourceTestClient;
 import io.druid.testing.clients.OverlordResourceTestClient;
-import io.druid.testing.utils.TestQueryHelper;
 import io.druid.testing.utils.RetryUtil;
+import io.druid.testing.utils.TestQueryHelper;
 import org.apache.commons.io.IOUtils;
 import org.joda.time.Interval;
 

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

@@ -34,9 +34,7 @@ import kafka.producer.KeyedMessage;
 import kafka.producer.ProducerConfig;
 import kafka.utils.ZKStringSerializer$;
 import org.I0Itec.zkclient.ZkClient;
-
+import org.apache.commons.io.IOUtils;
-import java.util.concurrent.TimeUnit;
-
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
@@ -45,13 +43,11 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import org.apache.commons.io.IOUtils;
-
-import java.io.InputStream;
 import java.io.IOException;
-
+import java.io.InputStream;
 import java.util.Properties;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 
 /*
  * This is a test for the kafka firehose.

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

@@ -17,10 +17,11 @@
 
 package io.druid.tests.indexer;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Throwables;
 import com.google.inject.Inject;
-import com.metamx.common.logger.Logger;
 import com.metamx.common.ISE;
+import com.metamx.common.logger.Logger;
 import com.metamx.http.client.HttpClient;
 import io.druid.curator.discovery.ServerDiscoveryFactory;
 import io.druid.curator.discovery.ServerDiscoverySelector;
@@ -30,6 +31,7 @@ import io.druid.testing.clients.EventReceiverFirehoseTestClient;
 import io.druid.testing.guice.DruidTestModuleFactory;
 import io.druid.testing.utils.RetryUtil;
 import io.druid.testing.utils.ServerDiscoveryUtil;
+import org.apache.commons.io.IOUtils;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
@@ -38,20 +40,12 @@ import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
 import javax.ws.rs.core.MediaType;
-
-import org.apache.commons.io.IOUtils;
-
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 

integration-tests/src/test/java/io/druid/tests/query/ITTwitterQueryTest.java

@@ -20,8 +20,8 @@ package io.druid.tests.query;
 import com.google.inject.Inject;
 import io.druid.testing.clients.CoordinatorResourceTestClient;
 import io.druid.testing.guice.DruidTestModuleFactory;
-import io.druid.testing.utils.TestQueryHelper;
 import io.druid.testing.utils.RetryUtil;
+import io.druid.testing.utils.TestQueryHelper;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;

integration-tests/src/test/java/io/druid/tests/query/ITWikipediaQueryTest.java

@@ -20,8 +20,8 @@ package io.druid.tests.query;
 import com.google.inject.Inject;
 import io.druid.testing.clients.CoordinatorResourceTestClient;
 import io.druid.testing.guice.DruidTestModuleFactory;
-import io.druid.testing.utils.TestQueryHelper;
 import io.druid.testing.utils.RetryUtil;
+import io.druid.testing.utils.TestQueryHelper;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;

processing/src/main/java/io/druid/jackson/AggregatorsModule.java

@@ -25,8 +25,6 @@ import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.query.aggregation.DoubleMaxAggregatorFactory;
 import io.druid.query.aggregation.DoubleMinAggregatorFactory;
-import io.druid.query.aggregation.MinAggregatorFactory;
-import io.druid.query.aggregation.MaxAggregatorFactory;
 import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.query.aggregation.FilteredAggregatorFactory;
 import io.druid.query.aggregation.HistogramAggregatorFactory;
@@ -34,6 +32,8 @@ import io.druid.query.aggregation.JavaScriptAggregatorFactory;
 import io.druid.query.aggregation.LongMaxAggregatorFactory;
 import io.druid.query.aggregation.LongMinAggregatorFactory;
 import io.druid.query.aggregation.LongSumAggregatorFactory;
+import io.druid.query.aggregation.MaxAggregatorFactory;
+import io.druid.query.aggregation.MinAggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.aggregation.cardinality.CardinalityAggregatorFactory;
 import io.druid.query.aggregation.hyperloglog.HyperUniqueFinalizingPostAggregator;

processing/src/main/java/io/druid/query/AsyncQueryRunner.java

@@ -19,12 +19,6 @@
 
 package io.druid.query;
 
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -33,6 +27,12 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.metamx.common.guava.LazySequence;
 import com.metamx.common.guava.Sequence;
 
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
 public class AsyncQueryRunner<T> implements QueryRunner<T>
 {
 

processing/src/main/java/io/druid/query/CPUTimeMetricQueryRunner.java

@@ -31,11 +31,9 @@ import com.metamx.common.guava.Yielder;
 import com.metamx.common.guava.YieldingAccumulator;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
-
 import io.druid.common.utils.VMUtils;
+
 import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 

processing/src/main/java/io/druid/query/IntervalChunkingQueryRunnerDecorator.java

@@ -19,13 +19,12 @@
 
 package io.druid.query;
 
+import com.google.inject.Inject;
+import com.metamx.emitter.service.ServiceEmitter;
 import io.druid.guice.annotations.Processing;
 
 import java.util.concurrent.ExecutorService;
 
-import com.google.inject.Inject;
-import com.metamx.emitter.service.ServiceEmitter;
-
 public class IntervalChunkingQueryRunnerDecorator
 {
   private final ExecutorService executor;

processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java

@@ -19,7 +19,6 @@ package io.druid.query;
 
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.metamx.common.guava.Accumulator;
 import com.metamx.common.guava.Sequence;
@@ -29,7 +28,6 @@ import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**

processing/src/main/java/io/druid/query/Query.java

@@ -20,8 +20,8 @@ package io.druid.query;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.common.guava.Sequence;
-import io.druid.query.groupby.GroupByQuery;
 import io.druid.query.datasourcemetadata.DataSourceMetadataQuery;
+import io.druid.query.groupby.GroupByQuery;
 import io.druid.query.metadata.metadata.SegmentMetadataQuery;
 import io.druid.query.search.search.SearchQuery;
 import io.druid.query.select.SelectQuery;

processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java

@@ -48,7 +48,6 @@ import io.druid.segment.StorageAdapter;
 import io.druid.segment.incremental.IncrementalIndex;
 
 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.CancellationException;

processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java

@@ -23,8 +23,8 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Longs;
-import com.metamx.common.logger.Logger;
 import com.metamx.common.StringUtils;
+import com.metamx.common.logger.Logger;
 import io.druid.query.metadata.metadata.ColumnAnalysis;
 import io.druid.query.metadata.metadata.SegmentMetadataQuery;
 import io.druid.segment.QueryableIndex;

processing/src/main/java/io/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java

@@ -27,7 +27,6 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
-import com.metamx.common.ISE;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
@@ -35,8 +34,8 @@ import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.collections.OrderedMergeSequence;
 import io.druid.common.utils.JodaUtils;
 import io.druid.query.CacheStrategy;
-import io.druid.query.Query;
 import io.druid.query.DruidMetrics;
+import io.druid.query.Query;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChest;
 import io.druid.query.ResultMergeQueryRunner;

processing/src/main/java/io/druid/query/search/SearchQueryRunner.java

@@ -17,8 +17,6 @@
 
 package io.druid.query.search;
 
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -56,7 +54,6 @@ import io.druid.segment.column.Column;
 import io.druid.segment.data.IndexedInts;
 import io.druid.segment.filter.Filters;
 
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

processing/src/main/java/io/druid/query/search/search/SearchQuery.java

@@ -19,9 +19,7 @@ package io.druid.query.search.search;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.BaseQuery;
 import io.druid.query.DataSource;
@@ -32,7 +30,6 @@ import io.druid.query.filter.DimFilter;
 import io.druid.query.search.SearchResultValue;
 import io.druid.query.spec.QuerySegmentSpec;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 

processing/src/main/java/io/druid/query/select/SelectQuery.java

@@ -17,10 +17,10 @@
 
 package io.druid.query.select;
 
-import com.google.common.base.Preconditions;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.common.base.Preconditions;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.BaseQuery;
 import io.druid.query.DataSource;

processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java

@@ -24,17 +24,17 @@ import com.google.common.base.Functions;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
+import com.metamx.common.StringUtils;
 import com.metamx.common.guava.MergeSequence;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
-import com.metamx.common.StringUtils;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.collections.OrderedMergeSequence;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.CacheStrategy;
+import io.druid.query.DruidMetrics;
 import io.druid.query.IntervalChunkingQueryRunnerDecorator;
 import io.druid.query.Query;
-import io.druid.query.DruidMetrics;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChest;
 import io.druid.query.Result;

processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java

@@ -30,10 +30,10 @@ import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.collections.OrderedMergeSequence;
 import io.druid.granularity.QueryGranularity;
 import io.druid.query.CacheStrategy;
+import io.druid.query.DruidMetrics;
 import io.druid.query.IntervalChunkingQueryRunnerDecorator;
 import io.druid.query.Query;
 import io.druid.query.QueryCacheHelper;
-import io.druid.query.DruidMetrics;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChest;
 import io.druid.query.Result;

processing/src/main/java/io/druid/query/topn/TimeExtractionTopNAlgorithm.java

@@ -21,12 +21,9 @@ package io.druid.query.topn;
 
 import com.google.common.collect.Maps;
 import io.druid.query.aggregation.Aggregator;
-import io.druid.query.extraction.ExtractionFn;
 import io.druid.segment.Capabilities;
 import io.druid.segment.Cursor;
 import io.druid.segment.DimensionSelector;
-import io.druid.segment.LongColumnSelector;
-import io.druid.segment.column.Column;
 
 import java.util.Map;
 

processing/src/main/java/io/druid/query/topn/TopNLexicographicResultBuilder.java

@@ -23,14 +23,14 @@ import com.google.common.collect.Maps;
 import io.druid.query.Result;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.dimension.DimensionSpec;
-import java.util.Arrays;
-import java.util.PriorityQueue;
 import org.joda.time.DateTime;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.PriorityQueue;
 
 /**
  */