From 4af42ed6f72fd5537b7cda72644a69773a67f36b Mon Sep 17 00:00:00 2001
From: Rafael Telles <rafael@telles.dev>
Date: Thu, 26 Aug 2021 13:32:47 -0300
Subject: [PATCH] Flight SQL Ratification Based On Community Feedback #7 (#98)

* Remove scope from 'hamcrest' dependency on java/pom.xml

* Use flight top-level module on parent pom.xml instead of declaring each one

* Avoid using getStatement inside StatementContext methods

* Make StatementContext.getQuery() return String

* Minor fixes on pom.xml

* Move 'os-maven-plugin' to parent pom.xml

* Update protobuf generation on pom.xml files

* Use ClassLoader#getResource to get network.properties on TestFlightSql

* Bind to any ephemeral port on TestFlightSql

* Move JDBC-Arrow type default conversion from JdbcToArrowConfig to JdbcToArrowUtils

* Micro-optimization: initialize ArrayList with the right size

* Fix null-check on PreparedStatement#setParameters

* Avoid wrapping vector into a ImmutableList and then into an ArrayList on FlightSqlExample#getTablesRoot

* Remove null-check on VectorSchemaRoot on FlightSqlClient#setParameters()

* Remove the need of separate cache for ResultSets

* Add missing 'final' modifiers
---
 .../apache/arrow/flight/TestFlightSql.java    |  4 +--
 java/flight/pom.xml                           | 31 +++++++-----------
 java/pom.xml                                  | 32 +++++++++++++++++++
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/TestFlightSql.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/TestFlightSql.java
index 115f85f0d419b..505b905d73009 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/TestFlightSql.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/TestFlightSql.java
@@ -27,9 +27,7 @@
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.channels.Channels;
+import java.nio.ByteBuffer;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index 9cc8acb94c0e0..ba5a72acfb1c0 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -25,9 +25,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <dep.grpc.version>1.44.1</dep.grpc.version>
-        <dep.netty-tcnative.version>2.0.46.Final</dep.netty-tcnative.version>
-        <dep.protobuf.version>3.19.4</dep.protobuf.version>
+        <dep.grpc.version>1.30.2</dep.grpc.version>
+        <dep.protobuf.version>3.7.1</dep.protobuf.version>
     </properties>
 
     <modules>
@@ -39,22 +38,14 @@
     </modules>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.xolstice.maven.plugins</groupId>
-                    <artifactId>protobuf-maven-plugin</artifactId>
-                    <version>0.6.1</version>
-                    <configuration>
-                        <protocArtifact>
-                            com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}
-                        </protocArtifact>
-                        <pluginId>grpc-java</pluginId>
-                        <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}
-                        </pluginArtifact>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        <extensions>
+            <!-- provides os.detected.classifier (i.e. linux-x86_64, osx-x86_64) property -->
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.5.0.Final</version>
+            </extension>
+        </extensions>
     </build>
+
 </project>
diff --git a/java/pom.xml b/java/pom.xml
index 495cdab0576ff..418f98d793b8d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -506,6 +506,38 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
+
+        <plugin>
+          <groupId>org.xolstice.maven.plugins</groupId>
+          <artifactId>protobuf-maven-plugin</artifactId>
+          <version>0.6.1</version>
+          <configuration>
+            <protocArtifact>com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+            <pluginId>grpc-java</pluginId>
+            <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+          </configuration>
+          <executions>
+            <execution>
+              <id>proto-compile</id>
+              <phase>generate-sources</phase>
+              <configuration>
+                <protoSourceRoot>${basedir}/../format/</protoSourceRoot>
+              </configuration>
+              <goals>
+                <goal>compile</goal>
+                <goal>compile-custom</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>proto-test-compile</id>
+              <phase>generate-test-sources</phase>
+              <goals>
+                <goal>test-compile</goal>
+                <goal>test-compile-custom</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>