apacheGH-41947: [Java] Support catalog in JDBC driver with session op…

…tions Spotless update
stevelorddremio · Jun 11, 2024 · 8c30b1a · 8c30b1a
1 parent e6a0b63
commit 8c30b1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/...c-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java b/...c-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java
@@ -99,7 +99,8 @@ static ArrowFlightSqlClientHandler createNewHandler(
       final Builder builder,
       final Collection<CallOption> options,
       final Optional<String> catalog) {
-    final ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler(new FlightSqlClient(client), builder, options, catalog);
+    final ArrowFlightSqlClientHandler handler =
+        new ArrowFlightSqlClientHandler(new FlightSqlClient(client), builder, options, catalog);
     handler.setSetCatalogInSessionIfPresent();
     return handler;
   }
@@ -272,29 +273,27 @@ public interface PreparedStatement extends AutoCloseable {
     void close();
   }
 
-  /**
-   * A connection is created with catalog set as a session option.
-   */
+  /** A connection is created with catalog set as a session option. */
   private void setSetCatalogInSessionIfPresent() {
     if (catalog.isPresent()) {
       final SetSessionOptionsRequest setSessionOptionRequest =
-              new SetSessionOptionsRequest(
-                      ImmutableMap.<String, SessionOptionValue>builder()
-                              .put(CATALOG, SessionOptionValueFactory.makeSessionOptionValue(catalog.get()))
-                              .build());
+          new SetSessionOptionsRequest(
+              ImmutableMap.<String, SessionOptionValue>builder()
+                  .put(CATALOG, SessionOptionValueFactory.makeSessionOptionValue(catalog.get()))
+                  .build());
       final SetSessionOptionsResult result =
-              sqlClient.setSessionOptions(setSessionOptionRequest, getOptions());
+          sqlClient.setSessionOptions(setSessionOptionRequest, getOptions());
 
       if (result.hasErrors()) {
         Map<String, SetSessionOptionsResult.Error> errors = result.getErrors();
         for (Map.Entry<String, SetSessionOptionsResult.Error> error : errors.entrySet()) {
           LOGGER.warn(error.toString());
         }
         throw CallStatus.INVALID_ARGUMENT
-                .withDescription(
-                        String.format(
-                                "Cannot set session option for catalog = %s. Check log for details.", catalog))
-                .toRuntimeException();
+            .withDescription(
+                String.format(
+                    "Cannot set session option for catalog = %s. Check log for details.", catalog))
+            .toRuntimeException();
       }
     }
   }

diff --git a/...test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java b/...test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Optional;
-
 import org.apache.arrow.driver.jdbc.FlightServerTestRule;
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
 import org.apache.arrow.memory.BufferAllocator;
@@ -150,8 +149,7 @@ public void testDefaults() {
 
   @Test
   public void testCatalog() {
-    ArrowFlightSqlClientHandler.Builder rootBuilder =
-            new ArrowFlightSqlClientHandler.Builder();
+    ArrowFlightSqlClientHandler.Builder rootBuilder = new ArrowFlightSqlClientHandler.Builder();
 
     rootBuilder.withCatalog(null);
     assertFalse(rootBuilder.catalog.isPresent());