Remove unused code and exception declarations (apache#5461)

* Remove unused code and exception declarations * Address comments * Remove redundant Exception declarations * Make FirehoseFactoryV2.connect() to throw IOException again
rkabhishek · Mar 16, 2018 · 693e357 · 693e357
1 parent afa2520
commit 693e357
Show file tree

Hide file tree

Showing 758 changed files with 2,116 additions and 6,291 deletions.
diff --git a/.idea/inspectionProfiles/Druid.xml b/.idea/inspectionProfiles/Druid.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/scopes/UnusedInspectionsScope.xml b/.idea/scopes/UnusedInspectionsScope.xml
diff --git a/api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java b/api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java
@@ -25,6 +25,7 @@
 import io.druid.java.util.common.parsers.ParseException;
 
 import java.io.IOException;
+
 /**
  * Initialization method that connects up the FirehoseV2.  If this method returns successfully it should be safe to
  * call start() on the returned FirehoseV2 (which might subsequently block).
@@ -41,5 +42,10 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 public interface FirehoseFactoryV2<T extends InputRowParser>
 {
+  /**
+   * This method is declared to throw {@link IOException}, although it's not thrown in the implementations in Druid
+   * code, for compatibility with third-party extensions.
+   */
+  @SuppressWarnings("RedundantThrows")
   FirehoseV2 connect(T parser, Object lastCommit) throws IOException, ParseException;
 }
diff --git a/api/src/main/java/io/druid/data/input/FirehoseV2.java b/api/src/main/java/io/druid/data/input/FirehoseV2.java
@@ -52,7 +52,7 @@ public interface FirehoseV2 extends Closeable
   /**
    * For initial start
    */
-  void start() throws Exception;
+  void start();
 
   /**
    * Advance the firehose to the next offset.  Implementations of this interface should make sure that

diff --git a/api/src/main/java/io/druid/guice/Binders.java b/api/src/main/java/io/druid/guice/Binders.java
@@ -27,7 +27,6 @@
 import io.druid.segment.loading.DataSegmentFinder;
 import io.druid.segment.loading.DataSegmentKiller;
 import io.druid.segment.loading.DataSegmentMover;
-import io.druid.segment.loading.DataSegmentPuller;
 import io.druid.segment.loading.DataSegmentPusher;
 import io.druid.tasklogs.TaskLogs;
 
@@ -36,10 +35,6 @@
 @PublicApi
 public class Binders
 {
-  public static MapBinder<String, DataSegmentPuller> dataSegmentPullerBinder(Binder binder)
-  {
-    return MapBinder.newMapBinder(binder, String.class, DataSegmentPuller.class);
-  }
 
   public static MapBinder<String, DataSegmentKiller> dataSegmentKillerBinder(Binder binder)
   {

diff --git a/api/src/main/java/io/druid/segment/loading/DataSegmentPuller.java b/api/src/main/java/io/druid/segment/loading/DataSegmentPuller.java
diff --git a/api/src/main/java/io/druid/tasklogs/NoopTaskLogs.java b/api/src/main/java/io/druid/tasklogs/NoopTaskLogs.java
@@ -24,32 +24,31 @@
 import io.druid.java.util.common.logger.Logger;
 
 import java.io.File;
-import java.io.IOException;
 
 public class NoopTaskLogs implements TaskLogs
 {
   private final Logger log = new Logger(TaskLogs.class);
 
   @Override
-  public Optional<ByteSource> streamTaskLog(String taskid, long offset) throws IOException
+  public Optional<ByteSource> streamTaskLog(String taskid, long offset)
   {
     return Optional.absent();
   }
 
   @Override
-  public void pushTaskLog(String taskid, File logFile) throws IOException
+  public void pushTaskLog(String taskid, File logFile)
   {
     log.info("Not pushing logs for task: %s", taskid);
   }
 
   @Override
-  public void killAll() throws IOException
+  public void killAll()
   {
     log.info("Noop: No task logs are deleted.");
   }
 
   @Override
-  public void killOlderThan(long timestamp) throws IOException
+  public void killOlderThan(long timestamp)
   {
     log.info("Noop: No task logs are deleted.");
   }

diff --git a/api/src/main/java/io/druid/utils/CompressionUtils.java b/api/src/main/java/io/druid/utils/CompressionUtils.java
@@ -72,7 +72,7 @@ public static void unzip(InputStream in, File outDir) throws IOException
    * @throws IOException on propogated IO exception, IAE if it cannot determine the proper new name for `pulledFile`
    */
   @Deprecated // See description for alternative
-  public static void gunzip(File pulledFile, File outDir) throws IOException
+  public static void gunzip(File pulledFile, File outDir)
   {
     final File outFile = new File(outDir, io.druid.java.util.common.CompressionUtils.getGzBaseName(pulledFile.getName()));
     io.druid.java.util.common.CompressionUtils.gunzip(pulledFile, outFile);

diff --git a/api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java b/api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java
@@ -28,7 +28,7 @@
 public class CSVParseSpecTest
 {
   @Test(expected = IllegalArgumentException.class)
-  public void testColumnMissing() throws Exception
+  public void testColumnMissing()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new CSVParseSpec(
@@ -50,7 +50,7 @@ public void testColumnMissing() throws Exception
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testComma() throws Exception
+  public void testComma()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new CSVParseSpec(

diff --git a/api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java b/api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java
@@ -59,7 +59,7 @@ public void testSerde() throws IOException
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testColumnMissing() throws Exception
+  public void testColumnMissing()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new DelimitedParseSpec(
@@ -82,7 +82,7 @@ public void testColumnMissing() throws Exception
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testComma() throws Exception
+  public void testComma()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new DelimitedParseSpec(

diff --git a/api/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java b/api/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java
@@ -45,7 +45,7 @@
 public class FileIteratingFirehoseTest
 {
   @Parameters(name = "{0}, {1}")
-  public static Collection<Object[]> constructorFeeder() throws IOException
+  public static Collection<Object[]> constructorFeeder()
   {
     final List<List<String>> inputTexts = ImmutableList.of(
         ImmutableList.of("2000,foo"),
@@ -133,14 +133,14 @@ public void testClose() throws IOException
     final LineIterator lineIterator = new LineIterator(new Reader()
     {
       @Override
-      public int read(char[] cbuf, int off, int len) throws IOException
+      public int read(char[] cbuf, int off, int len)
       {
         System.arraycopy(LINE_CHARS, 0, cbuf, 0, LINE_CHARS.length);
         return LINE_CHARS.length;
       }
 
       @Override
-      public void close() throws IOException
+      public void close()
       {
         throw new RuntimeException("close test for FileIteratingFirehose");
       }
@@ -162,7 +162,7 @@ private static final class TestCloseable implements Closeable
     private boolean closed;
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
       closed = true;
     }

diff --git a/api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java b/api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java
@@ -30,7 +30,7 @@
 public class JSONLowercaseParseSpecTest
 {
   @Test
-  public void testLowercasing() throws Exception
+  public void testLowercasing()
   {
     JSONLowercaseParseSpec spec = new JSONLowercaseParseSpec(
         new TimestampSpec(

diff --git a/api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java b/api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java
@@ -34,7 +34,7 @@ public class ParseSpecTest
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test(expected = ParseException.class)
-  public void testDuplicateNames() throws Exception
+  public void testDuplicateNames()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new DelimitedParseSpec(
@@ -57,7 +57,7 @@ public void testDuplicateNames() throws Exception
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testDimAndDimExcluOverlap() throws Exception
+  public void testDimAndDimExcluOverlap()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new DelimitedParseSpec(
@@ -80,7 +80,7 @@ public void testDimAndDimExcluOverlap() throws Exception
   }
 
   @Test
-  public void testDimExclusionDuplicate() throws Exception
+  public void testDimExclusionDuplicate()
   {
     @SuppressWarnings("unused") // expected exception
     final ParseSpec spec = new DelimitedParseSpec(
@@ -103,7 +103,7 @@ public void testDimExclusionDuplicate() throws Exception
   }
 
   @Test
-  public void testDefaultTimestampSpec() throws Exception
+  public void testDefaultTimestampSpec()
   {
     expectedException.expect(NullPointerException.class);
     expectedException.expectMessage("parseSpec requires timestampSpec");
@@ -124,7 +124,7 @@ public void testDefaultTimestampSpec() throws Exception
   }
 
   @Test
-  public void testDimensionSpecRequired() throws Exception
+  public void testDimensionSpecRequired()
   {
     expectedException.expect(NullPointerException.class);
     expectedException.expectMessage("parseSpec requires dimensionSpec");

diff --git a/api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java b/api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java
@@ -29,7 +29,7 @@
 public class TimestampSpecTest
 {
   @Test
-  public void testExtractTimestamp() throws Exception
+  public void testExtractTimestamp()
   {
     TimestampSpec spec = new TimestampSpec("TIMEstamp", "yyyy-MM-dd", null);
     Assert.assertEquals(
@@ -39,7 +39,7 @@ public void testExtractTimestamp() throws Exception
   }
 
   @Test
-  public void testExtractTimestampWithMissingTimestampColumn() throws Exception
+  public void testExtractTimestampWithMissingTimestampColumn()
   {
     TimestampSpec spec = new TimestampSpec(null, null, DateTimes.EPOCH);
     Assert.assertEquals(
@@ -49,7 +49,7 @@ public void testExtractTimestampWithMissingTimestampColumn() throws Exception
   }
 
   @Test
-  public void testContextualTimestampList() throws Exception
+  public void testContextualTimestampList()
   {
     String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
     String[] dates = new String[]{

diff --git a/...test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java b/...test/java/io/druid/data/input/impl/prefetch/PrefetchableTextFilesFirehoseFactoryTest.java
@@ -570,7 +570,7 @@ protected InputStream openObjectStream(File object) throws IOException
     }
 
     @Override
-    protected InputStream wrapObjectStream(File object, InputStream stream) throws IOException
+    protected InputStream wrapObjectStream(File object, InputStream stream)
     {
       return stream;
     }

diff --git a/api/src/test/java/io/druid/guice/ConditionalMultibindTest.java b/api/src/test/java/io/druid/guice/ConditionalMultibindTest.java
@@ -51,7 +51,7 @@ public class ConditionalMultibindTest
   private Properties props;
 
   @Before
-  public void setUp() throws Exception
+  public void setUp()
   {
     props = new Properties();
   }

diff --git a/api/src/test/java/io/druid/guice/JsonConfiguratorTest.java b/api/src/test/java/io/druid/guice/JsonConfiguratorTest.java
@@ -104,7 +104,7 @@ public void testTest()
   }
 
   @Test
-  public void testsimpleConfigurate() throws Exception
+  public void testsimpleConfigurate()
   {
     final JsonConfigurator configurator = new JsonConfigurator(mapper, validator);
     properties.setProperty(PROP_PREFIX + "prop1", "prop1");

diff --git a/api/src/test/java/io/druid/guice/PolyBindTest.java b/api/src/test/java/io/druid/guice/PolyBindTest.java
@@ -42,7 +42,7 @@ public class PolyBindTest
   private Properties props;
   private Injector injector;
 
-  public void setUp(Module... modules) throws Exception
+  public void setUp(Module... modules)
   {
     props = new Properties();
     injector = Guice.createInjector(
@@ -66,7 +66,7 @@ public void configure(Binder binder)
   }
 
   @Test
-  public void testSanity() throws Exception
+  public void testSanity()
   {
     setUp(
         new Module()