fix ci tests

Author: xborder

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

@@ -806,19 +806,19 @@ public void testResultSetAppMetadata() throws Exception {
   public void testSelectQueryWithUuidColumn() throws SQLException {
     // Expectations
     final int expectedRowCount = 4;
-    final UUID[] expectedUuids = new UUID[] {
-        CoreMockedSqlProducers.UUID_1,
-        CoreMockedSqlProducers.UUID_2,
-        CoreMockedSqlProducers.UUID_3,
-        null
-    };
+    final UUID[] expectedUuids =
+        new UUID[] {
+          CoreMockedSqlProducers.UUID_1,
+          CoreMockedSqlProducers.UUID_2,
+          CoreMockedSqlProducers.UUID_3,
+          null
+        };
 
     final Integer[] expectedIds = new Integer[] {1, 2, 3, 4};
 
     final List<UUID> actualUuids = new ArrayList<>(expectedRowCount);
     final List<Integer> actualIds = new ArrayList<>(expectedRowCount);
 
-
     // Query
     int actualRowCount = 0;
     try (Statement statement = connection.createStatement();
@@ -951,7 +951,8 @@ public void testPreparedStatementWithUuidParameter() throws SQLException {
 
   @Test
   public void testPreparedStatementWithUuidStringParameter() throws SQLException {
-    try (PreparedStatement pstmt = connection.prepareStatement(CoreMockedSqlProducers.UUID_PREPARED_SELECT_SQL_CMD)) {
+    try (PreparedStatement pstmt =
+        connection.prepareStatement(CoreMockedSqlProducers.UUID_PREPARED_SELECT_SQL_CMD)) {
       pstmt.setString(1, CoreMockedSqlProducers.UUID_1.toString());
       try (ResultSet rs = pstmt.executeQuery()) {
         rs.next();
@@ -962,7 +963,8 @@ public void testPreparedStatementWithUuidStringParameter() throws SQLException {
 
   @Test
   public void testPreparedStatementUpdateWithUuid() throws SQLException {
-    try (PreparedStatement pstmt = connection.prepareStatement(CoreMockedSqlProducers.UUID_PREPARED_UPDATE_SQL_CMD)) {
+    try (PreparedStatement pstmt =
+        connection.prepareStatement(CoreMockedSqlProducers.UUID_PREPARED_UPDATE_SQL_CMD)) {
       pstmt.setObject(1, CoreMockedSqlProducers.UUID_3);
       pstmt.setInt(2, 1);
       int updated = pstmt.executeUpdate();

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java

@@ -17,7 +17,6 @@
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.lang.String.format;
-import java.util.Arrays;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,6 +28,7 @@
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -69,8 +69,10 @@ public final class CoreMockedSqlProducers {
   public static final String LEGACY_REGULAR_WITH_EMPTY_SQL_CMD = "SELECT * FROM TEST_EMPTIES";
 
   public static final String UUID_SQL_CMD = "SELECT * FROM UUID_TABLE";
-  public static final String UUID_PREPARED_SELECT_SQL_CMD = "SELECT * FROM UUID_TABLE WHERE uuid_col = ?";
-  public static final String UUID_PREPARED_UPDATE_SQL_CMD = "UPDATE UUID_TABLE SET uuid_col = ? WHERE id = ?";
+  public static final String UUID_PREPARED_SELECT_SQL_CMD =
+      "SELECT * FROM UUID_TABLE WHERE uuid_col = ?";
+  public static final String UUID_PREPARED_UPDATE_SQL_CMD =
+      "UPDATE UUID_TABLE SET uuid_col = ? WHERE id = ?";
 
   public static final UUID UUID_1 = UUID.fromString("550e8400-e29b-41d4-a716-446655440000");
   public static final UUID UUID_2 = UUID.fromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8");
@@ -114,6 +116,7 @@ public static MockFlightSqlProducer getUuidProducer() {
     addUuidSqlCmdSupport(producer);
     return producer;
   }
+
   private static void addUuidPreparedUpdateSqlCmdSupport(final MockFlightSqlProducer producer) {
     final String query = "UPDATE UUID_TABLE SET uuid_col = ? WHERE id = ?";
     final Schema parameterSchema =

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java

@@ -87,7 +87,7 @@ public void testGetSqlTypeIdFromArrowType() {
 
     assertEquals(Types.NULL, getSqlTypeIdFromArrowType(new ArrowType.Null()));
 
-    assertEquals(Types.OTHER, getSqlTypeIdFromArrowType(new UuidType()));
+    assertEquals(Types.OTHER, getSqlTypeIdFromArrowType(UuidType.INSTANCE));
   }
 
   @Test
@@ -144,6 +144,6 @@ public void testGetSqlTypeNameFromArrowType() {
 
     assertEquals("NULL", getSqlTypeNameFromArrowType(new ArrowType.Null()));
 
-    assertEquals("OTHER", getSqlTypeNameFromArrowType(new UuidType()));
+    assertEquals("OTHER", getSqlTypeNameFromArrowType(UuidType.INSTANCE));
   }
 }