Modularize flight-sql

Bit-Quill · Dec 13, 2023 · 0e25c27 · 0e25c27
1 parent 6fc4427
commit 0e25c27
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 3 deletions.
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
@@ -50,6 +50,10 @@
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-memory-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-jdbc</artifactId>
@@ -110,4 +114,27 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>error-prone-jdk11+</id>
+      <activation>
+        <jdk>[11,]</jdk>
+        <property>
+          <name>!m2e.version</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration combine.self="override">
+              <argLine>--add-reads=org.apache.arrow.flight.sql=org.slf4j --add-reads=org.apache.arrow.flight.core=ALL-UNNAMED --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/java/flight/flight-sql/src/main/java/module-info.java b/java/flight/flight-sql/src/main/java/module-info.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module org.apache.arrow.flight.sql {
+  exports org.apache.arrow.flight.sql;
+  exports org.apache.arrow.flight.sql.example;
+  exports org.apache.arrow.flight.sql.util;
+
+  requires com.google.common;
+  requires java.sql;
+  requires org.apache.arrow.flight.core;
+  requires org.apache.arrow.memory.core;
+  requires org.apache.arrow.vector;
+  requires protobuf.java;
+}
diff --git a/...pache/arrow/flight/sql/TestFlightSql.java → .../arrow/flight/sql/test/TestFlightSql.java b/...pache/arrow/flight/sql/TestFlightSql.java → .../arrow/flight/sql/test/TestFlightSql.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.arrow.flight;
+package org.apache.arrow.flight.sql.test;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
@@ -38,6 +38,15 @@
 import java.util.Optional;
 import java.util.stream.IntStream;
 
+import org.apache.arrow.flight.CancelFlightInfoRequest;
+import org.apache.arrow.flight.FlightClient;
+import org.apache.arrow.flight.FlightInfo;
+import org.apache.arrow.flight.FlightRuntimeException;
+import org.apache.arrow.flight.FlightServer;
+import org.apache.arrow.flight.FlightStatusCode;
+import org.apache.arrow.flight.FlightStream;
+import org.apache.arrow.flight.Location;
+import org.apache.arrow.flight.RenewFlightEndpointRequest;
 import org.apache.arrow.flight.sql.FlightSqlClient;
 import org.apache.arrow.flight.sql.FlightSqlClient.PreparedStatement;
 import org.apache.arrow.flight.sql.FlightSqlColumnMetadata;
@@ -912,7 +921,7 @@ public void testCancelFlightInfo() {
     FlightInfo info = sqlClient.getSqlInfo();
     CancelFlightInfoRequest request = new CancelFlightInfoRequest(info);
     FlightRuntimeException fre = assertThrows(FlightRuntimeException.class, () -> sqlClient.cancelFlightInfo(request));
-    assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
+    Assertions.assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
   }
 
   @Test

diff --git a/...rrow/flight/sql/TestFlightSqlStreams.java → ...flight/sql/test/TestFlightSqlStreams.java b/...rrow/flight/sql/TestFlightSqlStreams.java → ...flight/sql/test/TestFlightSqlStreams.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.arrow.flight;
+package org.apache.arrow.flight.sql.test;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
@@ -28,6 +28,15 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.FlightClient;
+import org.apache.arrow.flight.FlightDescriptor;
+import org.apache.arrow.flight.FlightEndpoint;
+import org.apache.arrow.flight.FlightInfo;
+import org.apache.arrow.flight.FlightServer;
+import org.apache.arrow.flight.FlightStream;
+import org.apache.arrow.flight.Location;
+import org.apache.arrow.flight.Ticket;
 import org.apache.arrow.flight.sql.BasicFlightSqlProducer;
 import org.apache.arrow.flight.sql.FlightSqlClient;
 import org.apache.arrow.flight.sql.FlightSqlProducer;