Bump commons-io from 2.5 to 2.6 (#8006)

* Bump commons-io from 2.5 to 2.6

* Update licenses.yaml

* Address comments

core/src/main/java/org/apache/druid/data/input/Firehose.java

@@ -56,7 +56,7 @@ public interface Firehose extends Closeable
    *
    * @return true if and when there is another row available, false if the stream has dried up
    */
-  boolean hasMore();
+  boolean hasMore() throws IOException;
 
   /**
    * The next row available.  Should only be called if hasMore returns true.
@@ -65,7 +65,7 @@ public interface Firehose extends Closeable
    * @return The next row
    */
   @Nullable
-  InputRow nextRow();
+  InputRow nextRow() throws IOException;
 
   /**
    * Returns an InputRowPlusRaw object containing the InputRow plus the raw, unparsed data corresponding to the next row
@@ -75,7 +75,7 @@ public interface Firehose extends Closeable
    *
    * @return an InputRowPlusRaw which may contain any of: an InputRow, the raw data, or a ParseException
    */
-  default InputRowPlusRaw nextRowWithRaw()
+  default InputRowPlusRaw nextRowWithRaw() throws IOException
   {
     try {
       return InputRowPlusRaw.of(nextRow(), null);

core/src/main/java/org/apache/druid/data/input/impl/FileIteratingFirehose.java

@@ -62,7 +62,7 @@ public class FileIteratingFirehose implements Firehose
   }
 
   @Override
-  public boolean hasMore()
+  public boolean hasMore() throws IOException
   {
     while ((lineIterator == null || !lineIterator.hasNext()) && lineIterators.hasNext()) {
       lineIterator = getNextLineIterator();
@@ -73,7 +73,7 @@ public class FileIteratingFirehose implements Firehose
 
   @Nullable
   @Override
-  public InputRow nextRow()
+  public InputRow nextRow() throws IOException
   {
     if (!hasMore()) {
       throw new NoSuchElementException();
@@ -83,7 +83,7 @@ public class FileIteratingFirehose implements Firehose
   }
 
   @Override
-  public InputRowPlusRaw nextRowWithRaw()
+  public InputRowPlusRaw nextRowWithRaw() throws IOException
   {
     if (!hasMore()) {
       throw new NoSuchElementException();
@@ -98,7 +98,7 @@ public class FileIteratingFirehose implements Firehose
     }
   }
 
-  private LineIterator getNextLineIterator()
+  private LineIterator getNextLineIterator() throws IOException
   {
     if (lineIterator != null) {
       lineIterator.close();
@@ -119,7 +119,7 @@ public class FileIteratingFirehose implements Firehose
   public void close() throws IOException
   {
     try (Closeable ignore = closer;
-         Closeable ignore2 = lineIterator != null ? lineIterator::close : null) {
+         Closeable ignore2 = lineIterator) {
       // close both via try-with-resources
     }
   }

licenses.yaml

@@ -336,7 +336,7 @@ name: Apache Commons IO
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 2.5
+version: 2.6
 libraries:
   - commons-io: commons-io
 

pom.xml

@@ -206,7 +206,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>

server/src/main/java/org/apache/druid/segment/realtime/firehose/CombiningFirehoseFactory.java

@@ -105,14 +105,14 @@ public class CombiningFirehoseFactory implements FirehoseFactory<InputRowParser>
     }
 
     @Override
-    public boolean hasMore()
+    public boolean hasMore() throws IOException
     {
       return currentFirehose.hasMore();
     }
 
     @Nullable
     @Override
-    public InputRow nextRow()
+    public InputRow nextRow() throws IOException
     {
       InputRow rv = currentFirehose.nextRow();
       if (!currentFirehose.hasMore()) {

server/src/main/java/org/apache/druid/segment/realtime/firehose/FixedCountFirehoseFactory.java

@@ -67,17 +67,17 @@ public class FixedCountFirehoseFactory implements FirehoseFactory
     return new Firehose()
     {
       private int i = 0;
-      private Firehose delegateFirehose = delegate.connect(parser, temporaryDirectory);
+      private final Firehose delegateFirehose = delegate.connect(parser, temporaryDirectory);
 
       @Override
-      public boolean hasMore()
+      public boolean hasMore() throws IOException
       {
         return i < count && delegateFirehose.hasMore();
       }
 
       @Nullable
       @Override
-      public InputRow nextRow()
+      public InputRow nextRow() throws IOException
       {
         Preconditions.checkArgument(i++ < count, "Max events limit reached.");
         return delegateFirehose.nextRow();

server/src/main/java/org/apache/druid/segment/realtime/firehose/PredicateFirehose.java

@@ -50,7 +50,7 @@ public class PredicateFirehose implements Firehose
   }
 
   @Override
-  public boolean hasMore()
+  public boolean hasMore() throws IOException
   {
     if (savedInputRow != null) {
       return true;

server/src/main/java/org/apache/druid/segment/realtime/firehose/TimedShutoffFirehoseFactory.java

@@ -107,20 +107,20 @@ public class TimedShutoffFirehoseFactory implements FirehoseFactory<InputRowPars
     }
 
     @Override
-    public boolean hasMore()
+    public boolean hasMore() throws IOException
     {
       return firehose.hasMore();
     }
 
     @Nullable
     @Override
-    public InputRow nextRow()
+    public InputRow nextRow() throws IOException
     {
       return firehose.nextRow();
     }
 
     @Override
-    public InputRowPlusRaw nextRowWithRaw()
+    public InputRowPlusRaw nextRowWithRaw() throws IOException
     {
       return firehose.nextRowWithRaw();
     }

server/src/main/java/org/apache/druid/segment/realtime/plumber/Plumbers.java

@@ -30,6 +30,8 @@ import org.apache.druid.segment.incremental.IncrementalIndexAddResult;
 import org.apache.druid.segment.incremental.IndexSizeExceededException;
 import org.apache.druid.segment.realtime.FireDepartmentMetrics;
 
+import java.io.IOException;
+
 public class Plumbers
 {
   private static final Logger log = new Logger(Plumbers.class);
@@ -45,7 +47,7 @@ public class Plumbers
       final Plumber plumber,
       final boolean reportParseExceptions,
       final FireDepartmentMetrics metrics
-  )
+  ) throws IOException
   {
     final InputRow inputRow;
     try {