From commits-return-62210-archive-asf-public=cust-asf.ponee.io@commons.apache.org Sun May 6 18:21:28 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9BC31180674 for ; Sun, 6 May 2018 18:21:27 +0200 (CEST) Received: (qmail 52157 invoked by uid 500); 6 May 2018 16:21:26 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 52148 invoked by uid 99); 6 May 2018 16:21:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 May 2018 16:21:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68FAAE09F4; Sun, 6 May 2018 16:21:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ggregory@apache.org To: commits@commons.apache.org Message-Id: <41d5ad3d66a44444beb246bec4a8683e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: commons-dbutils git commit: Convert 'for' loops to enhanced 'for' loops. Date: Sun, 6 May 2018 16:21:26 +0000 (UTC) Repository: commons-dbutils Updated Branches: refs/heads/master e2c137f95 -> 84869ad01 Convert 'for' loops to enhanced 'for' loops. Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/84869ad0 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/84869ad0 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/84869ad0 Branch: refs/heads/master Commit: 84869ad01624685179821b69a0fb158ec05c24b2 Parents: e2c137f Author: Gary Gregory Authored: Sun May 6 10:21:24 2018 -0600 Committer: Gary Gregory Committed: Sun May 6 10:21:24 2018 -0600 ---------------------------------------------------------------------- .../java/org/apache/commons/dbutils/AbstractQueryRunner.java | 3 +-- src/main/java/org/apache/commons/dbutils/QueryRunner.java | 8 ++++---- .../commons/dbutils/wrappers/SqlNullCheckedResultSet.java | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/84869ad0/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java index 13bb1db..7db2cd1 100644 --- a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java +++ b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java @@ -410,8 +410,7 @@ public abstract class AbstractQueryRunner { + i); } boolean found = false; - for (int j = 0; j < descriptors.length; j++) { - final PropertyDescriptor descriptor = descriptors[j]; + for (final PropertyDescriptor descriptor : descriptors) { if (propertyName.equals(descriptor.getName())) { sorted[i] = descriptor; found = true; http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/84869ad0/src/main/java/org/apache/commons/dbutils/QueryRunner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/QueryRunner.java b/src/main/java/org/apache/commons/dbutils/QueryRunner.java index b7fb46b..85bae22 100644 --- a/src/main/java/org/apache/commons/dbutils/QueryRunner.java +++ b/src/main/java/org/apache/commons/dbutils/QueryRunner.java @@ -185,8 +185,8 @@ public class QueryRunner extends AbstractQueryRunner { try { stmt = this.prepareStatement(conn, sql); - for (int i = 0; i < params.length; i++) { - this.fillStatement(stmt, params[i]); + for (Object[] param : params) { + this.fillStatement(stmt, param); stmt.addBatch(); } rows = stmt.executeBatch(); @@ -726,8 +726,8 @@ public class QueryRunner extends AbstractQueryRunner { try { stmt = this.prepareStatement(conn, sql, Statement.RETURN_GENERATED_KEYS); - for (int i = 0; i < params.length; i++) { - this.fillStatement(stmt, params[i]); + for (Object[] param : params) { + this.fillStatement(stmt, param); stmt.addBatch(); } stmt.executeBatch(); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/84869ad0/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java index fa42f41..ea7617a 100644 --- a/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java +++ b/src/main/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java @@ -84,12 +84,12 @@ public class SqlNullCheckedResultSet implements InvocationHandler { static { final Method[] methods = SqlNullCheckedResultSet.class.getMethods(); - for (int i = 0; i < methods.length; i++) { - final String methodName = methods[i].getName(); + for (Method method : methods) { + final String methodName = method.getName(); if (methodName.startsWith(GET_NULL_PREFIX)) { final String normalName = "get" + methodName.substring(GET_NULL_PREFIX.length()); - nullMethods.put(normalName, methods[i]); + nullMethods.put(normalName, method); } } }