From dd9d31f76db7a08c912179be376a95a8a10d28fe Mon Sep 17 00:00:00 2001
From: Pedro Matias <pedro.matias@dremio.com>
Date: Mon, 20 Apr 2026 02:07:39 +0100
Subject: [PATCH 1/3] Fix incorrect cast

---
 .../org/apache/arrow/flight/grpc/NettyClientBuilder.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java b/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java
index 42cdaac016..e658711214 100644
--- a/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java
+++ b/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java
@@ -19,8 +19,8 @@
 import io.grpc.ManagedChannel;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
+import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import java.io.InputStream;
@@ -151,7 +151,7 @@ public NettyChannelBuilder build() {
               // Linux
               builder.channelType(
                   Class.forName("io.netty.channel.epoll.EpollDomainSocketChannel")
-                      .asSubclass(ServerChannel.class));
+                      .asSubclass(Channel.class));
               final EventLoopGroup elg =
                   Class.forName("io.netty.channel.epoll.EpollEventLoopGroup")
                       .asSubclass(EventLoopGroup.class)
@@ -162,7 +162,7 @@ public NettyChannelBuilder build() {
               // BSD
               builder.channelType(
                   Class.forName("io.netty.channel.kqueue.KQueueDomainSocketChannel")
-                      .asSubclass(ServerChannel.class));
+                      .asSubclass(Channel.class));
               final EventLoopGroup elg =
                   Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
                       .asSubclass(EventLoopGroup.class)

From 560ed2e59bc7780ec8a7d1152dc8917f77127392 Mon Sep 17 00:00:00 2001
From: Pedro Matias <pedro.matias@dremio.com>
Date: Mon, 20 Apr 2026 03:28:12 +0100
Subject: [PATCH 2/3] Fix test dependencies to run domain socket test

---
 flight/flight-core/pom.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/flight/flight-core/pom.xml b/flight/flight-core/pom.xml
index 5c6c3378c1..06447084a7 100644
--- a/flight/flight-core/pom.xml
+++ b/flight/flight-core/pom.xml
@@ -147,6 +147,39 @@ under the License.
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>native-epoll-test</id>
+      <activation>
+        <os><family>linux</family></os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${dep.netty-bom.version}</version>
+          <classifier>${os.detected.classifier}</classifier>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>native-kqueue-test</id>
+      <activation>
+        <os><family>mac</family></os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-kqueue</artifactId>
+          <version>${dep.netty-bom.version}</version>
+          <classifier>${os.detected.classifier}</classifier>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

From 4bf53f2825e1d17b125d2350ad226a9d5229cb63 Mon Sep 17 00:00:00 2001
From: Pedro Matias <pedro.matias@dremio.com>
Date: Mon, 20 Apr 2026 03:48:10 +0100
Subject: [PATCH 3/3] Fix formatting

---
 flight/flight-core/pom.xml | 70 ++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/flight/flight-core/pom.xml b/flight/flight-core/pom.xml
index 06447084a7..95748702a1 100644
--- a/flight/flight-core/pom.xml
+++ b/flight/flight-core/pom.xml
@@ -147,39 +147,6 @@ under the License.
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>native-epoll-test</id>
-      <activation>
-        <os><family>linux</family></os>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-epoll</artifactId>
-          <version>${dep.netty-bom.version}</version>
-          <classifier>${os.detected.classifier}</classifier>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>native-kqueue-test</id>
-      <activation>
-        <os><family>mac</family></os>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-          <version>${dep.netty-bom.version}</version>
-          <classifier>${os.detected.classifier}</classifier>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
@@ -235,4 +202,41 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>native-epoll-test</id>
+      <activation>
+        <os>
+          <family>linux</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${dep.netty-bom.version}</version>
+          <classifier>${os.detected.classifier}</classifier>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>native-kqueue-test</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-kqueue</artifactId>
+          <version>${dep.netty-bom.version}</version>
+          <classifier>${os.detected.classifier}</classifier>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>