Merge pull request #12 from vasilievip/master

wumpz · wumpz · commit a6f00a421192 · 2013-06-14T23:07:42.000-07:00
Additional fixes for violations found by code analysis
diff --git a/src/main/java/net/sf/jsqlparser/expression/CastExpression.java b/src/main/java/net/sf/jsqlparser/expression/CastExpression.java
@@ -31,7 +31,7 @@ public class CastExpression implements Expression {
 
 	private Expression leftExpression;
 	private ColDataType type;
-	boolean useCastKeyword;
+	private boolean useCastKeyword;
 
 	public ColDataType getType() {
 		return type;
diff --git a/src/main/java/net/sf/jsqlparser/expression/Expression.java b/src/main/java/net/sf/jsqlparser/expression/Expression.java
@@ -23,5 +23,5 @@
 
 public interface Expression {
 
-	public void accept(ExpressionVisitor expressionVisitor);
+	void accept(ExpressionVisitor expressionVisitor);
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -49,91 +49,91 @@
 
 public interface ExpressionVisitor {
 
-	public void visit(NullValue nullValue);
+	void visit(NullValue nullValue);
 
-	public void visit(Function function);
+	void visit(Function function);
 
-	public void visit(InverseExpression inverseExpression);
+	void visit(InverseExpression inverseExpression);
 
-	public void visit(JdbcParameter jdbcParameter);
+	void visit(JdbcParameter jdbcParameter);
 
-	public void visit(DoubleValue doubleValue);
+	void visit(DoubleValue doubleValue);
 
-	public void visit(LongValue longValue);
+	void visit(LongValue longValue);
 
-	public void visit(DateValue dateValue);
+	void visit(DateValue dateValue);
 
-	public void visit(TimeValue timeValue);
+	void visit(TimeValue timeValue);
 
-	public void visit(TimestampValue timestampValue);
+	void visit(TimestampValue timestampValue);
 
-	public void visit(Parenthesis parenthesis);
+	void visit(Parenthesis parenthesis);
 
-	public void visit(StringValue stringValue);
+	void visit(StringValue stringValue);
 
-	public void visit(Addition addition);
+	void visit(Addition addition);
 
-	public void visit(Division division);
+	void visit(Division division);
 
-	public void visit(Multiplication multiplication);
+	void visit(Multiplication multiplication);
 
-	public void visit(Subtraction subtraction);
+	void visit(Subtraction subtraction);
 
-	public void visit(AndExpression andExpression);
+	void visit(AndExpression andExpression);
 
-	public void visit(OrExpression orExpression);
+	void visit(OrExpression orExpression);
 
-	public void visit(Between between);
+	void visit(Between between);
 
-	public void visit(EqualsTo equalsTo);
+	void visit(EqualsTo equalsTo);
 
-	public void visit(GreaterThan greaterThan);
+	void visit(GreaterThan greaterThan);
 
-	public void visit(GreaterThanEquals greaterThanEquals);
+	void visit(GreaterThanEquals greaterThanEquals);
 
-	public void visit(InExpression inExpression);
+	void visit(InExpression inExpression);
 
-	public void visit(IsNullExpression isNullExpression);
+	void visit(IsNullExpression isNullExpression);
 
-	public void visit(LikeExpression likeExpression);
+	void visit(LikeExpression likeExpression);
 
-	public void visit(MinorThan minorThan);
+	void visit(MinorThan minorThan);
 
-	public void visit(MinorThanEquals minorThanEquals);
+	void visit(MinorThanEquals minorThanEquals);
 
-	public void visit(NotEqualsTo notEqualsTo);
+	void visit(NotEqualsTo notEqualsTo);
 
-	public void visit(Column tableColumn);
+	void visit(Column tableColumn);
 
-	public void visit(SubSelect subSelect);
+	void visit(SubSelect subSelect);
 
-	public void visit(CaseExpression caseExpression);
+	void visit(CaseExpression caseExpression);
 
-	public void visit(WhenClause whenClause);
+	void visit(WhenClause whenClause);
 
-	public void visit(ExistsExpression existsExpression);
+	void visit(ExistsExpression existsExpression);
 
-	public void visit(AllComparisonExpression allComparisonExpression);
+	void visit(AllComparisonExpression allComparisonExpression);
 
-	public void visit(AnyComparisonExpression anyComparisonExpression);
+	void visit(AnyComparisonExpression anyComparisonExpression);
 
-	public void visit(Concat concat);
+	void visit(Concat concat);
 
-	public void visit(Matches matches);
+	void visit(Matches matches);
 
-	public void visit(BitwiseAnd bitwiseAnd);
+	void visit(BitwiseAnd bitwiseAnd);
 
-	public void visit(BitwiseOr bitwiseOr);
+	void visit(BitwiseOr bitwiseOr);
 
-	public void visit(BitwiseXor bitwiseXor);
+	void visit(BitwiseXor bitwiseXor);
 
-	public void visit(CastExpression cast);
+	void visit(CastExpression cast);
 
-	public void visit(Modulo modulo);
+	void visit(Modulo modulo);
 
-	public void visit(AnalyticExpression aexpr);
+	void visit(AnalyticExpression aexpr);
 
-	public void visit(ExtractExpression eexpr);
+	void visit(ExtractExpression eexpr);
 	
-	public void visit(IntervalExpression iexpr);
+	void visit(IntervalExpression iexpr);
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/LongValue.java b/src/main/java/net/sf/jsqlparser/expression/LongValue.java
@@ -34,7 +34,7 @@ public LongValue(String value) {
 			value = value.substring(1);
 		}
 		this.value = Long.parseLong(value);
-		setStringValue(value);
+        this.stringValue = value;
 	}
 
 	@Override
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsList.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsList.java
@@ -27,5 +27,5 @@
  */
 public interface ItemsList {
 
-	public void accept(ItemsListVisitor itemsListVisitor);
+	void accept(ItemsListVisitor itemsListVisitor);
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/ItemsListVisitor.java
@@ -25,9 +25,9 @@
 
 public interface ItemsListVisitor {
 
-	public void visit(SubSelect subSelect);
+	void visit(SubSelect subSelect);
 
-	public void visit(ExpressionList expressionList);
+	void visit(ExpressionList expressionList);
 
-	public void visit(MultiExpressionList multiExprList);
+	void visit(MultiExpressionList multiExprList);
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/MultiExpressionList.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/MultiExpressionList.java
@@ -44,8 +44,6 @@
 import java.util.Iterator;
 import java.util.List;
 import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.statement.select.FromItem;
-import net.sf.jsqlparser.statement.select.FromItemVisitor;
 
 /**
  * A list of ExpressionList items. e.g. multi values of insert statements. This
@@ -55,7 +53,7 @@
  */
 public class MultiExpressionList implements ItemsList {
 
-	List<ExpressionList> exprList;
+	private List<ExpressionList> exprList;
 
 	public MultiExpressionList() {
 		this.exprList = new ArrayList<ExpressionList>();
diff --git a/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserManager.java b/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserManager.java
@@ -21,9 +21,7 @@
  */
 package net.sf.jsqlparser.parser;
 
-import java.io.InputStream;
 import java.io.Reader;
-import java.io.StringReader;
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.statement.Statement;
diff --git a/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java b/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java
@@ -24,16 +24,14 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.statement.Statement;
 
 /**
  * Toolfunctions to start and use JSqlParser.
  * @author toben
  */
-public class CCJSqlParserUtil {
+public final class CCJSqlParserUtil {
 	public static Statement parse(Reader statementReader) throws JSQLParserException {
 		CCJSqlParser parser = new CCJSqlParser(statementReader);
 		try {
diff --git a/src/main/java/net/sf/jsqlparser/parser/JSqlParser.java b/src/main/java/net/sf/jsqlparser/parser/JSqlParser.java
@@ -31,5 +31,5 @@
  */
 public interface JSqlParser {
 
-	public Statement parse(Reader statementReader) throws JSQLParserException;
+	Statement parse(Reader statementReader) throws JSQLParserException;
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/Statement.java b/src/main/java/net/sf/jsqlparser/statement/Statement.java
@@ -26,5 +26,5 @@
  */
 public interface Statement {
 
-	public void accept(StatementVisitor statementVisitor);
+	void accept(StatementVisitor statementVisitor);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java b/src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java
@@ -34,23 +34,23 @@
 
 public interface StatementVisitor {
 
-	public void visit(Select select);
+	void visit(Select select);
 
-	public void visit(Delete delete);
+	void visit(Delete delete);
 
-	public void visit(Update update);
+	void visit(Update update);
 
-	public void visit(Insert insert);
+	void visit(Insert insert);
 
-	public void visit(Replace replace);
+	void visit(Replace replace);
 
-	public void visit(Drop drop);
+	void visit(Drop drop);
 
-	public void visit(Truncate truncate);
+	void visit(Truncate truncate);
 
-	public void visit(CreateIndex createIndex);
+	void visit(CreateIndex createIndex);
 
-	public void visit(CreateTable createTable);
+	void visit(CreateTable createTable);
 
-	public void visit(CreateView createView);
+	void visit(CreateView createView);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItem.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItem.java
@@ -27,9 +27,9 @@
  */
 public interface FromItem {
 
-	public void accept(FromItemVisitor fromItemVisitor);
+	void accept(FromItemVisitor fromItemVisitor);
 
-	public String getAlias();
+	String getAlias();
 
-	public void setAlias(String alias);
+	void setAlias(String alias);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java
@@ -25,13 +25,13 @@
 
 public interface FromItemVisitor {
 
-	public void visit(Table tableName);
+	void visit(Table tableName);
 
-	public void visit(SubSelect subSelect);
+	void visit(SubSelect subSelect);
 
-	public void visit(SubJoin subjoin);
+	void visit(SubJoin subjoin);
 
-	public void visit(LateralSubSelect lateralSubSelect);
+	void visit(LateralSubSelect lateralSubSelect);
 
-	public void visit(ValuesList valuesList);
+	void visit(ValuesList valuesList);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/IntoTableVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/IntoTableVisitor.java
@@ -25,5 +25,5 @@
 
 public interface IntoTableVisitor {
 
-	public void visit(Table tableName);
+	void visit(Table tableName);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/OrderByVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/OrderByVisitor.java
@@ -23,5 +23,5 @@
 
 public interface OrderByVisitor {
 
-	public void visit(OrderByElement orderBy);
+	void visit(OrderByElement orderBy);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectBody.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectBody.java
@@ -23,5 +23,5 @@
 
 public interface SelectBody {
 
-	public void accept(SelectVisitor selectVisitor);
+	void accept(SelectVisitor selectVisitor);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectItem.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectItem.java
@@ -27,5 +27,5 @@
  */
 public interface SelectItem {
 
-	public void accept(SelectItemVisitor selectItemVisitor);
+	void accept(SelectItemVisitor selectItemVisitor);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectItemVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectItemVisitor.java
@@ -23,9 +23,9 @@
 
 public interface SelectItemVisitor {
 
-	public void visit(AllColumns allColumns);
+	void visit(AllColumns allColumns);
 
-	public void visit(AllTableColumns allTableColumns);
+	void visit(AllTableColumns allTableColumns);
 
-	public void visit(SelectExpressionItem selectExpressionItem);
+	void visit(SelectExpressionItem selectExpressionItem);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectVisitor.java
@@ -23,9 +23,9 @@
 
 public interface SelectVisitor {
 
-	public void visit(PlainSelect plainSelect);
+	void visit(PlainSelect plainSelect);
 
-	public void visit(SetOperationList setOpList);
+	void visit(SetOperationList setOpList);
 
-	public void visit(WithItem withItem);
+	void visit(WithItem withItem);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/update/Update.java b/src/main/java/net/sf/jsqlparser/statement/update/Update.java
@@ -21,7 +21,6 @@
  */
 package net.sf.jsqlparser.statement.update;
 
-import java.util.Iterator;
 import java.util.List;
 
 import net.sf.jsqlparser.expression.Expression;
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -22,7 +22,6 @@
 package net.sf.jsqlparser.util;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import net.sf.jsqlparser.expression.AllComparisonExpression;
 import net.sf.jsqlparser.expression.AnalyticExpression;
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/CreateIndexDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/CreateIndexDeParser.java
@@ -33,7 +33,8 @@
  * @author Raymond Augé
  */
 public class CreateIndexDeParser {
-	protected StringBuilder buffer;
+
+    private StringBuilder buffer;
 
 	/**
 	 * @param buffer the buffer that will be filled with the create
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/CreateViewDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/CreateViewDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/UpdateDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/UpdateDeParser.java

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@`
`23`	`23`
`24`	`24`	`public interface Expression {`
`25`	`25`
`26`		`- public void accept(ExpressionVisitor expressionVisitor);`
	`26`	`+ void accept(ExpressionVisitor expressionVisitor);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public LongValue(String value) {`
`34`	`34`	`value = value.substring(1);`
`35`	`35`	`}`
`36`	`36`	`this.value = Long.parseLong(value);`
`37`		`- setStringValue(value);`
	`37`	`+ this.stringValue = value;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@`
`27`	`27`	`*/`
`28`	`28`	`public interface ItemsList {`
`29`	`29`
`30`		`- public void accept(ItemsListVisitor itemsListVisitor);`
	`30`	`+ void accept(ItemsListVisitor itemsListVisitor);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@`
`25`	`25`
`26`	`26`	`public interface ItemsListVisitor {`
`27`	`27`
`28`		`- public void visit(SubSelect subSelect);`
	`28`	`+ void visit(SubSelect subSelect);`
`29`	`29`
`30`		`- public void visit(ExpressionList expressionList);`
	`30`	`+ void visit(ExpressionList expressionList);`
`31`	`31`
`32`		`- public void visit(MultiExpressionList multiExprList);`
	`32`	`+ void visit(MultiExpressionList multiExprList);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@`
`31`	`31`	`*/`
`32`	`32`	`public interface JSqlParser {`
`33`	`33`
`34`		`- public Statement parse(Reader statementReader) throws JSQLParserException;`
	`34`	`+ Statement parse(Reader statementReader) throws JSQLParserException;`
`35`	`35`	`}`