Author: markt
Date: Tue Jul 19 21:41:09 2011
New Revision: 1148555
URL: http://svn.apache.org/viewvc?rev=1148555&view=rev
Log:
Extract PStmtKey to separate class (required for Generics)
Added:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java
(with props)
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
Added: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java?rev=1148555&view=auto
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java
(added)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java
Tue Jul 19 21:41:09 2011
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.commons.dbcp2;
+
+import java.sql.PreparedStatement;
+
+/**
+ * A key uniquely identifying {@link PreparedStatement}s.
+ */
+class PStmtKey {
+
+ /** SQL defining Prepared or Callable Statement */
+ protected String _sql = null;
+
+ /** Result set type */
+ protected Integer _resultSetType = null;
+
+ /** Result set concurrency */
+ protected Integer _resultSetConcurrency = null;
+
+ /** Database catalog */
+ protected String _catalog = null;
+
+ /**
+ * Statement type. Either STATEMENT_PREPAREDSTMT (PreparedStatement)
+ * or STATEMENT_CALLABLESTMT (CallableStatement)
+ */
+ protected byte _stmtType = PoolingConnection.STATEMENT_PREPAREDSTMT;
+
+ PStmtKey(String sql) {
+ _sql = sql;
+ }
+
+ PStmtKey(String sql, String catalog) {
+ _sql = sql;
+ _catalog = catalog;
+ }
+
+ PStmtKey(String sql, String catalog, byte stmtType) {
+ _sql = sql;
+ _catalog = catalog;
+ _stmtType = stmtType;
+ }
+
+ PStmtKey(String sql, int resultSetType, int resultSetConcurrency) {
+ _sql = sql;
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
+ }
+
+ PStmtKey(String sql, String catalog, int resultSetType, int
resultSetConcurrency) {
+ _sql = sql;
+ _catalog = catalog;
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
+ }
+
+ PStmtKey(String sql, String catalog, int resultSetType, int
resultSetConcurrency, byte stmtType) {
+ _sql = sql;
+ _catalog = catalog;
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
+ _stmtType = stmtType;
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ try {
+ PStmtKey key = (PStmtKey)that;
+ return( ((null == _sql && null == key._sql) ||
_sql.equals(key._sql)) &&
+ ((null == _catalog && null == key._catalog) ||
_catalog.equals(key._catalog)) &&
+ ((null == _resultSetType && null == key._resultSetType) ||
_resultSetType.equals(key._resultSetType)) &&
+ ((null == _resultSetConcurrency && null ==
key._resultSetConcurrency) ||
_resultSetConcurrency.equals(key._resultSetConcurrency)) &&
+ (_stmtType == key._stmtType)
+ );
+ } catch(ClassCastException e) {
+ return false;
+ } catch(NullPointerException e) {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ if (_catalog==null)
+ return(null == _sql ? 0 : _sql.hashCode());
+ else
+ return(null == _sql ? _catalog.hashCode() : (_catalog +
_sql).hashCode());
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buf = new StringBuffer();
+ buf.append("PStmtKey: sql=");
+ buf.append(_sql);
+ buf.append(", catalog=");
+ buf.append(_catalog);
+ buf.append(", resultSetType=");
+ buf.append(_resultSetType);
+ buf.append(", resultSetConcurrency=");
+ buf.append(_resultSetConcurrency);
+ buf.append(", statmentType=");
+ buf.append(_stmtType);
+ return buf.toString();
+ }
+}
\ No newline at end of file
Propchange:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PStmtKey.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1148555&r1=1148554&r2=1148555&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
Tue Jul 19 21:41:09 2011
@@ -49,7 +49,7 @@ public class PoolingConnection extends D
protected KeyedObjectPool<PStmtKey,PreparedStatement> _pstmtPool = null;
/** Prepared Statement type */
- private static final byte STATEMENT_PREPAREDSTMT = 0;
+ protected static final byte STATEMENT_PREPAREDSTMT = 0;
/** Callable Statement type */
private static final byte STATEMENT_CALLABLESTMT = 1;
@@ -366,105 +366,4 @@ public class PoolingConnection extends D
return "PoolingConnection: null";
}
}
-
- /**
- * A key uniquely identifying {@link PreparedStatement}s.
- */
- static class PStmtKey {
-
- /** SQL defining Prepared or Callable Statement */
- protected String _sql = null;
-
- /** Result set type */
- protected Integer _resultSetType = null;
-
- /** Result set concurrency */
- protected Integer _resultSetConcurrency = null;
-
- /** Database catalog */
- protected String _catalog = null;
-
- /**
- * Statement type. Either STATEMENT_PREPAREDSTMT (PreparedStatement)
- * or STATEMENT_CALLABLESTMT (CallableStatement)
- */
- protected byte _stmtType = STATEMENT_PREPAREDSTMT;
-
- PStmtKey(String sql) {
- _sql = sql;
- }
-
- PStmtKey(String sql, String catalog) {
- _sql = sql;
- _catalog = catalog;
- }
-
- PStmtKey(String sql, String catalog, byte stmtType) {
- _sql = sql;
- _catalog = catalog;
- _stmtType = stmtType;
- }
-
- PStmtKey(String sql, int resultSetType, int resultSetConcurrency) {
- _sql = sql;
- _resultSetType = new Integer(resultSetType);
- _resultSetConcurrency = new Integer(resultSetConcurrency);
- }
-
- PStmtKey(String sql, String catalog, int resultSetType, int
resultSetConcurrency) {
- _sql = sql;
- _catalog = catalog;
- _resultSetType = new Integer(resultSetType);
- _resultSetConcurrency = new Integer(resultSetConcurrency);
- }
-
- PStmtKey(String sql, String catalog, int resultSetType, int
resultSetConcurrency, byte stmtType) {
- _sql = sql;
- _catalog = catalog;
- _resultSetType = new Integer(resultSetType);
- _resultSetConcurrency = new Integer(resultSetConcurrency);
- _stmtType = stmtType;
- }
-
- @Override
- public boolean equals(Object that) {
- try {
- PStmtKey key = (PStmtKey)that;
- return( ((null == _sql && null == key._sql) ||
_sql.equals(key._sql)) &&
- ((null == _catalog && null == key._catalog) ||
_catalog.equals(key._catalog)) &&
- ((null == _resultSetType && null ==
key._resultSetType) || _resultSetType.equals(key._resultSetType)) &&
- ((null == _resultSetConcurrency && null ==
key._resultSetConcurrency) ||
_resultSetConcurrency.equals(key._resultSetConcurrency)) &&
- (_stmtType == key._stmtType)
- );
- } catch(ClassCastException e) {
- return false;
- } catch(NullPointerException e) {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- if (_catalog==null)
- return(null == _sql ? 0 : _sql.hashCode());
- else
- return(null == _sql ? _catalog.hashCode() : (_catalog +
_sql).hashCode());
- }
-
- @Override
- public String toString() {
- StringBuffer buf = new StringBuffer();
- buf.append("PStmtKey: sql=");
- buf.append(_sql);
- buf.append(", catalog=");
- buf.append(_catalog);
- buf.append(", resultSetType=");
- buf.append(_resultSetType);
- buf.append(", resultSetConcurrency=");
- buf.append(_resultSetConcurrency);
- buf.append(", statmentType=");
- buf.append(_stmtType);
- return buf.toString();
- }
- }
}
