Use varargs where possible for flexibility

mrigger · mrigger · commit eecd963cf320 · 2020-06-12T23:55:10.000+02:00
diff --git a/configs/pmd-rules.xml b/configs/pmd-rules.xml
@@ -21,7 +21,6 @@
 		<exclude name="PositionLiteralsFirstInComparisons" />
 		<exclude name="ForLoopCanBeForeach" />
 		<exclude name="CheckResultSet" />
-		<exclude name="UseVarargs" />
 		<exclude name="UseTryWithResources" />
 		<exclude name="AvoidReassigningLoopVariables" />
 		<exclude name="AbstractClassWithoutAbstractMethod" />
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -263,7 +263,7 @@ public void incrementCreateDatabase() {
 
     }
 
-    public static void printArray(Object[] arr) {
+    public static void printArray(Object... arr) {
         for (Object o : arr) {
             System.out.println(o);
         }
@@ -273,7 +273,7 @@ public static void main(String[] args) {
         System.exit(executeMain(args));
     }
 
-    public static int executeMain(String[] args) throws AssertionError {
+    public static int executeMain(String... args) throws AssertionError {
         List<DatabaseProvider<?, ?>> providers = getDBMSProviders();
         Map<String, DatabaseProvider<?, ?>> nameToProvider = new HashMap<>();
         Map<String, Object> nameToOptions = new HashMap<>();
diff --git a/src/sqlancer/mysql/ast/MySQLComputableFunction.java b/src/sqlancer/mysql/ast/MySQLComputableFunction.java
@@ -182,7 +182,7 @@ public int getNrArgs() {
             return nrArgs;
         }
 
-        public abstract MySQLConstant apply(MySQLConstant[] evaluatedArgs, MySQLExpression[] args);
+        public abstract MySQLConstant apply(MySQLConstant[] evaluatedArgs, MySQLExpression... args);
 
         public static MySQLFunction getRandomFunction() {
             return Randomly.fromOptions(values());
diff --git a/src/sqlancer/postgres/ast/PostgresFunction.java b/src/sqlancer/postgres/ast/PostgresFunction.java
@@ -253,7 +253,7 @@ public int getNrArgs() {
             return nrArgs;
         }
 
-        public abstract PostgresConstant apply(PostgresConstant[] evaluatedArgs, PostgresExpression[] args);
+        public abstract PostgresConstant apply(PostgresConstant[] evaluatedArgs, PostgresExpression... args);
 
         public static PostgresFunctionWithResult getRandomFunction() {
             return Randomly.fromOptions(values());
@@ -276,7 +276,7 @@ public String getName() {
 
         public abstract PostgresDataType[] getInputTypesForReturnType(PostgresDataType returnType, int nrArguments);
 
-        public boolean checkArguments(PostgresExpression[] constants) {
+        public boolean checkArguments(PostgresExpression... constants) {
             return true;
         }
 
diff --git a/src/sqlancer/sqlite3/SQLite3ToStringVisitor.java b/src/sqlancer/sqlite3/SQLite3ToStringVisitor.java
@@ -463,7 +463,7 @@ public void visit(SQLite3TableReference tableReference) {
         }
     }
 
-    private void visit(SQLite3Expression[] expressions) {
+    private void visit(SQLite3Expression... expressions) {
         visit(Arrays.asList(expressions));
     }
 
diff --git a/src/sqlancer/sqlite3/ast/SQLite3WindowFunction.java b/src/sqlancer/sqlite3/ast/SQLite3WindowFunction.java
@@ -107,7 +107,7 @@ public int getNrArgs() {
         }
     }
 
-    public SQLite3WindowFunction(WindowFunction func, SQLite3Expression[] args) {
+    public SQLite3WindowFunction(WindowFunction func, SQLite3Expression... args) {
         this.func = func;
         this.args = args.clone();
     }

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public void incrementCreateDatabase() {`
`263`	`263`
`264`	`264`	`}`
`265`	`265`
`266`		`- public static void printArray(Object[] arr) {`
	`266`	`+ public static void printArray(Object... arr) {`
`267`	`267`	`for (Object o : arr) {`
`268`	`268`	`System.out.println(o);`
`269`	`269`	`}`
`@@ -273,7 +273,7 @@ public static void main(String[] args) {`
`273`	`273`	`System.exit(executeMain(args));`
`274`	`274`	`}`
`275`	`275`
`276`		`- public static int executeMain(String[] args) throws AssertionError {`
	`276`	`+ public static int executeMain(String... args) throws AssertionError {`
`277`	`277`	`List<DatabaseProvider<?, ?>> providers = getDBMSProviders();`
`278`	`278`	`Map<String, DatabaseProvider<?, ?>> nameToProvider = new HashMap<>();`
`279`	`279`	`Map<String, Object> nameToOptions = new HashMap<>();`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public int getNrArgs() {`
`182`	`182`	`return nrArgs;`
`183`	`183`	`}`
`184`	`184`
`185`		`- public abstract MySQLConstant apply(MySQLConstant[] evaluatedArgs, MySQLExpression[] args);`
	`185`	`+ public abstract MySQLConstant apply(MySQLConstant[] evaluatedArgs, MySQLExpression... args);`
`186`	`186`
`187`	`187`	`public static MySQLFunction getRandomFunction() {`
`188`	`188`	`return Randomly.fromOptions(values());`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public int getNrArgs() {`
`253`	`253`	`return nrArgs;`
`254`	`254`	`}`
`255`	`255`
`256`		`- public abstract PostgresConstant apply(PostgresConstant[] evaluatedArgs, PostgresExpression[] args);`
	`256`	`+ public abstract PostgresConstant apply(PostgresConstant[] evaluatedArgs, PostgresExpression... args);`
`257`	`257`
`258`	`258`	`public static PostgresFunctionWithResult getRandomFunction() {`
`259`	`259`	`return Randomly.fromOptions(values());`
`@@ -276,7 +276,7 @@ public String getName() {`
`276`	`276`
`277`	`277`	`public abstract PostgresDataType[] getInputTypesForReturnType(PostgresDataType returnType, int nrArguments);`
`278`	`278`
`279`		`- public boolean checkArguments(PostgresExpression[] constants) {`
	`279`	`+ public boolean checkArguments(PostgresExpression... constants) {`
`280`	`280`	`return true;`
`281`	`281`	`}`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ public void visit(SQLite3TableReference tableReference) {`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`
`466`		`- private void visit(SQLite3Expression[] expressions) {`
	`466`	`+ private void visit(SQLite3Expression... expressions) {`
`467`	`467`	`visit(Arrays.asList(expressions));`
`468`	`468`	`}`
`469`	`469`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public int getNrArgs() {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- public SQLite3WindowFunction(WindowFunction func, SQLite3Expression[] args) {`
	`110`	`+ public SQLite3WindowFunction(WindowFunction func, SQLite3Expression... args) {`
`111`	`111`	`this.func = func;`
`112`	`112`	`this.args = args.clone();`
`113`	`113`	`}`