Changed all lists to their appropriate generics type.

cbockermann · cbockermann · commit 0dd60b143eae · 2011-09-17T09:53:14.000+02:00
diff --git a/change.log b/change.log
@@ -141,3 +141,9 @@ Arithmetic expressions in CASE expression
 Added matches (@@) operator
 Changed order by and group by to be Expressions
 Added bitwise operators (|, ^, &)
+
+0.7.1
+Changed project layout to maven project
+Added regexp (REGEXP) operator
+Added support for SELECT without FROM  (e.g. "SELECT 1+2")
+Moved parser from using StringBuffer to using StringBuilder
diff --git a/src/main/java/net/sf/jsqlparser/JSQLParserException.java b/src/main/java/net/sf/jsqlparser/JSQLParserException.java
@@ -26,7 +26,11 @@
  * An exception class with stack trace informations
  */
 public class JSQLParserException extends Exception {
-	private Throwable cause = null;
+    
+    /* The serial class version */
+    private static final long serialVersionUID = -1099039459759769980L;
+    
+    private Throwable cause = null;
 
 	public JSQLParserException() {
 		super();
diff --git a/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java b/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java
@@ -60,7 +60,7 @@ public class CaseExpression implements Expression {
 
 	private Expression switchExpression;
 
-	private List whenClauses;
+	private List<Expression> whenClauses;
 
 	private Expression elseExpression;
 
@@ -106,15 +106,15 @@ public void setElseExpression(Expression elseExpression) {
 	/**
 	 * @return Returns the whenClauses.
 	 */
-	public List getWhenClauses() {
+	public List<Expression> getWhenClauses() {
 		return whenClauses;
 	}
 
 	/**
 	 * @param whenClauses
 	 *            The whenClauses to set.
 	 */
-	public void setWhenClauses(List whenClauses) {
+	public void setWhenClauses(List<Expression> whenClauses) {
 		this.whenClauses = whenClauses;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
@@ -7,17 +7,17 @@
 public class ColDataType {
 
 	private String dataType;
-	private List argumentsStringList;
+	private List<String> argumentsStringList;
 
-	public List getArgumentsStringList() {
+	public List<String> getArgumentsStringList() {
 		return argumentsStringList;
 	}
 
 	public String getDataType() {
 		return dataType;
 	}
 
-	public void setArgumentsStringList(List list) {
+	public void setArgumentsStringList(List<String> list) {
 		argumentsStringList = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java
@@ -11,17 +11,17 @@
 public class ColumnDefinition {
 	private String columnName;
 	private ColDataType colDataType;
-	private List columnSpecStrings;
+	private List<String> columnSpecStrings;
 
 	/**
 	 * A list of strings of every word after the datatype of the column.<br>
 	 * Example ("NOT", "NULL")
 	 */
-	public List getColumnSpecStrings() {
+	public List<String> getColumnSpecStrings() {
 		return columnSpecStrings;
 	}
 
-	public void setColumnSpecStrings(List list) {
+	public void setColumnSpecStrings(List<String> list) {
 		columnSpecStrings = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
@@ -13,9 +13,9 @@
 public class CreateTable implements Statement {
 
 	private Table table;
-	private List tableOptionsStrings;
-	private List columnDefinitions;
-	private List indexes;
+	private List<String> tableOptionsStrings;
+	private List<ColumnDefinition> columnDefinitions;
+	private List<Index> indexes;
 
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
@@ -35,34 +35,34 @@ public void setTable(Table table) {
 	/**
 	 * A list of {@link ColumnDefinition}s of this table.
 	 */
-	public List getColumnDefinitions() {
+	public List<ColumnDefinition> getColumnDefinitions() {
 		return columnDefinitions;
 	}
 
-	public void setColumnDefinitions(List list) {
+	public void setColumnDefinitions(List<ColumnDefinition> list) {
 		columnDefinitions = list;
 	}
 
 	/**
 	 * A list of options (as simple strings) of this table definition, as ("TYPE", "=", "MYISAM")
 	 */
-	public List getTableOptionsStrings() {
+	public List<?> getTableOptionsStrings() {
 		return tableOptionsStrings;
 	}
 
-	public void setTableOptionsStrings(List list) {
+	public void setTableOptionsStrings(List<String> list) {
 		tableOptionsStrings = list;
 	}
 
 	/**
 	 * A list of {@link Index}es (for example "PRIMARY KEY") of this table.<br>
 	 * Indexes created with column definitions (as in mycol INT PRIMARY KEY) are not inserted into this list.
 	 */
-	public List getIndexes() {
+	public List<Index> getIndexes() {
 		return indexes;
 	}
 
-	public void setIndexes(List list) {
+	public void setIndexes(List<Index> list) {
 		indexes = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java
@@ -10,13 +10,13 @@
 public class Index {
 
 	private String type;
-	private List columnsNames;
+	private List<String> columnsNames;
 	private String name;
 
 	/**
 	 * A list of strings of all the columns regarding this index
 	 */
-	public List getColumnsNames() {
+	public List<String> getColumnsNames() {
 		return columnsNames;
 	}
 
@@ -31,7 +31,7 @@ public String getType() {
 		return type;
 	}
 
-	public void setColumnsNames(List list) {
+	public void setColumnsNames(List<String> list) {
 		columnsNames = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -9,7 +9,7 @@
 public class Drop implements Statement {
 	private String type;
 	private String name;
-	private List parameters;
+	private List<String> parameters;
 
 	public void accept(StatementVisitor statementVisitor) {
 		statementVisitor.visit(this);
@@ -19,7 +19,7 @@ public String getName() {
 		return name;
 	}
 
-	public List getParameters() {
+	public List<String> getParameters() {
 		return parameters;
 	}
 
@@ -31,7 +31,7 @@ public void setName(String string) {
 		name = string;
 	}
 
-	public void setParameters(List list) {
+	public void setParameters(List<String> list) {
 		parameters = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/replace/Replace.java b/src/main/java/net/sf/jsqlparser/statement/replace/Replace.java
@@ -24,7 +24,9 @@
 
 import java.util.List;
 
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
+import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -35,9 +37,9 @@
  */
 public class Replace implements Statement {
 	private Table table;
-	private List columns;
+	private List<Column> columns;
 	private ItemsList itemsList;
-	private List expressions;
+	private List<Expression> expressions;
 	private boolean useValues = true;
 
 	public void accept(StatementVisitor statementVisitor) {
@@ -58,7 +60,7 @@ public void setTable(Table name) {
 	 * 
 	 * @return a list of {@link net.sf.jsqlparser.schema.Column}s
 	 */
-	public List getColumns() {
+	public List<Column> getColumns() {
 		return columns;
 	}
 
@@ -70,7 +72,7 @@ public ItemsList getItemsList() {
 		return itemsList;
 	}
 
-	public void setColumns(List list) {
+	public void setColumns(List<Column> list) {
 		columns = list;
 	}
 
@@ -82,11 +84,11 @@ public void setItemsList(ItemsList list) {
 	 * A list of {@link net.sf.jsqlparser.expression.Expression}s (from a "REPLACE mytab SET col1=exp1, col2=exp2"). <br>
 	 * it is null in case of a "REPLACE mytab (col1, col2) [...]"
 	 */
-	public List getExpressions() {
+	public List<Expression> getExpressions() {
 		return expressions;
 	}
 
-	public void setExpressions(List list) {
+	public void setExpressions(List<Expression> list) {
 		expressions = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java b/src/main/java/net/sf/jsqlparser/statement/select/Distinct.java
@@ -6,18 +6,18 @@
  * A DISTINCT [ON (expression, ...)] clause
  */
 public class Distinct {
-	private List onSelectItems;
+	private List<SelectItem> onSelectItems;
 
 	/**
 	 * A list of {@link SelectItem}s expressions, as in "select DISTINCT ON (a,b,c) a,b FROM..."
 	 * 
 	 * @return a list of {@link SelectItem}s expressions
 	 */
-	public List getOnSelectItems() {
+	public List<SelectItem> getOnSelectItems() {
 		return onSelectItems;
 	}
 
-	public void setOnSelectItems(List list) {
+	public void setOnSelectItems(List<SelectItem> list) {
 		onSelectItems = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Join.java b/src/main/java/net/sf/jsqlparser/statement/select/Join.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.schema.Column;
 
 /**
  * A join clause
@@ -39,7 +40,7 @@ public class Join {
 	private boolean simple = false;
 	private FromItem rightItem;
 	private Expression onExpression;
-	private List usingColumns;
+	private List<Column> usingColumns;
 
 	/**
 	 * Whether is a tab1,tab2 join
@@ -157,11 +158,11 @@ public void setOnExpression(Expression expression) {
 	/**
 	 * Returns the "USING" list of {@link net.sf.jsqlparser.schema.Column}s (if any)
 	 */
-	public List getUsingColumns() {
+	public List<Column> getUsingColumns() {
 		return usingColumns;
 	}
 
-	public void setUsingColumns(List list) {
+	public void setUsingColumns(List<Column> list) {
 		usingColumns = list;
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java b/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,17 @@`
`7`	`7`	`public class ColDataType {`
`8`	`8`
`9`	`9`	`private String dataType;`
`10`		`- private List argumentsStringList;`
	`10`	`+ private List<String> argumentsStringList;`
`11`	`11`
`12`		`- public List getArgumentsStringList() {`
	`12`	`+ public List<String> getArgumentsStringList() {`
`13`	`13`	`return argumentsStringList;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public String getDataType() {`
`17`	`17`	`return dataType;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public void setArgumentsStringList(List list) {`
	`20`	`+ public void setArgumentsStringList(List<String> list) {`
`21`	`21`	`argumentsStringList = list;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@`
`10`	`10`	`public class Index {`
`11`	`11`
`12`	`12`	`private String type;`
`13`		`- private List columnsNames;`
	`13`	`+ private List<String> columnsNames;`
`14`	`14`	`private String name;`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* A list of strings of all the columns regarding this index`
`18`	`18`	`*/`
`19`		`- public List getColumnsNames() {`
	`19`	`+ public List<String> getColumnsNames() {`
`20`	`20`	`return columnsNames;`
`21`	`21`	`}`
`22`	`22`
`@@ -31,7 +31,7 @@ public String getType() {`
`31`	`31`	`return type;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void setColumnsNames(List list) {`
	`34`	`+ public void setColumnsNames(List<String> list) {`
`35`	`35`	`columnsNames = list;`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`public class Drop implements Statement {`
`10`	`10`	`private String type;`
`11`	`11`	`private String name;`
`12`		`- private List parameters;`
	`12`	`+ private List<String> parameters;`
`13`	`13`
`14`	`14`	`public void accept(StatementVisitor statementVisitor) {`
`15`	`15`	`statementVisitor.visit(this);`
`@@ -19,7 +19,7 @@ public String getName() {`
`19`	`19`	`return name;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public List getParameters() {`
	`22`	`+ public List<String> getParameters() {`
`23`	`23`	`return parameters;`
`24`	`24`	`}`
`25`	`25`
`@@ -31,7 +31,7 @@ public void setName(String string) {`
`31`	`31`	`name = string;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void setParameters(List list) {`
	`34`	`+ public void setParameters(List<String> list) {`
`35`	`35`	`parameters = list;`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,18 @@`
`6`	`6`	`* A DISTINCT [ON (expression, ...)] clause`
`7`	`7`	`*/`
`8`	`8`	`public class Distinct {`
`9`		`- private List onSelectItems;`
	`9`	`+ private List<SelectItem> onSelectItems;`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* A list of {@link SelectItem}s expressions, as in "select DISTINCT ON (a,b,c) a,b FROM..."`
`13`	`13`	`*`
`14`	`14`	`* @return a list of {@link SelectItem}s expressions`
`15`	`15`	`*/`
`16`		`- public List getOnSelectItems() {`
	`16`	`+ public List<SelectItem> getOnSelectItems() {`
`17`	`17`	`return onSelectItems;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public void setOnSelectItems(List list) {`
	`20`	`+ public void setOnSelectItems(List<SelectItem> list) {`
`21`	`21`	`onSelectItems = list;`
`22`	`22`	`}`
`23`	`23`