diff --git a/src/main/java/com/alibaba/druid/DruidException.java b/src/main/java/com/alibaba/druid/DruidException.java deleted file mode 100644 index 311c2bd2cb..0000000000 --- a/src/main/java/com/alibaba/druid/DruidException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid; - -public class DruidException extends Exception { - - private static final long serialVersionUID = 1L; - - public DruidException(){ - super(); - } - - public DruidException(String message, Throwable cause){ - super(message, cause); - } - - public DruidException(String message){ - super(message); - } - - public DruidException(Throwable cause){ - super(cause); - } - -} diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBitStringLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBitStringLiteralExpr.java deleted file mode 100644 index 4e7ecfbe0f..0000000000 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBitStringLiteralExpr.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.sql.ast.expr; - -import java.util.BitSet; - -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -/** - * SQL-92 - *

- * <bit string literal> ::= B <quote> [ <bit> ... ] <quote> [ { <separator> ... <quote> [ <bit> ... ] - * <quote> }... ] - *

- * - * @author WENSHAO - */ -public class SQLBitStringLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - - private static final long serialVersionUID = 1L; - - private BitSet value; - - public SQLBitStringLiteralExpr(){ - - } - - public BitSet getValue() { - return value; - } - - public void setValue(BitSet value) { - this.value = value; - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - visitor.visit(this); - - visitor.endVisit(this); - } - - public void output(StringBuffer buf) { - buf.append("b'"); - for (int i = 0; i < value.length(); ++i) { - buf.append(value); - } - buf.append("'"); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((value == null) ? 0 : value.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - SQLBitStringLiteralExpr other = (SQLBitStringLiteralExpr) obj; - if (value == null) { - if (other.value != null) { - return false; - } - } else if (!value.equals(other.value)) { - return false; - } - return true; - } -} diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateLiteralExpr.java deleted file mode 100644 index 039e352c4a..0000000000 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateLiteralExpr.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.sql.ast.expr; - -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -public class SQLDateLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - - private static final long serialVersionUID = 1L; - - private SQLDateLiteralValue value = new SQLDateLiteralValue(); - - public SQLDateLiteralExpr(){ - - } - - public SQLDateLiteralValue getValue() { - return value; - } - - public void setValue(SQLDateLiteralValue value) { - this.value = value; - } - - public void output(StringBuffer buf) { - buf.append("DATE'"); - this.value.output(buf); - buf.append("'"); - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - visitor.visit(this); - - visitor.endVisit(this); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((value == null) ? 0 : value.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - SQLDateLiteralExpr other = (SQLDateLiteralExpr) obj; - if (value == null) { - if (other.value != null) { - return false; - } - } else if (!value.equals(other.value)) { - return false; - } - return true; - } - -} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraintImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraintImpl.java deleted file mode 100644 index 34dee748de..0000000000 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraintImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.sql.ast.statement; - -import java.util.ArrayList; -import java.util.List; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -@SuppressWarnings("serial") -public class SQLUniqueConstraintImpl extends SQLConstaintImpl implements SQLUniqueConstraint { - - public SQLUniqueConstraintImpl(){ - - } - - private List columns = new ArrayList(); - - @Override - protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, this.getName()); - acceptChild(visitor, columns); - } - visitor.endVisit(this); - } - - @Override - public List getColumns() { - return columns; - } -} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObjectImpl.java deleted file mode 100644 index fb66bd08f7..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObjectImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.sql.dialect.transact.ast; - -import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -public abstract class TransactSQLObjectImpl extends SQLObjectImpl implements TransactSQLObject { - - private static final long serialVersionUID = 1L; - - public TransactSQLObjectImpl(){ - - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - this.accept0((OracleASTVisitor) visitor); - } - - public abstract void accept0(OracleASTVisitor visitor); -} diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 65df3707fc..55e57becd4 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -26,12 +26,10 @@ import com.alibaba.druid.sql.ast.expr.SQLAllExpr; import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBitStringLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.ast.expr.SQLCastExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; -import com.alibaba.druid.sql.ast.expr.SQLDateLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.ast.expr.SQLHexExpr; @@ -209,18 +207,10 @@ public interface SQLASTVisitor { void endVisit(SQLHexExpr x); - boolean visit(SQLBitStringLiteralExpr x); - - void endVisit(SQLBitStringLiteralExpr x); - boolean visit(SQLHexStringLiteralExpr x); void endVisit(SQLHexStringLiteralExpr x); - boolean visit(SQLDateLiteralExpr x); - - void endVisit(SQLDateLiteralExpr x); - boolean visit(SQLSelect x); void endVisit(SQLSelect select); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 959e003459..b9af2c5b13 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -26,12 +26,10 @@ import com.alibaba.druid.sql.ast.expr.SQLAllExpr; import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBitStringLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.ast.expr.SQLCastExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; -import com.alibaba.druid.sql.ast.expr.SQLDateLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.ast.expr.SQLHexExpr; @@ -270,13 +268,6 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { public void endVisit(SQLQueryExpr x) { } - public boolean visit(SQLBitStringLiteralExpr x) { - return true; - } - - public void endVisit(SQLBitStringLiteralExpr x) { - } - public boolean visit(SQLHexStringLiteralExpr x) { return true; } @@ -284,13 +275,6 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { public void endVisit(SQLHexStringLiteralExpr x) { } - public boolean visit(SQLDateLiteralExpr x) { - return true; - } - - public void endVisit(SQLDateLiteralExpr x) { - } - public boolean visit(SQLSelect x) { return true; } diff --git a/src/main/java/com/alibaba/druid/wall/WallRuntimeException.java b/src/main/java/com/alibaba/druid/wall/WallRuntimeException.java deleted file mode 100644 index e29f80ff33..0000000000 --- a/src/main/java/com/alibaba/druid/wall/WallRuntimeException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.wall; - - -public class WallRuntimeException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public WallRuntimeException(){ - super(); - } - - public WallRuntimeException(String reason, Throwable cause){ - super(reason, cause); - } - - public WallRuntimeException(String reason){ - super(reason); - } - - public WallRuntimeException(Throwable cause){ - super(cause); - } - -} diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java new file mode 100644 index 0000000000..f3a365dadc --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java @@ -0,0 +1,20 @@ +package com.alibaba.druid.bvt.pool; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.pool.DruidDataSourceFactory; + +public class DruidDataSourceFactoryTest0 extends TestCase { + + public void test_factory_null() throws Exception { + DruidDataSourceFactory factory = new DruidDataSourceFactory(); + Assert.assertNull(factory.getObjectInstance(null, null, null, null)); + } + + public void test_factory_null_1() throws Exception { + DruidDataSourceFactory factory = new DruidDataSourceFactory(); + Assert.assertNull(factory.getObjectInstance(new Object(), null, null, null)); + } +}