some housekeeping: adding missing braces

wumpz · wumpz · commit 5dabda1deca0 · 2012-11-15T23:33:05.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java b/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java
@@ -51,8 +51,9 @@ public String toString() {
 		if (partitionByColumns!=null && !partitionByColumns.isEmpty()) {
 			b.append("PARTITION BY ");
 			for (int i=0;i<partitionByColumns.size();i++) {
-				if (i>0)
+				if (i>0) {
 					b.append(", ");
+				}
 				b.append(partitionByColumns.get(i).toString());
 			}
 			b.append(" ");
@@ -61,8 +62,9 @@ public String toString() {
 		if (orderByElements!=null && !orderByElements.isEmpty()) {
 			b.append("ORDER BY ");
 			for (int i=0;i<orderByElements.size();i++) {
-				if (i>0)
+				if (i>0) {
 					b.append(", ");
+				}
 				b.append(orderByElements.get(i).toString());
 			}
 		}
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java
@@ -44,8 +44,9 @@ public String getStringExpression() {
 
 	public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
 		this.oldOracleJoinSyntax = oldOracleJoinSyntax;
-		if (oldOracleJoinSyntax<0 || oldOracleJoinSyntax>2)
+		if (oldOracleJoinSyntax<0 || oldOracleJoinSyntax>2) {
 			throw new IllegalArgumentException("unknown join type for oracle found (type=" + oldOracleJoinSyntax + ")");
+		}
 	}
 	
 	@Override
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Join.java b/src/main/java/net/sf/jsqlparser/statement/select/Join.java
@@ -168,24 +168,31 @@ public void setUsingColumns(List<Column> list) {
 
 	@Override
 	public String toString() {
-		if (isSimple())
+		if (isSimple()) {
 			return "" + rightItem;
+		}
 		else {
 			String type = "";
 
-			if (isRight())
+			if (isRight()) {
 				type += "RIGHT ";
-			else if (isNatural())
+			}
+			else if (isNatural()) {
 				type += "NATURAL ";
-			else if (isFull())
+			}
+			else if (isFull()) {
 				type += "FULL ";
-			else if (isLeft())
+			}
+			else if (isLeft()) {
 				type += "LEFT ";
+			}
 
-			if (isOuter())
+			if (isOuter()) {
 				type += "OUTER ";
-			else if (isInner())
+			}
+			else if (isInner()) {
 				type += "INNER ";
+			}
 
 			return type + "JOIN " + rightItem + ((onExpression != null) ? " ON " + onExpression + "" : "")
 					+ PlainSelect.getFormatedList(usingColumns, "USING", true, true);
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Select.java b/src/main/java/net/sf/jsqlparser/statement/select/Select.java
@@ -53,8 +53,9 @@ public String toString() {
 			for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
 				WithItem withItem = (WithItem) iter.next();
 				retval.append(withItem);
-				if (iter.hasNext())
+				if (iter.hasNext()) {
 					retval.append(",");
+				}
 				retval.append(" ");
 			}
 		}
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -82,8 +82,9 @@ public void visit(PlainSelect plainSelect) {
 				join.getRightItem().accept(this);
 			}
 		}
-		if (plainSelect.getWhere() != null)
+		if (plainSelect.getWhere() != null) {
 			plainSelect.getWhere().accept(this);
+		}
 
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java
@@ -74,8 +74,9 @@ public void visit(ExpressionList expressionList) {
 		for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
 			Expression expression = iter.next();
 			expression.accept(expressionVisitor);
-			if (iter.hasNext())
+			if (iter.hasNext()) {
 				buffer.append(", ");
+			}
 		}
 		buffer.append(")");
 	}
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ReplaceDeParser.java
@@ -88,8 +88,9 @@ public void visit(ExpressionList expressionList) {
 		for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
 			Expression expression = iter.next();
 			expression.accept(expressionVisitor);
-			if (iter.hasNext())
+			if (iter.hasNext()) {
 				buffer.append(", ");
+			}
 		}
 		buffer.append(")");
 	}
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -52,8 +52,9 @@ public SelectDeParser(ExpressionVisitor expressionVisitor, StringBuilder buffer)
 	public void visit(PlainSelect plainSelect) {
 		buffer.append("SELECT ");
 		Top top = plainSelect.getTop();
-		if (top != null)
+		if (top != null) {
 			buffer.append(top).append(" ");
+		}
 		if (plainSelect.getDistinct() != null) {
 			buffer.append("DISTINCT ");
 			if (plainSelect.getDistinct().getOnSelectItems() != null) {
@@ -124,8 +125,9 @@ public void visit(PlainSelect plainSelect) {
 	@Override
 	public void visit(OrderByElement orderBy) {
 		orderBy.getExpression().accept(expressionVisitor);
-		if (!orderBy.isAsc())
+		if (!orderBy.isAsc()) {
 			buffer.append(" DESC");
+		}
 	}
 
 	public void visit(Column column) {
@@ -225,23 +227,30 @@ public void visit(SubJoin subjoin) {
 	}
 
 	public void deparseJoin(Join join) {
-		if (join.isSimple())
+		if (join.isSimple()) {
 			buffer.append(", ");
+		}
 		else {
 
-			if (join.isRight())
+			if (join.isRight()) {
 				buffer.append(" RIGHT");
-			else if (join.isNatural())
+			}
+			else if (join.isNatural()) {
 				buffer.append(" NATURAL");
-			else if (join.isFull())
+			}
+			else if (join.isFull()) {
 				buffer.append(" FULL");
-			else if (join.isLeft())
+			}
+			else if (join.isLeft()) {
 				buffer.append(" LEFT");
+			}
 
-			if (join.isOuter())
+			if (join.isOuter()) {
 				buffer.append(" OUTER");
-			else if (join.isInner())
+			}
+			else if (join.isInner()) {
 				buffer.append(" INNER");
+			}
 
 			buffer.append(" JOIN ");
 
@@ -270,8 +279,9 @@ else if (join.isInner())
 	@Override
 	public void visit(SetOperationList list) {
 		for (int i=0;i<list.getPlainSelects().size();i++) {
-			if (i!=0)
+			if (i!=0) {
 				buffer.append(' ').append(list.getOperations().get(i-1)).append(' ');
+			}
 			buffer.append("(");
 			PlainSelect plainSelect = (PlainSelect) list.getPlainSelects().get(i);
 			plainSelect.accept(this);
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java
@@ -74,8 +74,9 @@ public void visit(Select select) {
 			for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
 				WithItem withItem = iter.next();
 				buffer.append(withItem);
-				if (iter.hasNext())
+				if (iter.hasNext()) {
 					buffer.append(",");
+				}
 				buffer.append(" ");
 			}
 		}
diff --git a/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java b/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java
@@ -60,8 +60,9 @@ public void testRUBiSCreateList() throws Exception {
 					break;
 				}
 
-				if (!line.equals("#begin"))
+				if (!line.equals("#begin")) {
 					break;
+				}
 				line = getLine(in);
 				StringBuilder buf = new StringBuilder(line);
 				while (true) {
@@ -147,8 +148,9 @@ public void testRUBiSCreateList() throws Exception {
 
 			}
 		} finally {
-			if (in != null)
+			if (in != null) {
 				in.close();
+			}
 		}
 	}
 
@@ -160,8 +162,9 @@ private String getLine(BufferedReader in) throws Exception {
 				line.trim();
 				if ((line.length() != 0)
 						&& ((line.length() < 2) || (line.length() >= 2)
-								&& !(line.charAt(0) == '/' && line.charAt(1) == '/')))
+								&& !(line.charAt(0) == '/' && line.charAt(1) == '/'))) {
 					break;
+				}
 			} else {
 				break;
 			}
diff --git a/src/test/java/net/sf/jsqlparser/test/select/SpeedTest.java b/src/test/java/net/sf/jsqlparser/test/select/SpeedTest.java
@@ -35,8 +35,9 @@ public void testSpeed() throws Exception {
 
 		while (true) {
 			String statement = CCJSqlParserManagerTest.getStatement(in);
-			if (statement == null)
+			if (statement == null) {
 				break;
+			}
 			statementsList.add(statement);
 		}
 		in.close();
@@ -48,11 +49,13 @@ public void testSpeed() throws Exception {
 			if (line == null) {
 				break;
 			}
-			if (line.length() == 0)
+			if (line.length() == 0) {
 				continue;
+			}
 
-			if (!line.equals("#begin"))
+			if (!line.equals("#begin")) {
 				break;
+			}
 			line = CCJSqlParserManagerTest.getLine(in);
 			StringBuilder buf = new StringBuilder(line);
 			while (true) {
diff --git a/src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java b/src/test/java/net/sf/jsqlparser/test/simpleparsing/CCJSqlParserManagerTest.java
diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,9 @@ public String getStringExpression() {`
`44`	`44`
`45`	`45`	`public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {`
`46`	`46`	`this.oldOracleJoinSyntax = oldOracleJoinSyntax;`
`47`		`- if (oldOracleJoinSyntax<0 \|\| oldOracleJoinSyntax>2)`
	`47`	`+ if (oldOracleJoinSyntax<0 \|\| oldOracleJoinSyntax>2) {`
`48`	`48`	`throw new IllegalArgumentException("unknown join type for oracle found (type=" + oldOracleJoinSyntax + ")");`
	`49`	`+ }`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,9 @@ public String toString() {`
`53`	`53`	`for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {`
`54`	`54`	`WithItem withItem = (WithItem) iter.next();`
`55`	`55`	`retval.append(withItem);`
`56`		`- if (iter.hasNext())`
	`56`	`+ if (iter.hasNext()) {`
`57`	`57`	`retval.append(",");`
	`58`	`+ }`
`58`	`59`	`retval.append(" ");`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,9 @@ public void visit(PlainSelect plainSelect) {`
`82`	`82`	`join.getRightItem().accept(this);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`- if (plainSelect.getWhere() != null)`
	`85`	`+ if (plainSelect.getWhere() != null) {`
`86`	`86`	`plainSelect.getWhere().accept(this);`
	`87`	`+ }`
`87`	`88`
`88`	`89`	`}`
`89`	`90`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,9 @@ public void visit(ExpressionList expressionList) {`
`74`	`74`	`for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {`
`75`	`75`	`Expression expression = iter.next();`
`76`	`76`	`expression.accept(expressionVisitor);`
`77`		`- if (iter.hasNext())`
	`77`	`+ if (iter.hasNext()) {`
`78`	`78`	`buffer.append(", ");`
	`79`	`+ }`
`79`	`80`	`}`
`80`	`81`	`buffer.append(")");`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,9 @@ public void visit(ExpressionList expressionList) {`
`88`	`88`	`for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {`
`89`	`89`	`Expression expression = iter.next();`
`90`	`90`	`expression.accept(expressionVisitor);`
`91`		`- if (iter.hasNext())`
	`91`	`+ if (iter.hasNext()) {`
`92`	`92`	`buffer.append(", ");`
	`93`	`+ }`
`93`	`94`	`}`
`94`	`95`	`buffer.append(")");`
`95`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,9 @@ public void visit(Select select) {`
`74`	`74`	`for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {`
`75`	`75`	`WithItem withItem = iter.next();`
`76`	`76`	`buffer.append(withItem);`
`77`		`- if (iter.hasNext())`
	`77`	`+ if (iter.hasNext()) {`
`78`	`78`	`buffer.append(",");`
	`79`	`+ }`
`79`	`80`	`buffer.append(" ");`
`80`	`81`	`}`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,9 @@ public void testRUBiSCreateList() throws Exception {`
`60`	`60`	`break;`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (!line.equals("#begin"))`
	`63`	`+ if (!line.equals("#begin")) {`
`64`	`64`	`break;`
	`65`	`+ }`
`65`	`66`	`line = getLine(in);`
`66`	`67`	`StringBuilder buf = new StringBuilder(line);`
`67`	`68`	`while (true) {`
`@@ -147,8 +148,9 @@ public void testRUBiSCreateList() throws Exception {`
`147`	`148`
`148`	`149`	`}`
`149`	`150`	`} finally {`
`150`		`- if (in != null)`
	`151`	`+ if (in != null) {`
`151`	`152`	`in.close();`
	`153`	`+ }`
`152`	`154`	`}`
`153`	`155`	`}`
`154`	`156`
`@@ -160,8 +162,9 @@ private String getLine(BufferedReader in) throws Exception {`
`160`	`162`	`line.trim();`
`161`	`163`	`if ((line.length() != 0)`
`162`	`164`	`&& ((line.length() < 2) \|\| (line.length() >= 2)`
`163`		`- && !(line.charAt(0) == '/' && line.charAt(1) == '/')))`
	`165`	`+ && !(line.charAt(0) == '/' && line.charAt(1) == '/'))) {`
`164`	`166`	`break;`
	`167`	`+ }`
`165`	`168`	`} else {`
`166`	`169`	`break;`
`167`	`170`	`}`