Unify and check the import order

mrigger · mrigger · commit fa42b8bef5c9 · 2020-07-23T23:11:36.000+02:00
diff --git a/configs/checkstyle.xml b/configs/checkstyle.xml
@@ -169,9 +169,16 @@
 		<module name="SuppressionCommentFilter" />
 
 
-
 		<!-- additional rules -->
 		<module name="MissingOverride" />
+		<module name="CustomImportOrder">
+			<property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+			<property name="specialImportsRegExp" value="^org\."/>
+			<property name="thirdPartyPackageRegExp" value="^com\."/>
+			<property name="sortImportsInGroupAlphabetically" value="true"/>
+			<property name="separateLineBetweenGroups" value="true"/>
+		</module>
+
 
 	</module>
 
diff --git a/src/sqlancer/clickhouse/ClickHouseSchema.java b/src/sqlancer/clickhouse/ClickHouseSchema.java
@@ -13,7 +13,6 @@
 import java.util.stream.Collectors;
 
 import ru.yandex.clickhouse.domain.ClickHouseDataType;
-
 import sqlancer.IgnoreMeException;
 import sqlancer.Randomly;
 import sqlancer.StateToReproduce;
diff --git a/src/sqlancer/clickhouse/ast/ClickHouseAggregate.java b/src/sqlancer/clickhouse/ast/ClickHouseAggregate.java
@@ -1,13 +1,13 @@
 package sqlancer.clickhouse.ast;
 
-import sqlancer.Randomly;
-import sqlancer.clickhouse.ClickHouseSchema;
-import ru.yandex.clickhouse.domain.ClickHouseDataType;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import ru.yandex.clickhouse.domain.ClickHouseDataType;
+import sqlancer.Randomly;
+import sqlancer.clickhouse.ClickHouseSchema;
+
 public class ClickHouseAggregate extends ClickHouseExpression {
 
     private final ClickHouseAggregate.ClickHouseAggregateFunction func;
diff --git a/src/sqlancer/clickhouse/ast/ClickHouseCast.java b/src/sqlancer/clickhouse/ast/ClickHouseCast.java
@@ -1,13 +1,13 @@
 package sqlancer.clickhouse.ast;
 
-import ru.yandex.clickhouse.domain.ClickHouseDataType;
-
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Statement;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
+import ru.yandex.clickhouse.domain.ClickHouseDataType;
+
 public final class ClickHouseCast extends ClickHouseExpression {
 
     private static final double MAX_INT_FOR_WHICH_CONVERSION_TO_INT_IS_TRIED = Math.pow(2, 51 - 1) - 1;
diff --git a/src/sqlancer/clickhouse/ast/ClickHouseCastOperation.java b/src/sqlancer/clickhouse/ast/ClickHouseCastOperation.java
@@ -1,7 +1,6 @@
 package sqlancer.clickhouse.ast;
 
 import ru.yandex.clickhouse.domain.ClickHouseDataType;
-
 import sqlancer.clickhouse.ClickHouseSchema.ClickHouseLancerDataType;
 
 public class ClickHouseCastOperation extends ClickHouseExpression {
diff --git a/src/sqlancer/clickhouse/ast/ClickHouseConstant.java b/src/sqlancer/clickhouse/ast/ClickHouseConstant.java
@@ -1,10 +1,10 @@
 package sqlancer.clickhouse.ast;
 
+import java.math.BigInteger;
+
 import ru.yandex.clickhouse.domain.ClickHouseDataType;
 import sqlancer.IgnoreMeException;
 
-import java.math.BigInteger;
-
 public abstract class ClickHouseConstant extends ClickHouseExpression {
 
     public static class ClickHouseNullConstant extends ClickHouseConstant {
diff --git a/src/sqlancer/clickhouse/ast/ClickHouseUnaryPrefixOperation.java b/src/sqlancer/clickhouse/ast/ClickHouseUnaryPrefixOperation.java
@@ -1,9 +1,9 @@
 package sqlancer.clickhouse.ast;
 
+import ru.yandex.clickhouse.domain.ClickHouseDataType;
 import sqlancer.Randomly;
 import sqlancer.ast.BinaryOperatorNode.Operator;
 import sqlancer.visitor.UnaryOperation;
-import ru.yandex.clickhouse.domain.ClickHouseDataType;
 
 public class ClickHouseUnaryPrefixOperation extends ClickHouseExpression
         implements UnaryOperation<ClickHouseExpression> {
diff --git a/src/sqlancer/clickhouse/gen/ClickHouseColumnBuilder.java b/src/sqlancer/clickhouse/gen/ClickHouseColumnBuilder.java
@@ -1,14 +1,14 @@
 package sqlancer.clickhouse.gen;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.Randomly;
 import sqlancer.clickhouse.ClickHouseProvider;
 import sqlancer.clickhouse.ClickHouseSchema;
 import sqlancer.clickhouse.ClickHouseVisitor;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class ClickHouseColumnBuilder {
 
     private final StringBuilder sb = new StringBuilder();
diff --git a/src/sqlancer/clickhouse/gen/ClickHouseCommon.java b/src/sqlancer/clickhouse/gen/ClickHouseCommon.java
@@ -1,12 +1,12 @@
 package sqlancer.clickhouse.gen;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import sqlancer.clickhouse.ClickHouseSchema;
 import sqlancer.clickhouse.ast.ClickHouseExpression;
 import sqlancer.clickhouse.ast.ClickHouseTableReference;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public final class ClickHouseCommon {
 
     private ClickHouseCommon() {
diff --git a/src/sqlancer/clickhouse/gen/ClickHouseExpressionGenerator.java b/src/sqlancer/clickhouse/gen/ClickHouseExpressionGenerator.java
@@ -17,8 +17,8 @@
 import sqlancer.clickhouse.ast.ClickHouseConstant;
 import sqlancer.clickhouse.ast.ClickHouseExpression;
 import sqlancer.clickhouse.ast.ClickHouseUnaryPostfixOperation;
-import sqlancer.clickhouse.ast.ClickHouseUnaryPrefixOperation;
 import sqlancer.clickhouse.ast.ClickHouseUnaryPostfixOperation.ClickHouseUnaryPostfixOperator;
+import sqlancer.clickhouse.ast.ClickHouseUnaryPrefixOperation;
 import sqlancer.clickhouse.ast.ClickHouseUnaryPrefixOperation.ClickHouseUnaryPrefixOperator;
 import sqlancer.gen.TypedExpressionGenerator;
 
diff --git a/src/sqlancer/clickhouse/gen/ClickHouseTableGenerator.java b/src/sqlancer/clickhouse/gen/ClickHouseTableGenerator.java
@@ -1,15 +1,14 @@
 package sqlancer.clickhouse.gen;
 
-import ru.yandex.clickhouse.domain.ClickHouseDataType;
-import sqlancer.Query;
-import sqlancer.QueryAdapter;
-import sqlancer.Randomly;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import ru.yandex.clickhouse.domain.ClickHouseDataType;
+import sqlancer.Query;
+import sqlancer.QueryAdapter;
+import sqlancer.Randomly;
 import sqlancer.clickhouse.ClickHouseErrors;
 import sqlancer.clickhouse.ClickHouseProvider;
 import sqlancer.clickhouse.ClickHouseSchema;
diff --git a/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPAggregateOracle.java b/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPAggregateOracle.java
@@ -1,5 +1,10 @@
 package sqlancer.clickhouse.oracle.tlp;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
 import ru.yandex.clickhouse.domain.ClickHouseDataType;
 import sqlancer.ComparatorHelper;
 import sqlancer.IgnoreMeException;
@@ -17,11 +22,6 @@
 import sqlancer.clickhouse.gen.ClickHouseCommon;
 import sqlancer.clickhouse.gen.ClickHouseExpressionGenerator;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-
 public class ClickHouseTLPAggregateOracle implements TestOracle {
 
     private final ClickHouseProvider.ClickHouseGlobalState state;
diff --git a/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPDistinctOracle.java b/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPDistinctOracle.java
@@ -1,14 +1,14 @@
 package sqlancer.clickhouse.oracle.tlp;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.clickhouse.ClickHouseProvider;
 import sqlancer.clickhouse.ClickHouseVisitor;
 import sqlancer.clickhouse.ast.ClickHouseSelect;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class ClickHouseTLPDistinctOracle extends ClickHouseTLPBase {
 
     public ClickHouseTLPDistinctOracle(ClickHouseProvider.ClickHouseGlobalState state) {
diff --git a/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPGroupByOracle.java b/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPGroupByOracle.java
@@ -1,17 +1,17 @@
 package sqlancer.clickhouse.oracle.tlp;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.Randomly;
 import sqlancer.clickhouse.ClickHouseProvider;
 import sqlancer.clickhouse.ClickHouseVisitor;
 import sqlancer.clickhouse.ast.ClickHouseColumnReference;
 import sqlancer.clickhouse.ast.ClickHouseExpression;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class ClickHouseTLPGroupByOracle extends ClickHouseTLPBase {
 
     public ClickHouseTLPGroupByOracle(ClickHouseProvider.ClickHouseGlobalState state) {
diff --git a/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPHavingOracle.java b/src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPHavingOracle.java
@@ -1,5 +1,10 @@
 package sqlancer.clickhouse.oracle.tlp;
 
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.Randomly;
 import sqlancer.clickhouse.ClickHouseErrors;
@@ -14,11 +19,6 @@
 import sqlancer.clickhouse.gen.ClickHouseCommon;
 import sqlancer.clickhouse.gen.ClickHouseExpressionGenerator;
 
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class ClickHouseTLPHavingOracle extends ClickHouseTLPBase {
 
     public ClickHouseTLPHavingOracle(ClickHouseProvider.ClickHouseGlobalState state) {
diff --git a/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java b/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java
@@ -1,12 +1,12 @@
 package sqlancer.postgres.oracle.tlp;
 
+import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import java.io.IOException;
 import org.postgresql.util.PSQLException;
 
 import sqlancer.ComparatorHelper;
@@ -139,13 +139,16 @@ private List<PostgresExpression> mapped(PostgresAggregate aggregate) {
         case MIN:
             return aliasArgs(Arrays.asList(aggregate));
         // case AVG:
-        //// List<PostgresExpression> arg = Arrays.asList(new PostgresCast(aggregate.getExpr().get(0),
+        //// List<PostgresExpression> arg = Arrays.asList(new
+        // PostgresCast(aggregate.getExpr().get(0),
         // PostgresDataType.DECIMAL.get()));
-        // PostgresAggregate sum = new PostgresAggregate(PostgresAggregateFunction.SUM, aggregate.getExpr());
+        // PostgresAggregate sum = new PostgresAggregate(PostgresAggregateFunction.SUM,
+        // aggregate.getExpr());
         // PostgresCast count = new PostgresCast(
         // new PostgresAggregate(PostgresAggregateFunction.COUNT, aggregate.getExpr()),
         // PostgresDataType.DECIMAL.get());
-        //// PostgresBinaryArithmeticOperation avg = new PostgresBinaryArithmeticOperation(sum, count,
+        //// PostgresBinaryArithmeticOperation avg = new
+        // PostgresBinaryArithmeticOperation(sum, count,
         // PostgresBinaryArithmeticOperator.DIV);
         // return aliasArgs(Arrays.asList(sum, count));
         default:
diff --git a/src/sqlancer/postgres/oracle/tlp/PostgresTLPBase.java b/src/sqlancer/postgres/oracle/tlp/PostgresTLPBase.java
@@ -1,9 +1,9 @@
 package sqlancer.postgres.oracle.tlp;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 import sqlancer.Randomly;
@@ -12,17 +12,17 @@
 import sqlancer.gen.ExpressionGenerator;
 import sqlancer.postgres.PostgresGlobalState;
 import sqlancer.postgres.PostgresSchema;
+import sqlancer.postgres.PostgresSchema.PostgresDataType;
 import sqlancer.postgres.PostgresSchema.PostgresTable;
 import sqlancer.postgres.PostgresSchema.PostgresTables;
-import sqlancer.postgres.PostgresSchema.PostgresDataType;
 import sqlancer.postgres.ast.PostgresColumnValue;
+import sqlancer.postgres.ast.PostgresConstant;
 import sqlancer.postgres.ast.PostgresExpression;
 import sqlancer.postgres.ast.PostgresJoin;
 import sqlancer.postgres.ast.PostgresSelect;
 import sqlancer.postgres.ast.PostgresSelect.ForClause;
 import sqlancer.postgres.ast.PostgresSelect.PostgresFromTable;
 import sqlancer.postgres.ast.PostgresSelect.PostgresSubquery;
-import sqlancer.postgres.ast.PostgresConstant;
 import sqlancer.postgres.gen.PostgresCommon;
 import sqlancer.postgres.gen.PostgresExpressionGenerator;
 import sqlancer.postgres.oracle.PostgresNoRECOracle;
