(commons-dbcp) 11/15: Merge if statements

[ggregory]

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-dbcp.git

commit e99abc24c512877b28009ca4a85c93daf73e68ae
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Nov 21 19:56:51 2025 +0000

    Merge if statements
---
 .../java/org/apache/commons/dbcp2/PStmtKey.java    | 29 ++++------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java 
b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index ad2afae2..12dfe1a3 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -516,35 +516,16 @@ public class PStmtKey {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final PStmtKey other = (PStmtKey) obj;
-        if (!Objects.equals(autoGeneratedKeys, other.autoGeneratedKeys)) {
-            return false;
-        }
-        if (!Objects.equals(catalog, other.catalog)) {
-            return false;
-        }
-        if (!Arrays.equals(columnIndexes, other.columnIndexes)) {
-            return false;
-        }
-        if (!Arrays.equals(columnNames, other.columnNames)) {
-            return false;
-        }
-        if (!Objects.equals(resultSetConcurrency, other.resultSetConcurrency)) 
{
-            return false;
-        }
-        if (!Objects.equals(resultSetHoldability, other.resultSetHoldability)) 
{
-            return false;
-        }
-        if (!Objects.equals(resultSetType, other.resultSetType)) {
+        if (!Objects.equals(autoGeneratedKeys, other.autoGeneratedKeys) || 
!Objects.equals(catalog, other.catalog)
+                || !Arrays.equals(columnIndexes, other.columnIndexes) || 
!Arrays.equals(columnNames, other.columnNames)) {
             return false;
         }
-        if (!Objects.equals(schema, other.schema)) {
+        if (!Objects.equals(resultSetConcurrency, other.resultSetConcurrency) 
|| !Objects.equals(resultSetHoldability, other.resultSetHoldability)
+                || !Objects.equals(resultSetType, other.resultSetType) || 
!Objects.equals(schema, other.schema)) {
             return false;
         }
         if (!Objects.equals(sql, other.sql)) {