Fixes nullability and style issues

apache · Oct 14, 2024 · bd6092e · bd6092e
1 parent 841708e
commit bd6092e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 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
@@ -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
@@ -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/.../flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/FlightSqlConnection.java b/.../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
@@ -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
@@ -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
@@ -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);
     }
   }