DRILL-7019: Add check for redundant imports

close apache/drill#1629

24 files changed, 37 insertions, 75 deletions

diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/initilializers/DefaultReadersInitializer.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/initilializers/DefaultReadersInitializer.java
index b38346935..c6fbdca05 100644
--- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/initilializers/DefaultReadersInitializer.java
+++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/initilializers/DefaultReadersInitializer.java
@@ -22,7 +22,6 @@ import org.apache.drill.exec.store.RecordReader;
 import org.apache.drill.exec.store.hive.HivePartition;
 import org.apache.drill.exec.store.hive.HiveSubScan;
 import org.apache.drill.exec.store.hive.readers.HiveAbstractReader;
-import org.apache.drill.exec.store.hive.readers.initilializers.AbstractReadersInitializer;
 import org.apache.hadoop.mapred.InputSplit;
 
 import java.lang.reflect.Constructor;
diff --git a/drill-yarn/src/test/java/org/apache/drill/yarn/client/TestCommandLineOptions.java b/drill-yarn/src/test/java/org/apache/drill/yarn/client/TestCommandLineOptions.java
index f996c5b49..e6c220b7e 100644
--- a/drill-yarn/src/test/java/org/apache/drill/yarn/client/TestCommandLineOptions.java
+++ b/drill-yarn/src/test/java/org/apache/drill/yarn/client/TestCommandLineOptions.java
@@ -22,8 +22,6 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.apache.drill.yarn.client.CommandLineOptions;
-
 public class TestCommandLineOptions {
   @Test
   public void testOptions() {
diff --git a/drill-yarn/src/test/resources/doy-test-logback.xml b/drill-yarn/src/test/resources/doy-test-logback.xml
index 819ee485d..2516c338d 100644
--- a/drill-yarn/src/test/resources/doy-test-logback.xml
+++ b/drill-yarn/src/test/resources/doy-test-logback.xml
@@ -20,7 +20,7 @@
 -->
 <configuration>
 
-<!-- 
+<!--
   <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
     <Compressing>true</Compressing>
     <ReconnectionDelay>10000</ReconnectionDelay>
diff --git a/drill-yarn/src/test/resources/second-test-config.conf b/drill-yarn/src/test/resources/second-test-config.conf
index 11c180f6e..72cf09baa 100644
--- a/drill-yarn/src/test/resources/second-test-config.conf
+++ b/drill-yarn/src/test/resources/second-test-config.conf
@@ -20,14 +20,14 @@
 
 drill.yarn: {
   app-name: "My-App"
-  
+
   drill-install: {
     localize: false
     drill-home: "/config/drill/home"
     site-dir: "/config/drill/site"
     client-path: "/foo/bar/drill-archive.tar.gz"
   }
-  
+
   yarn: {
     queue: "my-queue"
   }
diff --git a/drill-yarn/src/test/resources/test-doy-config.conf b/drill-yarn/src/test/resources/test-doy-config.conf
index b588530aa..f6d257c47 100644
--- a/drill-yarn/src/test/resources/test-doy-config.conf
+++ b/drill-yarn/src/test/resources/test-doy-config.conf
@@ -20,12 +20,12 @@
 
 drill.yarn: {
   app-name: "My-App"
-  
+
   drill-install: {
     drill-home: "/config/drill/home"
     client-path: "/foo/bar/drill-archive.tar.gz"
   }
-  
+
   yarn: {
     queue: "my-queue"
   }
diff --git a/drill-yarn/src/test/resources/test-doy-distrib.conf b/drill-yarn/src/test/resources/test-doy-distrib.conf
index ff73ef395..98afc1653 100644
--- a/drill-yarn/src/test/resources/test-doy-distrib.conf
+++ b/drill-yarn/src/test/resources/test-doy-distrib.conf
@@ -20,7 +20,7 @@
 
 drill.yarn: {
   app-name: "config-app-name"
-  
+
   dfs: {
     app-dir: "/opt/drill"
   }
diff --git a/drill-yarn/src/test/resources/third-test-config.conf b/drill-yarn/src/test/resources/third-test-config.conf
index f585e220b..c33d8e98b 100644
--- a/drill-yarn/src/test/resources/third-test-config.conf
+++ b/drill-yarn/src/test/resources/third-test-config.conf
@@ -20,12 +20,12 @@
 
 drill.yarn: {
   app-name: "My-App"
-  
+
   drill-install: {
     localize: false
     drill-home: "/config/drill/home"
   }
-  
+
   yarn: {
     queue: "my-queue"
   }
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java
index e4314826d..586776645 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java
@@ -17,7 +17,6 @@
  */
 package org.apache.drill.exec.planner;
 
-import org.apache.drill.shaded.guava.com.google.common.base.Preconditions;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
 import org.apache.calcite.plan.volcano.AbstractConverter;
@@ -49,6 +48,8 @@ import org.apache.calcite.rel.rules.SubQueryRemoveRule;
 import org.apache.calcite.rel.rules.UnionToDistinctRule;
 import org.apache.drill.exec.planner.logical.DrillConditions;
 import org.apache.drill.exec.planner.logical.DrillRelFactories;
+import org.apache.drill.shaded.guava.com.google.common.base.Preconditions;
+
 /**
  * Contains rule instances which use custom RelBuilder.
  */
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java
index 86ed4301c..42c525bec 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java
@@ -17,7 +17,6 @@
  */
 package org.apache.drill.exec.planner.index.rules;
 
-import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch;
 import org.apache.drill.shaded.guava.com.google.common.base.Preconditions;
 import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch;
 import org.apache.calcite.plan.RelOptRule;
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java
index 07e553c68..db29c31a7 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java
@@ -26,7 +26,6 @@ import org.apache.drill.common.logical.PlanProperties.Generator.ResultMode;
 import org.apache.drill.common.logical.PlanProperties.PlanType;
 import org.apache.drill.common.logical.data.LogicalOperator;
 import org.apache.drill.common.logical.data.visitors.AbstractLogicalVisitor;
-import org.apache.calcite.rel.RelNode;
 
 import org.apache.drill.shaded.guava.com.google.common.collect.Sets;
 
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeProjectRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeProjectRule.java
index 10f9567c5..f63759af3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeProjectRule.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeProjectRule.java
@@ -34,8 +34,6 @@ import org.apache.calcite.rex.RexNode;
 import org.apache.drill.exec.planner.DrillRelBuilder;
 import org.apache.drill.exec.planner.physical.PrelFactories;
 
-import java.util.List;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java
index f8f4b9d13..ad9a2d517 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java
@@ -26,8 +26,6 @@ import org.apache.calcite.rel.RelCollationImpl;
 import org.apache.calcite.rel.RelFieldCollation;
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.calcite.rex.RexNode;
-import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.drill.exec.physical.base.PhysicalOperator;
 import org.apache.drill.exec.physical.config.TopN;
 import org.apache.drill.exec.planner.common.OrderedRel;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java
index cb27a2d49..90b9f7182 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java
@@ -26,9 +26,6 @@ import org.apache.drill.common.types.TypeProtos.DataMode;
 import org.apache.drill.common.types.TypeProtos.MajorType;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.common.types.Types;
-import org.apache.drill.exec.physical.impl.scan.project.NullColumnBuilder;
-import org.apache.drill.exec.physical.impl.scan.project.NullColumnLoader;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedNullColumn;
 import org.apache.drill.exec.physical.rowSet.ResultVectorCache;
 import org.apache.drill.exec.physical.rowSet.impl.NullResultVectorCacheImpl;
 import org.apache.drill.exec.physical.rowSet.impl.ResultVectorCacheImpl;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java
index 883fe9e9d..289b418e5 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java
@@ -19,12 +19,7 @@ package org.apache.drill.exec.physical.impl.scan.project;
 
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.common.types.Types;
-import org.apache.drill.exec.physical.impl.scan.project.NullColumnBuilder;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedMapColumn;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedColumn;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple;
 import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple.ResolvedRow;
-import org.apache.drill.exec.physical.impl.scan.project.VectorSource;
 import org.apache.drill.exec.physical.rowSet.ResultVectorCache;
 import org.apache.drill.exec.physical.rowSet.impl.NullResultVectorCacheImpl;
 import org.apache.drill.exec.record.BatchSchema;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java
index e07ad9a62..c58991aa8 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java
@@ -25,8 +25,6 @@ import static org.junit.Assert.fail;
 import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.expression.SchemaPath;
 import org.apache.drill.exec.physical.impl.scan.ScanTestUtils;
-import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection;
-import org.apache.drill.exec.physical.impl.scan.project.UnresolvedColumn;
 import org.apache.drill.exec.physical.rowSet.impl.RowSetTestUtils;
 import org.apache.drill.exec.physical.rowSet.project.RequestedTuple.RequestedColumn;
 import org.apache.drill.exec.record.metadata.ProjectionType;
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java
index dc2c94b61..c10e5fc7a 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java
@@ -28,19 +28,8 @@ import java.util.List;
 
 import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.types.TypeProtos.MinorType;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedMapColumn;
 import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple.ResolvedRow;
 import org.apache.drill.exec.physical.impl.scan.ScanTestUtils;
-import org.apache.drill.exec.physical.impl.scan.project.ExplicitSchemaProjection;
-import org.apache.drill.exec.physical.impl.scan.project.NullColumnBuilder;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedColumn;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedNullColumn;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedTableColumn;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple;
-import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection;
-import org.apache.drill.exec.physical.impl.scan.project.UnresolvedColumn;
-import org.apache.drill.exec.physical.impl.scan.project.VectorSource;
-import org.apache.drill.exec.physical.impl.scan.project.WildcardSchemaProjection;
 import org.apache.drill.exec.physical.rowSet.impl.RowSetTestUtils;
 import org.apache.drill.exec.record.metadata.SchemaBuilder;
 import org.apache.drill.exec.record.metadata.TupleMetadata;
@@ -382,16 +371,16 @@ public class TestSchemaLevelProjection extends SubOperatorTest {
     final ResolvedColumn xCol = columns.get(0);
     assertEquals("x", xCol.name());
     assertEquals(ResolvedTableColumn.ID, xCol.nodeType());
-    assertSame(rootTuple, ((ResolvedTableColumn) (xCol)).source());
-    assertEquals(0, ((ResolvedTableColumn) (xCol)).sourceIndex());
+    assertSame(rootTuple, xCol.source());
+    assertEquals(0, xCol.sourceIndex());
 
     // Y is projected
 
     final ResolvedColumn yCol = columns.get(2);
     assertEquals("y", yCol.name());
     assertEquals(ResolvedTableColumn.ID, yCol.nodeType());
-    assertSame(rootTuple, ((ResolvedTableColumn) (yCol)).source());
-    assertEquals(1, ((ResolvedTableColumn) (yCol)).sourceIndex());
+    assertSame(rootTuple, yCol.source());
+    assertEquals(1, yCol.sourceIndex());
 
     // A is projected
 
@@ -410,7 +399,7 @@ public class TestSchemaLevelProjection extends SubOperatorTest {
     final ResolvedColumn acCol = aMembers.columns().get(0);
     assertEquals("c", acCol.name());
     assertEquals(ResolvedTableColumn.ID, acCol.nodeType());
-    assertEquals(1, ((ResolvedTableColumn) (acCol)).sourceIndex());
+    assertEquals(1, acCol.sourceIndex());
 
     // a.d is not in the table, is null
 
@@ -481,8 +470,8 @@ public class TestSchemaLevelProjection extends SubOperatorTest {
     final ResolvedColumn aCol = columns.get(0);
     assertEquals("a", aCol.name());
     assertEquals(ResolvedTableColumn.ID, aCol.nodeType());
-    assertSame(rootTuple, ((ResolvedTableColumn) (aCol)).source());
-    assertEquals(0, ((ResolvedTableColumn) (aCol)).sourceIndex());
+    assertSame(rootTuple, aCol.source());
+    assertEquals(0, aCol.sourceIndex());
   }
 
   /**
@@ -550,8 +539,8 @@ public class TestSchemaLevelProjection extends SubOperatorTest {
     final ResolvedColumn aCol = columns.get(0);
     assertEquals("a", aCol.name());
     assertEquals(ResolvedTableColumn.ID, aCol.nodeType());
-    assertSame(rootTuple, ((ResolvedTableColumn) (aCol)).source());
-    assertEquals(0, ((ResolvedTableColumn) (aCol)).sourceIndex());
+    assertSame(rootTuple, aCol.source());
+    assertEquals(0, aCol.sourceIndex());
   }
 
   /**
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java
index 78c90e070..d008a9d8c 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java
@@ -27,16 +27,9 @@ import java.util.List;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.physical.impl.protocol.SchemaTracker;
 import org.apache.drill.exec.physical.impl.scan.ScanTestUtils;
-import org.apache.drill.exec.physical.impl.scan.project.NullColumnBuilder;
-import org.apache.drill.exec.physical.impl.scan.project.ResolvedColumn;
 import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple.ResolvedRow;
-import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection;
-import org.apache.drill.exec.physical.impl.scan.project.ScanSchemaOrchestrator;
 import org.apache.drill.exec.physical.impl.scan.project.ScanSchemaOrchestrator.ReaderSchemaOrchestrator;
-import org.apache.drill.exec.physical.impl.scan.project.SchemaSmoother;
 import org.apache.drill.exec.physical.impl.scan.project.SchemaSmoother.IncompatibleSchemaException;
-import org.apache.drill.exec.physical.impl.scan.project.SmoothingProjection;
-import org.apache.drill.exec.physical.impl.scan.project.WildcardSchemaProjection;
 import org.apache.drill.exec.physical.rowSet.ResultSetLoader;
 import org.apache.drill.exec.physical.rowSet.impl.RowSetTestUtils;
 import org.apache.drill.exec.record.metadata.SchemaBuilder;
diff --git a/exec/java-exec/src/test/resources/drill-module.conf b/exec/java-exec/src/test/resources/drill-module.conf
index d701bab3e..f7e7b8b86 100644
--- a/exec/java-exec/src/test/resources/drill-module.conf
+++ b/exec/java-exec/src/test/resources/drill-module.conf
@@ -10,7 +10,7 @@ drill: {
     packages += "org.apache.drill.exec.testing",
     packages += "org.apache.drill.exec.rpc.user.security.testing"
   }
-  test.query.printing.silent : false, 
+  test.query.printing.silent : false,
   exec: {
   cluster-id: "drillbits1"
   rpc: {
diff --git a/exec/java-exec/src/test/resources/zkacltest.conf b/exec/java-exec/src/test/resources/zkacltest.conf
index e1b545531..b95e2ad35 100644
--- a/exec/java-exec/src/test/resources/zkacltest.conf
+++ b/exec/java-exec/src/test/resources/zkacltest.conf
@@ -15,14 +15,14 @@
 
 // This file contains ZK client and server config for testing ZK ACLs
 
-  Server {
-            org.apache.zookeeper.server.auth.DigestLoginModule required
-            user_testuser1="testpassword"
-            user_testuser2="testpassword";
-           };
-                
-  Client {
-          	org.apache.zookeeper.server.auth.DigestLoginModule required
-          	username="testuser1"
-          	password="testpassword";
-          };
+Server {
+  org.apache.zookeeper.server.auth.DigestLoginModule required
+  user_testuser1 = "testpassword"
+  user_testuser2 = "testpassword";
+};
+
+Client {
+  org.apache.zookeeper.server.auth.DigestLoginModule required
+  username = "testuser1"
+  password = "testpassword";
+};
diff --git a/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java b/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
index ed258cf02..f4d6b818b 100644
--- a/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
+++ b/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
@@ -25,8 +25,6 @@ import java.io.OutputStream;
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.netty.util.internal.PlatformDependent;
-
 /**
  * The underlying class we use for little-endian access to memory. Is used
  * underneath DrillBufs to abstract away the Netty classes and underlying Netty
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java
index 3bcaa5136..0552f7784 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java
@@ -19,7 +19,6 @@ package org.apache.drill.exec.vector.complex;
 
 import org.apache.drill.exec.vector.UInt4Vector;
 import org.apache.drill.exec.vector.ValueVector;
-import org.apache.drill.exec.vector.complex.ContainerVectorLike;
 
 /**
  * An abstraction representing repeated value vectors.
@@ -31,7 +30,7 @@ import org.apache.drill.exec.vector.complex.ContainerVectorLike;
  */
 public interface RepeatedValueVector extends ValueVector, ContainerVectorLike {
 
-  final static int DEFAULT_REPEAT_PER_RECORD = 5;
+  int DEFAULT_REPEAT_PER_RECORD = 5;
 
   /**
    * Returns the underlying offset vector or null if none exists.
diff --git a/pom.xml b/pom.xml
index a2e0948c1..530d3de2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>7.8.2</version>
+            <version>8.16</version>
           </dependency>
         </dependencies>
         <configuration>
@@ -417,7 +417,7 @@
           <consoleOutput>true</consoleOutput>
           <includeResources>true</includeResources>
           <includeTestResources>true</includeTestResources>
-          <resourceIncludes>**/*.properties,**/*.conf,**/*.json,**/*.xml</resourceIncludes>
+          <resourceIncludes>**/*.properties,**/*.conf,**/*.xml</resourceIncludes>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <configLocation>src/main/resources/checkstyle-config.xml</configLocation>
           <suppressionsLocation>src/main/resources/checkstyle-suppressions.xml</suppressionsLocation>
@@ -904,7 +904,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.12.1</version> <!--it necessary to solve Checkstyle7.8.2 errors to update it to latest version-->
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/resources/checkstyle-config.xml b/src/main/resources/checkstyle-config.xml
index b4b1cbc1c..f444cc43b 100644
--- a/src/main/resources/checkstyle-config.xml
+++ b/src/main/resources/checkstyle-config.xml
@@ -28,6 +28,7 @@
 
   <module name="TreeWalker">
     <module name="UnusedImports"/>
+    <module name="RedundantImport"/>
     <module name="IllegalImport">
       <!-- For "org.apache.commons.lang.*" classes use the corresponding class from "org.apache.commons.lang3.*".
         For com.google.common.* classes use shaded ones from org.apache.drill.shaded.guava.com.google.common.*-->
diff --git a/src/main/resources/checkstyle-suppressions.xml b/src/main/resources/checkstyle-suppressions.xml
index 17d6d211c..84eddb9ad 100644
--- a/src/main/resources/checkstyle-suppressions.xml
+++ b/src/main/resources/checkstyle-suppressions.xml
@@ -24,5 +24,5 @@
 
 <!--  Checkstyle Suppressions for Apache Drill -->
 <suppressions>
-  <suppress files="[\\/]generated-sources[\\/]" checks="AvoidStarImport,NeedBraces"/>
+  <suppress files="[\\/]generated-sources[\\/]" checks="[AvoidStarImport,NeedBraces,RegexpSingleline]"/>
 </suppressions>