svn commit: r835624 - /commons/proper/commons-build/trunk/downloads/downloads.xml
Author: dfabulich Date: Thu Nov 12 22:57:29 2009 New Revision: 835624 URL: http://svn.apache.org/viewvc?rev=835624view=rev Log: Bumping version number Modified: commons/proper/commons-build/trunk/downloads/downloads.xml Modified: commons/proper/commons-build/trunk/downloads/downloads.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-build/trunk/downloads/downloads.xml?rev=835624r1=835623r2=835624view=diff == --- commons/proper/commons-build/trunk/downloads/downloads.xml (original) +++ commons/proper/commons-build/trunk/downloads/downloads.xml Thu Nov 12 22:57:29 2009 @@ -172,12 +172,12 @@ project id=dbutils name=DbUtils href=http://commons.apache.org/dbutils/; downloads keys=commons/KEYS primary=http://www.apache.org/dist/; mirrored=true archive=http://archive.apache.org/dist/commons/dbutils/; group label=Binary -download name=1.2.tar.gz href=commons/dbutils/binaries/commons-dbutils-1.2-bin.tar.gz/ -download name=1.2.zip href=commons/dbutils/binaries/commons-dbutils-1.2-bin.zip/ +download name=1.3.tar.gz href=commons/dbutils/binaries/commons-dbutils-1.3-bin.tar.gz/ +download name=1.3.zip href=commons/dbutils/binaries/commons-dbutils-1.3-bin.zip/ /group group label=Source -download name=1.2.tar.gz href=commons/dbutils/source/commons-dbutils-1.2-src.tar.gz/ -download name=1.2.zip href=commons/dbutils/source/commons-dbutils-1.2-src.zip/ +download name=1.3.tar.gz href=commons/dbutils/source/commons-dbutils-1.3-src.tar.gz/ +download name=1.3.zip href=commons/dbutils/source/commons-dbutils-1.3-src.zip/ /group download name=browse download area href=commons/dbutils/ directory=true/ /downloads
svn commit: r833898 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Author: dfabulich
Date: Sun Nov 8 17:59:20 2009
New Revision: 833898
URL: http://svn.apache.org/viewvc?rev=833898view=rev
Log:
Fixing 1.5 compatibility error
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java?rev=833898r1=833897r2=833898view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Sun Nov 8 17:59:20 2009
@@ -29,7 +29,6 @@
import java.sql.ResultSet;
import java.sql.Time;
import java.sql.Timestamp;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -213,7 +212,10 @@
* @return the value
*/
public byte[] getNullBytes() {
-return this.nullBytes == null ? null : Arrays.copyOf(this.nullBytes,
this.nullBytes.length);
+if (this.nullBytes == null) return null;
+byte[] copy = new byte[this.nullBytes.length];
+System.arraycopy(this.nullBytes, 0, copy, 0, this.nullBytes.length);
+return copy;
}
/**
@@ -449,7 +451,9 @@
* @param nullBytes the value
*/
public void setNullBytes(byte[] nullBytes) {
-this.nullBytes = Arrays.copyOf(nullBytes, nullBytes.length);
+byte[] copy = new byte[nullBytes.length];
+System.arraycopy(nullBytes, 0, copy, 0, nullBytes.length);
+this.nullBytes = copy;
}
/**
svn commit: r833899 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 17:59:58 2009 New Revision: 833899 URL: http://svn.apache.org/viewvc?rev=833899view=rev Log: Prepare for RC4 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833899r1=833898r2=833899view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 17:59:58 2009 @@ -183,7 +183,7 @@ maven.compile.target1.5/maven.compile.target commons.componentiddbutils/commons.componentid commons.release.version1.3/commons.release.version -commons.rc.versionRC3/commons.rc.version +commons.rc.versionRC4/commons.rc.version commons.binary.suffix / commons.jira.idDBUTILS/commons.jira.id commons.jira.pid12310470/commons.jira.pid
svn commit: r833902 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 18:02:55 2009 New Revision: 833902 URL: http://svn.apache.org/viewvc?rev=833902view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_3_RC4 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833902r1=833901r2=833902view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 18:02:55 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.4-SNAPSHOT/version + version1.3/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/url /scm developers
svn commit: r833903 - /commons/proper/dbutils/tags/DBUTILS_1_3_RC4/
Author: dfabulich Date: Sun Nov 8 18:02:59 2009 New Revision: 833903 URL: http://svn.apache.org/viewvc?rev=833903view=rev Log: [maven-scm] copy for tag DBUTILS_1_3_RC4 Added: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ (props changed) - copied from r833902, commons/proper/dbutils/trunk/ Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 8 18:02:59 2009 @@ -0,0 +1,5 @@ +target +maven.log +.classpath +.project +*.log Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Nov 8 18:02:59 2009 @@ -0,0 +1,2 @@ +/commons/sandbox/dbutils/bugfixing:741987-747450 +/commons/sandbox/dbutils/java5:741988-832184
svn commit: r833904 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 18:03:01 2009 New Revision: 833904 URL: http://svn.apache.org/viewvc?rev=833904view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833904r1=833903r2=833904view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 18:03:01 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3/version + version1.4-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r833912 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Author: dfabulich
Date: Sun Nov 8 18:59:55 2009
New Revision: 833912
URL: http://svn.apache.org/viewvc?rev=833912view=rev
Log:
Fix minor CheckStyle error
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java?rev=833912r1=833911r2=833912view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Sun Nov 8 18:59:55 2009
@@ -212,7 +212,9 @@
* @return the value
*/
public byte[] getNullBytes() {
-if (this.nullBytes == null) return null;
+if (this.nullBytes == null) {
+return null;
+}
byte[] copy = new byte[this.nullBytes.length];
System.arraycopy(this.nullBytes, 0, copy, 0, this.nullBytes.length);
return copy;
svn commit: r833756 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
Author: dfabulich
Date: Sat Nov 7 20:33:59 2009
New Revision: 833756
URL: http://svn.apache.org/viewvc?rev=833756view=rev
Log:
Fixing more FindBugs errors
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java?rev=833756r1=833755r2=833756view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
Sat Nov 7 20:33:59 2009
@@ -65,14 +65,14 @@
private static final MapClass?, Object primitiveDefaults = new
HashMapClass?, Object();
static {
-primitiveDefaults.put(Integer.TYPE, new Integer(0));
-primitiveDefaults.put(Short.TYPE, new Short((short) 0));
-primitiveDefaults.put(Byte.TYPE, new Byte((byte) 0));
-primitiveDefaults.put(Float.TYPE, new Float(0));
-primitiveDefaults.put(Double.TYPE, new Double(0));
-primitiveDefaults.put(Long.TYPE, new Long(0));
+primitiveDefaults.put(Integer.TYPE, 0);
+primitiveDefaults.put(Short.TYPE, (Short)((short) 0));
+primitiveDefaults.put(Byte.TYPE, (Byte)((byte) 0));
+primitiveDefaults.put(Float.TYPE, (Float)(float)(0));
+primitiveDefaults.put(Double.TYPE, (Double)(double)(0));
+primitiveDefaults.put(Long.TYPE, (Long)(0L));
primitiveDefaults.put(Boolean.TYPE, Boolean.FALSE);
-primitiveDefaults.put(Character.TYPE, new Character('\u'));
+primitiveDefaults.put(Character.TYPE, '\u');
}
/**
@@ -449,29 +449,29 @@
} else if (
propType.equals(Integer.TYPE) || propType.equals(Integer.class)) {
-return new Integer(rs.getInt(index));
+return (rs.getInt(index));
} else if (
propType.equals(Boolean.TYPE) || propType.equals(Boolean.class)) {
-return Boolean.valueOf(rs.getBoolean(index));
+return (rs.getBoolean(index));
} else if (propType.equals(Long.TYPE) || propType.equals(Long.class)) {
-return new Long(rs.getLong(index));
+return (rs.getLong(index));
} else if (
propType.equals(Double.TYPE) || propType.equals(Double.class)) {
-return new Double(rs.getDouble(index));
+return (rs.getDouble(index));
} else if (
propType.equals(Float.TYPE) || propType.equals(Float.class)) {
-return new Float(rs.getFloat(index));
+return (rs.getFloat(index));
} else if (
propType.equals(Short.TYPE) || propType.equals(Short.class)) {
-return new Short(rs.getShort(index));
+return (rs.getShort(index));
} else if (propType.equals(Byte.TYPE) || propType.equals(Byte.class)) {
-return new Byte(rs.getByte(index));
+return (rs.getByte(index));
} else if (propType.equals(Timestamp.class)) {
return rs.getTimestamp(index);
svn commit: r833759 - in /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils: BasicRowProcessor.java QueryLoader.java
Author: dfabulich
Date: Sat Nov 7 20:36:42 2009
New Revision: 833759
URL: http://svn.apache.org/viewvc?rev=833759view=rev
Log:
Fixing more FindBugs errors
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=833759r1=833758r2=833759view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Sat Nov 7 20:36:42 2009
@@ -212,7 +212,7 @@
* (That's why we call super.remove(oldKey) and not just
* super.put(key, value))
*/
-Object oldKey = lowerCaseMap.put(key.toString().toLowerCase(),
key);
+Object oldKey = lowerCaseMap.put(key.toLowerCase(), key);
Object oldValue = super.remove(oldKey);
super.put(key, value);
return oldValue;
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java?rev=833759r1=833758r2=833759view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
Sat Nov 7 20:36:42 2009
@@ -93,6 +93,7 @@
*/
@SuppressWarnings(unchecked)
protected MapString,String loadQueries(String path) throws IOException {
+ // Findbugs flags getClass().getResource as a bad practice; maybe we
should change the API?
InputStream in = getClass().getResourceAsStream(path);
if (in == null) {
svn commit: r833771 - in /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils: ./ handlers/ wrappers/
Author: dfabulich
Date: Sat Nov 7 21:51:22 2009
New Revision: 833771
URL: http://svn.apache.org/viewvc?rev=833771view=rev
Log:
Fixing CheckStyle errors
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/RowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ScalarHandler.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=833771r1=833770r2=833771view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Sat Nov 7 21:51:22 2009
@@ -87,6 +87,9 @@
* will be set to codenull/code if the column was SQL NULL.
*
* @see org.apache.commons.dbutils.RowProcessor#toArray(java.sql.ResultSet)
+ * @param rs ResultSet that supplies the array data
+ * @throws SQLException if a database access error occurs
+ * @return the newly created array
*/
public Object[] toArray(ResultSet rs) throws SQLException {
ResultSetMetaData meta = rs.getMetaData();
@@ -104,7 +107,12 @@
* Convert a codeResultSet/code row into a JavaBean. This
* implementation delegates to a BeanProcessor instance.
* @see org.apache.commons.dbutils.RowProcessor#toBean(java.sql.ResultSet,
java.lang.Class)
- * @see
org.apache.commons.dbutils.BeanProcessor#toBean(java.sql.ResultSet,
java.lang.Class)
+ * @see
org.apache.commons.dbutils.BeanProcessor#toBean(java.sql.ResultSet,
java.lang.Class)
+ * @param T The type of bean to create
+ * @param rs ResultSet that supplies the bean data
+ * @param type Class from which to create the bean instance
+ * @throws SQLException if a database access error occurs
+ * @return the newly created bean
*/
public T T toBean(ResultSet rs, ClassT type) throws SQLException {
return this.convert.toBean(rs, type);
@@ -115,6 +123,12 @@
* This implementation delegates to a BeanProcessor instance.
* @see
org.apache.commons.dbutils.RowProcessor#toBeanList(java.sql.ResultSet,
java.lang.Class)
* @see
org.apache.commons.dbutils.BeanProcessor#toBeanList(java.sql.ResultSet,
java.lang.Class)
+ * @param T The type of bean to create
+ * @param rs ResultSet that supplies the bean data
+ * @param type Class from which to create the bean instance
+ * @throws SQLException if a database access error occurs
+ * @return A codeList/code of beans with the given type in the order
+ * they were returned by the codeResultSet/code.
*/
public T ListT toBeanList(ResultSet rs, ClassT type) throws
SQLException {
return this.convert.toBeanList(rs, type);
@@ -126,6 +140,9 @@
* names as keys. Calls to codemap.get(COL)/code and
* codemap.get(col)/code return the same value.
* @see org.apache.commons.dbutils.RowProcessor#toMap(java.sql.ResultSet)
+ * @param rs ResultSet that supplies the map data
+ * @throws SQLException if a database access error occurs
+ * @return the newly created Map
*/
public MapString, Object toMap(ResultSet rs
svn commit: r833792 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 01:35:45 2009 New Revision: 833792 URL: http://svn.apache.org/viewvc?rev=833792view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_3_RC3 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833792r1=833791r2=833792view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 01:35:45 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.4-SNAPSHOT/version + version1.3/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/url /scm developers
svn commit: r833793 - /commons/proper/dbutils/tags/DBUTILS_1_3_RC3/
Author: dfabulich Date: Sun Nov 8 01:35:49 2009 New Revision: 833793 URL: http://svn.apache.org/viewvc?rev=833793view=rev Log: [maven-scm] copy for tag DBUTILS_1_3_RC3 Added: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ (props changed) - copied from r833792, commons/proper/dbutils/trunk/ Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 8 01:35:49 2009 @@ -0,0 +1,5 @@ +target +maven.log +.classpath +.project +*.log Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Nov 8 01:35:49 2009 @@ -0,0 +1,2 @@ +/commons/sandbox/dbutils/bugfixing:741987-747450 +/commons/sandbox/dbutils/java5:741988-832184
svn commit: r833794 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 01:35:51 2009 New Revision: 833794 URL: http://svn.apache.org/viewvc?rev=833794view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833794r1=833793r2=833794view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 01:35:51 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3/version + version1.4-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r833795 - /commons/proper/dbutils/tags/DBUTILS_1_3_RC3/
Author: dfabulich Date: Sun Nov 8 01:40:33 2009 New Revision: 833795 URL: http://svn.apache.org/viewvc?rev=833795view=rev Log: Wrong RC3 Removed: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/
svn commit: r833796 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 01:40:59 2009 New Revision: 833796 URL: http://svn.apache.org/viewvc?rev=833796view=rev Log: Uploading to RC3 directory Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833796r1=833795r2=833796view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 01:40:59 2009 @@ -183,7 +183,7 @@ maven.compile.target1.5/maven.compile.target commons.componentiddbutils/commons.componentid commons.release.version1.3/commons.release.version -commons.rc.versionRC2/commons.rc.version +commons.rc.versionRC3/commons.rc.version commons.binary.suffix / commons.jira.idDBUTILS/commons.jira.id commons.jira.pid12310470/commons.jira.pid
svn commit: r833797 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 01:43:29 2009 New Revision: 833797 URL: http://svn.apache.org/viewvc?rev=833797view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_3_RC3 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833797r1=833796r2=833797view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 01:43:29 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.4-SNAPSHOT/version + version1.3/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/url /scm developers
svn commit: r833798 - /commons/proper/dbutils/tags/DBUTILS_1_3_RC3/
Author: dfabulich Date: Sun Nov 8 01:43:32 2009 New Revision: 833798 URL: http://svn.apache.org/viewvc?rev=833798view=rev Log: [maven-scm] copy for tag DBUTILS_1_3_RC3 Added: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ (props changed) - copied from r833797, commons/proper/dbutils/trunk/ Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 8 01:43:32 2009 @@ -0,0 +1,5 @@ +target +maven.log +.classpath +.project +*.log Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Nov 8 01:43:32 2009 @@ -0,0 +1,2 @@ +/commons/sandbox/dbutils/bugfixing:741987-747450 +/commons/sandbox/dbutils/java5:741988-832184
svn commit: r833799 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 01:43:34 2009 New Revision: 833799 URL: http://svn.apache.org/viewvc?rev=833799view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833799r1=833798r2=833799view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 01:43:34 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3/version + version1.4-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC3/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r832805 - /commons/proper/dbutils/trunk/xdocs/changes.xml
Author: dfabulich Date: Wed Nov 4 17:31:14 2009 New Revision: 832805 URL: http://svn.apache.org/viewvc?rev=832805view=rev Log: Updated changes.xml for 1.3 release Modified: commons/proper/dbutils/trunk/xdocs/changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/xdocs/changes.xml?rev=832805r1=832804r2=832805view=diff == --- commons/proper/dbutils/trunk/xdocs/changes.xml (original) +++ commons/proper/dbutils/trunk/xdocs/changes.xml Wed Nov 4 17:31:14 2009 @@ -38,6 +38,17 @@ titleRelease Notes/title /properties body +release version=1.3 date=2009-11-04 description=Adds Java5 generics and varargs + action dev=dfabulich type=update issue=DBUTILS-57 +BeanProcessor#mapColumnsToProperties now prefers to use column labels over column names (where aliases are not set, these should be identical) + /action + action dev=dfabulich type=update issue=DBUTILS-58 +Setting pmdKnownBroken in QueryRunner constructor now completely ignores ParameterMetaData + /action + action dev=dfabulich type=fix issue=DBUTILS-60 +Fixed error message in QueryRunner#rethrow + /action +/release release version=1.2 date=2009-03-06 description=Another round of fixes; deprecates methods in preparation for varargs in java5 action dev=dfabulich type=update issue=DBUTILS-52 Removed setDataSource method to guarantee thread safety
svn commit: r832818 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Nov 4 17:52:25 2009 New Revision: 832818 URL: http://svn.apache.org/viewvc?rev=832818view=rev Log: Fix PMD 1.5 warnings Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=832818r1=832817r2=832818view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Nov 4 17:52:25 2009 @@ -268,6 +268,9 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId version2.3/version +configuration + targetJdk1.5/targetJdk +/configuration /plugin /plugins /reporting
svn commit: r832856 - in /commons/proper/dbutils/trunk: pom.xml src/assembly/src.xml xdocs/download_dbutils.xml
Author: dfabulich
Date: Wed Nov 4 19:40:45 2009
New Revision: 832856
URL: http://svn.apache.org/viewvc?rev=832856view=rev
Log:
Preparing for 1.3 release
Modified:
commons/proper/dbutils/trunk/pom.xml
commons/proper/dbutils/trunk/src/assembly/src.xml
commons/proper/dbutils/trunk/xdocs/download_dbutils.xml
Modified: commons/proper/dbutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=832856r1=832855r2=832856view=diff
==
--- commons/proper/dbutils/trunk/pom.xml [utf-8] (original)
+++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Nov 4 19:40:45 2009
@@ -182,8 +182,8 @@
maven.compile.source1.5/maven.compile.source
maven.compile.target1.5/maven.compile.target
commons.componentiddbutils/commons.componentid
-commons.release.version1.2/commons.release.version
-commons.rc.versionRC3/commons.rc.version
+commons.release.version1.3/commons.release.version
+commons.rc.versionRC1/commons.rc.version
commons.binary.suffix /
commons.jira.idDBUTILS/commons.jira.id
commons.jira.pid12310470/commons.jira.pid
Modified: commons/proper/dbutils/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/assembly/src.xml?rev=832856r1=832855r2=832856view=diff
==
--- commons/proper/dbutils/trunk/src/assembly/src.xml (original)
+++ commons/proper/dbutils/trunk/src/assembly/src.xml Wed Nov 4 19:40:45 2009
@@ -20,7 +20,7 @@
formattar.gz/format
formatzip/format
/formats
-baseDirectory${project.artifactId}-${project.version}-src/baseDirectory
+
baseDirectory${project.artifactId}-${commons.release.version}-src/baseDirectory
fileSets
fileSet
includes
Modified: commons/proper/dbutils/trunk/xdocs/download_dbutils.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/xdocs/download_dbutils.xml?rev=832856r1=832855r2=832856view=diff
==
--- commons/proper/dbutils/trunk/xdocs/download_dbutils.xml (original)
+++ commons/proper/dbutils/trunk/xdocs/download_dbutils.xml Wed Nov 4 19:40:45
2009
@@ -102,17 +102,17 @@
ul class=downloads
li class=groupdiv class=linksspan
class=labelBinary/span/div
ul
- li class=downloada
href=[preferred]/commons/dbutils/binaries/commons-dbutils-1.1.tar.gz1.1.tar.gz/a
+ li class=downloada
href=[preferred]/commons/dbutils/binaries/commons-dbutils-1.3.tar.gz1.3.tar.gz/a
ul class=attributes
- lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.1.tar.gz.md5;md5/a]/span
- span class=pgp[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.1.tar.gz.asc;pgp/a]/span
+ lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.3.tar.gz.md5;md5/a]/span
+ span class=pgp[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.3.tar.gz.asc;pgp/a]/span
/li
/ul
/li
- li class=downloada
href=[preferred]/commons/dbutils/binaries/commons-dbutils-1.1.zip1.1.zip/a
+ li class=downloada
href=[preferred]/commons/dbutils/binaries/commons-dbutils-1.3.zip1.3.zip/a
ul class=attributes
- lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.1.zip.md5;md5/a]/span
- span class=pgp[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.1.zip.asc;pgp/a]/span
+ lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.3.zip.md5;md5/a]/span
+ span class=pgp[a
href=http://www.apache.org/dist/commons/dbutils/binaries/commons-dbutils-1.3.zip.asc;pgp/a]/span
/li
/ul
/li
@@ -120,17 +120,17 @@
/li
li class=groupdiv class=linksspan
class=labelSource/span/div
ul
- li class=downloada
href=[preferred]/commons/dbutils/source/commons-dbutils-1.1-src.tar.gz1.1.tar.gz/a
+ li class=downloada
href=[preferred]/commons/dbutils/source/commons-dbutils-1.3-src.tar.gz1.3.tar.gz/a
ul class=attributes
- lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.1-src.tar.gz.md5;md5/a]/span
- span class=pgp[a
href=http://www.apache.org/dist/commons/dbutils/source/commons-dbutils-1.1-src.tar.gz.asc;pgp/a]/span
+ lispan class=md5[a
href=http://www.apache.org/dist/commons/dbutils
svn commit: r832862 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Nov 4 19:56:56 2009 New Revision: 832862 URL: http://svn.apache.org/viewvc?rev=832862view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_3_RC1 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=832862r1=832861r2=832862view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Nov 4 19:56:56 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3-SNAPSHOT/version + version1.3/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/url /scm developers
svn commit: r832864 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Nov 4 19:57:03 2009 New Revision: 832864 URL: http://svn.apache.org/viewvc?rev=832864view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=832864r1=832863r2=832864view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Nov 4 19:57:03 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3/version + version1.4-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC1/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r832480 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Tue Nov 3 17:32:57 2009 New Revision: 832480 URL: http://svn.apache.org/viewvc?rev=832480view=rev Log: Updating compiler plugin separately (why did this ever work before?) Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=832480r1=832479r2=832480view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Tue Nov 3 17:32:57 2009 @@ -206,8 +206,8 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId configuration -source1.4/source -target1.4/target +source1.5/source +target1.5/target /configuration /plugin plugin
svn commit: r832548 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: dfabulich
Date: Tue Nov 3 20:49:18 2009
New Revision: 832548
URL: http://svn.apache.org/viewvc?rev=832548view=rev
Log:
[DBUTILS-60] Enhance message in QueryRunner#rethrow for Batch
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=832548r1=832547r2=832548view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Tue Nov 3 20:49:18 2009
@@ -536,7 +536,7 @@
if (params == null) {
msg.append([]);
} else {
-msg.append(Arrays.asList(params));
+msg.append(Arrays.deepToString(params));
}
SQLException e = new SQLException(msg.toString(), cause.getSQLState(),
svn commit: r832529 - in /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers: AbstractKeyedHandler.java KeyedHandler.java
Author: dfabulich
Date: Tue Nov 3 19:53:33 2009
New Revision: 832529
URL: http://svn.apache.org/viewvc?rev=832529view=rev
Log:
[DBUTILS-61] Backwards binary compatibility broken in KeyedHandler
Added:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Added:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java?rev=832529view=auto
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java
(added)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java
Tue Nov 3 19:53:33 2009
@@ -0,0 +1,84 @@
+/*
+ * 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.dbutils.handlers;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.dbutils.ResultSetHandler;
+
+/**
+ * p
+ * codeResultSetHandler/code implementation that returns a Map.
+ * codeResultSet/code rows are converted into objects (Vs) which are then
stored
+ * in a Map under the given keys (Ks).
+ * /p
+ *
+ * @see org.apache.commons.dbutils.ResultSetHandler
+ * @since DbUtils 1.3
+ */
+public abstract class AbstractKeyedHandlerK,V implements
ResultSetHandlerMapK,V {
+
+
+/**
+ * Convert each row's columns into a Map and store then
+ * in a codeMap/code under codeResultSet.getObject(key)/code key.
+ *
+ * @return A codeMap/code, never codenull/code.
+ * @throws SQLException if a database access error occurs
+ * @see
org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+ */
+public MapK,V handle(ResultSet rs) throws SQLException {
+MapK,V result = createMap();
+while (rs.next()) {
+result.put(createKey(rs), createRow(rs));
+}
+return result;
+}
+
+/**
+ * This factory method is called by codehandle()/code to create the Map
+ * to store records in. This implementation returns a codeHashMap/code
+ * instance.
+ *
+ * @return Map to store records in
+ */
+protected MapK,V createMap() {
+return new HashMapK,V();
+}
+
+/**
+ * This factory method is called by codehandle()/code to retrieve the
+ * key value from the current codeResultSet/code row.
+ * @param rs ResultSet to create a key from
+ * @return K from the configured key column name/index
+ * @throws SQLException if a database access error occurs
+ */
+protected abstract K createKey(ResultSet rs) throws SQLException;
+
+/**
+ * This factory method is called by codehandle()/code to store the
+ * current codeResultSet/code row in some object.
+ * @param rs ResultSet to create a row from
+ * @return V object created from the current row
+ * @throws SQLException if a database access error occurs
+ */
+protected abstract V createRow(ResultSet rs) throws SQLException;
+
+}
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java?rev=832529r1=832528r2=832529view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Tue Nov 3 19:53:33 2009
@@ -18,19 +18,15 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.dbutils.ResultSetHandler;
import org.apache.commons.dbutils.RowProcessor;
/**
* p
* codeResultSetHandler/code implementation
svn commit: r832535 - in /commons/proper/dbutils/trunk/src: java/org/apache/commons/dbutils/BeanProcessor.java test/org/apache/commons/dbutils/BeanProcessorTest.java test/org/apache/commons/dbutils/Mo
Author: dfabulich
Date: Tue Nov 3 20:21:17 2009
New Revision: 832535
URL: http://svn.apache.org/viewvc?rev=832535view=rev
Log:
[DBUTILS-57] BeanProcessor not able to map an alias column from a HSQLDB query
to the any bean properties
Submitted by: Julien Aymé
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/BeanProcessorTest.java
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java?rev=832535r1=832534r2=832535view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BeanProcessor.java
Tue Nov 3 20:21:17 2009
@@ -390,7 +390,10 @@
Arrays.fill(columnToProperty, PROPERTY_NOT_FOUND);
for (int col = 1; col = cols; col++) {
-String columnName = rsmd.getColumnName(col);
+String columnName = rsmd.getColumnLabel(col);
+if (null == columnName || 0 == columnName.length()) {
+ columnName = rsmd.getColumnName(col);
+}
for (int i = 0; i props.length; i++) {
if (columnName.equalsIgnoreCase(props[i].getName())) {
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/BeanProcessorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/BeanProcessorTest.java?rev=832535r1=832534r2=832535view=diff
==
---
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/BeanProcessorTest.java
(original)
+++
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/BeanProcessorTest.java
Tue Nov 3 20:21:17 2009
@@ -16,6 +16,9 @@
*/
package org.apache.commons.dbutils;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
public class BeanProcessorTest extends BaseTestCase {
@@ -25,14 +28,58 @@
public void testProcess() throws SQLException {
TestBean b = null;
assertTrue(this.rs.next());
-b = (TestBean) beanProc.toBean(this.rs, TestBean.class);
+b = beanProc.toBean(this.rs, TestBean.class);
assertEquals(13.0, b.getColumnProcessorDoubleTest(), 0);
-
+
assertTrue(this.rs.next());
-b = (TestBean) beanProc.toBean(this.rs, TestBean.class);
+b = beanProc.toBean(this.rs, TestBean.class);
assertEquals(13.0, b.getColumnProcessorDoubleTest(), 0);
assertFalse(this.rs.next());
}
+public static class MapColumnToPropertiesBean {
+private String one;
+
+private String two;
+
+private String three;
+
+public String getOne() {
+return one;
+}
+
+public void setOne(String one) {
+this.one = one;
+}
+
+public String getTwo() {
+return two;
+}
+
+public void setTwo(String two) {
+this.two = two;
+}
+
+public String getThree() {
+return three;
+}
+
+public void setThree(String three) {
+this.three = three;
+}
+}
+
+public void testMapColumnToProperties() throws Exception {
+String[] columnNames = { test, test, three };
+String[] columnLabels = { one, two, null };
+ResultSetMetaData rsmd =
ProxyFactory.instance().createResultSetMetaData(
+new MockResultSetMetaData(columnNames, columnLabels));
+PropertyDescriptor[] props =
Introspector.getBeanInfo(MapColumnToPropertiesBean.class).getPropertyDescriptors();
+
+int[] columns = beanProc.mapColumnsToProperties(rsmd, props);
+for (int i = 1; i columns.length; i++) {
+assertTrue(columns[i] != BeanProcessor.PROPERTY_NOT_FOUND);
+}
+}
}
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java?rev=832535r1=832534r2=832535view=diff
==
---
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
(original)
+++
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
Tue Nov 3 20:21:17 2009
@@ -27,6 +27,7 @@
public class MockResultSetMetaData implements
svn commit: r832257 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: dfabulich
Date: Tue Nov 3 01:46:43 2009
New Revision: 832257
URL: http://svn.apache.org/viewvc?rev=832257view=rev
Log:
[DBUTILS-58] QueryRunner: Allow to completly disable use of
PreparedStatement#getParameterMetaData
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=832257r1=832256r2=832257view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Tue Nov 3 01:46:43 2009
@@ -171,10 +171,13 @@
return;
}
-ParameterMetaData pmd = stmt.getParameterMetaData();
-if (pmd.getParameterCount() params.length) {
-throw new SQLException(Too many parameters: expected
-+ pmd.getParameterCount() + , was given +
params.length);
+ParameterMetaData pmd = null;
+if (!pmdKnownBroken) {
+ pmd = stmt.getParameterMetaData();
+if (pmd.getParameterCount() params.length) {
+throw new SQLException(Too many parameters: expected
++ pmd.getParameterCount() + , was given +
params.length);
+}
}
for (int i = 0; i params.length; i++) {
if (params[i] != null) {
svn commit: r832260 - /commons/sandbox/dbutils/
Author: dfabulich Date: Tue Nov 3 01:59:29 2009 New Revision: 832260 URL: http://svn.apache.org/viewvc?rev=832260view=rev Log: These branches have been merged to trunk Removed: commons/sandbox/dbutils/
svn commit: r770071 - /commons/proper/commons-build/trunk/downloads/downloads.xml
Author: dfabulich Date: Thu Apr 30 05:22:55 2009 New Revision: 770071 URL: http://svn.apache.org/viewvc?rev=770071view=rev Log: releasing dbutils 1.2 Modified: commons/proper/commons-build/trunk/downloads/downloads.xml Modified: commons/proper/commons-build/trunk/downloads/downloads.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-build/trunk/downloads/downloads.xml?rev=770071r1=770070r2=770071view=diff == --- commons/proper/commons-build/trunk/downloads/downloads.xml (original) +++ commons/proper/commons-build/trunk/downloads/downloads.xml Thu Apr 30 05:22:55 2009 @@ -172,12 +172,12 @@ project id=dbutils name=DbUtils href=http://commons.apache.org/dbutils/; downloads keys=commons/KEYS primary=http://www.apache.org/dist/; mirrored=true archive=http://archive.apache.org/dist/commons/dbutils/; group label=Binary -download name=1.1.tar.gz href=commons/dbutils/binaries/commons-dbutils-1.1.tar.gz/ -download name=1.1.zip href=commons/dbutils/binaries/commons-dbutils-1.1.zip/ +download name=1.2.tar.gz href=commons/dbutils/binaries/commons-dbutils-1.2-bin.tar.gz/ +download name=1.2.zip href=commons/dbutils/binaries/commons-dbutils-1.2-bin.zip/ /group group label=Source -download name=1.1.tar.gz href=commons/dbutils/source/commons-dbutils-1.1-src.tar.gz/ -download name=1.1.zip href=commons/dbutils/source/commons-dbutils-1.1-src.zip/ +download name=1.2.tar.gz href=commons/dbutils/source/commons-dbutils-1.2-src.tar.gz/ +download name=1.2.zip href=commons/dbutils/source/commons-dbutils-1.2-src.zip/ /group download name=browse download area href=commons/dbutils/ directory=true/ /downloads
svn commit: r768866 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich
Date: Mon Apr 27 04:39:35 2009
New Revision: 768866
URL: http://svn.apache.org/viewvc?rev=768866view=rev
Log:
Adding release profile distributionManagement
Modified:
commons/proper/dbutils/trunk/pom.xml
Modified: commons/proper/dbutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=768866r1=768865r2=768866view=diff
==
--- commons/proper/dbutils/trunk/pom.xml [utf-8] (original)
+++ commons/proper/dbutils/trunk/pom.xml [utf-8] Mon Apr 27 04:39:35 2009
@@ -281,6 +281,18 @@
/site
/distributionManagement
/profile
+profile
+ idrelease/id
+ distributionManagement
+!-- Cannot define in parent ATM, see COMMONSSITE-26 --
+site
+ idapache.website/id
+ nameApache Commons Release Site/name
+
url${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/dbutils//url
+/site
+ /distributionManagement
+/profile
/profiles
+
/project
svn commit: r754711 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Author: dfabulich
Date: Sun Mar 15 18:26:46 2009
New Revision: 754711
URL: http://svn.apache.org/viewvc?rev=754711view=rev
Log:
Documenting explicitly that SqlNullCheckedResultSet is not thread-safe
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java?rev=754711r1=754710r2=754711view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Sun Mar 15 18:26:46 2009
@@ -66,6 +66,7 @@
* /pre
* /blockquote
* /p
+ * pUnlike some other classes in DbUtils, this class is NOT thread-safe./p
*/
public class SqlNullCheckedResultSet implements InvocationHandler {
svn commit: r754713 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 18:32:36 2009 New Revision: 754713 URL: http://svn.apache.org/viewvc?rev=754713view=rev Log: Rolling back to prepare for RC3 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754713r1=754712r2=754713view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 18:32:36 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3-SNAPSHOT/version + version1.2-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -181,7 +181,7 @@ properties commons.componentiddbutils/commons.componentid commons.release.version1.2/commons.release.version -commons.rc.versionRC2/commons.rc.version +commons.rc.versionRC3/commons.rc.version commons.binary.suffix / commons.jira.idDBUTILS/commons.jira.id commons.jira.pid12310470/commons.jira.pid
svn commit: r754714 - /commons/proper/dbutils/tags/DBUTILS_1_2/
Author: dfabulich Date: Sun Mar 15 18:33:10 2009 New Revision: 754714 URL: http://svn.apache.org/viewvc?rev=754714view=rev Log: Deleting tag in preparation for RC3 Removed: commons/proper/dbutils/tags/DBUTILS_1_2/
svn commit: r754717 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 18:55:21 2009 New Revision: 754717 URL: http://svn.apache.org/viewvc?rev=754717view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_2 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754717r1=754716r2=754717view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 18:55:21 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2-SNAPSHOT/version + version1.2/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url /scm developers
svn commit: r754719 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 18:55:29 2009 New Revision: 754719 URL: http://svn.apache.org/viewvc?rev=754719view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754719r1=754718r2=754719view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 18:55:29 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r754721 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 19:00:10 2009 New Revision: 754721 URL: http://svn.apache.org/viewvc?rev=754721view=rev Log: Screwed up RC3 attempt, trying again Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754721r1=754720r2=754721view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 19:00:10 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3-SNAPSHOT/version + version1.2-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear
svn commit: r754722 - /commons/proper/dbutils/trunk/xdocs/changes.xml
Author: dfabulich Date: Sun Mar 15 19:00:48 2009 New Revision: 754722 URL: http://svn.apache.org/viewvc?rev=754722view=rev Log: Noting DBUTILS-52 Modified: commons/proper/dbutils/trunk/xdocs/changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/xdocs/changes.xml?rev=754722r1=754721r2=754722view=diff == --- commons/proper/dbutils/trunk/xdocs/changes.xml (original) +++ commons/proper/dbutils/trunk/xdocs/changes.xml Sun Mar 15 19:00:48 2009 @@ -39,6 +39,9 @@ /properties body release version=1.2 date=2009-03-06 description=Another round of fixes; deprecates methods in preparation for varargs in java5 + action dev=dfabulich type=update issue=DBUTILS-52 +Removed setDataSource method to guarantee thread safety + /action action dev=sebb type=update issue=DBUTILS-51 Made numerous private instance members final to guarantee thread safety; changed protected member of KeyedHandler to final /action
svn commit: r754723 - /commons/proper/dbutils/tags/DBUTILS_1_2/
Author: dfabulich Date: Sun Mar 15 19:01:24 2009 New Revision: 754723 URL: http://svn.apache.org/viewvc?rev=754723view=rev Log: Repeating RC3 attempt Removed: commons/proper/dbutils/tags/DBUTILS_1_2/
svn commit: r754724 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 19:03:08 2009 New Revision: 754724 URL: http://svn.apache.org/viewvc?rev=754724view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_2 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754724r1=754723r2=754724view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 19:03:08 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2-SNAPSHOT/version + version1.2/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url /scm developers
svn commit: r754725 - in /commons/proper/dbutils/tags/DBUTILS_1_2: ./ pom.xml
Author: dfabulich Date: Sun Mar 15 19:03:16 2009 New Revision: 754725 URL: http://svn.apache.org/viewvc?rev=754725view=rev Log: [maven-release-plugin] copy for tag DBUTILS_1_2 Added: commons/proper/dbutils/tags/DBUTILS_1_2/ - copied from r754722, commons/proper/dbutils/trunk/ commons/proper/dbutils/tags/DBUTILS_1_2/pom.xml - copied unchanged from r754724, commons/proper/dbutils/trunk/pom.xml
svn commit: r754726 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 15 19:03:19 2009 New Revision: 754726 URL: http://svn.apache.org/viewvc?rev=754726view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=754726r1=754725r2=754726view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 15 19:03:19 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r752523 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: dfabulich
Date: Wed Mar 11 16:55:49 2009
New Revision: 752523
URL: http://svn.apache.org/viewvc?rev=752523view=rev
Log:
DBUTILS-52, removing setDataSource method and making DataSource final
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=752523r1=752522r2=752523view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Wed Mar 11 16:55:49 2009
@@ -48,13 +48,14 @@
/**
* The DataSource to retrieve connections from.
*/
-protected DataSource ds = null;
+protected final DataSource ds;
/**
* Constructor for QueryRunner.
*/
public QueryRunner() {
super();
+ds = null;
}
/**
@@ -66,6 +67,7 @@
public QueryRunner(boolean pmdKnownBroken) {
super();
this.pmdKnownBroken = pmdKnownBroken;
+ds = null;
}
/**
@@ -77,7 +79,7 @@
*/
public QueryRunner(DataSource ds) {
super();
-setDataSource(ds);
+this.ds = ds;
}
/**
@@ -93,7 +95,7 @@
public QueryRunner(DataSource ds, boolean pmdKnownBroken) {
super();
this.pmdKnownBroken = pmdKnownBroken;
-setDataSource(ds);
+this.ds = ds;
}
/**
@@ -543,18 +545,6 @@
}
/**
- * Sets the codeDataSource/code this runner will use to get
- * database connections from. This should be called after creating a
- * runner with the default constructor if you intend to use the
- * execute methods without passing in a codeConnection/code.
- *
- * @param dataSource The DataSource to use.
- */
-public void setDataSource(DataSource dataSource) {
-this.ds = dataSource;
-}
-
-/**
* Execute an SQL INSERT, UPDATE, or DELETE query without replacement
* parameters.
*
svn commit: r752329 - /commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: dfabulich
Date: Wed Mar 11 00:56:31 2009
New Revision: 752329
URL: http://svn.apache.org/viewvc?rev=752329view=rev
Log: (empty)
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?rev=752329r1=752328r2=752329view=diff
==
---
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
(original)
+++
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Wed Mar 11 00:56:31 2009
@@ -59,7 +59,7 @@
runner.fillStatement(stmt, new Object[] { null, null });
}
-private PreparedStatement fakeFillablePreparedStatement(final boolean
simulateOracle, final int[] types) {
+private PreparedStatement fakeFillablePreparedStatement(final boolean
simulateOracle, final int[] types) throws NoSuchMethodException {
// prepare a mock ParameterMetaData and a mock PreparedStatement to
return the PMD
final ParameterMetaData pmd =
mockParameterMetaData(simulateOracle,types);
InvocationHandler stmtHandler = new InvocationHandler() {
@@ -153,8 +153,7 @@
public void testFillStatementWithBeanErrorReadMethodPrivate() throws
Exception {
getPrivate();
-Method getPrivate = getClass().getDeclaredMethod(getPrivate, new
Class[0]);
-PropertyDescriptor badReadMethod = new
PropertyDescriptor(throwsException, getPrivate, null);
+PropertyDescriptor badReadMethod = new BadPrivatePropertyDescriptor();
PropertyDescriptor properties[] = new PropertyDescriptor[] {
badReadMethod };
try {
runner.fillStatementWithBean(stmt, this, properties);
@@ -162,6 +161,19 @@
} catch (RuntimeException expected) {}
}
+class BadPrivatePropertyDescriptor extends PropertyDescriptor {
+Method getPrivate;
+BadPrivatePropertyDescriptor() throws Exception {
+super(throwsException, QueryRunnerTest.class,
getThrowsException, null);
+getPrivate = QueryRunnerTest.class.getDeclaredMethod(getPrivate,
new Class[0]);
+}
+
+public synchronized Method getReadMethod() {
+if (getPrivate == null) return super.getReadMethod();
+return getPrivate;
+}
+}
+
public void testRethrowNullMessage() {
// DBUTILS-40
SQLException sqe = new SQLException((String)null);
svn commit: r752367 - in /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils: BasicRowProcessor.java QueryLoader.java ResultSetIterator.java
Author: dfabulich
Date: Wed Mar 11 04:44:33 2009
New Revision: 752367
URL: http://svn.apache.org/viewvc?rev=752367view=rev
Log:
Incorporating sebb's dbutils.patch for DBUTILS-51.
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Wed Mar 11 04:44:33 2009
@@ -60,7 +60,7 @@
/**
* Use this to process beans.
*/
-private BeanProcessor convert = null;
+private final BeanProcessor convert;
/**
* BasicRowProcessor constructor. Bean processing defaults to a
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
Wed Mar 11 04:44:33 2009
@@ -46,7 +46,7 @@
/**
* Maps query set names to Maps of their queries.
*/
-private Map queries = new HashMap();
+private final Map queries = new HashMap();
/**
* QueryLoader constructor.
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
Wed Mar 11 04:44:33 2009
@@ -37,19 +37,19 @@
/**
* The wrapped codeResultSet/code.
*/
-private ResultSet rs = null;
+private final ResultSet rs;
/**
* The processor to use when converting a row into an Object[].
*/
-private RowProcessor convert = new BasicRowProcessor();
+private final RowProcessor convert;
/**
* Constructor for ResultSetIterator.
* @param rs Wrap this codeResultSet/code in an codeIterator/code.
*/
public ResultSetIterator(ResultSet rs) {
-this.rs = rs;
+this(rs , new BasicRowProcessor());
}
/**
svn commit: r752369 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Author: dfabulich
Date: Wed Mar 11 04:45:21 2009
New Revision: 752369
URL: http://svn.apache.org/viewvc?rev=752369view=rev
Log:
Applying sebb's KeyedHandler.patch from DBUTILS-51
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java?rev=752369r1=752368r2=752369view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Wed Mar 11 04:45:21 2009
@@ -63,25 +63,25 @@
* The RowProcessor implementation to use when converting rows
* into Objects.
*/
-protected RowProcessor convert = ArrayHandler.ROW_PROCESSOR;
+protected final RowProcessor convert;
/**
* The column index to retrieve key values from. Defaults to 1.
*/
-protected int columnIndex = 1;
+protected final int columnIndex;
/**
* The column name to retrieve key values from. Either columnName or
* columnIndex will be used but never both.
*/
-protected String columnName = null;
+protected final String columnName;
/**
* Creates a new instance of KeyedHandler. The value of the first column
* of each row will be a key in the Map.
*/
public KeyedHandler() {
-super();
+this(ArrayHandler.ROW_PROCESSOR, 1, null);
}
/**
@@ -92,8 +92,7 @@
* to use when converting rows into Maps
*/
public KeyedHandler(RowProcessor convert) {
-super();
-this.convert = convert;
+this(convert, 1, null);
}
/**
@@ -103,8 +102,7 @@
* retrieved from the column at this index.
*/
public KeyedHandler(int columnIndex) {
-super();
-this.columnIndex = columnIndex;
+this(ArrayHandler.ROW_PROCESSOR, columnIndex, null);
}
/**
@@ -114,7 +112,15 @@
* retrieved from the column with this name.
*/
public KeyedHandler(String columnName) {
+this(ArrayHandler.ROW_PROCESSOR, 1, columnName);
+}
+
+// Helper
+private KeyedHandler(RowProcessor convert, int columnIndex,
+String columnName) {
super();
+this.convert = convert;
+this.columnIndex = columnIndex;
this.columnName = columnName;
}
svn commit: r752371 - /commons/proper/dbutils/trunk/xdocs/changes.xml
Author: dfabulich Date: Wed Mar 11 04:52:50 2009 New Revision: 752371 URL: http://svn.apache.org/viewvc?rev=752371view=rev Log: Added DBUTILS-51 to changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/xdocs/changes.xml?rev=752371r1=752370r2=752371view=diff == --- commons/proper/dbutils/trunk/xdocs/changes.xml (original) +++ commons/proper/dbutils/trunk/xdocs/changes.xml Wed Mar 11 04:52:50 2009 @@ -39,6 +39,9 @@ /properties body release version=1.2 date=2009-03-06 description=Another round of fixes; deprecates methods in preparation for varargs in java5 + action dev=sebb type=update issue=DBUTILS-51 +Made numerous private instance members final to guarantee thread safety; changed protected member of KeyedHandler to final + /action action dev=bayard type=remove Remove old Maven1/Ant build scripts /action
svn commit: r752373 - /commons/proper/dbutils/tags/DBUTILS_1_2/
Author: dfabulich Date: Wed Mar 11 04:55:01 2009 New Revision: 752373 URL: http://svn.apache.org/viewvc?rev=752373view=rev Log: Deleting tag in preparation for RC2 Removed: commons/proper/dbutils/tags/DBUTILS_1_2/
svn commit: r752374 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Mar 11 04:58:50 2009 New Revision: 752374 URL: http://svn.apache.org/viewvc?rev=752374view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_2 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=752374r1=752373r2=752374view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Mar 11 04:58:50 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2-SNAPSHOT/version + version1.2/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url /scm developers
svn commit: r752376 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Mar 11 04:58:58 2009 New Revision: 752376 URL: http://svn.apache.org/viewvc?rev=752376view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=752376r1=752375r2=752376view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Mar 11 04:58:58 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r751387 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Mar 8 08:50:47 2009 New Revision: 751387 URL: http://svn.apache.org/viewvc?rev=751387view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=751387r1=751386r2=751387view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Mar 8 08:50:47 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r751212 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sat Mar 7 07:14:12 2009 New Revision: 751212 URL: http://svn.apache.org/viewvc?rev=751212view=rev Log: Fix encoding of Péter Bagyinszki's name Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=751212r1=751211r2=751212view=diff == --- commons/proper/dbutils/trunk/pom.xml (original) +++ commons/proper/dbutils/trunk/pom.xml Sat Mar 7 07:14:12 2009 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0 encoding=utf-8? !-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -102,7 +102,7 @@ contributors contributor - namePéter Bagyinszki/name + namePéter Bagyinszki/name roles roleJava Developer/role /roles
svn commit: r747449 - in /commons/sandbox/dbutils/bugfixing/src: java/org/apache/commons/dbutils/QueryRunner.java test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: dfabulich
Date: Tue Feb 24 17:30:59 2009
New Revision: 747449
URL: http://svn.apache.org/viewvc?rev=747449view=rev
Log:
fillStatementWithBean: tweaked exception handling, added unit test
Added:
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=747449r1=747448r2=747449view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Tue Feb 24 17:30:59 2009
@@ -19,6 +19,8 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
@@ -212,16 +214,19 @@
for (int i = 0; i properties.length; i++) {
PropertyDescriptor property = properties[i];
Object value = null;
+Method method = property.getReadMethod();
+if (method == null)
+throw new RuntimeException(No read method for bean property
++ bean.getClass() + + property.getName());
try {
-if (property.getReadMethod().getParameterTypes().length 0) {
-throw new SQLException(
-Can't use an indexed bean property as a SQL
parameter:
-+ property.getName());
-}
-value = property.getReadMethod().invoke(bean, new Object[0]);
-} catch (Exception e) {
-throw new RuntimeException(e);
-}
+value = method.invoke(bean, new Object[0]);
+} catch (InvocationTargetException e) {
+throw new RuntimeException(Couldn't invoke method: +
method, e);
+} catch (IllegalArgumentException e) {
+throw new RuntimeException(Couldn't invoke method with 0
arguments: + method, e);
+} catch (IllegalAccessException e) {
+throw new RuntimeException(Couldn't invoke method: +
method, e);
+}
params[i] = value;
}
fillStatement(stmt, params);
@@ -249,14 +254,13 @@
descriptors = Introspector.getBeanInfo(bean.getClass())
.getPropertyDescriptors();
} catch (IntrospectionException e) {
-throw new RuntimeException(e);
+throw new RuntimeException(Couldn't introspect bean +
bean.getClass().toString(), e);
}
PropertyDescriptor[] sorted = new
PropertyDescriptor[propertyNames.length];
for (int i = 0; i propertyNames.length; i++) {
String propertyName = propertyNames[i];
if (propertyName == null)
-throw new NullPointerException(propertyName can't be null:
-+ i);
+throw new NullPointerException(propertyName can't be null:
+ i);
boolean found = false;
for (int j = 0; j descriptors.length; j++) {
PropertyDescriptor descriptor = descriptors[j];
Added:
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?rev=747449view=auto
==
---
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
(added)
+++
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Tue Feb 24 17:30:59 2009
@@ -0,0 +1,124 @@
+package org.apache.commons.dbutils;
+
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+public class QueryRunnerTest extends TestCase {
+QueryRunner runner;
+PreparedStatement stmt;
+
+public void setUp() {
+runner = new QueryRunner();
+stmt = fakePreparedStatement();
+}
+
+public void testFillStatementWithBean() throws SQLException {
+TestBean tb = new TestBean();
+tb.setOne(uno);
+tb.setTwo(dos);
+tb.setThree(tres
svn commit: r747452 - in /commons/sandbox/dbutils/java5: ./ src/java/org/apache/commons/dbutils/QueryRunner.java src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: dfabulich
Date: Tue Feb 24 17:35:05 2009
New Revision: 747452
URL: http://svn.apache.org/viewvc?rev=747452view=rev
Log:
merged from bugfixing branch
Added:
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
- copied, changed from r747450,
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Modified:
commons/sandbox/dbutils/java5/ (props changed)
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java
Propchange: commons/sandbox/dbutils/java5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 17:35:05 2009
@@ -1 +1,4 @@
-/commons/sandbox/dbutils/bugfixing:741988-743293
+/commons/commons/proper/dbutils/trunk:560657
+/commons/proper/dbutils/trunk:560660-741986
+/commons/sandbox/dbutils/bugfixing:741987-747450
+/jakarta/commons/proper/dbutils/trunk:141655-560656,560658-560659
Modified:
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=747452r1=747451r2=747452view=diff
==
---
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java
Tue Feb 24 17:35:05 2009
@@ -19,6 +19,8 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
@@ -212,16 +214,19 @@
for (int i = 0; i properties.length; i++) {
PropertyDescriptor property = properties[i];
Object value = null;
+Method method = property.getReadMethod();
+if (method == null)
+throw new RuntimeException(No read method for bean property
++ bean.getClass() + + property.getName());
try {
-if (property.getReadMethod().getParameterTypes().length 0) {
-throw new SQLException(
-Can't use an indexed bean property as a SQL
parameter:
-+ property.getName());
-}
-value = property.getReadMethod().invoke(bean, new Object[0]);
-} catch (Exception e) {
-throw new RuntimeException(e);
-}
+value = method.invoke(bean, new Object[0]);
+} catch (InvocationTargetException e) {
+throw new RuntimeException(Couldn't invoke method: +
method, e);
+} catch (IllegalArgumentException e) {
+throw new RuntimeException(Couldn't invoke method with 0
arguments: + method, e);
+} catch (IllegalAccessException e) {
+throw new RuntimeException(Couldn't invoke method: +
method, e);
+}
params[i] = value;
}
fillStatement(stmt, params);
@@ -249,14 +254,13 @@
descriptors = Introspector.getBeanInfo(bean.getClass())
.getPropertyDescriptors();
} catch (IntrospectionException e) {
-throw new RuntimeException(e);
+throw new RuntimeException(Couldn't introspect bean +
bean.getClass().toString(), e);
}
PropertyDescriptor[] sorted = new
PropertyDescriptor[propertyNames.length];
for (int i = 0; i propertyNames.length; i++) {
String propertyName = propertyNames[i];
if (propertyName == null)
-throw new NullPointerException(propertyName can't be null:
-+ i);
+throw new NullPointerException(propertyName can't be null:
+ i);
boolean found = false;
for (int j = 0; j descriptors.length; j++) {
PropertyDescriptor descriptor = descriptors[j];
Copied:
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
(from r747450,
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?p2=commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/QueryRunnerTest.javap1=commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.javar1=747450r2=747452rev=747452view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
svn commit: r743269 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Author: dfabulich
Date: Wed Feb 11 08:08:01 2009
New Revision: 743269
URL: http://svn.apache.org/viewvc?rev=743269view=rev
Log:
[DBUTILS-34] BasicRowProcessor loses any information on database field case
Submitted by: Julien Aymé
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=743269r1=743268r2=743269view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Wed Feb 11 08:08:01 2009
@@ -144,10 +144,36 @@
* A Map that converts all keys to lowercase Strings for case insensitive
* lookups. This is needed for the toMap() implementation because
* databases don't consistenly handle the casing of column names.
+ *
+ * pThe keys are stored as they are given [BUG #DBUTILS-34], so we
maintain
+ * an internal mapping from lowercase keys to the real keys in order to
+ * achieve the case insensitive lookup.
+ *
+ * pNote: This implementation does not allow ttnull/tt
+ * for key, whereas {...@link HashMap} does, because of the code:
+ * pre
+ * key.toString().toLowerCase()
+ * /pre
*/
private static class CaseInsensitiveHashMap extends HashMap {
/**
+ * The internal mapping from lowercase keys to the real keys.
+ *
+ * p
+ * Any query operation using the key
+ * ({...@link #get(Object)}, {...@link #containsKey(Object)})
+ * is done in three steps:
+ * ul
+ * liconvert the parameter key to lower case/li
+ * liget the actual key that corresponds to the lower case key/li
+ * liquery the map with the actual key/li
+ * /ul
+ * /p
+ */
+private Map lowerCaseMap = new HashMap();
+
+/**
* Required for serialization support.
*
* @see java.io.Serializable
@@ -158,21 +184,37 @@
* @see java.util.Map#containsKey(java.lang.Object)
*/
public boolean containsKey(Object key) {
-return super.containsKey(key.toString().toLowerCase());
+Object realKey = lowerCaseMap.get(key.toString().toLowerCase());
+return super.containsKey(realKey);
+// Possible optimisation here:
+// Since the lowerCaseMap contains a mapping for all the keys,
+// we could just do this:
+// return lowerCaseMap.containsKey(key.toString().toLowerCase());
}
/**
* @see java.util.Map#get(java.lang.Object)
*/
public Object get(Object key) {
-return super.get(key.toString().toLowerCase());
+Object realKey = lowerCaseMap.get(key.toString().toLowerCase());
+return super.get(realKey);
}
/**
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
public Object put(Object key, Object value) {
-return super.put(key.toString().toLowerCase(), value);
+/*
+ * In order to keep the map and lowerCaseMap synchronized,
+ * we have to remove the old mapping before putting the
+ * new one. Indeed, oldKey and key are not necessaliry equals.
+ * (That's why we call super.remove(oldKey) and not just
+ * super.put(key, value))
+ */
+Object oldKey = lowerCaseMap.put(key.toString().toLowerCase(),
key);
+Object oldValue = super.remove(oldKey);
+super.put(key, value);
+return oldValue;
}
/**
@@ -191,7 +233,8 @@
* @see java.util.Map#remove(java.lang.Object)
*/
public Object remove(Object key) {
-return super.remove(key.toString().toLowerCase());
+Object realKey = lowerCaseMap.remove(key.toString().toLowerCase());
+return super.remove(realKey);
}
}
svn commit: r743278 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: dfabulich
Date: Wed Feb 11 09:18:45 2009
New Revision: 743278
URL: http://svn.apache.org/viewvc?rev=743278view=rev
Log:
Deprecating methods that will be eliminated in favor of varargs in java5 branch
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=743278r1=743277r2=743278view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Wed Feb 11 09:18:45 2009
@@ -335,11 +335,12 @@
* @param rsh The handler that converts the results into an object.
* @return The object returned by the handler.
* @throws SQLException if a database access error occurs
+ * @deprecated Use {...@link
#query(Connection,String,ResultSetHandler,Object[])} instead
*/
public Object query(Connection conn, String sql, Object param,
ResultSetHandler rsh) throws SQLException {
-return this.query(conn, sql, new Object[] { param }, rsh);
+return this.query(conn, sql, rsh, new Object[] { param });
}
/**
@@ -352,9 +353,26 @@
* @param rsh The handler that converts the results into an object.
* @return The object returned by the handler.
* @throws SQLException if a database access error occurs
+ * @deprecated Use {...@link
#query(Connection,String,ResultSetHandler,Object[])} instead
*/
public Object query(Connection conn, String sql, Object[] params,
ResultSetHandler rsh) throws SQLException {
+return query(conn, sql, rsh, params);
+}
+
+/**
+ * Execute an SQL SELECT query with replacement parameters. The
+ * caller is responsible for closing the connection.
+ *
+ * @param conn The connection to execute the query in.
+ * @param sql The query to execute.
+ * @param rsh The handler that converts the results into an object.
+ * @param params The replacement parameters.
+ * @return The object returned by the handler.
+ * @throws SQLException if a database access error occurs
+ */
+public Object query(Connection conn, String sql, ResultSetHandler rsh,
+Object[] params) throws SQLException {
PreparedStatement stmt = null;
ResultSet rs = null;
@@ -393,7 +411,7 @@
public Object query(Connection conn, String sql, ResultSetHandler rsh)
throws SQLException {
-return this.query(conn, sql, (Object[]) null, rsh);
+return this.query(conn, sql, rsh, (Object[]) null);
}
/**
@@ -408,11 +426,12 @@
*
* @return An object generated by the handler.
* @throws SQLException if a database access error occurs
+ * @deprecated Use {...@link #query(String,ResultSetHandler,Object[])}
instead
*/
public Object query(String sql, Object param, ResultSetHandler rsh)
throws SQLException {
-return this.query(sql, new Object[] { param }, rsh);
+return this.query(sql, rsh, new Object[] { param });
}
/**
@@ -429,14 +448,33 @@
*
* @return An object generated by the handler.
* @throws SQLException if a database access error occurs
+ * @deprecated Use {...@link #query(String,ResultSetHandler,Object[])}
instead
*/
public Object query(String sql, Object[] params, ResultSetHandler rsh)
throws SQLException {
+return query(sql, rsh, params);
+}
+
+/**
+ * Executes the given SELECT SQL query and returns a result object.
+ * The codeConnection/code is retrieved from the
+ * codeDataSource/code set in the constructor.
+ *
+ * @param sql The SQL statement to execute.
+ * @param rsh The handler used to create the result object from
+ * the codeResultSet/code.
+ * @param params Initialize the PreparedStatement's IN parameters with
+ * this array.
+ * @return An object generated by the handler.
+ * @throws SQLException if a database access error occurs
+ */
+public Object query(String sql, ResultSetHandler rsh, Object[] params)
+throws SQLException {
Connection conn = this.prepareConnection();
try {
-return this.query(conn, sql, params, rsh);
+return this.query(conn, sql, rsh, params);
} finally {
close(conn);
}
@@ -455,7 +493,7 @@
* @throws SQLException if a database access error occurs
*/
public Object query(String sql, ResultSetHandler rsh) throws SQLException {
-return this.query(sql, (Object[]) null, rsh
svn commit: r743292 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Author: dfabulich
Date: Wed Feb 11 10:35:04 2009
New Revision: 743292
URL: http://svn.apache.org/viewvc?rev=743292view=rev
Log:
Incorporating a couple more of Julien's suggestions (especially to use an
entrySet instead of a keySet0
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=743292r1=743291r2=743292view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Wed Feb 11 10:35:04 2009
@@ -171,7 +171,7 @@
* /ul
* /p
*/
-private Map lowerCaseMap = new HashMap();
+private final Map lowerCaseMap = new HashMap();
/**
* Required for serialization support.
@@ -221,10 +221,11 @@
* @see java.util.Map#putAll(java.util.Map)
*/
public void putAll(Map m) {
-Iterator iter = m.keySet().iterator();
+Iterator iter = m.entrySet().iterator();
while (iter.hasNext()) {
-Object key = iter.next();
-Object value = m.get(key);
+Map.Entry entry = (Map.Entry) iter.next();
+Object key = entry.getKey();
+Object value = entry.getValue();
this.put(key, value);
}
}
svn commit: r743097 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Author: dfabulich
Date: Tue Feb 10 20:52:10 2009
New Revision: 743097
URL: http://svn.apache.org/viewvc?rev=743097view=rev
Log:
[DBUTILS-37] BeanListHandler#handle(ResultSet) is not optimal
Submitted by: Julien Aymé
Julien's patch created a separate OptimalBeanListHandler to avoid breaking
users who had extended BeanListHandler; I chose to just replace the existing
one rather than clutter the API
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java?rev=743097r1=743096r2=743097view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Tue Feb 10 20:52:10 2009
@@ -19,6 +19,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.apache.commons.dbutils.ResultSetHandler;
import org.apache.commons.dbutils.RowProcessor;
/**
@@ -28,7 +29,7 @@
*
* @see org.apache.commons.dbutils.ResultSetHandler
*/
-public class BeanListHandler extends GenericListHandler {
+public class BeanListHandler implements ResultSetHandler {
/**
* The Class of beans produced by this handler.
@@ -65,16 +66,17 @@
}
/**
- * Convert the codeResultSet/code row into a bean with
+ * Convert the whole codeResultSet/code into a List of beans with
* the codeClass/code given in the constructor.
*
- * @return A bean, never codenull/code.
+ * @param rs The codeResultSet/code to handle.
+ *
+ * @return A List of beans, never codenull/code.
*
* @throws SQLException if a database access error occurs
- * @see
org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet)
+ * @see org.apache.commons.dbutils.RowProcessor#toBeanList(ResultSet,
Class)
*/
-protected Object handleRow(ResultSet rs) throws SQLException {
-return this.convert.toBean(rs, type);
+public Object handle(ResultSet rs) throws SQLException {
+return this.convert.toBeanList(rs, type);
}
-
}
svn commit: r742701 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java
Author: dfabulich
Date: Mon Feb 9 19:44:18 2009
New Revision: 742701
URL: http://svn.apache.org/viewvc?rev=742701view=rev
Log:
[DBUTILS-42] Object with Long or Decimal got initial zero value while database
field is null
Submitted by: Brandon Atkinson
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java?rev=742701r1=742700r2=742701view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/BeanProcessor.java
Mon Feb 9 19:44:18 2009
@@ -432,7 +432,11 @@
*/
protected Object processColumn(ResultSet rs, int index, Class propType)
throws SQLException {
-
+
+ if ( !propType.isPrimitive() rs.getObject(index) == null ) {
+ return null;
+ }
+
if (propType.equals(String.class)) {
return rs.getString(index);
svn commit: r742704 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
Author: dfabulich
Date: Mon Feb 9 19:45:18 2009
New Revision: 742704
URL: http://svn.apache.org/viewvc?rev=742704view=rev
Log:
[DBUTILS-33] Make GenericListHandler public
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java?rev=742704r1=742703r2=742704view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
Mon Feb 9 19:45:18 2009
@@ -29,7 +29,7 @@
*
* @see org.apache.commons.dbutils.ResultSetHandler
*/
-abstract class GenericListHandler implements ResultSetHandler {
+public abstract class GenericListHandler implements ResultSetHandler {
/**
* Whole codeResultSet/code handler. It produce codeList/code as
* result. To convert individual rows into Java objects it uses
svn commit: r742870 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: dfabulich
Date: Tue Feb 10 07:20:16 2009
New Revision: 742870
URL: http://svn.apache.org/viewvc?rev=742870view=rev
Log:
[DBUTILS-29] Support bean property to SQL IN parameter mapping
Defines new fillStatementWithBean functions, and makes fillStatement public
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=742870r1=742869r2=742870view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/QueryRunner.java
Tue Feb 10 07:20:16 2009
@@ -16,6 +16,9 @@
*/
package org.apache.commons.dbutils;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
import java.sql.Connection;
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
@@ -157,7 +160,7 @@
* value to pass in.
* @throws SQLException if a database access error occurs
*/
-protected void fillStatement(PreparedStatement stmt, Object[] params)
+public void fillStatement(PreparedStatement stmt, Object[] params)
throws SQLException {
if (params == null) {
@@ -190,6 +193,87 @@
}
/**
+ * Fill the codePreparedStatement/code replacement parameters with the
+ * given object's bean property values.
+ *
+ * @param stmt
+ *PreparedStatement to fill
+ * @param bean
+ *a JavaBean object
+ * @param properties
+ *an ordered array of properties; this gives the order to
insert
+ *values in the statement
+ * @throws SQLException
+ * if a database access error occurs
+ */
+public void fillStatementWithBean(PreparedStatement stmt, Object bean,
+PropertyDescriptor[] properties) throws SQLException {
+Object[] params = new Object[properties.length];
+for (int i = 0; i properties.length; i++) {
+PropertyDescriptor property = properties[i];
+Object value = null;
+try {
+if (property.getReadMethod().getParameterTypes().length 0) {
+throw new SQLException(
+Can't use an indexed bean property as a SQL
parameter:
++ property.getName());
+}
+value = property.getReadMethod().invoke(bean, new Object[0]);
+} catch (Exception e) {
+throw new RuntimeException(e);
+}
+params[i] = value;
+}
+fillStatement(stmt, params);
+}
+
+/**
+ * Fill the codePreparedStatement/code replacement parameters with the
+ * given object's bean property values.
+ *
+ * @param stmt
+ *PreparedStatement to fill
+ * @param bean
+ *a JavaBean object
+ * @param propertyNames
+ *an ordered array of property names (these should match the
+ *getters/setters); this gives the order to insert values in
the
+ *statement
+ * @throws SQLException
+ * if a database access error occurs
+ */
+public void fillStatementWithBean(PreparedStatement stmt, Object bean,
+String[] propertyNames) throws SQLException {
+PropertyDescriptor[] descriptors;
+try {
+descriptors = Introspector.getBeanInfo(bean.getClass())
+.getPropertyDescriptors();
+} catch (IntrospectionException e) {
+throw new RuntimeException(e);
+}
+PropertyDescriptor[] sorted = new
PropertyDescriptor[propertyNames.length];
+for (int i = 0; i propertyNames.length; i++) {
+String propertyName = propertyNames[i];
+if (propertyName == null)
+throw new NullPointerException(propertyName can't be null:
++ i);
+boolean found = false;
+for (int j = 0; j descriptors.length; j++) {
+PropertyDescriptor descriptor = descriptors[j];
+if (propertyName.equals(descriptor.getName())) {
+sorted[i] = descriptor;
+found = true;
+break;
+}
+}
+if (!found)
+throw new RuntimeException(Couldn't find bean property:
++ bean.getClass() + + propertyName);
+}
+fillStatementWithBean(stmt, bean, sorted);
+}
+
+/**
* Returns the codeDataSource/code this runner is using
svn commit: r741986 - /commons/sandbox/dbutils/
Author: dfabulich Date: Sun Feb 8 01:10:29 2009 New Revision: 741986 URL: http://svn.apache.org/viewvc?rev=741986view=rev Log: Preparation for java5 branch Added: commons/sandbox/dbutils/
svn commit: r741987 - /commons/sandbox/dbutils/bugfixing/
Author: dfabulich Date: Sun Feb 8 01:13:22 2009 New Revision: 741987 URL: http://svn.apache.org/viewvc?rev=741987view=rev Log: Make a branch from trunk to fix various dbutils 1.2 bugs Added: commons/sandbox/dbutils/bugfixing/ - copied from r741986, commons/proper/dbutils/trunk/
svn commit: r741988 - /commons/sandbox/dbutils/java5/
Author: dfabulich Date: Sun Feb 8 01:14:13 2009 New Revision: 741988 URL: http://svn.apache.org/viewvc?rev=741988view=rev Log: Creating a branch to add java5 generics and varargs to dbutils (2.0?) Added: commons/sandbox/dbutils/java5/ - copied from r741987, commons/proper/dbutils/trunk/
svn commit: r741990 - in /commons/sandbox/dbutils/java5: ./ src/java/org/apache/commons/dbutils/ src/java/org/apache/commons/dbutils/handlers/ src/java/org/apache/commons/dbutils/wrappers/ src/test/or
Author: dfabulich
Date: Sun Feb 8 01:27:53 2009
New Revision: 741990
URL: http://svn.apache.org/viewvc?rev=741990view=rev
Log:
Committing initial java5 patch
Modified:
commons/sandbox/dbutils/java5/pom.xml
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BeanProcessor.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/ProxyFactory.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryLoader.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/QueryRunner.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/ResultSetHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/ResultSetIterator.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/RowProcessor.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/ArrayHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/BeanHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/GenericListHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/MapHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/handlers/ScalarHandler.java
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/BasicRowProcessorTest.java
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/MockResultSet.java
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/QueryLoaderTest.java
commons/sandbox/dbutils/java5/src/test/org/apache/commons/dbutils/ResultSetIteratorTest.java
Modified: commons/sandbox/dbutils/java5/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/java5/pom.xml?rev=741990r1=741989r2=741990view=diff
==
--- commons/sandbox/dbutils/java5/pom.xml (original)
+++ commons/sandbox/dbutils/java5/pom.xml Sun Feb 8 01:27:53 2009
@@ -27,7 +27,7 @@
modelVersion4.0.0/modelVersion
groupIdcommons-dbutils/groupId
artifactIdcommons-dbutils/artifactId
- version1.2-SNAPSHOT/version
+ version2.0-SNAPSHOT/version
nameCommons DbUtils/name
inceptionYear2002/inceptionYear
@@ -203,6 +203,13 @@
tarLongFileModegnu/tarLongFileMode
/configuration
/plugin
+plugin
+ artifactIdmaven-compiler-plugin/artifactId
+ configuration
+source1.5/source
+target1.5/target
+ /configuration
+/plugin
/plugins
/build
Modified:
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=741990r1=741989r2=741990view=diff
==
---
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/sandbox/dbutils/java5/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Sun Feb 8 01:27:53 2009
@@ -20,7 +20,6 @@
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -107,7 +106,7 @@
* @see org.apache.commons.dbutils.RowProcessor#toBean(java.sql.ResultSet,
java.lang.Class)
* @see
org.apache.commons.dbutils.BeanProcessor#toBean(java.sql.ResultSet,
java.lang.Class)
*/
-public Object toBean(ResultSet rs, Class type) throws SQLException {
+public T T toBean(ResultSet rs, ClassT type) throws SQLException {
return this.convert.toBean(rs, type);
}
@@ -117,7 +116,7 @@
* @see
org.apache.commons.dbutils.RowProcessor#toBeanList(java.sql.ResultSet,
java.lang.Class)
* @see
org.apache.commons.dbutils.BeanProcessor#toBeanList(java.sql.ResultSet,
java.lang.Class)
*/
-public List toBeanList(ResultSet rs, Class type) throws SQLException {
+public T ListT toBeanList(ResultSet rs, ClassT type) throws
SQLException {
return this.convert.toBeanList(rs
