upgraded checkstyle due to security alert

wumpz · wumpz · commit cb1726e478d3 · 2019-03-16T23:40:36.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -413,7 +413,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>6.19</version>
+                                <version>8.18</version>
                             </dependency>
                         </dependencies>
                     </plugin>
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/NamedExpressionList.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/NamedExpressionList.java
@@ -11,7 +11,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import net.sf.jsqlparser.expression.Expression;
 
 public class NamedExpressionList implements ItemsList {
@@ -25,8 +24,8 @@ public NamedExpressionList() {
     public NamedExpressionList(List<Expression> expressions) {
         this.expressions = expressions;
     }
-    
-    public NamedExpressionList(Expression ... expressions) {
+
+    public NamedExpressionList(Expression... expressions) {
         this.expressions = Arrays.asList(expressions);
     }
 
@@ -38,7 +37,6 @@ public List<String> getNames() {
         return names;
     }
 
-
     public void setExpressions(List<Expression> list) {
         expressions = list;
     }
@@ -47,7 +45,6 @@ public void setNames(List<String> list) {
         names = list;
     }
 
-
     @Override
     public void accept(ItemsListVisitor itemsListVisitor) {
         itemsListVisitor.visit(this);
@@ -58,13 +55,13 @@ public String toString() {
 
         StringBuilder ret = new StringBuilder();
         ret.append("(");
-        for(int i=0; i<expressions.size(); i++){
-            if(i>0){
+        for (int i = 0; i < expressions.size(); i++) {
+            if (i > 0) {
                 ret.append(" ");
             }
-            if(! names.get(i).equals("")){
+            if (!names.get(i).equals("")) {
                 ret.append(names.get(i)).append(" ").append(expressions.get(i));
-            }else{
+            } else {
                 ret.append(expressions.get(i));
             }
         }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java
@@ -13,7 +13,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.create.table.Index;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -148,12 +147,12 @@ public String getConstraintName() {
     public void setConstraintName(final String constraintName) {
         this.constraintName = constraintName;
     }
-    
+
     public boolean isConstraintIfExists() {
         return constraintIfExists;
     }
-    
-    public void setConstraintIfExists( boolean constraintIfExists ) {
+
+    public void setConstraintIfExists(boolean constraintIfExists) {
         this.constraintIfExists = constraintIfExists;
     }
 
@@ -234,8 +233,8 @@ public String toString() {
         if (columnName != null) {
             b.append("COLUMN ").append(columnName);
         } else if (getColDataTypeList() != null) {
-            if(operation == AlterOperation.CHANGE) {
-                if(optionalSpecifier != null) {
+            if (operation == AlterOperation.CHANGE) {
+                if (optionalSpecifier != null) {
                     b.append(optionalSpecifier).append(" ");
                 }
                 b.append(columnOldName).append(" ");
@@ -250,8 +249,8 @@ public String toString() {
             }
         } else if (constraintName != null) {
             b.append("CONSTRAINT ");
-            if(constraintIfExists) {
-               b.append("IF EXISTS ");
+            if (constraintIfExists) {
+                b.append("IF EXISTS ");
             }
             b.append(constraintName);
         } else if (pkColumns != null) {
@@ -264,7 +263,7 @@ public String toString() {
                 } else {
                     b.append(" INDEX ");
                 }
-              b.append(ukName);    
+                b.append(ukName);
             }
             b.append(" (").append(PlainSelect.getStringList(ukColumns)).append(")");
         } else if (fkColumns != null) {
@@ -287,7 +286,7 @@ public String toString() {
         if (getUseEqual()) {
             b.append('=');
         }
-        if (parameters!=null && !parameters.isEmpty()) {
+        if (parameters != null && !parameters.isEmpty()) {
             b.append(' ').append(PlainSelect.getStringList(parameters, false, false));
         }
 
@@ -325,7 +324,7 @@ public List<String> getColumnSpecs() {
 
         @Override
         public String toString() {
-            return columnName + ( withType ? " TYPE " : " " ) + colDataType + parametersToString();
+            return columnName + (withType ? " TYPE " : " ") + colDataType + parametersToString();
         }
 
         private String parametersToString() {
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java b/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
@@ -60,13 +60,12 @@ public void setUseReplace(boolean useReplace) {
         this.useReplace = useReplace;
     }
 
-
     @Override
     public String toString() {
         StringBuilder sql;
-        if(useReplace){
+        if (useReplace) {
             sql = new StringBuilder("REPLACE ");
-        }else{
+        } else {
             sql = new StringBuilder("ALTER ");
         }
         sql.append("VIEW ");
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SubJoin.java b/src/main/java/net/sf/jsqlparser/statement/select/SubJoin.java
@@ -9,9 +9,8 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.expression.Alias;
-
 import java.util.List;
+import net.sf.jsqlparser.expression.Alias;
 
 public class SubJoin implements FromItem {
 
@@ -65,7 +64,7 @@ public void setAlias(Alias alias) {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(").append(left);
-        for(Join j : joinList) {
+        for (Join j : joinList) {
             sb.append(" ").append(j);
         }
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java b/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
@@ -31,18 +31,18 @@ public void setTable(Table table) {
         this.table = table;
     }
 
-    public boolean getCascade(){
+    public boolean getCascade() {
         return cascade;
     }
 
-    public void setCascade(boolean c){
-        cascade=c;
+    public void setCascade(boolean c) {
+        cascade = c;
     }
 
     @Override
     public String toString() {
-        if(cascade){
-            return "TRUNCATE TABLE " + table+" CASCADE";
+        if (cascade) {
+            return "TRUNCATE TABLE " + table + " CASCADE";
         }
         return "TRUNCATE TABLE " + table;
     }
diff --git a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java
@@ -10,7 +10,6 @@
 package net.sf.jsqlparser.util.cnfexpression;
 
 import java.util.List;
-
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.expression.NullValue;
@@ -19,58 +18,58 @@
 public abstract class MultipleExpression extends ASTNodeAccessImpl implements Expression {
 
     private final List<Expression> childlist;
-    
+
     public MultipleExpression(List<Expression> childlist) {
         this.childlist = childlist;
     }
-    
+
     public int size() {
         return childlist.size();
     }
-    
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(new NullValue());
     }
-    
+
     public List<Expression> getList() {
         return childlist;
     }
-    
+
     public Expression getChild(int index) {
         return childlist.get(index);
     }
-    
+
     public Expression removeChild(int index) {
         return childlist.remove(index);
     }
-    
+
     public void setChild(int index, Expression express) {
         childlist.set(index, express);
     }
-    
+
     public int getIndex(Expression express) {
         return childlist.indexOf(express);
     }
-    
+
     public void addChild(int index, Expression express) {
         childlist.add(index, express);
     }
-    
+
     public abstract String getStringExpression();
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("(");
-        for(int i=0; i<size(); i++) {
+        for (int i = 0; i < size(); i++) {
             sb.append(getChild(i));
-            if(i!=size() - 1) {
+            if (i != size() - 1) {
                 sb.append(" ").append(getStringExpression()).append(" ");
             }
         }
         sb.append(")");
         return sb.toString();
     }
-    
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/AlterViewDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/AlterViewDeParser.java
@@ -33,9 +33,9 @@ public AlterViewDeParser(StringBuilder buffer, SelectVisitor selectVisitor) {
     }
 
     public void deParse(AlterView alterView) {
-        if(alterView.isUseReplace()){
+        if (alterView.isUseReplace()) {
             buffer.append("REPLACE ");
-        }else{
+        } else {
             buffer.append("ALTER ");
         }
         buffer.append("VIEW ").append(alterView.getView().getFullyQualifiedName());

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import java.util.Arrays;`
`13`	`13`	`import java.util.List;`
`14`		`-`
`15`	`14`	`import net.sf.jsqlparser.expression.Expression;`
`16`	`15`
`17`	`16`	`public class NamedExpressionList implements ItemsList {`
`@@ -25,8 +24,8 @@ public NamedExpressionList() {`
`25`	`24`	`public NamedExpressionList(List<Expression> expressions) {`
`26`	`25`	`this.expressions = expressions;`
`27`	`26`	`}`
`28`		`-`
`29`		`- public NamedExpressionList(Expression ... expressions) {`
	`27`	`+`
	`28`	`+ public NamedExpressionList(Expression... expressions) {`
`30`	`29`	`this.expressions = Arrays.asList(expressions);`
`31`	`30`	`}`
`32`	`31`
`@@ -38,7 +37,6 @@ public List<String> getNames() {`
`38`	`37`	`return names;`
`39`	`38`	`}`
`40`	`39`
`41`		`-`
`42`	`40`	`public void setExpressions(List<Expression> list) {`
`43`	`41`	`expressions = list;`
`44`	`42`	`}`
`@@ -47,7 +45,6 @@ public void setNames(List<String> list) {`
`47`	`45`	`names = list;`
`48`	`46`	`}`
`49`	`47`
`50`		`-`
`51`	`48`	`@Override`
`52`	`49`	`public void accept(ItemsListVisitor itemsListVisitor) {`
`53`	`50`	`itemsListVisitor.visit(this);`
`@@ -58,13 +55,13 @@ public String toString() {`
`58`	`55`
`59`	`56`	`StringBuilder ret = new StringBuilder();`
`60`	`57`	`ret.append("(");`
`61`		`- for(int i=0; i<expressions.size(); i++){`
`62`		`- if(i>0){`
	`58`	`+ for (int i = 0; i < expressions.size(); i++) {`
	`59`	`+ if (i > 0) {`
`63`	`60`	`ret.append(" ");`
`64`	`61`	`}`
`65`		`- if(! names.get(i).equals("")){`
	`62`	`+ if (!names.get(i).equals("")) {`
`66`	`63`	`ret.append(names.get(i)).append(" ").append(expressions.get(i));`
`67`		`- }else{`
	`64`	`+ } else {`
`68`	`65`	`ret.append(expressions.get(i));`
`69`	`66`	`}`
`70`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,18 @@ public void setTable(Table table) {`
`31`	`31`	`this.table = table;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public boolean getCascade(){`
	`34`	`+ public boolean getCascade() {`
`35`	`35`	`return cascade;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public void setCascade(boolean c){`
`39`		`- cascade=c;`
	`38`	`+ public void setCascade(boolean c) {`
	`39`	`+ cascade = c;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`public String toString() {`
`44`		`- if(cascade){`
`45`		`- return "TRUNCATE TABLE " + table+" CASCADE";`
	`44`	`+ if (cascade) {`
	`45`	`+ return "TRUNCATE TABLE " + table + " CASCADE";`
`46`	`46`	`}`
`47`	`47`	`return "TRUNCATE TABLE " + table;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public AlterViewDeParser(StringBuilder buffer, SelectVisitor selectVisitor) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public void deParse(AlterView alterView) {`
`36`		`- if(alterView.isUseReplace()){`
	`36`	`+ if (alterView.isUseReplace()) {`
`37`	`37`	`buffer.append("REPLACE ");`
`38`		`- }else{`
	`38`	`+ } else {`
`39`	`39`	`buffer.append("ALTER ");`
`40`	`40`	`}`
`41`	`41`	`buffer.append("VIEW ").append(alterView.getView().getFullyQualifiedName());`