You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/05/22 14:55:09 UTC
(commons-dbutils) branch master updated (5650aa2 -> 69cd6e6)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
from 5650aa2 Bump commons-parent from 69 to 70
new 52d8557 Fix entry types
new 0cdf832 ResultSetIterator.next() does not check if it is already at the end of the result set (SpotBugs CheckResultSet)
new 06f79e2 Comment: NOPMD False positive CheckResultSet
new 69cd6e6 Bump commons-parent from 62 to 70
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 351 ++++++++++-----------
src/changes/changes.xml | 9 +-
.../org/apache/commons/dbutils/BeanProcessor.java | 6 +-
.../apache/commons/dbutils/ResultSetIterator.java | 3 +-
4 files changed, 181 insertions(+), 188 deletions(-)
(commons-dbutils) 01/04: Fix entry types
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 52d85577ecc440149a9b2fc415b4cbe578b48d08
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 10:45:36 2024 -0400
Fix entry types
---
src/changes/changes.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 712deb8..ee30596 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,10 +45,10 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="1.9.0" date="YYYY-MM-DD" description="New features and bug fixes.">
<!-- FIX -->
- <action dev="ggregory" type="update" due-to="sanjanarampurkottur01, Gary Gregory">Switch on String instead of cascading if-else in MockResultSet #220.</action>
- <action dev="ggregory" type="update" due-to="sanjanarampurkottur01, Gary Gregory">Encapsulate test fields #222.</action>
- <action dev="ggregory" type="update" due-to="Gary Gregory">Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
- <action dev="ggregory" type="update" due-to="Gary Gregory">Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
+ <action dev="ggregory" type="fix" due-to="sanjanarampurkottur01, Gary Gregory">Switch on String instead of cascading if-else in MockResultSet #220.</action>
+ <action dev="ggregory" type="fix" due-to="sanjanarampurkottur01, Gary Gregory">Encapsulate test fields #222.</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
<!-- ADD -->
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump Java from 8 to 11.</action>
(commons-dbutils) 04/04: Bump commons-parent from 62 to 70
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 69cd6e6b81a379accb54ad21f026a5959867d7ca
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 10:55:05 2024 -0400
Bump commons-parent from 62 to 70
Move some sections to the bottom
---
pom.xml | 351 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 174 insertions(+), 177 deletions(-)
diff --git a/pom.xml b/pom.xml
index d13425e..710ff38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,183 +42,6 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-dbutils.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=commons-dbutils.git</url>
</scm>
-
- <developers>
- <developer>
- <name>Juozas Baliuka</name>
- <id>baliuka</id>
- <email>baliuka@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Steven Caswell</name>
- <id>scaswell</id>
- <email>steven@caswell.name</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Dan Fabulich</name>
- <id>dfabulich</id>
- <email>dan@fabulich.com</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>David Graham</name>
- <id>dgraham</id>
- <email>dgraham@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Yoav Shapira</name>
- <id>yoavs</id>
- <email>yoavs@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>William Speirs</name>
- <id>wspeirs</id>
- <email>wspeirs@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Simone Tripodi</name>
- <id>simonetripodi</id>
- <email>simonetripodi at apache dot org</email>
- </developer>
- <developer>
- <name>Henri Yandell</name>
- <id>bayard</id>
- <email>bayard@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Benedikt Ritter</name>
- <id>britter</id>
- <email>britter@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Carl Hall</name>
- <id>thecarlhall</id>
- <email>thecarlhall@apache.org</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <id>ggregory</id>
- <name>Gary Gregory</name>
- <email>ggregory at apache.org</email>
- <url>https://www.garygregory.com</url>
- <organization>The Apache Software Foundation</organization>
- <organizationUrl>https://www.apache.org/</organizationUrl>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>America/New_York</timezone>
- <properties>
- <picUrl>https://people.apache.org/~ggregory/img/garydgregory80.png</picUrl>
- </properties>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Péter Bagyinszki</name>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Alan Canon</name>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Stefan Fleiter</name>
- <email>stefan.fleiter@web.de</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Adkins Kendall</name>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Markus Khouri</name>
- <email>mkhouri.list@gmail.com</email>
- <roles>
- <role>Documentation</role>
- </roles>
- </contributor>
- <contributor>
- <name>Uli Kleeberger</name>
- <email>ukleeberger@web.de</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Piotr Lakomy</name>
- <email>piotrl@cft-inc.net</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Corby Page</name>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Michael Schuerig</name>
- <email>michael@schuerig.de</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Norris Shelton</name>
- <email>norrisshelton@yahoo.com</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </contributor>
- <contributor>
- <name>Stevo Slavic</name>
- <email>sslavic at gmail dot com</email>
- </contributor>
- </contributors>
-
<dependencies>
<dependency>
<groupId>org.junit.vintage</groupId>
@@ -414,5 +237,179 @@
</distributionManagement>
</profile>
</profiles>
+ <developers>
+ <developer>
+ <name>Juozas Baliuka</name>
+ <id>baliuka</id>
+ <email>baliuka@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Steven Caswell</name>
+ <id>scaswell</id>
+ <email>steven@caswell.name</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Dan Fabulich</name>
+ <id>dfabulich</id>
+ <email>dan@fabulich.com</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David Graham</name>
+ <id>dgraham</id>
+ <email>dgraham@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Yoav Shapira</name>
+ <id>yoavs</id>
+ <email>yoavs@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>William Speirs</name>
+ <id>wspeirs</id>
+ <email>wspeirs@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Simone Tripodi</name>
+ <id>simonetripodi</id>
+ <email>simonetripodi at apache dot org</email>
+ </developer>
+ <developer>
+ <name>Henri Yandell</name>
+ <id>bayard</id>
+ <email>bayard@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Benedikt Ritter</name>
+ <id>britter</id>
+ <email>britter@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Carl Hall</name>
+ <id>thecarlhall</id>
+ <email>thecarlhall@apache.org</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>ggregory</id>
+ <name>Gary Gregory</name>
+ <email>ggregory at apache.org</email>
+ <url>https://www.garygregory.com</url>
+ <organization>The Apache Software Foundation</organization>
+ <organizationUrl>https://www.apache.org/</organizationUrl>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>America/New_York</timezone>
+ <properties>
+ <picUrl>https://people.apache.org/~ggregory/img/garydgregory80.png</picUrl>
+ </properties>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Péter Bagyinszki</name>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Alan Canon</name>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Stefan Fleiter</name>
+ <email>stefan.fleiter@web.de</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Adkins Kendall</name>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Markus Khouri</name>
+ <email>mkhouri.list@gmail.com</email>
+ <roles>
+ <role>Documentation</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Uli Kleeberger</name>
+ <email>ukleeberger@web.de</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Piotr Lakomy</name>
+ <email>piotrl@cft-inc.net</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Corby Page</name>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Michael Schuerig</name>
+ <email>michael@schuerig.de</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Norris Shelton</name>
+ <email>norrisshelton@yahoo.com</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Stevo Slavic</name>
+ <email>sslavic at gmail dot com</email>
+ </contributor>
+ </contributors>
</project>
(commons-dbutils) 03/04: Comment: NOPMD False positive CheckResultSet
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 06f79e221a542e551eb0ec63c5ba2b8405e85913
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 10:54:25 2024 -0400
Comment: NOPMD False positive CheckResultSet
---
src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index 18240ee..1d8c649 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -509,19 +509,15 @@ public class BeanProcessor {
*/
public <T> List<T> toBeanList(final ResultSet resultSet, final Class<? extends T> type) throws SQLException {
final List<T> results = new ArrayList<>();
-
if (!resultSet.next()) {
return results;
}
-
final PropertyDescriptor[] props = this.propertyDescriptors(type);
final ResultSetMetaData rsmd = resultSet.getMetaData();
final int[] columnToProperty = this.mapColumnsToProperties(rsmd, props);
-
do {
results.add(this.createBean(resultSet, type, props, columnToProperty));
- } while (resultSet.next());
-
+ } while (resultSet.next()); // NOPMD False positive CheckResultSet
return results;
}
(commons-dbutils) 02/04: ResultSetIterator.next() does not check if it is already at the end of the result set (SpotBugs CheckResultSet)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit 0cdf8321ce36d405e1636a5d2309d47a42d72029
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 10:47:33 2024 -0400
ResultSetIterator.next() does not check if it is already at the end of
the result set (SpotBugs CheckResultSet)
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/dbutils/ResultSetIterator.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ee30596..ba3abc9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,6 +49,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="sanjanarampurkottur01, Gary Gregory">Encapsulate test fields #222.</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix BeanProcessor SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix StatementConfiguration SpotBugs CT: Be wary of letting constructors throw exceptions. (CT_CONSTRUCTOR_THROW).</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">ResultSetIterator.next() does not check if it is already at the end of the result set (SpotBugs CheckResultSet).</action>
<!-- ADD -->
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump Java from 8 to 11.</action>
diff --git a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
index 7535023..5f776ff 100644
--- a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
@@ -99,8 +99,7 @@ public class ResultSetIterator implements Iterator<Object[]> {
@Override
public Object[] next() {
try {
- resultSet.next();
- return this.convert.toArray(resultSet);
+ return resultSet.next() ? this.convert.toArray(resultSet) : new Object[0];
} catch (final SQLException e) {
rethrow(e);
return null;