DRILL-6656: Disallow extra semicolons and multiple statements on the same line.

closes #1415

8 files changed, 93 insertions, 88 deletions

diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
index 6e1efe512..e73b51272 100644
--- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
+++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java
@@ -292,7 +292,7 @@ public class HBaseFilterBuilder extends AbstractExprVisitor<HBaseScanSpec, Void,
             startRow = prefix.getBytes(Charsets.UTF_8);
             stopRow = startRow.clone();
             boolean isMaxVal = true;
-            for (int i = stopRow.length - 1; i >= 0 ; --i) {
+            for (int i = stopRow.length - 1; i >= 0; --i) {
               int nextByteValue = (0xff & stopRow[i]) + 1;
               if (nextByteValue < 0xff) {
                 stopRow[i] = (byte) nextByteValue;
diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java
index 632f04659..1128f3991 100644
--- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java
+++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java
@@ -125,7 +125,7 @@ public abstract class HBasePushFilterIntoScan extends StoragePluginOptimizerRule
     final ScanPrel newScanPrel = ScanPrel.create(scan, filter.getTraitSet(), newGroupsScan, scan.getRowType());
 
     // Depending on whether is a project in the middle, assign either scan or copy of project to childRel.
-    final RelNode childRel = project == null ? newScanPrel : project.copy(project.getTraitSet(), ImmutableList.of((RelNode)newScanPrel));;
+    final RelNode childRel = project == null ? newScanPrel : project.copy(project.getTraitSet(), ImmutableList.of(newScanPrel));
 
     if (hbaseFilterBuilder.isAllExpressionsConverted()) {
         /*
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java
index 36224b305..3227277c5 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java
@@ -31,8 +31,8 @@ public class TestHBaseConnectionManager extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "row_key\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` tableName",
+        8);
 
     /*
      * Simulate HBase connection close and ensure that the connection
@@ -42,8 +42,8 @@ public class TestHBaseConnectionManager extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "row_key\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` tableName",
+        8);
 
     /*
      * Simulate HBase cluster restart and ensure that running query against
@@ -54,8 +54,8 @@ public class TestHBaseConnectionManager extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "row_key\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` tableName",
+        8);
 
   }
 
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
index aee18eb70..cccaeb1c0 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java
@@ -91,8 +91,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') < DATE '2015-06-18' AND\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') > DATE '2015-06-13'"
-        , 12);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') > DATE '2015-06-13'",
+        12);
   }
 
   @Test
@@ -104,8 +104,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + ", CONVERT_FROM(tableName.f.c, 'UTF8') \n"
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') = DATE '2015-08-22'"
-        , 3);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') = DATE '2015-08-22'",
+        3);
   }
 
   @Test
@@ -118,8 +118,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') < DATE '2015-06-18' AND\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') > DATE '2015-06-13'"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'date_epoch_be') > DATE '2015-06-13'",
+        1);
   }
 
   @Test
@@ -133,8 +133,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'timestamp_epoch_be') >= TIMESTAMP '2015-06-18 08:00:00.000' AND\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'timestamp_epoch_be') < TIMESTAMP '2015-06-20 16:00:00.000'"
-        , 7);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'timestamp_epoch_be') < TIMESTAMP '2015-06-20 16:00:00.000'",
+        7);
   }
 
   @Test
@@ -146,8 +146,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + ", CONVERT_FROM(tableName.f.c, 'UTF8') \n"
         + " FROM hbase.`TestTableCompositeTime` tableName\n"
         + " WHERE\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') = TIME '23:57:15.275'"//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'), 'BIGINT_BE') \n"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') = TIME '23:57:15.275'",//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'), 'BIGINT_BE') \n"
+        1);
   }
 
   @Test
@@ -159,8 +159,9 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + ", CONVERT_FROM(tableName.f.c, 'UTF8') \n"
         + " FROM hbase.`TestTableCompositeTime` tableName\n"
         + " WHERE\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') = TIME '23:55:51.250'"//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'), 'BIGINT_BE') \n"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') = TIME '23:55:51.250'",//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'),
+        // 'BIGINT_BE') \n"
+        1);
   }
 
   @Test
@@ -173,8 +174,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeTime` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') > TIME '23:57:06' AND"//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'), 'BIGINT_BE') \n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') < TIME '23:59:59'"
-        , 8);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'time_epoch_be') < TIME '23:59:59'",
+        8);
   }
 
   @Test
@@ -186,8 +187,9 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + ", CONVERT_FROM(tableName.f.c, 'UTF8') \n"
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'bigint_be') = cast(1409040000000 as bigint)"//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'), 'BIGINT_BE') \n"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'bigint_be') = cast(1409040000000 as bigint)",//convert_from(binary_string('\\x00\\x00\\x00\\x00\\x55\\x4D\\xBE\\x80'),
+        // 'BIGINT_BE') \n"
+        1);
   }
 
   @Test
@@ -202,8 +204,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeDate` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'uint8_be') > cast(1438300800000 as bigint) AND\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'uint8_be') < cast(1438617600000 as bigint)"
-        , 10);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 8), 'uint8_be') < cast(1438617600000 as bigint)",
+        10);
   }
 
   @Test
@@ -216,8 +218,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeInt` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') >= cast(423 as int) AND"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') < cast(940 as int)"
-        , 11);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') < cast(940 as int)",
+        11);
   }
 
   @Test
@@ -230,8 +232,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + " FROM hbase.`TestTableCompositeInt` tableName\n"
         + " WHERE\n"
         + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') >= cast(300 as int) AND"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') < cast(900 as int)"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') < cast(900 as int)",
+        1);
   }
 
   @Test
@@ -243,8 +245,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + ", CONVERT_FROM(tableName.f.c, 'UTF8') \n"
         + " FROM hbase.`TestTableCompositeInt` tableName\n"
         + " WHERE\n"
-        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') = cast(658 as int)"
-        , 1);
+        + " CONVERT_FROM(BYTE_SUBSTR(row_key, 1, 4), 'uint4_be') = cast(658 as int)",
+        1);
   }
 
   @Test
@@ -256,8 +258,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "FROM\n"
         + "  hbase.`TestTableDoubleOB` t\n"
         + "WHERE\n"
-        + "  CONVERT_FROM(row_key, 'DOUBLE_OB') > cast(95.54 as DOUBLE)"
-        , 6);
+        + "  CONVERT_FROM(row_key, 'DOUBLE_OB') > cast(95.54 as DOUBLE)",
+        6);
   }
 
   @Test
@@ -270,8 +272,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "FROM\n"
         + "  hbase.`TestTableDoubleOB` t\n"
         + "WHERE\n"
-        + "  CONVERT_FROM(row_key, 'DOUBLE_OB') > cast(95.54 as DOUBLE)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'DOUBLE_OB') > cast(95.54 as DOUBLE)",
+        1);
   }
 
   @Test
@@ -283,8 +285,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "FROM\n"
         + "  hbase.`TestTableDoubleOBDesc` t\n"
         + "WHERE\n"
-        + "  CONVERT_FROM(row_key, 'DOUBLE_OBD') > cast(95.54 as DOUBLE)"
-        , 6);
+        + "  CONVERT_FROM(row_key, 'DOUBLE_OBD') > cast(95.54 as DOUBLE)",
+        6);
   }
 
   @Test
@@ -297,8 +299,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "FROM\n"
         + "  hbase.`TestTableDoubleOBDesc` t\n"
         + "WHERE\n"
-        + "  CONVERT_FROM(row_key, 'DOUBLE_OBD') > cast(95.54 as DOUBLE)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'DOUBLE_OBD') > cast(95.54 as DOUBLE)",
+        1);
   }
 
   @Test
@@ -311,8 +313,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableIntOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'INT_OB') >= cast(-32 as INT) AND"
-        + "  CONVERT_FROM(row_key, 'INT_OB') < cast(59 as INT)"
-        , 91);
+        + "  CONVERT_FROM(row_key, 'INT_OB') < cast(59 as INT)",
+        91);
   }
 
   @Test
@@ -325,8 +327,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableIntOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'INT_OBD') >= cast(-32 as INT) AND"
-        + "  CONVERT_FROM(row_key, 'INT_OBD') < cast(59 as INT)"
-        , 91);
+        + "  CONVERT_FROM(row_key, 'INT_OBD') < cast(59 as INT)",
+        91);
   }
 
   @Test
@@ -340,8 +342,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableIntOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'INT_OB') > cast(-23 as INT) AND"
-        + "  CONVERT_FROM(row_key, 'INT_OB') < cast(14 as INT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'INT_OB') < cast(14 as INT)",
+        1);
   }
 
   @Test
@@ -355,8 +357,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableIntOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'INT_OBD') > cast(-23 as INT) AND"
-        + "  CONVERT_FROM(row_key, 'INT_OBD') < cast(14 as INT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'INT_OBD') < cast(14 as INT)",
+        1);
   }
 
   @Test
@@ -369,8 +371,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableBigIntOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'BIGINT_OB') > cast(1438034423063 as BIGINT) AND"
-        + "  CONVERT_FROM(row_key, 'BIGINT_OB') <= cast(1438034423097 as BIGINT)"
-        , 34);
+        + "  CONVERT_FROM(row_key, 'BIGINT_OB') <= cast(1438034423097 as BIGINT)",
+        34);
   }
 
   @Test
@@ -384,8 +386,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableBigIntOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'BIGINT_OB') > cast(1438034423063 as BIGINT) AND"
-        + "  CONVERT_FROM(row_key, 'BIGINT_OB') < cast(1438034423097 as BIGINT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'BIGINT_OB') < cast(1438034423097 as BIGINT)",
+        1);
   }
 
   @Test
@@ -398,8 +400,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableFloatOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'FLOAT_OB') > cast(95.74 as FLOAT) AND"
-        + "  CONVERT_FROM(row_key, 'FLOAT_OB') < cast(99.5 as FLOAT)"
-        , 5);
+        + "  CONVERT_FROM(row_key, 'FLOAT_OB') < cast(99.5 as FLOAT)",
+        5);
   }
 
   @Test
@@ -413,8 +415,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableFloatOB` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'FLOAT_OB') > cast(95.54 as FLOAT) AND"
-        + "  CONVERT_FROM(row_key, 'FLOAT_OB') < cast(99.77 as FLOAT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'FLOAT_OB') < cast(99.77 as FLOAT)",
+        1);
   }
 
   @Test
@@ -427,8 +429,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableBigIntOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'BIGINT_OBD') > cast(1438034423063 as BIGINT) AND"
-        + "  CONVERT_FROM(row_key, 'BIGINT_OBD') <= cast(1438034423097 as BIGINT)"
-        , 34);
+        + "  CONVERT_FROM(row_key, 'BIGINT_OBD') <= cast(1438034423097 as BIGINT)",
+        34);
   }
 
   @Test
@@ -442,8 +444,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableBigIntOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'BIGINT_OBD') > cast(1438034423063 as BIGINT) AND"
-        + "  CONVERT_FROM(row_key, 'BIGINT_OBD') < cast(1438034423097 as BIGINT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'BIGINT_OBD') < cast(1438034423097 as BIGINT)",
+        1);
   }
 
   @Test
@@ -456,8 +458,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableFloatOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'FLOAT_OBD') > cast(95.74 as FLOAT) AND"
-        + "  CONVERT_FROM(row_key, 'FLOAT_OBD') < cast(99.5 as FLOAT)"
-        , 5);
+        + "  CONVERT_FROM(row_key, 'FLOAT_OBD') < cast(99.5 as FLOAT)",
+        5);
   }
 
   @Test
@@ -471,8 +473,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "  hbase.`TestTableFloatOBDesc` t\n"
         + "WHERE\n"
         + "  CONVERT_FROM(row_key, 'FLOAT_OBD') > cast(95.54 as FLOAT) AND"
-        + "  CONVERT_FROM(row_key, 'FLOAT_OBD') < cast(99.77 as FLOAT)"
-        , 1);
+        + "  CONVERT_FROM(row_key, 'FLOAT_OBD') < cast(99.77 as FLOAT)",
+        1);
   }
 
   @Test
@@ -680,8 +682,8 @@ public class TestHBaseFilterPushDown extends BaseHBaseTest {
         + "FROM\n"
         + "  hbase.`[TABLE_NAME]` tableName\n"
         + "WHERE\n"
-        + "  convert_from(row_key, 'INT_BE') = 75"
-        , 1);
+        + "  convert_from(row_key, 'INT_BE') = 75",
+        1);
   }
 
   @Test
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java
index 28bf03613..9c0c70768 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java
@@ -31,8 +31,8 @@ public class TestHBaseProjectPushDown extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "row_key\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` tableName",
+        8);
   }
 
   @Test
@@ -41,8 +41,8 @@ public class TestHBaseProjectPushDown extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "t.f2.c7 as `t.f2.c7`\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` t"
-        , 1);
+        + "  hbase.`[TABLE_NAME]` t",
+        1);
   }
 
   @Test
@@ -55,8 +55,8 @@ public class TestHBaseProjectPushDown extends BaseHBaseTest {
         + "row_key, t.f.c1 * 31 as `t dot f dot c1 * 31`, "
         + "t.f.c2 as `t dot f dot c2`, 5 as `5`, 'abc' as `'abc'`\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` t"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` t",
+        8);
   }
 
   @Test
@@ -65,8 +65,8 @@ public class TestHBaseProjectPushDown extends BaseHBaseTest {
     runHBaseSQLVerifyCount("SELECT\n"
         + "row_key, f, f2\n"
         + "FROM\n"
-        + "  hbase.`[TABLE_NAME]` tableName"
-        , 8);
+        + "  hbase.`[TABLE_NAME]` tableName",
+        8);
   }
 
 }
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
index 27882b59e..e8fa925eb 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
@@ -54,8 +54,8 @@ public class TestHBaseQueries extends BaseHBaseTest {
       setColumnWidths(new int[] {8, 15});
       runHBaseSQLVerifyCount("SELECT *\n"
           + "FROM\n"
-          + "  hbase.`" + tableName + "` tableName\n"
-          , 1);
+          + "  hbase.`" + tableName + "` tableName\n",
+          1);
     } finally {
       try {
         admin.disableTable(tableName);
@@ -78,8 +78,8 @@ public class TestHBaseQueries extends BaseHBaseTest {
       setColumnWidths(new int[] {8, 15});
       runHBaseSQLVerifyCount("SELECT row_key, count(*)\n"
           + "FROM\n"
-          + "  hbase.`" + tableName + "` tableName GROUP BY row_key\n"
-          , 0);
+          + "  hbase.`" + tableName + "` tableName GROUP BY row_key\n",
+          0);
     } finally {
       try {
         admin.disableTable(tableName);
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java
index 112eb87f4..a414bb775 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NavigableMap;
@@ -176,8 +177,9 @@ public class TestHBaseRegionScanAssignments extends BaseHBaseTest {
     scan.applyAssignments(endpoints);
 
     LinkedList<Integer> sizes = Lists.newLinkedList();
-    sizes.add(1); sizes.add(1); sizes.add(1); sizes.add(1); sizes.add(1); sizes.add(1); sizes.add(1); sizes.add(1);
-    sizes.add(2); sizes.add(2); sizes.add(2); sizes.add(2); sizes.add(2);
+    Collections.addAll(sizes, 1, 1, 1, 1, 1, 1, 1, 1);
+    Collections.addAll(sizes, 2, 2, 2, 2, 2);
+
     for (int i = 0; i < endpoints.size(); i++) {
       assertTrue(sizes.remove((Integer)scan.getSpecificScan(i).getRegionScanSpecList().size()));
     }
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java
index 26d1c440b..3c650db45 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java
@@ -235,7 +235,8 @@ public class TestTableGenerator {
       for (int i = 0; i < numberRegions; i++) {
         Put p = new Put((""+rowKeyChar+iteration).getBytes());
         for (int j = 1; j <= numColumns; j++) {
-          bytes = new byte[5000]; random.nextBytes(bytes);
+          bytes = new byte[5000];
+          random.nextBytes(bytes);
           p.addColumn("f".getBytes(), ("c"+j).getBytes(), bytes);
         }
         table.mutate(p);
@@ -316,7 +317,7 @@ public class TestTableGenerator {
     long endTime    = startTime + MILLISECONDS_IN_A_YEAR;
     long interval   = MILLISECONDS_IN_A_DAY / 3;
 
-    for (long ts = startTime, counter = 0; ts < endTime; ts += interval, counter ++) {
+    for (long ts = startTime, counter = 0; ts < endTime; ts += interval, counter++) {
       byte[] rowKey = ByteBuffer.allocate(16) .putLong(ts).array();
 
       for(int i = 0; i < 8; ++i) {
@@ -356,7 +357,7 @@ public class TestTableGenerator {
     long largeInterval   = MILLISECONDS_IN_A_SEC * 42;
     long interval        = smallInterval;
 
-    for (long ts = startTime, counter = 0; ts < endTime; ts += interval, counter ++) {
+    for (long ts = startTime, counter = 0; ts < endTime; ts += interval, counter++) {
       byte[] rowKey = ByteBuffer.allocate(16) .putLong(ts).array();
 
       for(int i = 0; i < 8; ++i) {
@@ -398,7 +399,7 @@ public class TestTableGenerator {
     int stopVal = 1000;
     int interval = 47;
     long counter = 0;
-    for (int i = startVal; i < stopVal; i += interval, counter ++) {
+    for (int i = startVal; i < stopVal; i += interval, counter++) {
       byte[] rowKey = ByteBuffer.allocate(12).putInt(i).array();
 
       for(int j = 0; j < 8; ++j) {
@@ -492,7 +493,7 @@ public class TestTableGenerator {
 
     BufferedMutator table = conn.getBufferedMutator(tableName);
     long startTime = (long)1438034423 * 1000;
-    for (long i = startTime; i <= startTime + 100; i ++) {
+    for (long i = startTime; i <= startTime + 100; i++) {
       byte[] bytes = new byte[9];
       PositionedByteRange br = new SimplePositionedMutableByteRange(bytes, 0, 9);
       OrderedBytes.encodeInt64(br, i, Order.ASCENDING);
@@ -523,7 +524,7 @@ public class TestTableGenerator {
 
     BufferedMutator table = conn.getBufferedMutator(tableName);
 
-    for (int i = -49; i <= 100; i ++) {
+    for (int i = -49; i <= 100; i++) {
       byte[] bytes = new byte[5];
       PositionedByteRange br = new SimplePositionedMutableByteRange(bytes, 0, 5);
       OrderedBytes.encodeInt32(br, i, Order.ASCENDING);
@@ -616,7 +617,7 @@ public class TestTableGenerator {
 
     BufferedMutator table = conn.getBufferedMutator(tableName);
     long startTime = (long)1438034423 * 1000;
-    for (long i = startTime; i <= startTime + 100; i ++) {
+    for (long i = startTime; i <= startTime + 100; i++) {
       byte[] bytes = new byte[9];
       PositionedByteRange br = new SimplePositionedMutableByteRange(bytes, 0, 9);
       OrderedBytes.encodeInt64(br, i, Order.DESCENDING);
@@ -648,7 +649,7 @@ public class TestTableGenerator {
 
     BufferedMutator table = conn.getBufferedMutator(tableName);
 
-    for (int i = -49; i <= 100; i ++) {
+    for (int i = -49; i <= 100; i++) {
       byte[] bytes = new byte[5];
       PositionedByteRange br = new SimplePositionedMutableByteRange(bytes, 0, 5);
       OrderedBytes.encodeInt32(br, i, Order.DESCENDING);