From bd6092eb0ad8b9d20bb5ac8ef8be274af336aa53 Mon Sep 17 00:00:00 2001
From: Laurent Goujon <laurent@apache.org>
Date: Mon, 14 Oct 2024 09:28:39 -0700
Subject: [PATCH] Fixes nullability and style issues

---
 .../main/java/org/apache/arrow/adbc/core/AdbcException.java  | 5 +++++
 .../main/java/org/apache/arrow/adbc/core/AdbcStatement.java  | 4 ++--
 .../arrow/adbc/driver/flightsql/FlightSqlConnection.java     | 2 +-
 .../org/apache/arrow/adbc/driver/jdbc/JdbcConnection.java    | 2 +-
 .../arrow/adbc/driver/jdbc/JdbcDataSourceDatabase.java       | 2 +-
 .../org/apache/arrow/adbc/driver/jdbc/JdbcStatement.java     | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcException.java b/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcException.java
index 193bbaa96c..25a5c620f0 100644
--- a/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcException.java
+++ b/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcException.java
@@ -72,6 +72,11 @@ public static AdbcException io(String message) {
     return new AdbcException(message, /*cause*/ null, AdbcStatusCode.IO, null, 0);
   }
 
+  /** Create a new exception with code {@link AdbcStatusCode#IO} from an existing exception. */
+  public static AdbcException io(Throwable cause) {
+    return new AdbcException(cause.getMessage(), cause, AdbcStatusCode.IO, null, 0);
+  }
+
   /** Create a new exception with code {@link AdbcStatusCode#INVALID_STATE}. */
   public static AdbcException invalidState(String message) {
     return new AdbcException(message, /*cause*/ null, AdbcStatusCode.INVALID_STATE, null, 0);
diff --git a/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcStatement.java b/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcStatement.java
index b015072b10..c26380aa83 100644
--- a/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcStatement.java
+++ b/java/core/src/main/java/org/apache/arrow/adbc/core/AdbcStatement.java
@@ -208,9 +208,9 @@ public String toString() {
     @Override
     public void close() throws AdbcException {
       try {
-      reader.close();
+        reader.close();
       } catch (IOException e) {
-        throw AdbcException.io(e.getMessage()).withCause(e);
+        throw AdbcException.io(e);
       }
     }
   }
diff --git a/java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java b/java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java
index 4a2760ebb1..39ddd1e21e 100644
--- a/java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java
+++ b/java/driver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java
@@ -211,7 +211,7 @@ public void close() throws AdbcException {
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
-      throw AdbcException.io(e.getMessage()).withCause(e);
+      throw AdbcException.io(e);
     }
   }
 
diff --git a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcConnection.java b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcConnection.java
index 2efeaa0d90..086946acab 100644
--- a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcConnection.java
+++ b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcConnection.java
@@ -514,7 +514,7 @@ public void close() throws AdbcException {
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
-      throw AdbcException.io(e.getMessage()).withCause(e);
+      throw AdbcException.io(e);
     }
   }
 
diff --git a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcDataSourceDatabase.java b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcDataSourceDatabase.java
index 9585cc7ca3..c860383562 100644
--- a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcDataSourceDatabase.java
+++ b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcDataSourceDatabase.java
@@ -82,7 +82,7 @@ public void close() throws AdbcException {
       try {
         connection.close();
       } catch (SQLException e) {
-        throw AdbcException.io(e.getMessage()).withCause(e);
+        throw AdbcException.io(e);
       }
     }
     connection = null;
diff --git a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcStatement.java b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcStatement.java
index 016e6dc529..9072ff9708 100644
--- a/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcStatement.java
+++ b/java/driver/jdbc/src/main/java/org/apache/arrow/adbc/driver/jdbc/JdbcStatement.java
@@ -377,7 +377,7 @@ public void close() throws AdbcException {
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
-      throw AdbcException.io(e.getMessage()).withCause(e);
+      throw AdbcException.io(e);
     }
   }