format code

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@527 b9813039-fb51-4c41-a8b9-e21c2acb5095

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java

@@ -28,7 +28,7 @@ public class MySqlBooleanExpr extends SQLLiteralExpr implements MySqlExpr {
     public MySqlBooleanExpr(){
 
     }
-    
+
     public MySqlBooleanExpr(boolean value){
         this.value = value;
     }

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java

@@ -59,7 +59,8 @@ public class MySqlMatchAgainstExpr extends SQLExprImpl implements MySqlExpr {
 
     public static enum SearchModifier {
         IN_BOOLEAN_MODE("IN BOOLEAN MODE"), IN_NATURAL_LANGUAGE_MODE("IN NATURAL LANGUAGE MODE"),
-        IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION("IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"), WITH_QUERY_EXPANSION("WITH QUERY EXPANSION"), ;
+        IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION("IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"),
+        WITH_QUERY_EXPANSION("WITH QUERY EXPANSION"), ;
 
         public final String name;
 

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlTableIndex.java

@@ -62,7 +62,7 @@ public class MySqlTableIndex extends SQLObjectImpl implements SQLTableElement {
             accept0((MySqlASTVisitor) visitor);
             return;
         }
-        
+
         if (visitor.visit(this)) {
             acceptChild(visitor, name);
             acceptChild(visitor, columns);

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java

@@ -190,7 +190,8 @@ public class MySqlExprParser extends SQLExprParser {
                 String collate = lexer.stringVal();
                 lexer.nextToken();
 
-                SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.COLLATE, new SQLIdentifierExpr(collate));
+                SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.COLLATE,
+                                                                 new SQLIdentifierExpr(collate));
 
                 expr = binaryExpr;
 

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java

@@ -29,8 +29,9 @@ import com.alibaba.druid.sql.parser.SQLParseException;
 import com.alibaba.druid.sql.parser.Token;
 
 public class MySqlLexer extends Lexer {
-    public final static Keywords           DEFAULT_MYSQL_KEYWORDS;
-    
+
+    public final static Keywords DEFAULT_MYSQL_KEYWORDS;
+
     static {
         Map<String, Token> map = new HashMap<String, Token>();
         map.put("EXISTS", Token.EXISTS);
@@ -102,11 +103,11 @@ public class MySqlLexer extends Lexer {
         map.put("LOCK", Token.LOCK);
         map.put("SOME", Token.SOME);
         map.put("ANY", Token.ANY);
-        
+
         map.put("TRUE", Token.TRUE);
         map.put("FALSE", Token.FALSE);
         map.put("LIMIT", Token.LIMIT);
-        
+
         DEFAULT_MYSQL_KEYWORDS = new Keywords(map);
     }
 

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java

@@ -38,7 +38,7 @@ public class MySqlSelectParser extends SQLSelectParser {
         this(new MySqlLexer(sql));
         this.lexer.nextToken();
     }
-    
+
     @Override
     protected SQLSelectQuery query() throws ParserException {
         if (lexer.token() == (Token.LPAREN)) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java

@@ -771,7 +771,7 @@ public class MySqlStatementParser extends SQLStatementParser {
 
         SQLName tableName = this.exprParser.name();
         insertStatement.setTableName(tableName);
-        
+
         if (lexer.token() == Token.IDENTIFIER) {
             insertStatement.setAlias(lexer.stringVal());
             lexer.nextToken();

src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java

@@ -131,7 +131,8 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
                 print(select.getOutFileCharset());
             }
 
-            if (select.getOutFileColumnsTerminatedBy() != null || select.getOutFileColumnsEnclosedBy() != null || select.getOutFileColumnsEscaped() != null) {
+            if (select.getOutFileColumnsTerminatedBy() != null || select.getOutFileColumnsEnclosedBy() != null
+                || select.getOutFileColumnsEscaped() != null) {
                 print(" COLUMNS");
                 if (select.getOutFileColumnsTerminatedBy() != null) {
                     print(" TERMINATED BY ");

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java

@@ -37,7 +37,7 @@ public class OracleOrderBy extends SQLOrderBy {
     public void setSibings(boolean sibings) {
         this.sibings = sibings;
     }
-    
+
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);
     }

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java

@@ -7,7 +7,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 public abstract class FlashbackQueryClause extends OracleSQLObject {
 
     private static final long serialVersionUID = 1L;
-    
+
     private Type              type;
 
     public Type getType() {
@@ -23,10 +23,11 @@ public abstract class FlashbackQueryClause extends OracleSQLObject {
     }
 
     public static class VersionsFlashbackQueryClause extends FlashbackQueryClause {
+
         private static final long serialVersionUID = 1L;
-        
-        private SQLExpr begin;
-        private SQLExpr end;
+
+        private SQLExpr           begin;
+        private SQLExpr           end;
 
         public SQLExpr getBegin() {
             return begin;
@@ -55,9 +56,10 @@ public abstract class FlashbackQueryClause extends OracleSQLObject {
     }
 
     public static class AsOfFlashbackQueryClause extends FlashbackQueryClause {
+
         private static final long serialVersionUID = 1L;
-        
-        private SQLExpr expr;
+
+        private SQLExpr           expr;
 
         public SQLExpr getExpr() {
             return expr;

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java

@@ -10,8 +10,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class GroupingSetExpr extends SQLExprImpl {
 
-    private static final long serialVersionUID = 1L;
-    private final List<SQLExpr>     parameters       = new ArrayList<SQLExpr>();
+    private static final long   serialVersionUID = 1L;
+    private final List<SQLExpr> parameters       = new ArrayList<SQLExpr>();
 
     public List<SQLExpr> getParameters() {
         return parameters;
@@ -21,7 +21,7 @@ public class GroupingSetExpr extends SQLExprImpl {
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);
     }
-    
+
     protected void accept0(OracleASTVisitor visitor) {
         if (visitor.visit(this)) {
             acceptChild(visitor, parameters);

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java

@@ -10,10 +10,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 public class PartitionExtensionClause extends OracleSQLObject {
 
     private static final long   serialVersionUID = 1L;
-    
+
     private boolean             subPartition;
     private SQLName             partition;
-    private final List<SQLName> target          = new ArrayList<SQLName>();
+    private final List<SQLName> target           = new ArrayList<SQLName>();
 
     public boolean isSubPartition() {
         return subPartition;

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java

@@ -8,7 +8,7 @@ public class OracleBinaryFloatExpr extends SQLNumericLiteralExpr {
 
     private static final long serialVersionUID = 1L;
 
-    private Float            value;
+    private Float             value;
 
     public OracleBinaryFloatExpr(){
 

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java

@@ -9,12 +9,12 @@ public class OraclePriorExpr extends SQLExprImpl {
 
     private static final long serialVersionUID = 1L;
     private SQLExpr           expr;
-    
-    public OraclePriorExpr() {
-        
+
+    public OraclePriorExpr(){
+
     }
-    
-    public OraclePriorExpr(SQLExpr expr) {
+
+    public OraclePriorExpr(SQLExpr expr){
         this.expr = expr;
     }
 
@@ -25,7 +25,7 @@ public class OraclePriorExpr extends SQLExprImpl {
     public void setExpr(SQLExpr expr) {
         this.expr = expr;
     }
-    
+
     @Override
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java

@@ -37,7 +37,7 @@ public class OracleOrderByItem extends SQLSelectOrderByItem {
     public void setNullsOrderType(NullsOrderType nullsOrderType) {
         this.nullsOrderType = nullsOrderType;
     }
-    
+
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);
     }

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java

@@ -55,7 +55,7 @@ public class OracleSelectQueryBlock extends SQLSelectQueryBlock {
             accept0((OracleASTVisitor) visitor);
             return;
         }
-        
+
         if (visitor.visit(this)) {
             acceptChild(visitor, this.selectList);
             acceptChild(visitor, this.from);

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java

@@ -46,6 +46,7 @@ import com.alibaba.druid.sql.parser.Token;
 
 public class OracleExprParser extends SQLExprParser {
 
+
     public boolean                allowStringAdditive = false;
 
     /**

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java

@@ -11,8 +11,9 @@ import com.alibaba.druid.sql.parser.SQLParseException;
 import com.alibaba.druid.sql.parser.Token;
 
 public class OracleLexer extends Lexer {
-    public final static Keywords           DEFAULT_ORACLE_KEYWORDS;
-    
+
+    public final static Keywords DEFAULT_ORACLE_KEYWORDS;
+
     static {
         Map<String, Token> map = new HashMap<String, Token>();
         map.put("EXISTS", Token.EXISTS);
@@ -84,7 +85,7 @@ public class OracleLexer extends Lexer {
         map.put("LOCK", Token.LOCK);
         map.put("SOME", Token.SOME);
         map.put("ANY", Token.ANY);
-        
+
         map.put("START", Token.START);
         map.put("CONNECT", Token.CONNECT);
         map.put("PRIOR", Token.PRIOR);
@@ -92,7 +93,7 @@ public class OracleLexer extends Lexer {
         map.put("EXTRACT", Token.EXTRACT);
         map.put("DATE", Token.DATE);
         map.put("TIMESTAMP", Token.TIMESTAMP);
-        
+
         DEFAULT_ORACLE_KEYWORDS = new Keywords(map);
     }
 
@@ -105,14 +106,14 @@ public class OracleLexer extends Lexer {
         super(input);
         super.keywods = DEFAULT_ORACLE_KEYWORDS;
     }
-    
+
     public void scanVariable() {
         if (ch == '@') {
             scanChar();
             token = Token.MONKEYS_AT;
             return;
         }
-        
+
         if (ch != ':') {
             throw new SQLParseException("illegal variable");
         }
@@ -122,7 +123,7 @@ public class OracleLexer extends Lexer {
         np = bp;
         sp = 1;
         char ch;
-        
+
         for (;;) {
             ch = buf[++bp];
 
@@ -157,16 +158,16 @@ public class OracleLexer extends Lexer {
         scanChar();
         sp++;
 
-        // /*+  */
+        // /*+ */
         if (ch == '*') {
             scanChar();
             sp++;
-            
+
             while (ch == ' ') {
                 scanChar();
                 sp++;
             }
-            
+
             boolean isHint = false;
             int startHintSp = sp + 1;
             if (ch == '+') {
@@ -187,8 +188,6 @@ public class OracleLexer extends Lexer {
                 sp++;
             }
 
-            
-            
             if (isHint) {
                 stringVal = new String(buf, np + startHintSp, (sp - startHintSp) - 2).trim();
                 token = Token.HINT;
@@ -196,7 +195,7 @@ public class OracleLexer extends Lexer {
                 stringVal = new String(buf, np, sp);
                 token = Token.MULTI_LINE_COMMENT;
             }
-           
+
             return;
         }
 
@@ -230,7 +229,7 @@ public class OracleLexer extends Lexer {
             return;
         }
     }
-    
+
     public void scanNumber() {
         np = bp;
 
@@ -285,13 +284,13 @@ public class OracleLexer extends Lexer {
 
             isDouble = true;
         }
-        
+
         if (ch == 'f' || ch == 'F') {
             token = Token.BINARY_FLOAT;
             scanChar();
             return;
         }
-        
+
         if (ch == 'd' || ch == 'D') {
             token = Token.BINARY_DOUBLE;
             scanChar();

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java

@@ -521,7 +521,7 @@ public class OracleSelectParser extends SQLSelectParser {
                     clause.setType(AsOfFlashbackQueryClause.Type.SCN);
                     lexer.nextToken();
                 } else {
-                   accept(Token.TIMESTAMP);
+                    accept(Token.TIMESTAMP);
                     clause.setType(AsOfFlashbackQueryClause.Type.TIMESTAMP);
                 }
 
@@ -576,7 +576,7 @@ public class OracleSelectParser extends SQLSelectParser {
             accept(Token.JOIN);
             joinType = OracleSelectJoin.JoinType.FULL_OUTER_JOIN;
         }
-        
+
         if (lexer.token() == Token.INNER) {
             lexer.nextToken();
             accept(Token.JOIN);

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java

@@ -38,7 +38,7 @@ public class OracleStatementParser extends SQLStatementParser {
     public OracleStatementParser(Lexer lexer){
         super(lexer);
     }
-    
+
     protected SQLExprParser createExprParser() {
         return new OracleExprParser(lexer);
     }
@@ -102,12 +102,12 @@ public class OracleStatementParser extends SQLStatementParser {
             if (lexer.token() == Token.ALTER) {
                 throw new ParserException("TODO");
             }
-            
+
             if (lexer.token() == Token.WITH) {
                 statementList.add(new SQLSelectStatement(new OracleSelectParser(this.lexer).select()));
                 continue;
             }
-            
+
             if (identifierEquals("CALL")) {
                 statementList.add(this.parseCall());
                 continue;
@@ -116,7 +116,7 @@ public class OracleStatementParser extends SQLStatementParser {
             throw new ParserException("TODO : " + lexer.token() + " " + lexer.stringVal());
         }
     }
-    
+
     public OracleCreateTableStatement parseOracleCreateTable() throws ParserException {
         // OracleCreateTableParser parser = new OracleCreateTableParser(this.tokenList);
         // return parser.parseCrateTable();

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java

@@ -109,7 +109,7 @@ public class OracleUpdateParser extends SQLStatementParser {
 
         update.setSetClause(setListClause);
     }
-    
+
     protected SQLExprParser createExprParser() {
         return new OracleExprParser(lexer);
     }

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java

@@ -80,10 +80,10 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora
     public boolean visit(OracleSelect x) {
         return true;
     }
-    
+
     public void endVisit(OracleSelect x) {
     }
-    
+
     @Override
     public void endVisit(OracleAggregateExpr astNode) {
 

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java

@@ -363,8 +363,8 @@ public interface OracleASTVisitor extends SQLASTVisitor {
     boolean visit(OracleBinaryDoubleExpr x);
 
     void endVisit(OracleBinaryDoubleExpr x);
-    
+
     boolean visit(OracleSelect x);
-    
+
     void endVisit(OracleSelect x);
 }

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java

@@ -1675,7 +1675,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
 
     @Override
     public void endVisit(OracleSelect x) {
-        
+
     }
 
 }

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java

@@ -12,8 +12,9 @@ import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
 import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
 
 public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
+
     private static final String ATTR_PARAMS_SKIP = "_params.skip_";
-    
+
     public OracleParameterizedOutputVisitor(Appendable appender){
         super(appender);
     }
@@ -33,13 +34,13 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
 
         return false;
     }
-    
+
     public boolean visit(SQLBinaryOpExpr x) {
         x = merge(x);
 
         return super.visit(x);
     }
-    
+
     public SQLBinaryOpExpr merge(SQLBinaryOpExpr x) {
         if (x.getLeft() instanceof SQLLiteralExpr && x.getRight() instanceof SQLLiteralExpr) {
             if (x.getOperator() == SQLBinaryOperator.Equality || x.getOperator() == SQLBinaryOperator.NotEqual) {
@@ -128,12 +129,12 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
 
         return false;
     }
-    
+
     public boolean visit(SQLIntegerExpr x) {
         if (Boolean.TRUE.equals(x.getAttribute(ATTR_PARAMS_SKIP))) {
             return super.visit(x);
         }
-        
+
         print('?');
         return false;
     }
@@ -142,7 +143,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
         if (Boolean.TRUE.equals(x.getAttribute(ATTR_PARAMS_SKIP))) {
             return super.visit(x);
         }
-        
+
         print('?');
         return false;
     }
@@ -151,7 +152,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
         if (Boolean.TRUE.equals(x.getAttribute(ATTR_PARAMS_SKIP))) {
             return super.visit(x);
         }
-        
+
         print('?');
         return false;
     }
@@ -160,7 +161,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
         if (Boolean.TRUE.equals(x.getAttribute(ATTR_PARAMS_SKIP))) {
             return super.visit(x);
         }
-        
+
         print('?');
         return false;
     }

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java

@@ -129,7 +129,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter {
             }
             return false;
         }
-        
+
         accept(x.getExpr());
 
         return false;
@@ -419,7 +419,7 @@ public class OracleSchemaStatVisitor extends OracleASTVIsitorAdapter {
         if ("SYSDATE".equalsIgnoreCase(x.getName())) {
             return false;
         }
-        
+
         if ("+".equalsIgnoreCase(x.getName())) {
             return false;
         }