cleanup and remove unused imports

cay914 · Nov 11, 2015 · fa6142e · fa6142e
1 parent 07157f9
commit fa6142e
Show file tree

Hide file tree

Showing 174 changed files with 231 additions and 476 deletions.
diff --git a/aws-common/src/main/java/io/druid/common/aws/FileSessionCredentialsProvider.java b/aws-common/src/main/java/io/druid/common/aws/FileSessionCredentialsProvider.java
@@ -20,15 +20,13 @@
 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;
 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;
 

diff --git a/benchmarks/src/main/java/io/druid/benchmark/CompressedVSizeIndexedBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/CompressedVSizeIndexedBenchmark.java
@@ -38,10 +38,6 @@
 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;

diff --git a/benchmarks/src/main/java/io/druid/benchmark/MergeSequenceBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/MergeSequenceBenchmark.java
@@ -7,11 +7,6 @@
 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.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
 {

diff --git a/benchmarks/src/main/java/io/druid/benchmark/StupidPoolConcurrencyBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/StupidPoolConcurrencyBenchmark.java
@@ -20,21 +20,18 @@
 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;
 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;

diff --git a/common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java b/common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java
@@ -25,7 +25,6 @@
 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;

diff --git a/common/src/test/java/io/druid/collections/CombiningIterableTest.java b/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.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class CombiningIterableTest
 {

diff --git a/common/src/test/java/io/druid/collections/CombiningIteratorTest.java b/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;

diff --git a/common/src/test/java/io/druid/collections/CountingMapTest.java b/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;

diff --git a/common/src/test/java/io/druid/collections/IntListTest.java b/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

diff --git a/common/src/test/java/io/druid/collections/StupidPoolTest.java b/common/src/test/java/io/druid/collections/StupidPoolTest.java
@@ -21,10 +21,8 @@
 
 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;

diff --git a/common/src/test/java/io/druid/collections/StupidResourceHolderTest.java b/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;

diff --git a/common/src/test/java/io/druid/common/utils/JodaUtilsTest.java b/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 java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
 /**

diff --git a/common/src/test/java/io/druid/common/utils/PropUtilsTest.java b/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

diff --git a/common/src/test/java/io/druid/common/utils/SerializerUtilsTest.java b/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.WritableByteChannel;
 import java.nio.charset.Charset;
 
-import io.druid.collections.IntList;
-
 public class SerializerUtilsTest
 {
   private SerializerUtils serializerUtils;

diff --git a/common/src/test/java/io/druid/common/utils/SocketUtilTest.java b/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;

diff --git a/common/src/test/java/io/druid/metadata/DefaultPasswordProviderTest.java b/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";

diff --git a/common/src/test/java/io/druid/metadata/MetadataStorageConnectorConfigTest.java b/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();

diff --git a/common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java b/common/src/test/java/io/druid/timeline/VersionedIntervalTimelineTest.java
@@ -21,7 +21,6 @@
 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;

diff --git a/extensions/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java b/extensions/azure-extensions/src/main/java/io/druid/storage/azure/AzureDataSegmentPuller.java
@@ -19,13 +19,13 @@
 
 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;

diff --git a/...nsions/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java b/...nsions/azure-extensions/src/main/java/io/druid/storage/azure/AzureStorageDruidModule.java
@@ -30,7 +30,6 @@
 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;

diff --git a/extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java b/extensions/azure-extensions/src/test/java/io/druid/storage/azure/AzureByteSourceTest.java
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 import java.net.URISyntaxException;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
 
 public class AzureByteSourceTest extends EasyMockSupport
 {

diff --git a/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java b/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java
@@ -32,7 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
 
 public class AzureDataSegmentKillerTest extends EasyMockSupport
 {

diff --git a/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java b/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java
@@ -35,7 +35,7 @@
 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;

diff --git a/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java b/...ons/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java
@@ -34,10 +34,10 @@
 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";

diff --git a/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java b/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPuller.java
@@ -32,12 +32,10 @@
 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.net.URI;
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
-import java.util.regex.Pattern;
 
 /**
  */

diff --git a/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java b/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsLoadSpec.java
@@ -22,14 +22,11 @@
 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;
 
 /**
  *

diff --git a/...c/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java b/...c/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java
@@ -30,8 +30,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import java.io.File;
-
 /**
  */
 public class ApproximateHistogramAggregationTest

diff --git a/.../test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java b/.../test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java
@@ -48,7 +48,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 /**

diff --git a/...src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java b/...src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
@@ -27,8 +27,8 @@
 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 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;