fix(bigquery): address review comments on finalize cleanup and typed Schema parameter

Author: jinseopkim0

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ArrowDeserializer.java

@@ -190,10 +190,9 @@ static Schema arrowSchemaToBigQuerySchema(Object arrowSchema) {
    * @throws IOException if deserialization of the Arrow record batch fails
    */
   static List<FieldValueList> deserializeRecordBatch(
-      byte[] recordBatchBytes, Schema schema, Object arrowSchema) throws IOException {
-    List<FieldVector> vectors =
-        ArrowPojoUtils.createVectors(
-            (org.apache.arrow.vector.types.pojo.Schema) arrowSchema, ALLOCATOR);
+      byte[] recordBatchBytes, Schema schema, org.apache.arrow.vector.types.pojo.Schema arrowSchema)
+      throws IOException {
+    List<FieldVector> vectors = ArrowPojoUtils.createVectors(arrowSchema, ALLOCATOR);
     VectorSchemaRoot root;
     try {
       root = new VectorSchemaRoot(vectors);

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

@@ -422,6 +422,24 @@ public Page<FieldValueList> getNextPage() {
       String nextPageToken = hasMore ? String.valueOf(totalRowsReturned) : null;
       return new PageImpl<>(this, nextPageToken, rowBatch);
     }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    protected void finalize() throws Throwable {
+      try {
+        if (client != null) {
+          try {
+            client.close();
+          } catch (Exception e) {
+            // ignore
+          }
+          client = null;
+          streamIterator = null;
+        }
+      } finally {
+        super.finalize();
+      }
+    }
   }
 
   private final HttpBigQueryRpc bigQueryRpc;
@@ -2281,7 +2299,7 @@ public com.google.api.services.bigquery.model.QueryResponse call()
               ArrowDeserializer.deserializeRecordBatch(
                   results.getArrowRecordBatch().decodeSerializedRecordBatch(),
                   schema,
-                  arrowSchemaPojo);
+                  (org.apache.arrow.vector.types.pojo.Schema) arrowSchemaPojo);
         } catch (IOException e) {
           throw new BigQueryException(0, "Failed to deserialize Arrow record batch", e);
         }

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ArrowDeserializerTest.java

@@ -131,7 +131,7 @@ public void testDeserializeRecordBatchPrimitives() throws IOException {
           ImmutableList.of(intVector, nameVector, scoreVector, activeVector, bytesVector, tsVector);
 
       try (VectorSchemaRoot root = new VectorSchemaRoot(vectors)) {
-        Object arrowSchema = root.getSchema();
+        org.apache.arrow.vector.types.pojo.Schema arrowSchema = root.getSchema();
         Schema bqSchema = ArrowDeserializer.arrowSchemaToBigQuerySchema(arrowSchema);
 
         byte[] recordBatchBytes = serializeVectorSchemaRoot(root, allocator);